diff --git a/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java b/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java index 8baecdf..80a1844 100644 --- a/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java +++ b/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java @@ -438,16 +438,15 @@ private OperationHandle executeStatementInternal(String statement, Map(); + } else { + Map conf = new HashMap(); + conf.putAll(confOverlay); + confOverlay = conf; } - String queryId = confOverlay.get(HiveConf.ConfVars.HIVEQUERYID.varname); - if (queryId == null || queryId.isEmpty()) { - queryId = QueryPlan.makeQueryId(); - confOverlay.put(HiveConf.ConfVars.HIVEQUERYID.varname, queryId); - } + confOverlay.put(HiveConf.ConfVars.HIVEQUERYID.varname, QueryPlan.makeQueryId()); OperationManager operationManager = getOperationManager(); ExecuteStatementOperation operation = operationManager