Skip to content

HIVE-29246: Upgrade derby version to 10.17.1.0 #6116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 13, 2025
Merged

HIVE-29246: Upgrade derby version to 10.17.1.0 #6116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82fa864
HIVE-29246: Upgrade derby version to 10.17.1.0
Aggarwal-Raghav Oct 6, 2025
3b73941
Address review comments
Aggarwal-Raghav Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1552,7 +1552,7 @@ public static enum ConfVars {
* @deprecated Use MetastoreConf.CONNECTION_DRIVER
*/
@Deprecated
METASTORE_CONNECTION_DRIVER("javax.jdo.option.ConnectionDriverName", "org.apache.derby.jdbc.EmbeddedDriver",
METASTORE_CONNECTION_DRIVER("javax.jdo.option.ConnectionDriverName", "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"Driver class name for a JDBC metastore"),
/**
* @deprecated Use MetastoreConf.MANAGER_FACTORY_CLASS
Expand Down
2 changes: 1 addition & 1 deletion data/conf/hive-site-old.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

<property>
<name>javax.jdo.option.ConnectionDriverName</name>
<value>org.apache.derby.jdbc.EmbeddedDriver</value>
<value>org.apache.derby.iapi.jdbc.AutoloadedDriver</value>
</property>

<property>
Expand Down
2 changes: 1 addition & 1 deletion data/conf/hive-site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@

<property>
<name>javax.jdo.option.ConnectionDriverName</name>
<value>org.apache.derby.jdbc.EmbeddedDriver</value>
<value>org.apache.derby.iapi.jdbc.AutoloadedDriver</value>
</property>

<property>
Expand Down
2 changes: 1 addition & 1 deletion data/conf/iceberg/llap/hive-site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@

<property>
<name>javax.jdo.option.ConnectionDriverName</name>
<value>org.apache.derby.jdbc.EmbeddedDriver</value>
<value>org.apache.derby.iapi.jdbc.AutoloadedDriver</value>
</property>

<property>
Expand Down
2 changes: 1 addition & 1 deletion data/conf/iceberg/tez/hive-site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@

<property>
<name>javax.jdo.option.ConnectionDriverName</name>
<value>org.apache.derby.jdbc.EmbeddedDriver</value>
<value>org.apache.derby.iapi.jdbc.AutoloadedDriver</value>
</property>

<property>
Expand Down
2 changes: 1 addition & 1 deletion data/conf/llap/hive-site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@

<property>
<name>javax.jdo.option.ConnectionDriverName</name>
<value>org.apache.derby.jdbc.EmbeddedDriver</value>
<value>org.apache.derby.iapi.jdbc.AutoloadedDriver</value>
</property>

<property>
Expand Down
2 changes: 1 addition & 1 deletion data/conf/mr/hive-site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@

<property>
<name>javax.jdo.option.ConnectionDriverName</name>
<value>org.apache.derby.jdbc.EmbeddedDriver</value>
<value>org.apache.derby.iapi.jdbc.AutoloadedDriver</value>
</property>

<property>
Expand Down
2 changes: 1 addition & 1 deletion data/conf/rlist/hive-site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@

<property>
<name>javax.jdo.option.ConnectionDriverName</name>
<value>org.apache.derby.jdbc.EmbeddedDriver</value>
<value>org.apache.derby.iapi.jdbc.AutoloadedDriver</value>
</property>

<property>
Expand Down
2 changes: 1 addition & 1 deletion data/conf/tez/hive-site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@

<property>
<name>javax.jdo.option.ConnectionDriverName</name>
<value>org.apache.derby.jdbc.EmbeddedDriver</value>
<value>org.apache.derby.iapi.jdbc.AutoloadedDriver</value>
</property>

<property>
Expand Down
2 changes: 1 addition & 1 deletion hcatalog/core/src/test/java/org/apache/hive/hcatalog/DerbyPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

package org.apache.hive.hcatalog;

import org.apache.derby.security.SystemPermission;
import org.apache.derby.shared.common.security.SystemPermission;

import java.security.CodeSource;
import java.security.Permission;
Expand Down
2 changes: 1 addition & 1 deletion itests/hive-blobstore/src/test/resources/hive-site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@

<property>
<name>javax.jdo.option.ConnectionDriverName</name>
<value>org.apache.derby.jdbc.EmbeddedDriver</value>
<value>org.apache.derby.iapi.jdbc.AutoloadedDriver</value>
</property>

<property>
Expand Down
2 changes: 1 addition & 1 deletion itests/util/src/main/java/org/apache/hadoop/hive/ql/externalDB/Derby.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ protected String getJdbcUrl() {

@Override
protected String getJdbcDriver() {
return "org.apache.derby.jdbc.EmbeddedDriver";
return "org.apache.derby.iapi.jdbc.AutoloadedDriver";
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
<commons-math3.version>3.6.1</commons-math3.version>
<commons-dbcp2.version>2.12.0</commons-dbcp2.version>
<commons-text.version>1.10.0</commons-text.version>
<derby.version>10.14.2.0</derby.version>
<derby.version>10.17.1.0</derby.version>
<dropwizard.version>3.1.0</dropwizard.version>
<dropwizard-metrics-hadoop-metrics2-reporter.version>0.1.2</dropwizard-metrics-hadoop-metrics2-reporter.version>
<druid.version>0.17.1</druid.version>
Expand Down
2 changes: 1 addition & 1 deletion ql/src/test/queries/clientnegative/authorization_jdbc_keystore.q
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ CREATE EXTERNAL TABLE ext_auth1
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password.keystore" = "jceks://file/${system:test.tmp.dir}/test.jceks",
Expand Down
2 changes: 1 addition & 1 deletion ql/src/test/queries/clientnegative/external_jdbc_negative.q
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ CREATE EXTERNAL TABLE db1_ext_negative1
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
Expand Down
4 changes: 2 additions & 2 deletions ql/src/test/queries/clientpositive/authorization_privilege_objects.q
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ CREATE EXTERNAL TABLE ext_simple_derby_table_src
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
Expand All @@ -54,7 +54,7 @@ CREATE EXTERNAL TABLE default.jdbctable_from_ctas
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
Expand Down
2 changes: 1 addition & 1 deletion ql/src/test/queries/clientpositive/explain_jdbc.q
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ CREATE EXTERNAL TABLE ext_DERBY_TABLE
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
Expand Down
4 changes: 2 additions & 2 deletions ql/src/test/queries/clientpositive/external_jdbc_auth.q
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ CREATE EXTERNAL TABLE ext_auth1
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password.keystore" = "jceks://file/${system:test.tmp.dir}/../../../data/files/test.jceks",
Expand All @@ -101,7 +101,7 @@ CREATE EXTERNAL TABLE ext_auth2
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb2.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "user2",
"hive.sql.dbcp.password.keystore" = "jceks://file/${system:test.tmp.dir}/../../../data/files/test.jceks",
Expand Down
4 changes: 2 additions & 2 deletions ql/src/test/queries/clientpositive/external_jdbc_join_mv.q
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ CREATE EXTERNAL TABLE person
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
Expand All @@ -38,7 +38,7 @@ CREATE EXTERNAL TABLE country
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
Expand Down
8 changes: 4 additions & 4 deletions ql/src/test/queries/clientpositive/external_jdbc_rowcount.q
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ CREATE EXTERNAL TABLE ext_simple_derby_table11
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
Expand All @@ -47,7 +47,7 @@ CREATE EXTERNAL TABLE ext_simple_derby_table12
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
Expand All @@ -65,7 +65,7 @@ CREATE EXTERNAL TABLE ext_simple_derby_table13
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
Expand All @@ -85,7 +85,7 @@ CREATE EXTERNAL TABLE ext_simple_derby_table14
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
Expand Down
4 changes: 2 additions & 2 deletions ql/src/test/queries/clientpositive/external_jdbc_table.q
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ CREATE EXTERNAL TABLE ext_simple_derby_table1
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
Expand All @@ -82,7 +82,7 @@ CREATE EXTERNAL TABLE ext_simple_derby_table2
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
Expand Down
6 changes: 3 additions & 3 deletions ql/src/test/queries/clientpositive/external_jdbc_table2.q
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ CREATE EXTERNAL TABLE db1_ext_auth1
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url}",
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
Expand All @@ -77,7 +77,7 @@ CREATE EXTERNAL TABLE db2_ext_auth2
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url}",
"hive.sql.dbcp.username" = "user2",
"hive.sql.dbcp.password" = "passwd2",
Expand All @@ -95,7 +95,7 @@ CREATE EXTERNAL TABLE db1_ext_auth2
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url}",
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
Expand Down
4 changes: 2 additions & 2 deletions ql/src/test/queries/clientpositive/external_jdbc_table3.q
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ CREATE EXTERNAL TABLE db1_ext_auth3_1
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
Expand All @@ -66,7 +66,7 @@ CREATE EXTERNAL TABLE db1_ext_auth3_2
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
Expand Down
6 changes: 3 additions & 3 deletions ql/src/test/queries/clientpositive/external_jdbc_table4.q
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ CREATE EXTERNAL TABLE db1_ext_auth1
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
Expand All @@ -78,7 +78,7 @@ CREATE EXTERNAL TABLE db2_ext_auth2
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb2.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "user2",
"hive.sql.dbcp.password" = "passwd2",
Expand All @@ -96,7 +96,7 @@ CREATE EXTERNAL TABLE db1_ext_auth2
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
Expand Down
8 changes: 4 additions & 4 deletions ql/src/test/queries/clientpositive/external_jdbc_table_partition.q
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ CREATE EXTERNAL TABLE jdbc_partition_table1
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
Expand Down Expand Up @@ -63,7 +63,7 @@ CREATE EXTERNAL TABLE jdbc_partition_table2
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
Expand Down Expand Up @@ -91,7 +91,7 @@ CREATE EXTERNAL TABLE jdbc_partition_table3
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
Expand Down Expand Up @@ -120,7 +120,7 @@ CREATE EXTERNAL TABLE jdbc_partition_table4
STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler'
TBLPROPERTIES (
"hive.sql.database.type" = "DERBY",
"hive.sql.jdbc.driver" = "org.apache.derby.jdbc.EmbeddedDriver",
"hive.sql.jdbc.driver" = "org.apache.derby.iapi.jdbc.AutoloadedDriver",
"hive.sql.jdbc.url" = "${system:hive.test.database.qdb.jdbc.url};collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
Expand Down
Loading