This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new c01d9a73a [linkis-engineplugin-pipeline] Modification of scala file
floating red (#3214)
c01d9a73a is described below
commit c01d9a73adca028aa0e97b936c86b579d23ef24b
Author: 成彬彬 <[email protected]>
AuthorDate: Wed Sep 7 23:50:42 2022 +0800
[linkis-engineplugin-pipeline] Modification of scala file floating red
(#3214)
* [linkis-engineplugin-pipeline] Modification of scala file floating red
---
.../manager/engineplugin/pipeline/executor/PipeLineExecutor.scala | 2 +-
.../engineplugin/pipeline/executor/PipelineEngineConnExecutor.scala | 6 +++---
.../engineplugin/pipeline/executor/PipelineExecutorSelector.scala | 3 ++-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git
a/linkis-engineconn-plugins/pipeline/src/main/scala/org/apache/linkis/manager/engineplugin/pipeline/executor/PipeLineExecutor.scala
b/linkis-engineconn-plugins/pipeline/src/main/scala/org/apache/linkis/manager/engineplugin/pipeline/executor/PipeLineExecutor.scala
index 820ee99fe..7b72998a7 100644
---
a/linkis-engineconn-plugins/pipeline/src/main/scala/org/apache/linkis/manager/engineplugin/pipeline/executor/PipeLineExecutor.scala
+++
b/linkis-engineconn-plugins/pipeline/src/main/scala/org/apache/linkis/manager/engineplugin/pipeline/executor/PipeLineExecutor.scala
@@ -38,5 +38,5 @@ trait PipeLineExecutor {
options = newOptions
}
- def cleanOptions = options = null
+ def cleanOptions: Unit = options = null
}
diff --git
a/linkis-engineconn-plugins/pipeline/src/main/scala/org/apache/linkis/manager/engineplugin/pipeline/executor/PipelineEngineConnExecutor.scala
b/linkis-engineconn-plugins/pipeline/src/main/scala/org/apache/linkis/manager/engineplugin/pipeline/executor/PipelineEngineConnExecutor.scala
index 907c0be5c..fc1c387ff 100644
---
a/linkis-engineconn-plugins/pipeline/src/main/scala/org/apache/linkis/manager/engineplugin/pipeline/executor/PipelineEngineConnExecutor.scala
+++
b/linkis-engineconn-plugins/pipeline/src/main/scala/org/apache/linkis/manager/engineplugin/pipeline/executor/PipelineEngineConnExecutor.scala
@@ -37,7 +37,7 @@ import org.apache.linkis.scheduler.executer.ExecuteResponse
import java.util
-import scala.collection.JavaConversions.mapAsScalaMap
+import scala.collection.JavaConverters._
class PipelineEngineConnExecutor(val id: Int) extends ComputationExecutor with
Logging {
@@ -60,10 +60,10 @@ class PipelineEngineConnExecutor(val id: Int) extends
ComputationExecutor with L
var succeedTasks = 1
val newOptions = new util.HashMap[String, String]()
newOptions.putAll(EngineConnObject.getEngineCreationContext.getOptions)
- engineExecutorContext.getProperties.foreach { keyAndValue =>
+ engineExecutorContext.getProperties.asScala.foreach { keyAndValue =>
newOptions.put(keyAndValue._1, keyAndValue._2.toString)
}
- newOptions.foreach({ case (k, v) => logger.info(s"key is $k, value is $v")
})
+ newOptions.asScala.foreach({ case (k, v) => logger.info(s"key is $k, value
is $v") })
val regex = "(?i)\\s*from\\s+(\\S+)\\s+to\\s+(\\S+)\\s?".r
try {
thread = Thread.currentThread()
diff --git
a/linkis-engineconn-plugins/pipeline/src/main/scala/org/apache/linkis/manager/engineplugin/pipeline/executor/PipelineExecutorSelector.scala
b/linkis-engineconn-plugins/pipeline/src/main/scala/org/apache/linkis/manager/engineplugin/pipeline/executor/PipelineExecutorSelector.scala
index f3e7d3c01..e5fa794fa 100644
---
a/linkis-engineconn-plugins/pipeline/src/main/scala/org/apache/linkis/manager/engineplugin/pipeline/executor/PipelineExecutorSelector.scala
+++
b/linkis-engineconn-plugins/pipeline/src/main/scala/org/apache/linkis/manager/engineplugin/pipeline/executor/PipelineExecutorSelector.scala
@@ -35,8 +35,9 @@ object PipelineExecutorSelector extends Logging {
): PipeLineExecutor = {
PipelineEngineConnExecutor.listPipelineExecutors.foreach(_.init(options))
Utils.tryCatch {
- if (new File(sourcePath).getName.equals(new File(destPath).getName))
+ if (new File(sourcePath).getName.equals(new File(destPath).getName)) {
return PipelineEngineConnExecutor.listPipelineExecutors()(0)
+ }
getSuffix(destPath) match {
case ".csv" => PipelineEngineConnExecutor.listPipelineExecutors()(1)
case ".xlsx" => PipelineEngineConnExecutor.listPipelineExecutors()(2)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
