diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/spark/HiveSparkClientFactory.java ql/src/java/org/apache/hadoop/hive/ql/exec/spark/HiveSparkClientFactory.java index a49e72d327..6d402538cf 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/spark/HiveSparkClientFactory.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/spark/HiveSparkClientFactory.java @@ -74,7 +74,7 @@ public static HiveSparkClient createHiveSparkClient(HiveConf hiveconf, String sp // With local spark context, all user sessions share the same spark context. return LocalHiveSparkClient.getInstance(generateSparkConf(sparkConf), hiveconf); } else { - return new RemoteHiveSparkClient(hiveconf, sparkConf, hiveSessionId + "_" + sparkSessionId); + return new RemoteHiveSparkClient(hiveconf, sparkConf, sparkSessionId); } } diff --git ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java index 455ffc3887..e9565befc4 100644 --- ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java +++ ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java @@ -2066,7 +2066,7 @@ public void addCleanupItem(Closeable item) { } public String getNewSparkSessionId() { - return Long.toString(this.sparkSessionId.getAndIncrement()); + return getSessionId() + "_" + Long.toString(this.sparkSessionId.getAndIncrement()); } } diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/spark/session/TestSparkSessionManagerImpl.java ql/src/test/org/apache/hadoop/hive/ql/exec/spark/session/TestSparkSessionManagerImpl.java index 3882b58ba7..0a2738df4b 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/spark/session/TestSparkSessionManagerImpl.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/spark/session/TestSparkSessionManagerImpl.java @@ -206,15 +206,15 @@ public void testGetSessionId() throws HiveException { SparkSessionManager ssm = SparkSessionManagerImpl.getInstance(); ss.setSparkSession(ssm.getSession(null, SESSION_HIVE_CONF, true)); - assertEquals("0", ss.getSparkSession().getSessionId()); + assertEquals(ss.getSessionId() + "_0", ss.getSparkSession().getSessionId()); ss.setSparkSession(ssm.getSession(null, SESSION_HIVE_CONF, true)); - assertEquals("1", ss.getSparkSession().getSessionId()); + assertEquals(ss.getSessionId() + "_1", ss.getSparkSession().getSessionId()); ss = SessionState.start(SESSION_HIVE_CONF); ss.setSparkSession(ssm.getSession(null, SESSION_HIVE_CONF, true)); - assertEquals("0", ss.getSparkSession().getSessionId()); + assertEquals(ss.getSessionId() + "_0", ss.getSparkSession().getSessionId()); } @Test