This is an automated email from the ASF dual-hosted git repository.
zabetak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 009dea2b09e HIVE-29246: Upgrade derby version to 10.17.1.0 (#6116)
009dea2b09e is described below
commit 009dea2b09eceba05bc96282842311b27e0d8c07
Author: Raghav Aggarwal <[email protected]>
AuthorDate: Mon Oct 13 13:51:22 2025 +0530
HIVE-29246: Upgrade derby version to 10.17.1.0 (#6116)
Migration from org.apache.derby.jdbc.EmbeddedDriver to
org.apache.derby.iapi.jdbc.AutoloadedDriver
---
.../java/org/apache/hadoop/hive/conf/HiveConf.java | 2 +-
data/conf/hive-site-old.xml | 2 +-
data/conf/hive-site.xml | 2 +-
data/conf/iceberg/llap/hive-site.xml | 2 +-
data/conf/iceberg/tez/hive-site.xml | 2 +-
data/conf/llap/hive-site.xml | 2 +-
data/conf/mr/hive-site.xml | 2 +-
data/conf/rlist/hive-site.xml | 2 +-
data/conf/tez/hive-site.xml | 2 +-
.../java/org/apache/hive/hcatalog/DerbyPolicy.java | 2 +-
.../src/test/resources/hive-site.xml | 2 +-
.../apache/hadoop/hive/ql/externalDB/Derby.java | 2 +-
pom.xml | 2 +-
.../clientnegative/authorization_jdbc_keystore.q | 2 +-
.../clientnegative/external_jdbc_negative.q | 2 +-
.../authorization_privilege_objects.q | 4 +-
ql/src/test/queries/clientpositive/explain_jdbc.q | 2 +-
.../queries/clientpositive/external_jdbc_auth.q | 4 +-
.../queries/clientpositive/external_jdbc_join_mv.q | 4 +-
.../clientpositive/external_jdbc_rowcount.q | 8 +--
.../queries/clientpositive/external_jdbc_table.q | 4 +-
.../queries/clientpositive/external_jdbc_table2.q | 6 +-
.../queries/clientpositive/external_jdbc_table3.q | 4 +-
.../queries/clientpositive/external_jdbc_table4.q | 6 +-
.../clientpositive/external_jdbc_table_partition.q | 8 +--
.../clientpositive/external_jdbc_table_perf.q | 34 +++++------
.../external_jdbc_table_typeconversion.q | 20 +++----
.../queries/clientpositive/external_jdbc_view.q | 6 +-
ql/src/test/queries/clientpositive/jdbc_handler.q | 4 +-
.../queries/clientpositive/jdbc_split_filter.q | 4 +-
.../queries/clientpositive/qt_database_derby.q | 2 +-
.../clientnegative/external_jdbc_negative.q.out | 2 +-
.../llap/authorization_privilege_objects.q.out | 8 +--
.../results/clientpositive/llap/explain_jdbc.q.out | 10 ++--
.../llap/explain_systest_password.q.out | 24 ++++----
.../clientpositive/llap/external_jdbc_auth.q.out | 8 +--
.../llap/external_jdbc_join_mv.q.out | 8 +--
.../llap/external_jdbc_rowcount.q.out | 16 ++---
.../clientpositive/llap/external_jdbc_table.q.out | 8 +--
.../clientpositive/llap/external_jdbc_table2.q.out | 12 ++--
.../clientpositive/llap/external_jdbc_table3.q.out | 8 +--
.../clientpositive/llap/external_jdbc_table4.q.out | 12 ++--
.../llap/external_jdbc_table_partition.q.out | 16 ++---
.../llap/external_jdbc_table_perf.q.out | 68 +++++++++++-----------
.../llap/external_jdbc_table_typeconversion.q.out | 40 ++++++-------
.../clientpositive/llap/external_jdbc_view.q.out | 12 ++--
.../results/clientpositive/llap/jdbc_handler.q.out | 8 +--
.../clientpositive/llap/jdbc_split_filter.q.out | 8 +--
.../clientpositive/llap/qt_database_derby.q.out | 4 +-
.../hadoop/hive/metastore/conf/MetastoreConf.java | 2 +-
.../jdbc/DerbySQLConnectorProvider.java | 7 +--
.../metastore-server/src/main/sql/derby/README | 2 +-
.../apache/hadoop/hive/metastore/FakeDerby.java | 7 ++-
.../hive/metastore/StatementVerifyingDerby.java | 4 +-
.../hadoop/hive/metastore/TestPackageJdo.java | 2 +-
.../hive/metastore/dbinstall/rules/Derby.java | 2 +-
standalone-metastore/pom.xml | 2 +-
57 files changed, 224 insertions(+), 226 deletions(-)
diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
index 094c6cfd2fb..72519be0cda 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -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
diff --git a/data/conf/hive-site-old.xml b/data/conf/hive-site-old.xml
index 33c4f29306b..48aabdcfec4 100644
--- a/data/conf/hive-site-old.xml
+++ b/data/conf/hive-site-old.xml
@@ -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>
diff --git a/data/conf/hive-site.xml b/data/conf/hive-site.xml
index e9b0480ab0c..b270604ff46 100644
--- a/data/conf/hive-site.xml
+++ b/data/conf/hive-site.xml
@@ -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>
diff --git a/data/conf/iceberg/llap/hive-site.xml
b/data/conf/iceberg/llap/hive-site.xml
index 545a8b82461..83802afff02 100644
--- a/data/conf/iceberg/llap/hive-site.xml
+++ b/data/conf/iceberg/llap/hive-site.xml
@@ -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>
diff --git a/data/conf/iceberg/tez/hive-site.xml
b/data/conf/iceberg/tez/hive-site.xml
index c122c49e514..680b2adcc08 100644
--- a/data/conf/iceberg/tez/hive-site.xml
+++ b/data/conf/iceberg/tez/hive-site.xml
@@ -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>
diff --git a/data/conf/llap/hive-site.xml b/data/conf/llap/hive-site.xml
index 88ff714489b..a1026d6c514 100644
--- a/data/conf/llap/hive-site.xml
+++ b/data/conf/llap/hive-site.xml
@@ -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>
diff --git a/data/conf/mr/hive-site.xml b/data/conf/mr/hive-site.xml
index 06eb0117a08..5ef04e23d52 100644
--- a/data/conf/mr/hive-site.xml
+++ b/data/conf/mr/hive-site.xml
@@ -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>
diff --git a/data/conf/rlist/hive-site.xml b/data/conf/rlist/hive-site.xml
index 3d628f3d3d6..e4f75b85ab7 100644
--- a/data/conf/rlist/hive-site.xml
+++ b/data/conf/rlist/hive-site.xml
@@ -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>
diff --git a/data/conf/tez/hive-site.xml b/data/conf/tez/hive-site.xml
index 0d5707f3240..57ce1ed7bf7 100644
--- a/data/conf/tez/hive-site.xml
+++ b/data/conf/tez/hive-site.xml
@@ -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>
diff --git
a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/DerbyPolicy.java
b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/DerbyPolicy.java
index cecf6dc676f..f90ea659216 100644
--- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/DerbyPolicy.java
+++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/DerbyPolicy.java
@@ -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;
diff --git a/itests/hive-blobstore/src/test/resources/hive-site.xml
b/itests/hive-blobstore/src/test/resources/hive-site.xml
index 52a431799a9..7656bd5c1f8 100644
--- a/itests/hive-blobstore/src/test/resources/hive-site.xml
+++ b/itests/hive-blobstore/src/test/resources/hive-site.xml
@@ -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>
diff --git
a/itests/util/src/main/java/org/apache/hadoop/hive/ql/externalDB/Derby.java
b/itests/util/src/main/java/org/apache/hadoop/hive/ql/externalDB/Derby.java
index 9d55b3f0c27..b26529a2e92 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/externalDB/Derby.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/externalDB/Derby.java
@@ -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
diff --git a/pom.xml b/pom.xml
index 5b20fc53833..28bc59c5c77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/ql/src/test/queries/clientnegative/authorization_jdbc_keystore.q
b/ql/src/test/queries/clientnegative/authorization_jdbc_keystore.q
index 0616e8e8c72..3fe4c26189c 100644
--- a/ql/src/test/queries/clientnegative/authorization_jdbc_keystore.q
+++ b/ql/src/test/queries/clientnegative/authorization_jdbc_keystore.q
@@ -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",
diff --git a/ql/src/test/queries/clientnegative/external_jdbc_negative.q
b/ql/src/test/queries/clientnegative/external_jdbc_negative.q
index 8de9648883d..a8f20018e81 100644
--- a/ql/src/test/queries/clientnegative/external_jdbc_negative.q
+++ b/ql/src/test/queries/clientnegative/external_jdbc_negative.q
@@ -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",
diff --git
a/ql/src/test/queries/clientpositive/authorization_privilege_objects.q
b/ql/src/test/queries/clientpositive/authorization_privilege_objects.q
index c41ce716a3d..c5d2649109d 100644
--- a/ql/src/test/queries/clientpositive/authorization_privilege_objects.q
+++ b/ql/src/test/queries/clientpositive/authorization_privilege_objects.q
@@ -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",
@@ -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",
diff --git a/ql/src/test/queries/clientpositive/explain_jdbc.q
b/ql/src/test/queries/clientpositive/explain_jdbc.q
index 53ae35a64ca..e6294f7eefc 100644
--- a/ql/src/test/queries/clientpositive/explain_jdbc.q
+++ b/ql/src/test/queries/clientpositive/explain_jdbc.q
@@ -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",
diff --git a/ql/src/test/queries/clientpositive/external_jdbc_auth.q
b/ql/src/test/queries/clientpositive/external_jdbc_auth.q
index df2820c04ff..9d1eed14bc8 100644
--- a/ql/src/test/queries/clientpositive/external_jdbc_auth.q
+++ b/ql/src/test/queries/clientpositive/external_jdbc_auth.q
@@ -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",
@@ -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",
diff --git a/ql/src/test/queries/clientpositive/external_jdbc_join_mv.q
b/ql/src/test/queries/clientpositive/external_jdbc_join_mv.q
index 2a2844f9d5b..70e85a10f21 100644
--- a/ql/src/test/queries/clientpositive/external_jdbc_join_mv.q
+++ b/ql/src/test/queries/clientpositive/external_jdbc_join_mv.q
@@ -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",
@@ -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",
diff --git a/ql/src/test/queries/clientpositive/external_jdbc_rowcount.q
b/ql/src/test/queries/clientpositive/external_jdbc_rowcount.q
index 4865235a171..70b04666c5f 100644
--- a/ql/src/test/queries/clientpositive/external_jdbc_rowcount.q
+++ b/ql/src/test/queries/clientpositive/external_jdbc_rowcount.q
@@ -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",
@@ -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",
@@ -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",
@@ -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",
diff --git a/ql/src/test/queries/clientpositive/external_jdbc_table.q
b/ql/src/test/queries/clientpositive/external_jdbc_table.q
index 32eeade2076..f77ef3e8acf 100644
--- a/ql/src/test/queries/clientpositive/external_jdbc_table.q
+++ b/ql/src/test/queries/clientpositive/external_jdbc_table.q
@@ -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",
@@ -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",
diff --git a/ql/src/test/queries/clientpositive/external_jdbc_table2.q
b/ql/src/test/queries/clientpositive/external_jdbc_table2.q
index 211eccd4d27..294c3acc066 100644
--- a/ql/src/test/queries/clientpositive/external_jdbc_table2.q
+++ b/ql/src/test/queries/clientpositive/external_jdbc_table2.q
@@ -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",
@@ -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",
@@ -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",
diff --git a/ql/src/test/queries/clientpositive/external_jdbc_table3.q
b/ql/src/test/queries/clientpositive/external_jdbc_table3.q
index 7884081cadc..9902982c61f 100644
--- a/ql/src/test/queries/clientpositive/external_jdbc_table3.q
+++ b/ql/src/test/queries/clientpositive/external_jdbc_table3.q
@@ -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",
@@ -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",
diff --git a/ql/src/test/queries/clientpositive/external_jdbc_table4.q
b/ql/src/test/queries/clientpositive/external_jdbc_table4.q
index c5bfa0681fd..040a41c5b6d 100644
--- a/ql/src/test/queries/clientpositive/external_jdbc_table4.q
+++ b/ql/src/test/queries/clientpositive/external_jdbc_table4.q
@@ -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",
@@ -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",
@@ -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",
diff --git a/ql/src/test/queries/clientpositive/external_jdbc_table_partition.q
b/ql/src/test/queries/clientpositive/external_jdbc_table_partition.q
index 5789d19ade9..d50c6d9be40 100644
--- a/ql/src/test/queries/clientpositive/external_jdbc_table_partition.q
+++ b/ql/src/test/queries/clientpositive/external_jdbc_table_partition.q
@@ -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",
@@ -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",
@@ -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",
@@ -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",
diff --git a/ql/src/test/queries/clientpositive/external_jdbc_table_perf.q
b/ql/src/test/queries/clientpositive/external_jdbc_table_perf.q
index 62e29695d13..f9c394594b1 100644
--- a/ql/src/test/queries/clientpositive/external_jdbc_table_perf.q
+++ b/ql/src/test/queries/clientpositive/external_jdbc_table_perf.q
@@ -143,7 +143,7 @@ CREATE EXTERNAL TABLE catalog_sales
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",
@@ -184,7 +184,7 @@ CREATE EXTERNAL TABLE catalog_returns
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",
@@ -221,7 +221,7 @@ CREATE EXTERNAL TABLE store_sales
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",
@@ -255,7 +255,7 @@ CREATE EXTERNAL TABLE store_returns
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",
@@ -303,7 +303,7 @@ CREATE EXTERNAL TABLE web_sales
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",
@@ -341,7 +341,7 @@ CREATE EXTERNAL TABLE web_returns
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",
@@ -373,7 +373,7 @@ CREATE EXTERNAL TABLE customer
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",
@@ -400,7 +400,7 @@ CREATE EXTERNAL TABLE customer_address
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",
@@ -423,7 +423,7 @@ CREATE EXTERNAL TABLE customer_demographics
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",
@@ -441,7 +441,7 @@ CREATE EXTERNAL TABLE inventory
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",
@@ -477,7 +477,7 @@ CREATE EXTERNAL TABLE item
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",
@@ -505,7 +505,7 @@ CREATE EXTERNAL TABLE warehouse
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",
@@ -547,7 +547,7 @@ CREATE EXTERNAL TABLE date_dim
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",
@@ -590,7 +590,7 @@ CREATE EXTERNAL TABLE store
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",
@@ -609,7 +609,7 @@ CREATE EXTERNAL TABLE household_demographics
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",
@@ -633,7 +633,7 @@ CREATE EXTERNAL TABLE time_dim
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",
@@ -650,7 +650,7 @@ CREATE EXTERNAL TABLE reason
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",
diff --git
a/ql/src/test/queries/clientpositive/external_jdbc_table_typeconversion.q
b/ql/src/test/queries/clientpositive/external_jdbc_table_typeconversion.q
index eac48611c8f..880f4736b9e 100644
--- a/ql/src/test/queries/clientpositive/external_jdbc_table_typeconversion.q
+++ b/ql/src/test/queries/clientpositive/external_jdbc_table_typeconversion.q
@@ -34,7 +34,7 @@ CREATE EXTERNAL TABLE jdbc_type_conversion_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",
@@ -83,7 +83,7 @@ CREATE EXTERNAL TABLE jdbc_string_conversion_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" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -110,7 +110,7 @@ CREATE EXTERNAL TABLE jdbc_int_conversion_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" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -137,7 +137,7 @@ CREATE EXTERNAL TABLE jdbc_bigint_conversion_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" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -164,7 +164,7 @@ CREATE EXTERNAL TABLE jdbc_double_conversion_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" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -191,7 +191,7 @@ CREATE EXTERNAL TABLE jdbc_decimal5_1_conversion_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" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -218,7 +218,7 @@ CREATE EXTERNAL TABLE jdbc_decimal6_4_conversion_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" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -245,7 +245,7 @@ CREATE EXTERNAL TABLE jdbc_decimal16_2_conversion_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" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -272,7 +272,7 @@ CREATE EXTERNAL TABLE jdbc_date_conversion_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" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -299,7 +299,7 @@ CREATE EXTERNAL TABLE jdbc_timestamp_conversion_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" = "user",
"hive.sql.dbcp.password" = "passwd",
diff --git a/ql/src/test/queries/clientpositive/external_jdbc_view.q
b/ql/src/test/queries/clientpositive/external_jdbc_view.q
index e254a792fb9..779dbb17738 100644
--- a/ql/src/test/queries/clientpositive/external_jdbc_view.q
+++ b/ql/src/test/queries/clientpositive/external_jdbc_view.q
@@ -24,7 +24,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",
@@ -41,7 +41,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",
@@ -62,7 +62,7 @@ CREATE EXTERNAL TABLE job
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",
diff --git a/ql/src/test/queries/clientpositive/jdbc_handler.q
b/ql/src/test/queries/clientpositive/jdbc_handler.q
index b2ed0b095c4..7aa8f6eee56 100644
--- a/ql/src/test/queries/clientpositive/jdbc_handler.q
+++ b/ql/src/test/queries/clientpositive/jdbc_handler.q
@@ -27,7 +27,7 @@ CREATE EXTERNAL TABLE ext_simple_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",
@@ -123,7 +123,7 @@ CREATE EXTERNAL TABLE insert_to_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",
diff --git a/ql/src/test/queries/clientpositive/jdbc_split_filter.q
b/ql/src/test/queries/clientpositive/jdbc_split_filter.q
index d624f938d77..a35b826398f 100644
--- a/ql/src/test/queries/clientpositive/jdbc_split_filter.q
+++ b/ql/src/test/queries/clientpositive/jdbc_split_filter.q
@@ -23,7 +23,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",
@@ -43,7 +43,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",
diff --git a/ql/src/test/queries/clientpositive/qt_database_derby.q
b/ql/src/test/queries/clientpositive/qt_database_derby.q
index 80e93aa70da..5f71225b6e9 100644
--- a/ql/src/test/queries/clientpositive/qt_database_derby.q
+++ b/ql/src/test/queries/clientpositive/qt_database_derby.q
@@ -7,7 +7,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}",
"hive.sql.dbcp.username" =
"${system:hive.test.database.qdb.jdbc.username}",
"hive.sql.dbcp.password" =
"${system:hive.test.database.qdb.jdbc.password}",
diff --git a/ql/src/test/results/clientnegative/external_jdbc_negative.q.out
b/ql/src/test/results/clientnegative/external_jdbc_negative.q.out
index 485a742fa44..f59b7e0299d 100644
--- a/ql/src/test/results/clientnegative/external_jdbc_negative.q.out
+++ b/ql/src/test/results/clientnegative/external_jdbc_negative.q.out
@@ -33,7 +33,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
diff --git
a/ql/src/test/results/clientpositive/llap/authorization_privilege_objects.q.out
b/ql/src/test/results/clientpositive/llap/authorization_privilege_objects.q.out
index 1313d8b2680..7fcbde2d2b7 100644
---
a/ql/src/test/results/clientpositive/llap/authorization_privilege_objects.q.out
+++
b/ql/src/test/results/clientpositive/llap/authorization_privilege_objects.q.out
@@ -264,7 +264,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -284,7 +284,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -327,7 +327,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -342,7 +342,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
diff --git a/ql/src/test/results/clientpositive/llap/explain_jdbc.q.out
b/ql/src/test/results/clientpositive/llap/explain_jdbc.q.out
index 5c5ceec0f61..cf0525e3633 100644
--- a/ql/src/test/results/clientpositive/llap/explain_jdbc.q.out
+++ b/ql/src/test/results/clientpositive/llap/explain_jdbc.q.out
@@ -47,7 +47,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -65,7 +65,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -161,7 +161,7 @@ FROM "DERBY_TABLE"
#### A masked pattern was here ####
hive.sql.database.type DERBY
hive.sql.dbcp.maxActive 1
- hive.sql.jdbc.driver org.apache.derby.jdbc.EmbeddedDriver
+ hive.sql.jdbc.driver
org.apache.derby.iapi.jdbc.AutoloadedDriver
#### A masked pattern was here ####
hive.sql.query SELECT 1 AS "$f0"
FROM "DERBY_TABLE"
@@ -187,7 +187,7 @@ FROM "DERBY_TABLE"
#### A masked pattern was here ####
hive.sql.database.type DERBY
hive.sql.dbcp.maxActive 1
- hive.sql.jdbc.driver org.apache.derby.jdbc.EmbeddedDriver
+ hive.sql.jdbc.driver
org.apache.derby.iapi.jdbc.AutoloadedDriver
#### A masked pattern was here ####
hive.sql.query SELECT 1 AS "$f0"
FROM "DERBY_TABLE"
@@ -212,7 +212,7 @@ FROM "DERBY_TABLE"
#### A masked pattern was here ####
hive.sql.database.type DERBY
hive.sql.dbcp.maxActive 1
- hive.sql.jdbc.driver org.apache.derby.jdbc.EmbeddedDriver
+ hive.sql.jdbc.driver
org.apache.derby.iapi.jdbc.AutoloadedDriver
#### A masked pattern was here ####
hive.sql.query SELECT 1 AS "$f0"
FROM "DERBY_TABLE"
diff --git
a/ql/src/test/results/clientpositive/llap/explain_systest_password.q.out
b/ql/src/test/results/clientpositive/llap/explain_systest_password.q.out
index e23123c4717..2ab7b771567 100644
--- a/ql/src/test/results/clientpositive/llap/explain_systest_password.q.out
+++ b/ql/src/test/results/clientpositive/llap/explain_systest_password.q.out
@@ -97,7 +97,7 @@ STAGE PLANS:
columns.types
bigint:int:bigint:int:string:int:bigint:string:string:string:string:boolean
#### A masked pattern was here ####
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
jdbc:derby:memory:junit_metastore_db;create=true
hive.sql.query SELECT
"TBL_ID",
@@ -130,7 +130,7 @@ FROM "TBLS"
columns.types
bigint:int:bigint:int:string:int:bigint:string:string:string:string:boolean
#### A masked pattern was here ####
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
jdbc:derby:memory:junit_metastore_db;create=true
hive.sql.query SELECT
"TBL_ID",
@@ -162,7 +162,7 @@ FROM "TBLS"
columns.types
bigint:int:bigint:int:string:int:bigint:string:string:string:string:boolean
#### A masked pattern was here ####
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
jdbc:derby:memory:junit_metastore_db;create=true
hive.sql.query SELECT
"TBL_ID",
@@ -232,7 +232,7 @@ FROM "TBLS"
columns.types bigint:string:string:string:string
#### A masked pattern was here ####
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
jdbc:derby:memory:junit_metastore_db;create=true
hive.sql.query SELECT
"DB_ID",
@@ -259,7 +259,7 @@ FROM
columns.types bigint:string:string:string:string
#### A masked pattern was here ####
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
jdbc:derby:memory:junit_metastore_db;create=true
hive.sql.query SELECT
"DB_ID",
@@ -285,7 +285,7 @@ FROM
columns.types bigint:string:string:string:string
#### A masked pattern was here ####
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
jdbc:derby:memory:junit_metastore_db;create=true
hive.sql.query SELECT
"DB_ID",
@@ -545,7 +545,7 @@ STAGE PLANS:
columns.types
bigint:int:bigint:int:string:int:bigint:string:string:string:string:boolean
#### A masked pattern was here ####
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
jdbc:derby:memory:junit_metastore_db;create=true
hive.sql.query SELECT
"TBL_ID",
@@ -578,7 +578,7 @@ FROM "TBLS"
columns.types
bigint:int:bigint:int:string:int:bigint:string:string:string:string:boolean
#### A masked pattern was here ####
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
jdbc:derby:memory:junit_metastore_db;create=true
hive.sql.query SELECT
"TBL_ID",
@@ -610,7 +610,7 @@ FROM "TBLS"
columns.types
bigint:int:bigint:int:string:int:bigint:string:string:string:string:boolean
#### A masked pattern was here ####
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
jdbc:derby:memory:junit_metastore_db;create=true
hive.sql.query SELECT
"TBL_ID",
@@ -871,7 +871,7 @@ STAGE PLANS:
columns.types
bigint:int:bigint:int:string:int:bigint:string:string:string:string:boolean
#### A masked pattern was here ####
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
jdbc:derby:memory:junit_metastore_db;create=true
hive.sql.query SELECT
"TBL_ID",
@@ -904,7 +904,7 @@ FROM "TBLS"
columns.types
bigint:int:bigint:int:string:int:bigint:string:string:string:string:boolean
#### A masked pattern was here ####
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
jdbc:derby:memory:junit_metastore_db;create=true
hive.sql.query SELECT
"TBL_ID",
@@ -936,7 +936,7 @@ FROM "TBLS"
columns.types
bigint:int:bigint:int:string:int:bigint:string:string:string:string:boolean
#### A masked pattern was here ####
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
jdbc:derby:memory:junit_metastore_db;create=true
hive.sql.query SELECT
"TBL_ID",
diff --git a/ql/src/test/results/clientpositive/llap/external_jdbc_auth.q.out
b/ql/src/test/results/clientpositive/llap/external_jdbc_auth.q.out
index b299a38326f..7b663d993e0 100644
--- a/ql/src/test/results/clientpositive/llap/external_jdbc_auth.q.out
+++ b/ql/src/test/results/clientpositive/llap/external_jdbc_auth.q.out
@@ -156,7 +156,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
#### A masked pattern was here ####
@@ -178,7 +178,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
#### A masked pattern was here ####
@@ -200,7 +200,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user2",
#### A masked pattern was here ####
@@ -222,7 +222,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user2",
#### A masked pattern was here ####
diff --git
a/ql/src/test/results/clientpositive/llap/external_jdbc_join_mv.q.out
b/ql/src/test/results/clientpositive/llap/external_jdbc_join_mv.q.out
index 538e12ce0a1..4309726f2b5 100644
--- a/ql/src/test/results/clientpositive/llap/external_jdbc_join_mv.q.out
+++ b/ql/src/test/results/clientpositive/llap/external_jdbc_join_mv.q.out
@@ -40,7 +40,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -60,7 +60,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -78,7 +78,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -96,7 +96,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
diff --git
a/ql/src/test/results/clientpositive/llap/external_jdbc_rowcount.q.out
b/ql/src/test/results/clientpositive/llap/external_jdbc_rowcount.q.out
index 10b6e1f93cd..39a8cfc42ba 100644
--- a/ql/src/test/results/clientpositive/llap/external_jdbc_rowcount.q.out
+++ b/ql/src/test/results/clientpositive/llap/external_jdbc_rowcount.q.out
@@ -66,7 +66,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -86,7 +86,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -107,7 +107,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -128,7 +128,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -148,7 +148,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -168,7 +168,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -189,7 +189,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -210,7 +210,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
diff --git a/ql/src/test/results/clientpositive/llap/external_jdbc_table.q.out
b/ql/src/test/results/clientpositive/llap/external_jdbc_table.q.out
index ac99bb17dd5..704163b64c2 100644
--- a/ql/src/test/results/clientpositive/llap/external_jdbc_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/external_jdbc_table.q.out
@@ -116,7 +116,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -136,7 +136,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -157,7 +157,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -178,7 +178,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
diff --git a/ql/src/test/results/clientpositive/llap/external_jdbc_table2.q.out
b/ql/src/test/results/clientpositive/llap/external_jdbc_table2.q.out
index 65ea5424f61..26efe619ef7 100644
--- a/ql/src/test/results/clientpositive/llap/external_jdbc_table2.q.out
+++ b/ql/src/test/results/clientpositive/llap/external_jdbc_table2.q.out
@@ -113,7 +113,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -133,7 +133,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -153,7 +153,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user2",
"hive.sql.dbcp.password" = "passwd2",
@@ -173,7 +173,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user2",
"hive.sql.dbcp.password" = "passwd2",
@@ -193,7 +193,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -213,7 +213,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
diff --git a/ql/src/test/results/clientpositive/llap/external_jdbc_table3.q.out
b/ql/src/test/results/clientpositive/llap/external_jdbc_table3.q.out
index e2f3dd048b7..4e78f97f78a 100644
--- a/ql/src/test/results/clientpositive/llap/external_jdbc_table3.q.out
+++ b/ql/src/test/results/clientpositive/llap/external_jdbc_table3.q.out
@@ -80,7 +80,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -100,7 +100,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -120,7 +120,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -140,7 +140,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
diff --git a/ql/src/test/results/clientpositive/llap/external_jdbc_table4.q.out
b/ql/src/test/results/clientpositive/llap/external_jdbc_table4.q.out
index 4d49e1680cf..44a64b6e7fc 100644
--- a/ql/src/test/results/clientpositive/llap/external_jdbc_table4.q.out
+++ b/ql/src/test/results/clientpositive/llap/external_jdbc_table4.q.out
@@ -113,7 +113,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -133,7 +133,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -153,7 +153,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user2",
"hive.sql.dbcp.password" = "passwd2",
@@ -173,7 +173,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user2",
"hive.sql.dbcp.password" = "passwd2",
@@ -193,7 +193,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -213,7 +213,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
diff --git
a/ql/src/test/results/clientpositive/llap/external_jdbc_table_partition.q.out
b/ql/src/test/results/clientpositive/llap/external_jdbc_table_partition.q.out
index feb9299aa7c..a18a15f0858 100644
---
a/ql/src/test/results/clientpositive/llap/external_jdbc_table_partition.q.out
+++
b/ql/src/test/results/clientpositive/llap/external_jdbc_table_partition.q.out
@@ -55,7 +55,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -81,7 +81,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -119,7 +119,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -145,7 +145,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -184,7 +184,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -213,7 +213,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -264,7 +264,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -289,7 +289,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
diff --git
a/ql/src/test/results/clientpositive/llap/external_jdbc_table_perf.q.out
b/ql/src/test/results/clientpositive/llap/external_jdbc_table_perf.q.out
index 183069a25b9..a06b1eb40f8 100644
--- a/ql/src/test/results/clientpositive/llap/external_jdbc_table_perf.q.out
+++ b/ql/src/test/results/clientpositive/llap/external_jdbc_table_perf.q.out
@@ -247,7 +247,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE catalog_sales
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -297,7 +297,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE catalog_sales
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -340,7 +340,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE catalog_returns
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -383,7 +383,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE catalog_returns
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -422,7 +422,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE store_sales
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -461,7 +461,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE store_sales
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -497,7 +497,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE store_returns
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -533,7 +533,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE store_returns
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -583,7 +583,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE web_sales
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -633,7 +633,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE web_sales
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -673,7 +673,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE web_returns
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -713,7 +713,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE web_returns
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -747,7 +747,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE customer
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -781,7 +781,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE customer
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -810,7 +810,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE customer_address
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -839,7 +839,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE customer_address
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -864,7 +864,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE customer_demographics
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -889,7 +889,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE customer_demographics
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -909,7 +909,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE inventory
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -929,7 +929,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE inventory
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -967,7 +967,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE item
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -1005,7 +1005,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE item
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -1035,7 +1035,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE warehouse
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -1065,7 +1065,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE warehouse
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -1109,7 +1109,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE date_dim
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -1153,7 +1153,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE date_dim
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -1198,7 +1198,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE store
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -1243,7 +1243,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE store
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -1264,7 +1264,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE
household_demographics
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -1285,7 +1285,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE
household_demographics
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -1311,7 +1311,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE time_dim
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -1337,7 +1337,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE time_dim
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -1356,7 +1356,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE reason
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
@@ -1375,7 +1375,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE reason
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user1",
"hive.sql.dbcp.password" = "passwd1",
diff --git
a/ql/src/test/results/clientpositive/llap/external_jdbc_table_typeconversion.q.out
b/ql/src/test/results/clientpositive/llap/external_jdbc_table_typeconversion.q.out
index 7b5c97756a5..c675223d79a 100644
---
a/ql/src/test/results/clientpositive/llap/external_jdbc_table_typeconversion.q.out
+++
b/ql/src/test/results/clientpositive/llap/external_jdbc_table_typeconversion.q.out
@@ -55,7 +55,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE
jdbc_type_conversion_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -79,7 +79,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE
jdbc_type_conversion_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -171,7 +171,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE
jdbc_string_conversion_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -196,7 +196,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE
jdbc_string_conversion_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -249,7 +249,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE
jdbc_int_conversion_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -274,7 +274,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE
jdbc_int_conversion_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -327,7 +327,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE
jdbc_bigint_conversion_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -352,7 +352,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE
jdbc_bigint_conversion_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -405,7 +405,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE
jdbc_double_conversion_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -430,7 +430,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE
jdbc_double_conversion_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -483,7 +483,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE
jdbc_decimal5_1_conversion_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -508,7 +508,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE
jdbc_decimal5_1_conversion_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -561,7 +561,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE
jdbc_decimal6_4_conversion_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -586,7 +586,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE
jdbc_decimal6_4_conversion_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -639,7 +639,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE
jdbc_decimal16_2_conversion_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -664,7 +664,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE
jdbc_decimal16_2_conversion_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -717,7 +717,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE
jdbc_date_conversion_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -742,7 +742,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE
jdbc_date_conversion_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -795,7 +795,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE
jdbc_timestamp_conversion_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
@@ -820,7 +820,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE
jdbc_timestamp_conversion_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "user",
"hive.sql.dbcp.password" = "passwd",
diff --git a/ql/src/test/results/clientpositive/llap/external_jdbc_view.q.out
b/ql/src/test/results/clientpositive/llap/external_jdbc_view.q.out
index 4094a8a80a9..5208d50d5e3 100644
--- a/ql/src/test/results/clientpositive/llap/external_jdbc_view.q.out
+++ b/ql/src/test/results/clientpositive/llap/external_jdbc_view.q.out
@@ -53,7 +53,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -73,7 +73,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -99,7 +99,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -119,7 +119,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -163,7 +163,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE job
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -184,7 +184,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE job
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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
diff --git a/ql/src/test/results/clientpositive/llap/jdbc_handler.q.out
b/ql/src/test/results/clientpositive/llap/jdbc_handler.q.out
index f4f596006aa..5d774e47aaf 100644
--- a/ql/src/test/results/clientpositive/llap/jdbc_handler.q.out
+++ b/ql/src/test/results/clientpositive/llap/jdbc_handler.q.out
@@ -42,7 +42,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE ext_simple_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -59,7 +59,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE ext_simple_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -405,7 +405,7 @@ PREHOOK: query: CREATE EXTERNAL TABLE
insert_to_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -435,7 +435,7 @@ POSTHOOK: query: CREATE EXTERNAL TABLE
insert_to_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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
diff --git a/ql/src/test/results/clientpositive/llap/jdbc_split_filter.q.out
b/ql/src/test/results/clientpositive/llap/jdbc_split_filter.q.out
index ad9605391d5..c55bbc3d89e 100644
--- a/ql/src/test/results/clientpositive/llap/jdbc_split_filter.q.out
+++ b/ql/src/test/results/clientpositive/llap/jdbc_split_filter.q.out
@@ -44,7 +44,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -64,7 +64,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -85,7 +85,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
@@ -106,7 +106,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
diff --git a/ql/src/test/results/clientpositive/llap/qt_database_derby.q.out
b/ql/src/test/results/clientpositive/llap/qt_database_derby.q.out
index da56622c061..725efc42005 100644
--- a/ql/src/test/results/clientpositive/llap/qt_database_derby.q.out
+++ b/ql/src/test/results/clientpositive/llap/qt_database_derby.q.out
@@ -6,7 +6,7 @@ PREHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "qtestuser",
"hive.sql.dbcp.password" = "qtestpassword",
@@ -24,7 +24,7 @@ POSTHOOK: query: 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",
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "qtestuser",
"hive.sql.dbcp.password" = "qtestpassword",
diff --git
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java
index e2c313ee7a0..cff6209a6fc 100644
---
a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java
+++
b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java
@@ -697,7 +697,7 @@ public enum ConfVars {
"hive.compactor.connectionPool.maxPoolSize", 5,
"Specify the maximum number of connections in the connection pool
used by the compactor."),
CONNECTION_DRIVER("javax.jdo.option.ConnectionDriverName",
- "javax.jdo.option.ConnectionDriverName",
"org.apache.derby.jdbc.EmbeddedDriver",
+ "javax.jdo.option.ConnectionDriverName",
"org.apache.derby.iapi.jdbc.AutoloadedDriver",
"Driver class name for a JDBC metastore"),
CONNECTION_POOLING_MAX_CONNECTIONS("datanucleus.connectionPool.maxPoolSize",
"datanucleus.connectionPool.maxPoolSize", 10,
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/dataconnector/jdbc/DerbySQLConnectorProvider.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/dataconnector/jdbc/DerbySQLConnectorProvider.java
index 56819ea9b9f..ea9ec313370 100644
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/dataconnector/jdbc/DerbySQLConnectorProvider.java
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/dataconnector/jdbc/DerbySQLConnectorProvider.java
@@ -21,17 +21,12 @@
import org.apache.hadoop.hive.metastore.ColumnType;
import org.apache.hadoop.hive.metastore.api.DataConnector;
import org.apache.hadoop.hive.metastore.api.MetaException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.sql.ResultSet;
-import java.sql.SQLException;
public class DerbySQLConnectorProvider extends AbstractJDBCConnectorProvider {
- private static Logger LOG =
LoggerFactory.getLogger(DerbySQLConnectorProvider.class);
- // private static final String DRIVER_CLASS =
"org.apache.derby.jdbc.EmbeddedDriver".intern();
- private static final String DRIVER_CLASS =
"org.apache.derby.jdbc.AutoloadedDriver".intern();
+ private static final String DRIVER_CLASS =
"org.apache.derby.iapi.jdbc.AutoloadedDriver";
public DerbySQLConnectorProvider(String dbName, DataConnector connector) {
super(dbName, connector, DRIVER_CLASS);
diff --git a/standalone-metastore/metastore-server/src/main/sql/derby/README
b/standalone-metastore/metastore-server/src/main/sql/derby/README
index 5325ad6508d..d57e64df7ba 100644
--- a/standalone-metastore/metastore-server/src/main/sql/derby/README
+++ b/standalone-metastore/metastore-server/src/main/sql/derby/README
@@ -81,7 +81,7 @@ MetaStore Upgrade Steps
5) You are now ready to run the schema upgrade script,
bin/schematool -initOrUpgradeSchema -dbType derby \
- -driver org.apache.derby.jdbc.EmbeddedDriver \
+ -driver org.apache.derby.iapi.jdbc.AutoloadedDriver \
-url 'jdbc:derby:;databaseName=hive;create=true'
The command should run to completion without any errors. If you
diff --git
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/FakeDerby.java
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/FakeDerby.java
index cc0bd776b61..dc3c3b49f70 100644
---
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/FakeDerby.java
+++
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/FakeDerby.java
@@ -18,7 +18,8 @@
package org.apache.hadoop.hive.metastore;
-import java.lang.Override;
+import org.apache.derby.iapi.jdbc.AutoloadedDriver;
+
import java.sql.Array;
import java.sql.Blob;
import java.sql.CallableStatement;
@@ -35,14 +36,14 @@
import java.sql.Statement;
import java.sql.Struct;
import java.util.Map;
+import java.util.Properties;
import java.util.concurrent.Executor;
import java.util.logging.Logger;
-import java.util.Properties;
/**
* Fake derby driver - companion class to enable testing by
TestObjectStoreInitRetry
*/
-public class FakeDerby extends org.apache.derby.jdbc.EmbeddedDriver {
+public class FakeDerby extends AutoloadedDriver {
public class Connection implements java.sql.Connection {
diff --git
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/StatementVerifyingDerby.java
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/StatementVerifyingDerby.java
index 45c5cb21074..c013dfda937 100644
---
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/StatementVerifyingDerby.java
+++
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/StatementVerifyingDerby.java
@@ -18,6 +18,8 @@
package org.apache.hadoop.hive.metastore;
+import org.apache.derby.iapi.jdbc.AutoloadedDriver;
+
import java.sql.Array;
import java.sql.Blob;
import java.sql.CallableStatement;
@@ -43,7 +45,7 @@
* Fake derby driver - companion class to enable testing by
TestObjectStoreStatementVerify.
* This derby driver will call a verifying function during prepareStatement.
*/
-public class StatementVerifyingDerby extends
org.apache.derby.jdbc.EmbeddedDriver {
+public class StatementVerifyingDerby extends AutoloadedDriver {
@Override
public boolean acceptsURL(String url) throws SQLException {
diff --git
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestPackageJdo.java
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestPackageJdo.java
index d15735a0ea7..d0d44814da5 100644
---
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestPackageJdo.java
+++
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestPackageJdo.java
@@ -52,7 +52,7 @@ public void setup() throws Exception {
MetastoreConf.setVar(conf, MetastoreConf.ConfVars.PWD, password);
MetastoreConf.setVar(conf, MetastoreConf.ConfVars.CONNECTION_USER_NAME,
"APP");
MetastoreConf.setVar(conf, MetastoreConf.ConfVars.CONNECTION_DRIVER,
- "org.apache.derby.jdbc.EmbeddedDriver");
+ "org.apache.derby.iapi.jdbc.AutoloadedDriver");
TestTxnDbUtil.prepDb(conf);
// Init the schema from package.jdo
diff --git
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/Derby.java
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/Derby.java
index fdf59d87b78..6054b29c5ff 100644
---
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/Derby.java
+++
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/Derby.java
@@ -63,7 +63,7 @@ public String getHivePassword() {
@Override
public String getJdbcDriver() {
- return "org.apache.derby.jdbc.EmbeddedDriver";
+ return "org.apache.derby.iapi.jdbc.AutoloadedDriver";
}
@Override
diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
index 7264c2f4e11..6cb03c821d4 100644
--- a/standalone-metastore/pom.xml
+++ b/standalone-metastore/pom.xml
@@ -73,7 +73,7 @@
<datanucleus-core.version>6.0.10</datanucleus-core.version>
<datanucleus-jdo.version>3.2.0-release</datanucleus-jdo.version>
<datanucleus-rdbms.version>6.0.10</datanucleus-rdbms.version>
- <derby.version>10.14.2.0</derby.version>
+ <derby.version>10.17.1.0</derby.version>
<mariadb.version>2.5.0</mariadb.version>
<mssql.version>6.2.1.jre8</mssql.version>
<mysql.version>8.2.0</mysql.version>
