[hive] branch branch-3.1 updated: HIVE-26530: HS2 OOM-OperationManager.queryIdOperation does not properly clean up multiple queryIds (#3589)

[dengzh]

This is an automated email from the ASF dual-hosted git repository.

dengzh pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/branch-3.1 by this push:
     new bffeac7186a HIVE-26530: HS2 OOM-OperationManager.queryIdOperation does 
not properly clean up multiple queryIds (#3589)
bffeac7186a is described below

commit bffeac7186ae958fa520e80b5c002e03583c57c0
Author: 惊帆 <piaobomengxi...@gmail.com>
AuthorDate: Wed Nov 16 11:36:53 2022 +0800

    HIVE-26530: HS2 OOM-OperationManager.queryIdOperation does not properly 
clean up multiple queryIds (#3589)
---
 .../src/java/org/apache/hive/service/cli/operation/Operation.java    | 5 +++++
 .../java/org/apache/hive/service/cli/operation/OperationManager.java | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git 
a/service/src/java/org/apache/hive/service/cli/operation/Operation.java 
b/service/src/java/org/apache/hive/service/cli/operation/Operation.java
index d866881b1a0..9859224e326 100644
--- a/service/src/java/org/apache/hive/service/cli/operation/Operation.java
+++ b/service/src/java/org/apache/hive/service/cli/operation/Operation.java
@@ -409,4 +409,9 @@ public abstract class Operation {
   protected void markOperationCompletedTime() {
     operationComplete = System.currentTimeMillis();
   }
+
+  public String getQueryId() {
+    return queryState.getQueryId();
+  }
+
 }
diff --git 
a/service/src/java/org/apache/hive/service/cli/operation/OperationManager.java 
b/service/src/java/org/apache/hive/service/cli/operation/OperationManager.java
index 5336034839f..a5435a68052 100644
--- 
a/service/src/java/org/apache/hive/service/cli/operation/OperationManager.java
+++ 
b/service/src/java/org/apache/hive/service/cli/operation/OperationManager.java
@@ -186,7 +186,7 @@ public class OperationManager extends AbstractService {
   }
 
   private String getQueryId(Operation operation) {
-    return 
operation.getParentSession().getHiveConf().getVar(ConfVars.HIVEQUERYID);
+    return operation.getQueryId();
   }
 
   private void addOperation(Operation operation) {