This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.0 by this push:
new 67036bd9b python parser support to skip (#3201)
67036bd9b is described below
commit 67036bd9b16f1123a8af253da4a58975d17982ad
Author: peacewong <[email protected]>
AuthorDate: Mon Sep 5 23:17:59 2022 +0800
python parser support to skip (#3201)
* python parser support to skip
* Fix unit test
---
.../apache/linkis/governance/common/conf/GovernaceCommonConf.scala | 2 ++
.../scala/org/apache/linkis/governance/common/paser/CodeParser.scala | 3 +++
.../apache/linkis/governance/common/paser/PythonCodeParseTest.scala | 2 +-
.../engineconn/computation/executor/cs/CSTableResultSetWriter.scala | 4 ++--
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git
a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/conf/GovernaceCommonConf.scala
b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/conf/GovernaceCommonConf.scala
index 8e37f68a3..c0be0276a 100644
---
a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/conf/GovernaceCommonConf.scala
+++
b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/conf/GovernaceCommonConf.scala
@@ -50,6 +50,8 @@ object GovernanceCommonConf {
val ENGINE_DEFAULT_LIMIT = CommonVars("wds.linkis.engine.default.limit",
5000)
+ val SKIP_PYTHON_PARSER = CommonVars("linkis.code.parser.skip.python", true,
"skip python parser")
+
val RESULT_SET_STORE_PATH = CommonVars(
"wds.linkis.resultSet.store.path",
CommonVars[String]("wds.linkis.filesystem.hdfs.root.path",
"hdfs:///tmp/linkis/").getValue
diff --git
a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/paser/CodeParser.scala
b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/paser/CodeParser.scala
index 92de725ab..d30723e18 100644
---
a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/paser/CodeParser.scala
+++
b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/paser/CodeParser.scala
@@ -121,6 +121,9 @@ class PythonCodeParser extends SingleCodeParser with
Logging {
val LOG: Logger = LoggerFactory.getLogger(getClass)
override def parse(code: String): Array[String] = {
+ if (GovernanceCommonConf.SKIP_PYTHON_PARSER.getValue) {
+ return Array(code)
+ }
Utils.tryCatch(parsePythonCode(code)) { e =>
logger.info(s"Your code will be submitted in overall mode.
${e.getMessage} ")
Array(code)
diff --git
a/linkis-computation-governance/linkis-computation-governance-common/src/test/scala/org/apache/linkis/governance/common/paser/PythonCodeParseTest.scala
b/linkis-computation-governance/linkis-computation-governance-common/src/test/scala/org/apache/linkis/governance/common/paser/PythonCodeParseTest.scala
index db9541db6..3b050ff5d 100644
---
a/linkis-computation-governance/linkis-computation-governance-common/src/test/scala/org/apache/linkis/governance/common/paser/PythonCodeParseTest.scala
+++
b/linkis-computation-governance/linkis-computation-governance-common/src/test/scala/org/apache/linkis/governance/common/paser/PythonCodeParseTest.scala
@@ -50,7 +50,7 @@ class PythonCodeParseTest {
| .getOrCreate()
| return spark
|""".stripMargin
- val strings = parser.parse(pythonCode)
+ val strings = parser.parsePythonCode(pythonCode)
assertTrue(strings.length == 8)
}
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSTableResultSetWriter.scala
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSTableResultSetWriter.scala
index 5b39812a8..163d7cf57 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSTableResultSetWriter.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSTableResultSetWriter.scala
@@ -39,13 +39,13 @@ class CSTableResultSetWriter(
) extends StorageResultSetWriter[TableMetaData, TableRecord](tableResult,
maxCacheSize, storePath)
with Logging {
- override def toString: String = {
+ override def close(): Unit = {
Utils.tryCatch {
registerToCS
} { case t: Throwable =>
logger.info("Failed to register tmp table", t)
}
- super.toString
+ super.close()
}
private def registerToCS: Unit = {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
