From dc8db19d7679d66b5d5c47fdddad8b53ef16f83f Mon Sep 17 00:00:00 2001
From: CharlieYan <16526279+CharlieYan24@users.noreply.github.com>
Date: Sat, 24 Jun 2023 22:30:08 +0800
Subject: [PATCH] fix: 1.4.0 fix operate log #4686 (#4695)

---
 .../org/apache/linkis/manager/am/restful/EMRestfulApi.java    | 4 +++-
 .../engineplugin/hive/conf/HiveEngineConfiguration.scala      | 3 ---
 .../engineplugin/hive/creation/HiveEngineConnFactory.scala    | 3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java
index f35eb48b7e..82bf4d4d7b 100644
--- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java
+++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EMRestfulApi.java
@@ -359,7 +359,9 @@ public Message executeECMOperation(HttpServletRequest req, @RequestBody JsonNode
           "Fail to process the operation parameters, cased by "
               + ExceptionUtils.getRootCauseMessage(e));
     }
-    return executeECMOperation(ecmNode, "", new ECMOperateRequest(userName, parameters));
+    String engineConnInstance = (String) parameters.get("engineConnInstance");
+    return executeECMOperation(
+        ecmNode, engineConnInstance, new ECMOperateRequest(userName, parameters));
   }
 
   @ApiOperation(value = "openEngineLog", notes = "open Engine log", response = Message.class)
diff --git a/linkis-engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/conf/HiveEngineConfiguration.scala b/linkis-engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/conf/HiveEngineConfiguration.scala
index 8865dc66de..4de8f02f52 100644
--- a/linkis-engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/conf/HiveEngineConfiguration.scala
+++ b/linkis-engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/conf/HiveEngineConfiguration.scala
@@ -44,9 +44,6 @@ object HiveEngineConfiguration {
   val HIVE_ENGINE_CONCURRENT_LIMIT =
     CommonVars[Int]("linkis.hive.engineconn.concurrent.limit", 10).getValue
 
-  val HIVE_ENGINE_CONCURRENT_SUPPORT =
-    CommonVars[Boolean]("linkis.hive.engineconn.concurrent.support", false).getValue
-
   val HIVE_RANGER_ENABLE = CommonVars[Boolean]("linkis.hive.ranger.enabled", false).getValue
 
 }
diff --git a/linkis-engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/creation/HiveEngineConnFactory.scala b/linkis-engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/creation/HiveEngineConnFactory.scala
index 25c6182f28..b637da27e1 100644
--- a/linkis-engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/creation/HiveEngineConnFactory.scala
+++ b/linkis-engineconn-plugins/hive/src/main/scala/org/apache/linkis/engineplugin/hive/creation/HiveEngineConnFactory.scala
@@ -18,6 +18,7 @@
 package org.apache.linkis.engineplugin.hive.creation
 
 import org.apache.linkis.common.utils.{Logging, Utils}
+import org.apache.linkis.engineconn.acessible.executor.conf.AccessibleExecutorConfiguration
 import org.apache.linkis.engineconn.common.creation.EngineCreationContext
 import org.apache.linkis.engineconn.common.engineconn.EngineConn
 import org.apache.linkis.engineconn.computation.executor.creation.ComputationSingleExecutorEngineConnFactory
@@ -96,7 +97,7 @@ class HiveEngineConnFactory extends ComputationSingleExecutorEngineConnFactory w
       engineCreationContext: EngineCreationContext
   ): AbstractHiveSession = {
     // if hive engine support concurrent, return HiveConcurrentSession
-    if (HiveEngineConfiguration.HIVE_ENGINE_CONCURRENT_SUPPORT) {
+    if (AccessibleExecutorConfiguration.ENGINECONN_SUPPORT_PARALLELISM) {
       return doCreateHiveConcurrentSession(engineCreationContext.getOptions)
     }