You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2023/04/16 08:21:33 UTC
[linkis] branch dev-1.4.0 updated: ECM code optimization (#4449)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.4.0
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.4.0 by this push:
new c8d151250 ECM code optimization (#4449)
c8d151250 is described below
commit c8d15125009b3fd7a9e3e17ab49e54b3e78de585
Author: ChengJie1053 <18...@163.com>
AuthorDate: Sun Apr 16 16:21:25 2023 +0800
ECM code optimization (#4449)
* ECM code optimization
---
.../governance/common/utils/ECPathUtils.scala | 28 ++++++++--------------
.../linkis/governance/common/utils/JobUtils.scala | 10 +++-----
.../linkis/ecm/server/hook/JarUDFLoadECMHook.scala | 1 -
.../ecm/server/service/ECMMetricsService.scala | 20 ----------------
.../impl/BmlResourceLocalizationService.scala | 2 --
.../service/impl/DefaultECMMetricsService.scala | 25 -------------------
.../manager/common/protocol/bml/BmlResource.java | 9 -------
7 files changed, 13 insertions(+), 82 deletions(-)
diff --git a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/ECPathUtils.scala b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/ECPathUtils.scala
index 58c08b1f8..a27de9726 100644
--- a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/ECPathUtils.scala
+++ b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/ECPathUtils.scala
@@ -25,24 +25,16 @@ import java.nio.file.Paths
object ECPathUtils {
- def getECWOrkDirPathSuffix(
- user: String,
- ticketId: String,
- engineType: String,
- timeStamp: Long = System.currentTimeMillis()
- ): String = {
- val suffix = if (StringUtils.isBlank(engineType)) {
- Paths
- .get(user, DateFormatUtils.format(System.currentTimeMillis(), "yyyyMMdd"))
- .toFile
- .getPath
- } else {
- Paths
- .get(user, DateFormatUtils.format(System.currentTimeMillis(), "yyyyMMdd"), engineType)
- .toFile
- .getPath
- }
- suffix + File.separator + ticketId
+ def getECWOrkDirPathSuffix(user: String, ticketId: String, engineType: String): String = {
+ Paths
+ .get(
+ user,
+ DateFormatUtils.format(System.currentTimeMillis(), "yyyyMMdd"),
+ if (StringUtils.isBlank(engineType)) "" else engineType
+ )
+ .toFile
+ .getPath + File.separator + ticketId
+
}
}
diff --git a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/JobUtils.scala b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/JobUtils.scala
index c55db3d62..d328ebb63 100644
--- a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/JobUtils.scala
+++ b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/JobUtils.scala
@@ -19,6 +19,8 @@ package org.apache.linkis.governance.common.utils
import org.apache.linkis.governance.common.constant.job.JobRequestConstants
+import org.apache.commons.collections.MapUtils
+
import java.util;
object JobUtils {
@@ -34,13 +36,7 @@ object JobUtils {
}
def getJobIdFromStringMap(map: util.Map[String, String]): String = {
- if (null != map && map.containsKey(JobRequestConstants.JOB_ID)) {
- val value = map.get(JobRequestConstants.JOB_ID)
- if (null != value) {
- return value
- }
- }
- null
+ if (MapUtils.isNotEmpty(map)) map.getOrDefault(JobRequestConstants.JOB_ID, null) else null
}
}
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/hook/JarUDFLoadECMHook.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/hook/JarUDFLoadECMHook.scala
index 26cccfc9c..39efe74cc 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/hook/JarUDFLoadECMHook.scala
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/hook/JarUDFLoadECMHook.scala
@@ -113,7 +113,6 @@ class JarUDFLoadECMHook extends ECMHook with Logging {
)
}
}
- // LaunchConstants.addPathToClassPath(pel.environment, udfDir + File.separator + "*")
val udfJars = fileNameSet.map(udfDir + File.separator + _)
pel.environment.put(Environment.UDF_JARS.toString, udfJars.mkString(","));
}
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/ECMMetricsService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/ECMMetricsService.scala
deleted file mode 100644
index 62ae7c1fe..000000000
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/ECMMetricsService.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.linkis.ecm.server.service
-
-trait ECMMetricsService {}
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/BmlResourceLocalizationService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/BmlResourceLocalizationService.scala
index ed1490294..e334a8ac2 100644
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/BmlResourceLocalizationService.scala
+++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/BmlResourceLocalizationService.scala
@@ -120,8 +120,6 @@ class BmlResourceLocalizationService extends ResourceLocalizationService with Lo
}
}
- private val bmlResourceSuffix = ".zip"
-
private def createDirIfNotExit(noSchemaPath: String): String = {
val fsPath = new FsPath(schema + noSchemaPath)
if (!fs.exists(fsPath)) {
diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultECMMetricsService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultECMMetricsService.scala
deleted file mode 100644
index 5d7da6b91..000000000
--- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/org/apache/linkis/ecm/server/service/impl/DefaultECMMetricsService.scala
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.linkis.ecm.server.service.impl
-
-import org.apache.linkis.ecm.core.listener.{ECMEvent, ECMEventListener}
-import org.apache.linkis.ecm.server.service.ECMMetricsService
-
-class DefaultECMMetricsService extends ECMMetricsService with ECMEventListener {
- override def onEvent(event: ECMEvent): Unit = {}
-}
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/protocol/bml/BmlResource.java b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/protocol/bml/BmlResource.java
index 7c0d71f36..8c01009a5 100644
--- a/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/protocol/bml/BmlResource.java
+++ b/linkis-computation-governance/linkis-manager/linkis-manager-common/src/main/java/org/apache/linkis/manager/common/protocol/bml/BmlResource.java
@@ -80,13 +80,4 @@ public class BmlResource implements Serializable {
Private,
Label
}
-
- /* @Override
- public String toString() {
- return "{" +
- "fileName='" + fileName + '\'' +
- ", resourceId='" + resourceId + '\'' +
- ", version='" + version + '\'' +
- '}';
- }*/
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org