optimized code

apache · Jul 25, 2023 · a134118 · a134118
1 parent 5e584ab
commit a134118
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/...common/src/main/scala/org/apache/linkis/governance/common/conf/GovernanceCommonConf.scala b/...common/src/main/scala/org/apache/linkis/governance/common/conf/GovernanceCommonConf.scala
@@ -93,4 +93,7 @@ object GovernanceCommonConf {
   val SCALA_PARSE_APPEND_CODE_ENABLED =
     CommonVars("linkis.scala.parse.append.code.enable", true).getValue
 
+  val SCALA_PARSE_APPEND_CODE =
+    CommonVars("linkis.scala.parse.append.code", "val linkisVar=1").getValue
+
 }
diff --git a/...vernance-common/src/main/scala/org/apache/linkis/governance/common/paser/CodeParser.scala b/...vernance-common/src/main/scala/org/apache/linkis/governance/common/paser/CodeParser.scala
@@ -111,7 +111,9 @@ class ScalaCodeParser extends SingleCodeParser with Logging {
     if (statementBuffer.nonEmpty) codeBuffer.append(statementBuffer.mkString("\n"))
 
     // Append code `val linkisVar=1` in ends to prevent bugs that do not exit tasks for a long time
-    if (GovernanceCommonConf.SCALA_PARSE_APPEND_CODE_ENABLED) codeBuffer.append("val linkisVar=1")
+    if (GovernanceCommonConf.SCALA_PARSE_APPEND_CODE_ENABLED) {
+      codeBuffer.append(GovernanceCommonConf.SCALA_PARSE_APPEND_CODE)
+    }
     codeBuffer.toArray
   }
 

diff --git a/...spark/src/main/scala/org/apache/linkis/engineplugin/spark/config/SparkConfiguration.scala b/...spark/src/main/scala/org/apache/linkis/engineplugin/spark/config/SparkConfiguration.scala
@@ -159,6 +159,9 @@ object SparkConfiguration extends Logging {
 
   val LINKIS_SPARK_ETL_SUPPORT_HUDI = CommonVars[Boolean]("linkis.spark.etl.support.hudi", false)
 
+  val SCALA_PARSE_APPEND_CODE =
+    CommonVars("linkis.scala.parse.append.code", "val linkisVar=1").getValue
+
   private def getMainJarName(): String = {
     val somePath = ClassUtils.jarOfClass(classOf[SparkEngineConnFactory])
     if (somePath.isDefined) {

diff --git a/.../spark/src/main/scala/org/apache/linkis/engineplugin/spark/mdq/MDQPostExecutionHook.scala b/.../spark/src/main/scala/org/apache/linkis/engineplugin/spark/mdq/MDQPostExecutionHook.scala
@@ -56,11 +56,10 @@ class MDQPostExecutionHook extends SparkPostExecutionHook with Logging {
       case l: CodeLanguageLabel => l.getCodeType
       case _ => ""
     }
-    val linkisVar = "val linkisVar=1"
     if (
         StringUtils.isEmpty(runType) || !SparkKind.FUNCTION_MDQ_TYPE.equalsIgnoreCase(
           runType
-        ) || (code != null && code.contains(linkisVar))
+        ) || (code != null && code.contains(SparkConfiguration.SCALA_PARSE_APPEND_CODE))
     ) {
       return
     }

diff --git a/...s/spark/src/main/scala/org/apache/linkis/engineplugin/spark/mdq/MDQPreExecutionHook.scala b/...s/spark/src/main/scala/org/apache/linkis/engineplugin/spark/mdq/MDQPreExecutionHook.scala
@@ -60,11 +60,10 @@ class MDQPreExecutionHook extends SparkPreExecutionHook with Logging {
       case _ =>
         ""
     }
-    val linkisVar = "val linkisVar=1"
     if (
         StringUtils.isEmpty(runType) || !SparkKind.FUNCTION_MDQ_TYPE.equalsIgnoreCase(
           runType
-        ) || (code != null && code.contains(linkisVar))
+        ) || (code != null && code.contains(SparkConfiguration.SCALA_PARSE_APPEND_CODE))
     ) {
       return code
     }