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 7d3dc1f14 feat: scala code format alarm clear in
linkis-computation-engineconn (#3206)
7d3dc1f14 is described below
commit 7d3dc1f1431788bf94e18d031c3fb91a2f3f85c0
Author: ruY <[email protected]>
AuthorDate: Sat Sep 3 13:58:17 2022 +0800
feat: scala code format alarm clear in linkis-computation-engineconn (#3206)
---
.../async/AsyncConcurrentComputationExecutor.scala | 4 ++--
.../creation/ComputationExecutorManager.scala | 4 ++--
.../computation/executor/cs/CSResourceParser.scala | 5 +++--
.../computation/executor/cs/CSTableRegister.scala | 4 ++--
.../execute/ComputationEngineConnExecution.scala | 3 ++-
.../executor/execute/ComputationExecutor.scala | 19 ++++++++--------
.../executor/execute/EngineExecutionContext.scala | 2 +-
.../executor/hook/UDFLoadEngineConnHook.scala | 4 ++--
.../computation/executor/rs/RsOutputStream.scala | 10 ++++-----
.../executor/service/TaskExecutionService.scala | 4 ++--
.../service/TaskExecutionServiceImpl.scala | 25 ++++++++++------------
.../upstream/access/ECTaskEntranceInfoAccess.scala | 24 +++++++++++++--------
.../upstream/entity/ECTaskEntranceConnection.scala | 21 +++++++++---------
.../upstream/handler/ECTaskKillHandler.scala | 6 ++----
.../wrapper/ECTaskEntranceConnectionWrapper.scala | 5 ++---
.../executor/utlis/ComputationEngineConstant.scala | 8 +++----
16 files changed, 74 insertions(+), 74 deletions(-)
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/async/AsyncConcurrentComputationExecutor.scala
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/async/AsyncConcurrentComputationExecutor.scala
index 2fa5310c2..870b9ea65 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/async/AsyncConcurrentComputationExecutor.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/async/AsyncConcurrentComputationExecutor.scala
@@ -165,8 +165,8 @@ abstract class AsyncConcurrentComputationExecutor(override
val outputPrintLimit:
logger.info(s"kill job${job.getId()} task is ${task.getTaskId}")
job.kill()
}
- /*task.setStatus(ExecutionNodeStatus.Cancelled)
- transformTaskStatus(task, ExecutionNodeStatus.Cancelled)*/
+ /* task.setStatus(ExecutionNodeStatus.Cancelled)
+ transformTaskStatus(task, ExecutionNodeStatus.Cancelled) */
}
}
}
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/creation/ComputationExecutorManager.scala
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/creation/ComputationExecutorManager.scala
index 56a112975..b7e97670b 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/creation/ComputationExecutorManager.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/creation/ComputationExecutorManager.scala
@@ -89,10 +89,10 @@ class ComputationExecutorManagerImpl
}
}
- /*override def getReportExecutor: ComputationExecutor =
if(getExecutors.isEmpty) getDefaultExecutor
+ /* override def getReportExecutor: ComputationExecutor =
if(getExecutors.isEmpty) getDefaultExecutor
else getExecutors.maxBy {
case computationExecutor: ComputationExecutor =>
computationExecutor.getStatus.ordinal()
- }.asInstanceOf[ComputationExecutor]*/
+ }.asInstanceOf[ComputationExecutor] */
override protected def getLabelKey(labels: Array[Label[_]]): String = {
labels.foreach {
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSResourceParser.scala
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSResourceParser.scala
index cf25d059b..f59adaade 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSResourceParser.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSResourceParser.scala
@@ -24,7 +24,7 @@ import org.apache.commons.lang3.StringUtils
import java.util
import java.util.regex.Pattern
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
import scala.collection.mutable.ArrayBuffer
class CSResourceParser {
@@ -58,7 +58,8 @@ class CSResourceParser {
val parsedNames = new ArrayBuffer[String]()
preFixResourceNames.foreach { preFixResourceName =>
val resourceName = preFixResourceName.replace(PREFIX, "").trim
- val bmlResourceOption =
bmlResourceList.find(_.getDownloadedFileName.equals(resourceName))
+ val bmlResourceOption =
+
bmlResourceList.asScala.find(_.getDownloadedFileName.equals(resourceName))
if (bmlResourceOption.isDefined) {
val bmlResource = bmlResourceOption.get
val map = new util.HashMap[String, Object]()
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSTableRegister.scala
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSTableRegister.scala
index 43f0d101b..cc899cece 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSTableRegister.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/cs/CSTableRegister.scala
@@ -52,9 +52,9 @@ object CSTableRegister extends Logging {
logger.info(s"Start to register TempTable nodeName:$nodeNameStr")
writer.flush()
val tableName =
- if (StringUtils.isNotBlank(alias))
+ if (StringUtils.isNotBlank(alias)) {
s"${CSCommonUtils.CS_TMP_TABLE_PREFIX}${nodeNameStr}_${alias}"
- else {
+ } else {
var i = 1;
var rsName: String = null;
while (StringUtils.isEmpty(rsName)) {
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/ComputationEngineConnExecution.scala
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/ComputationEngineConnExecution.scala
index eaef40cd1..6d59e23ba 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/ComputationEngineConnExecution.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/ComputationEngineConnExecution.scala
@@ -71,11 +71,12 @@ class ComputationExecutorManagerEngineConnExecution extends
EngineConnExecution
shouldSet =
ComputationEngineConnExecution.getSupportedEngineConnModes.contains(mode)
case _ =>
}
- if (shouldSet)
+ if (shouldSet) {
DataWorkCloudApplication.setProperty(
EngineConnExecutorConfiguration.EXECUTOR_MANAGER_CLASS.key,
ComputationExecutorConf.DEFAULT_COMPUTATION_EXECUTORMANAGER_CLAZZ.getValue
)
+ }
}
/**
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/ComputationExecutor.scala
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/ComputationExecutor.scala
index 2c9b6783e..dab20dcf8 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/ComputationExecutor.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/ComputationExecutor.scala
@@ -137,9 +137,9 @@ abstract class ComputationExecutor(val outputPrintLimit:
Int = 1000)
// override def getName: String =
ComputationExecutorConf.DEFAULT_COMPUTATION_NAME
- protected def ensureOp[A](f: => A): A = if (!isEngineInitialized)
+ protected def ensureOp[A](f: => A): A = if (!isEngineInitialized) {
f
- else ensureIdle(f)
+ } else ensureIdle(f)
protected def beforeExecute(engineConnTask: EngineConnTask): Unit = {}
@@ -194,15 +194,14 @@ abstract class ComputationExecutor(val outputPrintLimit:
Int = 1000)
}
engineExecutionContext.setTotalParagraph(codes.length)
codes.indices.foreach({ index =>
- if (ExecutionNodeStatus.Cancelled == engineConnTask.getStatus)
+ if (ExecutionNodeStatus.Cancelled == engineConnTask.getStatus) {
return ErrorExecuteResponse("Job is killed by user!", null)
+ }
val code = codes(index)
engineExecutionContext.setCurrentParagraph(index + 1)
- response = Utils.tryCatch(
- if (incomplete.nonEmpty)
- executeCompletely(engineExecutionContext, code,
incomplete.toString())
- else executeLine(engineExecutionContext, code)
- ) { t =>
+ response = Utils.tryCatch(if (incomplete.nonEmpty) {
+ executeCompletely(engineExecutionContext, code,
incomplete.toString())
+ } else executeLine(engineExecutionContext, code)) { t =>
ErrorExecuteResponse(ExceptionUtils.getRootCauseMessage(t), t)
}
// info(s"Finished to execute task ${engineConnTask.getTaskId}")
@@ -218,9 +217,9 @@ abstract class ComputationExecutor(val outputPrintLimit:
Int = 1000)
case e: OutputExecuteResponse =>
incomplete.setLength(0)
val output =
- if (StringUtils.isNotEmpty(e.getOutput) && e.getOutput.length >
outputPrintLimit)
+ if (StringUtils.isNotEmpty(e.getOutput) && e.getOutput.length >
outputPrintLimit) {
e.getOutput.substring(0, outputPrintLimit)
- else e.getOutput
+ } else e.getOutput
engineExecutionContext.appendStdout(output)
if (StringUtils.isNotBlank(e.getOutput))
engineExecutionContext.sendResultSet(e)
case _: IncompleteExecuteResponse =>
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala
index fb7827ac1..933929ea4 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala
@@ -207,7 +207,7 @@ class EngineExecutionContext(executor: ComputationExecutor,
executorUser: String
def getExecutor: Executor = executor
- def getEnableResultsetMetaWithTableName = enableResultsetMetaWithTableName
+ def getEnableResultsetMetaWithTableName: Boolean =
enableResultsetMetaWithTableName
def setEnableResultsetMetaWithTableName(withTableName: Boolean): Unit =
this.enableResultsetMetaWithTableName = withTableName
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/hook/UDFLoadEngineConnHook.scala
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/hook/UDFLoadEngineConnHook.scala
index 34ec21077..ca73e8823 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/hook/UDFLoadEngineConnHook.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/hook/UDFLoadEngineConnHook.scala
@@ -43,7 +43,7 @@ import org.apache.commons.lang3.StringUtils
import java.io.File
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
import scala.collection.mutable.ArrayBuffer
abstract class UDFLoad extends Logging {
@@ -197,7 +197,7 @@ abstract class UDFLoadEngineConnHook extends UDFLoad with
EngineConnHook with Lo
engineConn: EngineConn
): Unit = {
val codeLanguageLabel = new CodeLanguageLabel
- engineCreationContext.getLabels().find(_.isInstanceOf[EngineTypeLabel])
match {
+
engineCreationContext.getLabels().asScala.find(_.isInstanceOf[EngineTypeLabel])
match {
case Some(engineTypeLabel) =>
codeLanguageLabel.setCodeType(
getRealRunType(engineTypeLabel.asInstanceOf[EngineTypeLabel].getEngineType).toString
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/rs/RsOutputStream.scala
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/rs/RsOutputStream.scala
index eff8a17bc..1f8c491ce 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/rs/RsOutputStream.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/rs/RsOutputStream.scala
@@ -32,7 +32,7 @@ class RsOutputStream extends OutputStream with Logging {
private var isReady = false
private var writer: ResultSetWriter[_ <: MetaData, _ <: Record] = _
- override def write(b: Int) = if (isReady) synchronized {
+ override def write(b: Int): Unit = if (isReady) synchronized {
if (writer != null) {
if (b == '\n') {
val outStr = new String(line.toArray, "UTF-8")
@@ -44,12 +44,12 @@ class RsOutputStream extends OutputStream with Logging {
}
}
- def reset(engineExecutionContext: EngineExecutionContext) = {
+ def reset(engineExecutionContext: EngineExecutionContext): Unit = {
writer = engineExecutionContext.createDefaultResultSetWriter()
writer.addMetaData(null)
}
- def ready() = isReady = true
+ def ready(): Unit = isReady = true
override def flush(): Unit = if (writer != null && line.nonEmpty) {
val outStr = new String(line.toArray, "UTF-8")
@@ -57,9 +57,9 @@ class RsOutputStream extends OutputStream with Logging {
line.clear()
}
- override def toString = if (writer != null) writer.toString() else null
+ override def toString: String = if (writer != null) writer.toString() else
null
- override def close() = if (writer != null) {
+ override def close(): Unit = if (writer != null) {
flush()
writer.close()
writer = null
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/service/TaskExecutionService.scala
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/service/TaskExecutionService.scala
index 42c28543a..7d3933756 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/service/TaskExecutionService.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/service/TaskExecutionService.scala
@@ -33,9 +33,9 @@ trait TaskExecutionService {
def killTask(taskID: String): Unit
- /*def pauseTask(taskID: String): Unit
+ /* def pauseTask(taskID: String): Unit
- def resumeTask(taskID: String): Unit*/
+ def resumeTask(taskID: String): Unit */
def dealRequestTaskStatus(requestTaskStatus: RequestTaskStatus):
ResponseTaskStatus
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala
index b03ed7c69..608c2da2a 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala
@@ -360,16 +360,14 @@ class TaskExecutionServiceImpl
Utils.tryCatch {
logger.info(s"Start to run task ${task.getTaskId}")
executeTask(task, executor)
- } {
- case t: Throwable => {
- errCount += 1
- logger.error(s"Execute task ${task.getTaskId} failed
:", t)
- if (errCount > ERR_COUNT_MAX) {
- logger.error(
- s"Executor run failed for ${errCount} times over
ERROR_COUNT_MAX : ${ERR_COUNT_MAX}, will shutdown."
- )
- executor.transition(NodeStatus.ShuttingDown)
- }
+ } { case t: Throwable =>
+ errCount += 1
+ logger.error(s"Execute task ${task.getTaskId} failed :",
t)
+ if (errCount > ERR_COUNT_MAX) {
+ logger.error(
+ s"Executor run failed for ${errCount} times over
ERROR_COUNT_MAX : ${ERR_COUNT_MAX}, will shutdown."
+ )
+ executor.transition(NodeStatus.ShuttingDown)
}
}
}
@@ -425,7 +423,7 @@ class TaskExecutionServiceImpl
val progressResponse = taskProgress(task.getTaskId)
val resourceResponse: ResponseTaskYarnResource =
taskYarnResource(task.getTaskId) match {
- case responseTaskYarnResource: ResponseTaskYarnResource => {
+ case responseTaskYarnResource: ResponseTaskYarnResource =>
if (
responseTaskYarnResource.resourceMap != null &&
!responseTaskYarnResource.resourceMap.isEmpty
) {
@@ -433,7 +431,6 @@ class TaskExecutionServiceImpl
} else {
null
}
- }
case _ =>
null
}
@@ -534,9 +531,9 @@ class TaskExecutionServiceImpl
}
}
- /*override def resumeTask(taskID: String): Unit = {
+ /* override def resumeTask(taskID: String): Unit = {
// todo
- }*/
+ } */
@Receiver
override def dealRequestTaskStatus(requestTaskStatus: RequestTaskStatus):
ResponseTaskStatus = {
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/access/ECTaskEntranceInfoAccess.scala
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/access/ECTaskEntranceInfoAccess.scala
index 5efc8013c..981f389c1 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/access/ECTaskEntranceInfoAccess.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/access/ECTaskEntranceInfoAccess.scala
@@ -29,8 +29,9 @@ import org.springframework.cloud.client.{ServiceInstance =>
SpringCloudServiceIn
import
org.springframework.cloud.netflix.eureka.EurekaDiscoveryClient.EurekaServiceInstance
import java.util
+import java.util.Locale
-import scala.collection.JavaConversions
+import scala.collection.JavaConverters
import scala.collection.JavaConverters._
/**
@@ -49,8 +50,8 @@ class ECTaskEntranceInfoAccess extends ConnectionInfoAccess
with Logging {
val ret: util.List[ECTaskEntranceConnection] = new
util.ArrayList[ECTaskEntranceConnection]
request match {
- case eCTaskEntranceInfoAccessRequest: ECTaskEntranceInfoAccessRequest =>
{
- // val instances =
Sender.getInstances(GovernanceCommonConf.ENTRANCE_SPRING_NAME.getValue) //use
discoveryClient
+ case eCTaskEntranceInfoAccessRequest: ECTaskEntranceInfoAccessRequest =>
+ // val instances =
Sender.getInstances(GovernanceCommonConf.ENTRANCE_SPRING_NAME.getValue) //use
discoveryClient
val instanceMap = new util.HashMap[String, ServiceInstance]
Utils.tryCatch(discoveryClient.getServices.asScala.map(s => {
discoveryClient.getInstances(s).asScala.map { s1 =>
@@ -82,7 +83,7 @@ class ECTaskEntranceInfoAccess extends ConnectionInfoAccess
with Logging {
logger.warn("wrapper should not be null")
} else {
wrapper match {
- case ecWrapper: ECTaskEntranceConnectionWrapper => {
+ case ecWrapper: ECTaskEntranceConnectionWrapper =>
val engineConnTask = ecWrapper.getEngineConnTask
val instance = engineConnTask.getCallbackServiceInstance
val eCTaskEntranceConnection =
@@ -91,7 +92,6 @@ class ECTaskEntranceInfoAccess extends ConnectionInfoAccess
with Logging {
eCTaskEntranceConnection.updatePrevAliveTimeStamp(currentTime)
}
ret.add(eCTaskEntranceConnection)
- }
case _ =>
logger.warn(
"invalid data-type: " + wrapper.getClass.getCanonicalName +
" for data in ECTaskEntranceInfoAccessRequest"
@@ -99,14 +99,13 @@ class ECTaskEntranceInfoAccess extends ConnectionInfoAccess
with Logging {
}
}
}
- }
case _ =>
throw new EngineConnException(
ComputationErrorCode.INVALID_DATA_TYPE_ERROR_CODE,
"invalid data-type: " + request.getClass.getCanonicalName
)
}
- JavaConversions.asScalaIterator(ret.iterator()).toList
+ JavaConverters.asScalaIteratorConverter(ret.iterator()).asScala.toList
}
private def getDWCServiceInstance(serviceInstance:
SpringCloudServiceInstance): ServiceInstance =
@@ -114,11 +113,18 @@ class ECTaskEntranceInfoAccess extends
ConnectionInfoAccess with Logging {
case instance: EurekaServiceInstance =>
val applicationName = instance.getInstanceInfo.getAppName
val instanceId = instance.getInstanceInfo.getInstanceId
- ServiceInstance(applicationName.toLowerCase,
getInstance(applicationName, instanceId))
+ ServiceInstance(
+ applicationName.toLowerCase(Locale.getDefault),
+ getInstance(applicationName, instanceId)
+ )
}
private def getInstance(applicationName: String, instanceId: String): String
=
- if (instanceId.toLowerCase.indexOf(applicationName.toLowerCase) > 0) {
+ if (
+ instanceId
+ .toLowerCase(Locale.getDefault)
+ .indexOf(applicationName.toLowerCase(Locale.getDefault)) > 0
+ ) {
val instanceInfos = instanceId.split(":")
instanceInfos(0) + ":" + instanceInfos(2)
} else instanceId
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/entity/ECTaskEntranceConnection.scala
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/entity/ECTaskEntranceConnection.scala
index eb2525bd3..252e64797 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/entity/ECTaskEntranceConnection.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/entity/ECTaskEntranceConnection.scala
@@ -43,18 +43,17 @@ class ECTaskEntranceConnection(
override def isSameConnectionAs(upstreamConnection: UpstreamConnection):
Boolean =
upstreamConnection match {
- case upstreamConnection2: ECTaskEntranceConnection => {
+ case upstreamConnection2: ECTaskEntranceConnection =>
StringUtils.equals(upstreamConnection2.getKey, this.getKey) &&
- StringUtils.equals(upstreamConnection2.getTaskID, this.getTaskID) &&
- StringUtils.equals(
- upstreamConnection2.getCurrentServiceInstanceName,
- this.getCurrentServiceInstanceName
- ) &&
- StringUtils.equals(
- upstreamConnection2.getUpstreamServiceInstanceName,
- this.getUpstreamServiceInstanceName
- )
- }
+ StringUtils.equals(upstreamConnection2.getTaskID, this.getTaskID) &&
+ StringUtils.equals(
+ upstreamConnection2.getCurrentServiceInstanceName,
+ this.getCurrentServiceInstanceName
+ ) &&
+ StringUtils.equals(
+ upstreamConnection2.getUpstreamServiceInstanceName,
+ this.getUpstreamServiceInstanceName
+ )
case _ => false
}
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/handler/ECTaskKillHandler.scala
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/handler/ECTaskKillHandler.scala
index e6fc0dfa0..d06e8ac07 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/handler/ECTaskKillHandler.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/handler/ECTaskKillHandler.scala
@@ -32,7 +32,7 @@ class ECTaskKillHandler extends MonitorHandler with Logging {
logger.error("illegal input for handler: null")
} else {
request match {
- case _: ECTaskKillHandlerRequest => {
+ case _: ECTaskKillHandlerRequest =>
val toBeKilled =
request.asInstanceOf[ECTaskKillHandlerRequest].getData
if (toBeKilled != null && toBeKilled.size() != 0) {
val elements = toBeKilled.iterator
@@ -48,7 +48,6 @@ class ECTaskKillHandler extends MonitorHandler with Logging {
}
}
}
- }
case _ => logger.error("illegal input for handler: " +
request.getClass.getCanonicalName)
}
}
@@ -57,7 +56,7 @@ class ECTaskKillHandler extends MonitorHandler with Logging {
private def doKill(wrapper: ConnectionInfoWrapper): Unit = {
if (wrapper != null) {
wrapper match {
- case eCTaskEntranceConnectionWrapper: ECTaskEntranceConnectionWrapper
=> {
+ case eCTaskEntranceConnectionWrapper: ECTaskEntranceConnectionWrapper
=>
if (
eCTaskEntranceConnectionWrapper.getExecutor == null ||
eCTaskEntranceConnectionWrapper.getEngineConnTask == null
) {
@@ -77,7 +76,6 @@ class ECTaskKillHandler extends MonitorHandler with Logging {
ExecutorManager.getInstance.getReportExecutor.tryShutdown()
}
}
- }
case _ => logger.error("invalid data-type: " +
wrapper.getClass.getCanonicalName)
}
} else {
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/wrapper/ECTaskEntranceConnectionWrapper.scala
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/wrapper/ECTaskEntranceConnectionWrapper.scala
index 3cb8ba662..3dae777fd 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/wrapper/ECTaskEntranceConnectionWrapper.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/upstream/wrapper/ECTaskEntranceConnectionWrapper.scala
@@ -35,7 +35,7 @@ class ECTaskEntranceConnectionWrapper(
) extends ConnectionInfoWrapper
with Logging {
- /* delete if time for any entry being in map exceeds threshold*/
+ /* delete if time for any entry being in map exceeds threshold */
private val wrapperEntriesSurviveThresholdSec =
ComputationExecutorConf.UPSTREAM_MONITOR_WRAPPER_ENTRIES_SURVIVE_THRESHOLD_SEC
@@ -52,7 +52,7 @@ class ECTaskEntranceConnectionWrapper(
def getExecutor(): ComputationExecutor = executor
override def updateConnectionInfo(newInfo: UpstreamConnection): Unit =
newInfo match {
- case newInfo2: ECTaskEntranceConnection => {
+ case newInfo2: ECTaskEntranceConnection =>
if (connectionInfo == null ||
StringUtils.isBlank(connectionInfo.getKey)) {
connectionInfo = newInfo2
} else if (!connectionInfo.isSameConnectionAs(newInfo2)) {
@@ -65,7 +65,6 @@ class ECTaskEntranceConnectionWrapper(
connectionInfo = newInfo2
}
lastUpdateTime = System.currentTimeMillis
- }
case _ =>
logger.error("wrong data-type for UpstreamConnection:" +
newInfo.getClass.getCanonicalName)
}
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/utlis/ComputationEngineConstant.scala
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/utlis/ComputationEngineConstant.scala
index 82d00f3aa..2a03b405c 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/utlis/ComputationEngineConstant.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/utlis/ComputationEngineConstant.scala
@@ -19,12 +19,12 @@ package
org.apache.linkis.engineconn.computation.executor.utlis
object ComputationEngineConstant {
- def RETRYABLE_TYPE_NAME = "taskRetryable"
+ def RETRYABLE_TYPE_NAME: String = "taskRetryable"
- def LOCK_TYPE_NAME = "lock"
+ def LOCK_TYPE_NAME: String = "lock"
- def JOB_IN_RUNTIME_MAP_KEY = "job"
+ def JOB_IN_RUNTIME_MAP_KEY: String = "job"
- def CS_HOOK_ORDER = -1
+ def CS_HOOK_ORDER: Int = -1
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
