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 e3abbcefe feat: scala code format alarm clear in
linkis-once-engineconn (#3205)
e3abbcefe is described below
commit e3abbcefee4778834d66c2e9e83a9a7e612ba4ae
Author: ruY <[email protected]>
AuthorDate: Fri Sep 2 11:54:15 2022 +0800
feat: scala code format alarm clear in linkis-once-engineconn (#3205)
---
.../org/apache/linkis/engineconn/once/executor/OnceExecutor.scala | 3 ++-
.../engineconn/once/executor/creation/OnceExecutorManager.scala | 7 ++++---
.../once/executor/execution/OnceEngineConnExecution.scala | 3 ++-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/src/main/scala/org/apache/linkis/engineconn/once/executor/OnceExecutor.scala
b/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/src/main/scala/org/apache/linkis/engineconn/once/executor/OnceExecutor.scala
index 66e07ccef..b8e543daa 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/src/main/scala/org/apache/linkis/engineconn/once/executor/OnceExecutor.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/src/main/scala/org/apache/linkis/engineconn/once/executor/OnceExecutor.scala
@@ -74,11 +74,12 @@ trait OnceExecutor extends
ExecutableExecutor[ExecuteResponse] with LabelExecuto
): OnceExecutorExecutionContext = {
val resource =
engineCreationContext.getOptions.get(OnceExecutorContentUtils.ONCE_EXECUTOR_CONTENT_KEY)
- if (StringUtils.isEmpty(resource))
+ if (StringUtils.isEmpty(resource)) {
throw new OnceEngineConnErrorException(
12560,
OnceExecutorContentUtils.ONCE_EXECUTOR_CONTENT_KEY + " is not exist."
)
+ }
val bmlResource = OnceExecutorContentUtils.valueToResource(resource)
val bmlClient =
BmlClientFactory.createBmlClient(engineCreationContext.getUser)
val contentStr = Utils.tryFinally {
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/src/main/scala/org/apache/linkis/engineconn/once/executor/creation/OnceExecutorManager.scala
b/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/src/main/scala/org/apache/linkis/engineconn/once/executor/creation/OnceExecutorManager.scala
index c812fd9bd..2a6405589 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/src/main/scala/org/apache/linkis/engineconn/once/executor/creation/OnceExecutorManager.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/src/main/scala/org/apache/linkis/engineconn/once/executor/creation/OnceExecutorManager.scala
@@ -47,14 +47,14 @@ class OnceExecutorManagerImpl extends
LabelExecutorManagerImpl with OnceExecutor
override def getReportExecutor: OnceExecutor = if (getExecutors.isEmpty) {
val labels =
- if (null == engineConn.getEngineCreationContext.getLabels())
+ if (null == engineConn.getEngineCreationContext.getLabels()) {
throw new OnceEngineConnErrorException(12560, "No labels is exists.")
- else engineConn.getEngineCreationContext.getLabels()
+ } else engineConn.getEngineCreationContext.getLabels()
createExecutor(
engineConn.getEngineCreationContext,
labels.toArray[Label[_]](Array.empty[Label[_]])
).asInstanceOf[OnceExecutor]
- } else
+ } else {
getExecutors
.filter(_.isInstanceOf[OnceExecutor])
.maxBy {
@@ -62,5 +62,6 @@ class OnceExecutorManagerImpl extends
LabelExecutorManagerImpl with OnceExecutor
case executor: Executor => executor.getId.hashCode
}
.asInstanceOf[OnceExecutor]
+ }
}
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/src/main/scala/org/apache/linkis/engineconn/once/executor/execution/OnceEngineConnExecution.scala
b/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/src/main/scala/org/apache/linkis/engineconn/once/executor/execution/OnceEngineConnExecution.scala
index a756f2682..ce421886d 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/src/main/scala/org/apache/linkis/engineconn/once/executor/execution/OnceEngineConnExecution.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/src/main/scala/org/apache/linkis/engineconn/once/executor/execution/OnceEngineConnExecution.scala
@@ -132,11 +132,12 @@ class OnceExecutorManagerEngineConnExecution extends
EngineConnExecution {
shouldSet =
OnceEngineConnExecution.getSupportedEngineConnModes.contains(mode)
case _ =>
}
- if (shouldSet)
+ if (shouldSet) {
DataWorkCloudApplication.setProperty(
EngineConnExecutorConfiguration.EXECUTOR_MANAGER_CLASS.key,
"org.apache.linkis.engineconn.once.executor.creation.OnceExecutorManagerImpl"
)
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
