This is an automated email from the ASF dual-hosted git repository.
peacewong 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 e04917a28 refactor: refact some code (#3748)
e04917a28 is described below
commit e04917a288194387d204a6608cbefa31a2414728
Author: Jack Xu <[email protected]>
AuthorDate: Tue Nov 1 12:07:34 2022 +0800
refactor: refact some code (#3748)
---
.../linkis-engineconn-plugin-core-errorcode.md | 3 +-
.../errorcode/EngineconnCoreErrorCodeSummary.java | 5 ++-
.../classloader/EngineConnPluginClassLoader.java | 1 -
.../BmlEngineConnPluginResourceLoader.java | 48 +++++++++-------------
.../LocalEngineConnPluginResourceLoader.java | 11 ++---
.../AbstractEngineConnBmlResourceGenerator.scala | 34 +++++++++------
.../service/DefaultEngineConnLaunchService.scala | 2 +-
.../linkis/manager/label/entity/TenantLabel.java | 5 ---
.../manager/label/entity/UserModifiable.java | 6 +--
.../label/entity/engine/UserCreatorLabel.java | 5 ---
.../manager/label/entity/route/RouteLabel.java | 5 ---
.../linkis/manager/label/utils/LabelUtils.java | 11 +----
.../configuration/util/LabelEntityParser.java | 6 +--
.../label/service/impl/DefaultInsLabelService.java | 46 ---------------------
14 files changed, 60 insertions(+), 128 deletions(-)
diff --git a/docs/errorcode/linkis-engineconn-plugin-core-errorcode.md
b/docs/errorcode/linkis-engineconn-plugin-core-errorcode.md
index 73f7eed75..62b3f39d0 100644
--- a/docs/errorcode/linkis-engineconn-plugin-core-errorcode.md
+++ b/docs/errorcode/linkis-engineconn-plugin-core-errorcode.md
@@ -8,8 +8,9 @@
|linkis-engineconn-plugin-core |20000|Cannot find default
ExecutorFactory(找不到默认的
ExecutorFactory)|CANNOT_DEFAULT_EF|EngineconnCoreErrorCodeSummary|
|linkis-engineconn-plugin-core |20000|EngineTypeLabel is not
exists(EngineTypeLabel 不存在)|ETL_NOT_EXISTS|EngineconnCoreErrorCodeSummary|
|linkis-engineconn-plugin-core |20000|UserCreatorLabel is not
exists(UserCreatorLabel 不存在)|UCL_NOT_EXISTS|EngineconnCoreErrorCodeSummary|
+|linkis-engineconn-plugin-core |20001|The dist of EngineConn is
empty,engineConnType(EngineConn 的 dist
为空,engineConnType):{0}|DIST_IS_EMPTY|EngineconnCoreErrorCodeSummary|
|linkis-engineconn-plugin-core |20001|Cannot find the home path of
engineConn(找不到engineConn的home路径)|CANNOT_HOME_PATH_EC|EngineconnCoreErrorCodeSummary|
-|linkis-engineconn-plugin-core |20001|Cannot find the home path of engineconn
dist(找不到 engineconn dist
的home路径)|CANNOT_HOME_PATH_DIST|EngineconnCoreErrorCodeSummary|
+|linkis-engineconn-plugin-core |20001|Cannot find the path of engineConn with
specified version: {0} and engineConnType: {1}(找不到版本为：{0} engineConnType
为:{1}的engineConn路径|ENGIN_VERSION_NOT_FOUND|EngineconnCoreErrorCodeSummary|
|linkis-engineconn-plugin-core |20001|The dist of EngineConn is
empty,engineConnType(EngineConn 的 dist
为空,engineConnType):{0}|DIST_IS_EMPTY|EngineconnCoreErrorCodeSummary|
|linkis-engineconn-plugin-core |20001|The dist of EngineConn is irregular,
both the version dir and non-version dir are
exist,engineConnType(EngineConn的dist是不规则的，版本目录和非版本目录都存在,engineConnType):{0}|DIST_IRREGULAR_EXIST|EngineconnCoreErrorCodeSummary|
|linkis-engineconn-plugin-core |20001|System have no permission to delete old
engineConn
file,File(系统无权删除旧的engineConn文件,File):{0}|NO_PERMISSION_FILE|EngineconnCoreErrorCodeSummary|
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/java/org/apache/linkis/manager/engineplugin/errorcode/EngineconnCoreErrorCodeSummary.java
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/java/org/apache/linkis/manager/engineplugin/errorcode/EngineconnCoreErrorCodeSummary.java
index c50b7e85b..ec90017b7 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/java/org/apache/linkis/manager/engineplugin/errorcode/EngineconnCoreErrorCodeSummary.java
+++
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-core/src/main/java/org/apache/linkis/manager/engineplugin/errorcode/EngineconnCoreErrorCodeSummary.java
@@ -25,12 +25,15 @@ public enum EngineconnCoreErrorCodeSummary {
CANNOT_DEFAULT_EF(20000, "Cannot find default ExecutorFactory(找不到默认的
ExecutorFactory)"),
ETL_NOT_EXISTS(20000, "EngineTypeLabel is not exists(EngineTypeLabel 不存在)"),
UCL_NOT_EXISTS(20000, "UserCreatorLabel is not exists(UserCreatorLabel
不存在)"),
- CANNOT_HOME_PATH_EC(20001, "Cannot find the home path of engineConn(找不到
engineCon n的 home 路径)"),
+ CANNOT_HOME_PATH_EC(20001, "Cannot find the home path of engineConn(找不到
engineConn 的 home 路径)"),
CANNOT_HOME_PATH_DIST(
20001, "Cannot find the home path of engineconn dist(找不到 engineconn dist
的 home 路径)"),
DIST_IS_EMPTY(
20001,
"The dist of EngineConn is empty,engineConnType is:{0}(EngineConn 的 dist
为空,engineConnType为：{})"),
+ ENGIN_VERSION_NOT_FOUND(
+ 20001,
+ "Cannot find the path of engineConn with specified version: {0} and
engineConnType: {1}(找不到版本为：{0} engineConnType 为:{1}的engineConn路径"),
DIST_IRREGULAR_EXIST(
20001,
"The dist of engineConnType:{0} is irregular, both the version dir and
non-version dir are exist,(engineConnType:{0} 的 dist 目录不符合规范，版本目录和非版本目录都存在}"),
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/classloader/EngineConnPluginClassLoader.java
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/classloader/EngineConnPluginClassLoader.java
index 5c425e061..586c16210 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/classloader/EngineConnPluginClassLoader.java
+++
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/classloader/EngineConnPluginClassLoader.java
@@ -76,7 +76,6 @@ public class EngineConnPluginClassLoader extends
URLClassLoader {
// First, check if the class has already been loaded
Class<?> c = findLoadedClass(name);
if (c == null) {
- long t0 = System.nanoTime();
try {
// invoke findClass in this class
c = findClass(name);
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/loaders/resource/BmlEngineConnPluginResourceLoader.java
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/loaders/resource/BmlEngineConnPluginResourceLoader.java
index f934c234a..9254c83ee 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/loaders/resource/BmlEngineConnPluginResourceLoader.java
+++
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/loaders/resource/BmlEngineConnPluginResourceLoader.java
@@ -84,35 +84,28 @@ public class BmlEngineConnPluginResourceLoader implements
EngineConnPluginsResou
versions.stream().map(Version::version).max(Comparator.naturalOrder()).orElse(null);
if (null == maxVersion) {
LOG.trace(
- "Unable to find the versions of resourceId:["
- + resourceId
- + "] for engine conn plugin:[name: "
- + typeLabel.getEngineType()
- + ", version: "
- + typeLabel.getVersion()
- + "] in BML");
+ "Unable to find the versions of resourceId:[{}"
+ + "] for engine conn plugin:[name: {}, version: {}] in BML",
+ resourceId,
+ typeLabel.getEngineType(),
+ typeLabel.getVersion());
return null;
}
// Has the same version
if (maxVersion.equals(resourceVersion)) {
LOG.trace(
- "The version:["
- + versions
- + "] of resourceId:["
- + resourceId
- + "] for engine conn plugin:[name: "
- + typeLabel.getEngineType()
- + ", version: "
- + typeLabel.getVersion()
- + "] must be latest");
+ "The version:[{}] of resourceId:[{}] for engine conn
plugin:[name: {}, version: {}"
+ + "] must be latest",
+ versions,
+ resourceId,
+ typeLabel.getEngineType(),
+ typeLabel.getVersion());
return null;
}
LOG.trace(
- "Start to download resource of engine conn plugin:[name: "
- + typeLabel.getEngineType()
- + ", version: "
- + typeLabel.getVersion()
- + "]");
+ "Start to download resource of engine conn plugin:[name: {},
version: {}]",
+ typeLabel.getEngineType(),
+ typeLabel.getVersion());
// Try to download
downloadResource(typeLabel, resourceId, maxVersion, savePath);
// Bml doesn't need to provide urls
@@ -171,11 +164,10 @@ public class BmlEngineConnPluginResourceLoader implements
EngineConnPluginsResou
null);
} else {
LOG.info(
- "Success to download resource of plugin:[name: "
- + typeLabel.getEngineType()
- + ", version: "
- + typeLabel.getVersion()
- + "], start to load temp resource directory");
+ "Success to download resource of plugin:[name: {}, version: {}"
+ + "], start to load temp resource directory",
+ typeLabel.getEngineType(),
+ typeLabel.getVersion());
// Load tmp directory
loadTempResourceFile(tmpFile, savePos);
}
@@ -203,7 +195,7 @@ public class BmlEngineConnPluginResourceLoader implements
EngineConnPluginsResou
private void loadTempResourceFile(File tempFile, File saveDir)
throws EngineConnPluginLoadResourceException {
if (saveDir.exists()) {
- LOG.info("Clean out-of-date files in saving directory:[" +
saveDir.getAbsolutePath() + "]");
+ LOG.info("Clean out-of-date files in saving directory:[{}]",
saveDir.getAbsolutePath());
try {
FileUtils.cleanDirectory(saveDir);
} catch (IOException e) {
@@ -220,7 +212,7 @@ public class BmlEngineConnPluginResourceLoader implements
EngineConnPluginsResou
}
// TODO has a problem, we don't know the source file name or suffix name
of tmp file
// downloaded from BML
- LOG.info("Move tempFile:[" + tempFile.getPath() + "] to saveDir:[" +
saveDir.getPath() + "]");
+ LOG.info("Move tempFile:[{}] to saveDir:[{}]", tempFile.getPath(),
saveDir.getPath());
try {
FileUtils.moveDirectory(tempFile, saveDir);
} catch (IOException e) {
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/loaders/resource/LocalEngineConnPluginResourceLoader.java
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/loaders/resource/LocalEngineConnPluginResourceLoader.java
index 88cd555b4..b7d88333f 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/loaders/resource/LocalEngineConnPluginResourceLoader.java
+++
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/loader/loaders/resource/LocalEngineConnPluginResourceLoader.java
@@ -47,13 +47,10 @@ public class LocalEngineConnPluginResourceLoader implements
EngineConnPluginsRes
List<URL> urls = EngineConnPluginUtils.getJarsUrlsOfPath(savePath);
if (urls.size() > 0) {
LOG.info(
- "Load local resource of engine conn plugin: [name: "
- + typeLabel.getEngineType()
- + ", version: "
- + typeLabel.getVersion()
- + "] uri: ["
- + savePath
- + "]");
+ "Load local resource of engine conn plugin: [name: {}, version:
{}] uri: [{}]",
+ typeLabel.getEngineType(),
+ typeLabel.getVersion(),
+ savePath);
}
return new PluginResource(null, null, modifyTime, urls.toArray(new
URL[0]));
}
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/localize/AbstractEngineConnBmlResourceGenerator.scala
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/localize/AbstractEngineConnBmlResourceGenerator.scala
index 946691024..979215edf 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/localize/AbstractEngineConnBmlResourceGenerator.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/localize/AbstractEngineConnBmlResourceGenerator.scala
@@ -22,7 +22,6 @@ import
org.apache.linkis.engineplugin.server.localize.EngineConnBmlResourceGener
import
org.apache.linkis.manager.engineplugin.common.exception.EngineConnPluginErrorException
import
org.apache.linkis.manager.engineplugin.errorcode.EngineconnCoreErrorCodeSummary._
import org.apache.linkis.manager.label.entity.engine.EngineTypeLabel
-import org.apache.linkis.server.conf.ServerConfiguration
import org.apache.commons.lang3.StringUtils
@@ -48,27 +47,38 @@ abstract class AbstractEngineConnBmlResourceGenerator
extends EngineConnBmlResou
protected def getEngineConnDistHome(engineConnType: String, version:
String): String = {
val engineConnDistHome = Paths.get(getEngineConnsHome, engineConnType,
"dist").toFile.getPath
- if (!new File(engineConnDistHome).exists()) {
+ checkEngineConnDistHome(engineConnDistHome)
+ if (StringUtils.isBlank(version) || NO_VERSION_MARK == version) return
engineConnDistHome
+ val formattedVersion = if (version.startsWith("v")) version else "v" +
version
+ val engineConnPackageHome = Paths.get(engineConnDistHome,
formattedVersion).toFile.getPath
+ val engineConnPackageHomeFile = new File(engineConnPackageHome)
+ if (!engineConnPackageHomeFile.exists()) {
throw new EngineConnPluginErrorException(
- CANNOT_HOME_PATH_DIST.getErrorCode,
- CANNOT_HOME_PATH_DIST.getErrorDesc
+ ENGIN_VERSION_NOT_FOUND.getErrorCode,
+ MessageFormat.format(ENGIN_VERSION_NOT_FOUND.getErrorDesc, version,
engineConnType)
)
}
- if (StringUtils.isBlank(version) || NO_VERSION_MARK == version) return
engineConnDistHome
- val engineConnPackageHome = Paths.get(engineConnDistHome,
version).toFile.getPath
- if (new File(engineConnPackageHome).exists()) engineConnPackageHome
- else Paths.get(engineConnDistHome, "v" + version).toFile.getPath
+ engineConnPackageHome
}
- protected def getEngineConnDistHomeList(engineConnType: String):
Array[String] = {
- val engineConnDistHome = Paths.get(getEngineConnsHome, engineConnType,
"dist").toFile.getPath
- val engineConnDistHomeFile = new File(engineConnDistHome)
- if (!engineConnDistHomeFile.exists()) {
+ private def checkEngineConnDistHome(engineConnPackageHomePath: String): Unit
= {
+ val engineConnPackageHomeFile = new File(engineConnPackageHomePath)
+ checkEngineConnDistHome(engineConnPackageHomeFile)
+ }
+
+ private def checkEngineConnDistHome(engineConnPackageHome: File): Unit = {
+ if (!engineConnPackageHome.exists()) {
throw new EngineConnPluginErrorException(
CANNOT_HOME_PATH_DIST.getErrorCode,
CANNOT_HOME_PATH_DIST.getErrorDesc
)
}
+ }
+
+ protected def getEngineConnDistHomeList(engineConnType: String):
Array[String] = {
+ val engineConnDistHome = Paths.get(getEngineConnsHome, engineConnType,
"dist").toFile.getPath
+ val engineConnDistHomeFile = new File(engineConnDistHome)
+ checkEngineConnDistHome(engineConnDistHomeFile)
val children = engineConnDistHomeFile.listFiles()
if (children.isEmpty) {
throw new EngineConnPluginErrorException(
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnLaunchService.scala
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnLaunchService.scala
index 78d653a2e..52d830d32 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnLaunchService.scala
+++
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/scala/org/apache/linkis/engineplugin/server/service/DefaultEngineConnLaunchService.scala
@@ -74,7 +74,7 @@ class DefaultEngineConnLaunchService extends
EngineConnLaunchService with Loggin
)
throw new EngineConnPluginErrorException(
FAILED_CREATE_ELR.getErrorCode,
- FAILED_CREATE_ELR.getErrorDesc + s",
${ExceptionUtils.getRootCauseMessage(t)}"
+ s"${FAILED_CREATE_ELR.getErrorDesc},
${ExceptionUtils.getRootCauseMessage(t)}"
)
}
} else {
diff --git
a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/TenantLabel.java
b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/TenantLabel.java
index bf0f03fec..191bd6621 100644
---
a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/TenantLabel.java
+++
b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/TenantLabel.java
@@ -54,11 +54,6 @@ public class TenantLabel extends GenericLabel
return Feature.CORE;
}
- @Override
- public Boolean getModifiable() {
- return true;
- }
-
@Override
public void valueCheck(String stringValue) throws LabelErrorException {
if (!StringUtils.isEmpty(stringValue)) {
diff --git
a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/UserModifiable.java
b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/UserModifiable.java
index 9c5665d21..40f9b1acb 100644
---
a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/UserModifiable.java
+++
b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/UserModifiable.java
@@ -21,9 +21,9 @@ import
org.apache.linkis.manager.label.exception.LabelErrorException;
public interface UserModifiable {
- Boolean modifiable = true;
-
- Boolean getModifiable();
+ default Boolean getModifiable() {
+ return true;
+ }
void valueCheck(String stringValue) throws LabelErrorException;
}
diff --git
a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/UserCreatorLabel.java
b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/UserCreatorLabel.java
index b68768059..23b236e61 100644
---
a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/UserCreatorLabel.java
+++
b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/UserCreatorLabel.java
@@ -69,11 +69,6 @@ public class UserCreatorLabel extends GenericLabel
implements EngineNodeLabel, U
return getValue().get("creator");
}
- @Override
- public Boolean getModifiable() {
- return modifiable;
- }
-
@Override
public void valueCheck(String stringValue) throws LabelErrorException {
if (!StringUtils.isEmpty(stringValue)) {
diff --git
a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/route/RouteLabel.java
b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/route/RouteLabel.java
index 3f69e2e2c..c275355be 100644
---
a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/route/RouteLabel.java
+++
b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/route/RouteLabel.java
@@ -39,11 +39,6 @@ public class RouteLabel extends InheritableLabel<String>
implements UserModifiab
super.setValue(value);
}
- @Override
- public Boolean getModifiable() {
- return modifiable;
- }
-
@Override
public void valueCheck(String stringValue) throws LabelErrorException {
if (!StringUtils.isEmpty(stringValue)) {
diff --git
a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/utils/LabelUtils.java
b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/utils/LabelUtils.java
index 8b9d23727..cd71e8836 100644
---
a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/utils/LabelUtils.java
+++
b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/utils/LabelUtils.java
@@ -157,16 +157,10 @@ public class LabelUtils {
// Enum
mapper.configure(DeserializationFeature.READ_ENUMS_USING_TO_STRING,
true);
mapper.configure(SerializationFeature.WRITE_ENUMS_USING_TO_STRING, true);
- //
- //
mapper.configure(JsonReadFeature.ALLOW_UNESCAPED_CONTROL_CHARS.mappedFeature(),
- // true);
// Empty beans allowed
mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
// Ignore unknown properties
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,
false);
- // Cancel to scape no ascii
- //
mapper.configure(JsonWriteFeature.ESCAPE_NON_ASCII.mappedFeature(),
- // false);
}
/**
@@ -340,9 +334,6 @@ public class LabelUtils {
if (!labelMap.containsKey(label.getLabelKey())) {
labelMap.put(label.getLabelKey(), label.getStringValue());
}
- /*else {
- throw new
LabelRuntimeException(LabelConstant.LABEL_UTIL_CONVERT_ERROR_CODE, "Got more
than one " + label.getLabelKey() + " label, some will be dropped, use
labelsToPairList instead.");
- }*/
}
return labelMap;
}
@@ -354,7 +345,7 @@ public class LabelUtils {
List<ImmutablePair<String, String>> rsList = new
ArrayList<>(labelList.size());
for (Label<?> label : labelList) {
if (null != label) {
- rsList.add(new ImmutablePair<String, String>(label.getLabelKey(),
label.getStringValue()));
+ rsList.add(new ImmutablePair<>(label.getLabelKey(),
label.getStringValue()));
} else {
logger.warn("LabelList contans empty label.");
}
diff --git
a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/util/LabelEntityParser.java
b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/util/LabelEntityParser.java
index bbae02e94..343a63803 100644
---
a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/util/LabelEntityParser.java
+++
b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/util/LabelEntityParser.java
@@ -62,7 +62,7 @@ public class LabelEntityParser {
if (!StringUtils.isEmpty(version)) {
engineTypeLabel.setVersion(version);
}
- ArrayList labelList = new ArrayList<Label>();
+ ArrayList<Label> labelList = new ArrayList<>();
labelList.add(userCreatorLabel);
labelList.add(engineTypeLabel);
return labelList;
@@ -75,13 +75,13 @@ public class LabelEntityParser {
ArrayList<Label> labelList = new ArrayList<>();
for (int i = 1, j = 1; i < labelKeyList.length; i++, j--) {
String innerKey = labelKeyList[i];
- if (innerKey.toLowerCase().equals("usercreator")) {
+ if (innerKey.equalsIgnoreCase("usercreator")) {
UserCreatorLabel userCreatorLabel =
labelBuilderFactory.createLabel(UserCreatorLabel.class);
String[] innerString = stringValueList[j].split("-");
userCreatorLabel.setUser(innerString[0]);
userCreatorLabel.setCreator(innerString[1]);
labelList.add(userCreatorLabel);
- } else if (innerKey.toLowerCase().equals("enginetype")) {
+ } else if (innerKey.equalsIgnoreCase("enginetype")) {
EngineTypeLabel engineTypeLabel =
labelBuilderFactory.createLabel(EngineTypeLabel.class);
String[] innerString = stringValueList[j].split("-");
engineTypeLabel.setEngineType(innerString[0]);
diff --git
a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java
b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java
index b2bde3849..e424ffbf4 100644
---
a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java
+++
b/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java
@@ -67,7 +67,6 @@ import static
org.apache.linkis.instance.label.errorcode.LinkisInstanceLabelErro
public class DefaultInsLabelService implements InsLabelAccessService {
private static final Logger LOG =
LoggerFactory.getLogger(DefaultInsLabelService.class);
- private static Set<String> modifiableLabelKeyList;
@Autowired private InstanceLabelDao instanceLabelDao;
@Autowired private InstanceInfoDao instanceDao;
@Autowired private InsLabelRelationDao insLabelRelationDao;
@@ -147,17 +146,6 @@ public class DefaultInsLabelService implements
InsLabelAccessService {
insLabelRelationDao.dropRelationsByInstance(serviceInstance.getInstance());
// Attach labels to instance
attachLabelsToInstance(insLabels, serviceInstance);
- // Async to delete labels that have no relationship
- /* if(!labelsCandidateRemoved.isEmpty()){
- if(!asyncQueueInit.get()) {
- initQueue();
- }
- labelsCandidateRemoved.forEach( label -> {
- if(!asyncRemoveLabelQueue.offer(label)){
- LOG.warn("Async queue for removing labels maybe full. current
size: [" + asyncRemoveLabelQueue.size() + "]");
- }
- });
- }*/
}
@Override
@@ -168,18 +156,6 @@ public class DefaultInsLabelService implements
InsLabelAccessService {
insLabelRelationDao.searchLabelsByInstance(serviceInstance.getInstance());
LOG.info("Drop relationships related by instance: [" +
serviceInstance.getInstance() + "]");
insLabelRelationDao.dropRelationsByInstance(serviceInstance.getInstance());
- // Async to delete labels that have no relationship
- // if(!labelsCandidateRemoved.isEmpty()){
- // labelsCandidateRemoved.forEach( label -> {
- // if(!asyncQueueInit.get()) {
- // initQueue();
- // }
- // if(!asyncRemoveLabelQueue.offer(label)){
- // LOG.warn("Async queue for removing labels maybe
full. current size: ["
- // + asyncRemoveLabelQueue.size() + "]");
- // }
- // });
- // }
}
@Override
@@ -239,7 +215,6 @@ public class DefaultInsLabelService implements
InsLabelAccessService {
if (null == exist) {
LOG.info("Remove information of instance label: [" +
insLabel.toString() + "]");
instanceLabelDao.remove(insLabel);
- // instanceLabelDao.doRemoveKeyValues(insLabel.getId());
}
}
});
@@ -374,27 +349,6 @@ public class DefaultInsLabelService implements
InsLabelAccessService {
insLabels,
subInsLabels -> instanceLabelDao.insertBatch(subInsLabels),
InsLabelConf.DB_PERSIST_BATCH_SIZE.getValue());
- /*List<InsPersistenceLabelValue> labelValues =
- insLabels.stream()
- .flatMap(
- insLabel -> {
- if
(!Optional.ofNullable(insLabel.getId()).isPresent()) {
- throw new IllegalArgumentException(
- "Cannot get the generated id from
bulk insertion, please check your mybatis version");
- }
- return insLabel.getValue().entrySet().stream()
- .map(
- entry ->
- new
InsPersistenceLabelValue(
-
insLabel.getId(),
- entry.getKey(),
-
entry.getValue()));
- })
- .collect(Collectors.toList());
- batchOperation(
- labelValues,
- subLabelValues ->
instanceLabelDao.doInsertKeyValues(subLabelValues),
- InsLabelConf.DB_PERSIST_BATCH_SIZE.getValue());*/
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
