diff --git shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java index 2c9319f..849c0e0 100644 --- shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java +++ shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java @@ -1385,13 +1385,21 @@ public void setHadoopCallerContext(String callerContext) { } @Override - public void setHadoopQueryContext(String callerContext) { - setHadoopCallerContext("HIVE_QUERY_ID:" + callerContext); + public void setHadoopQueryContext(final String callerContext) { + String context = new String(callerContext); + if (!context.startsWith("HIVE_QUERY_ID")) { + context = "HIVE_QUERY_ID:" + context; + } + setHadoopCallerContext(context); } @Override - public void setHadoopSessionContext(String sessionId) { - setHadoopCallerContext("HIVE_SSN_ID:" + sessionId); + public void setHadoopSessionContext(final String sessionId) { + String context = new String(sessionId); + if (!context.startsWith("HIVE_SSN_ID")) { + context = "HIVE_SSN_ID:" + context; + } + setHadoopCallerContext(context); } @Override