You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by sz...@apache.org on 2018/07/17 09:33:56 UTC
hive git commit: HIVE-19486: Discrepancy in HikariCP config naming
(Antal Sinkovits via Adam Szita)
Repository: hive
Updated Branches:
refs/heads/master 3e0235461 -> dceeefbdf
HIVE-19486: Discrepancy in HikariCP config naming (Antal Sinkovits via Adam Szita)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/dceeefbd
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/dceeefbd
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/dceeefbd
Branch: refs/heads/master
Commit: dceeefbdf5e4f6fea83cb6ca5c11fbac10e77677
Parents: 3e02354
Author: Antal Sinkovits <as...@cloudera.com>
Authored: Tue Jul 17 10:45:54 2018 +0200
Committer: Adam Szita <sz...@cloudera.com>
Committed: Tue Jul 17 11:25:51 2018 +0200
----------------------------------------------------------------------
common/src/java/org/apache/hadoop/hive/conf/HiveConf.java | 2 +-
.../src/test/java/org/apache/hive/jdbc/TestRestrictedList.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/dceeefbd/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
----------------------------------------------------------------------
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 858c630..4ed1636 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -4358,7 +4358,7 @@ public class HiveConf extends Configuration {
"bonecp.,"+
"hive.druid.broker.address.default,"+
"hive.druid.coordinator.address.default,"+
- "hikari.,"+
+ "hikaricp.,"+
"hadoop.bin.path,"+
"yarn.bin.path,"+
"spark.home",
http://git-wip-us.apache.org/repos/asf/hive/blob/dceeefbd/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestRestrictedList.java
----------------------------------------------------------------------
diff --git a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestRestrictedList.java b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestRestrictedList.java
index cb005bf..f3f50a6e 100644
--- a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestRestrictedList.java
+++ b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestRestrictedList.java
@@ -95,7 +95,7 @@ public class TestRestrictedList {
addToExpectedRestrictedMap("bonecp.test");
addToExpectedRestrictedMap("hive.druid.broker.address.default");
addToExpectedRestrictedMap("hive.druid.coordinator.address.default");
- addToExpectedRestrictedMap("hikari.test");
+ addToExpectedRestrictedMap("hikaricp.test");
addToExpectedRestrictedMap("hadoop.bin.path");
addToExpectedRestrictedMap("yarn.bin.path");
addToExpectedRestrictedMap("hive.spark.client.connect.timeout");