diff --git a/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java b/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java index 2b4be7f..1b2891b 100644 --- a/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java +++ b/jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java @@ -58,7 +58,6 @@ import org.apache.http.protocol.HttpContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hive.jdbc.Utils.JdbcConnectionParams; import org.apache.hive.service.auth.HiveAuthFactory; import org.apache.hive.service.auth.KerberosSaslHelper; @@ -158,7 +157,7 @@ public HiveConnection(String uri, Properties info) throws SQLException { if (isEmbeddedMode) { EmbeddedThriftBinaryCLIService embeddedClient = new EmbeddedThriftBinaryCLIService(); - embeddedClient.init(new HiveConf()); + embeddedClient.init(null); client = embeddedClient; } else { // extract user/password from JDBC connection properties if its not supplied in the diff --git a/service/src/java/org/apache/hive/service/cli/thrift/EmbeddedThriftBinaryCLIService.java b/service/src/java/org/apache/hive/service/cli/thrift/EmbeddedThriftBinaryCLIService.java index ac63537..a57fc8f 100644 --- a/service/src/java/org/apache/hive/service/cli/thrift/EmbeddedThriftBinaryCLIService.java +++ b/service/src/java/org/apache/hive/service/cli/thrift/EmbeddedThriftBinaryCLIService.java @@ -37,6 +37,11 @@ public EmbeddedThriftBinaryCLIService() { @Override public synchronized void init(HiveConf hiveConf) { + // Null HiveConf is passed in jdbc driver side code since driver side is supposed to be + // independent of hiveConf object. Create new HiveConf object here in this case. + if (hiveConf == null) { + hiveConf = new HiveConf(); + } cliService.init(hiveConf); cliService.start(); super.init(hiveConf); diff --git a/service/src/test/org/apache/hive/service/cli/session/TestSessionHooks.java b/service/src/test/org/apache/hive/service/cli/session/TestSessionHooks.java index 746987d..aaf7388 100644 --- a/service/src/test/org/apache/hive/service/cli/session/TestSessionHooks.java +++ b/service/src/test/org/apache/hive/service/cli/session/TestSessionHooks.java @@ -26,7 +26,6 @@ import junit.framework.Assert; import junit.framework.TestCase; -import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hive.service.auth.HiveAuthFactory; import org.apache.hive.service.cli.HiveSQLException; @@ -64,7 +63,7 @@ public void setUp() throws Exception { System.setProperty(ConfVars.HIVE_SERVER2_SESSION_HOOK.varname, TestSessionHooks.SessionHookTest.class.getName()); service = new EmbeddedThriftBinaryCLIService(); - service.init(new HiveConf()); + service.init(null); client = new ThriftCLIServiceClient(service); }