Revert " 1.10.0 webank merge"

WeDataSphere · Dec 12, 2024 · 90a8fa5 · 90a8fa5
1 parent b5ba0f1
commit 90a8fa5
Show file tree

Hide file tree

Showing 372 changed files with 7,408 additions and 13,893 deletions.
diff --git a/.../linkis-common/src/main/java/org/apache/linkis/common/exception/LinkisRetryException.java b/.../linkis-common/src/main/java/org/apache/linkis/common/exception/LinkisRetryException.java
@@ -17,7 +17,7 @@
 
 package org.apache.linkis.common.exception;
 
-public class LinkisRetryException extends LinkisRuntimeException {
+public class LinkisRetryException extends LinkisException {
   LinkisRetryException(int errCode, String desc, String ip, int port, String serviceKind) {
     super(errCode, desc, ip, port, serviceKind);
   }
@@ -27,7 +27,7 @@ public LinkisRetryException(int errCode, String desc) {
   }
 
   @Override
-  public ExceptionLevel getLevel() {
+  ExceptionLevel getLevel() {
     return ExceptionLevel.RETRY;
   }
 }
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/LinkisUtils.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/LinkisUtils.java
diff --git a/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/SecurityUtils.java b/linkis-commons/linkis-common/src/main/java/org/apache/linkis/common/utils/SecurityUtils.java
@@ -320,40 +320,4 @@ private static boolean isNotSecurity(String key, String value, String param) {
     return key.toLowerCase().contains(param.toLowerCase())
         || value.toLowerCase().contains(param.toLowerCase());
   }
-
-  /**
-   * allowLoadLocalInfile=false&autoDeserialize=false&allowLocalInfile=false&allowUrlInLocalInfile=false
-   *
-   * @return
-   */
-  public static Properties getMysqlSecurityParams() {
-    Properties properties = new Properties();
-    properties.setProperty("allowLoadLocalInfile", "false");
-    properties.setProperty("autoDeserialize", "false");
-    properties.setProperty("allowLocalInfile", "false");
-    properties.setProperty("allowUrlInLocalInfile", "false");
-    return properties;
-  }
-
-  /**
-   * Check if the path has a relative path
-   *
-   * @param path
-   * @return
-   */
-  public static boolean containsRelativePath(String path) {
-    if (path.startsWith("./")
-        || path.contains("/./")
-        || path.startsWith("../")
-        || path.contains("/../")) {
-      return true;
-    }
-    if (path.startsWith(".\\")
-        || path.contains("\\.\\")
-        || path.startsWith("..\\")
-        || path.contains("\\..\\")) {
-      return true;
-    }
-    return false;
-  }
 }
diff --git a/...is-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/Configuration.scala b/...is-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/Configuration.scala
@@ -35,8 +35,6 @@ object Configuration extends Logging {
 
   val IS_PROMETHEUS_ENABLE = CommonVars("wds.linkis.prometheus.enable", false)
 
-  val IS_MULTIPLE_YARN_CLUSTER = CommonVars("linkis.multiple.yarn.cluster", false).getValue
-
   val PROMETHEUS_ENDPOINT = CommonVars("wds.linkis.prometheus.endpoint", "/actuator/prometheus")
 
   val LINKIS_HOME = CommonVars("wds.linkis.home", CommonVars("LINKIS_HOME", "/tmp").getValue)

diff --git a/...linkis-hadoop-common/src/main/scala/org/apache/linkis/hadoop/common/conf/HadoopConf.scala b/...linkis-hadoop-common/src/main/scala/org/apache/linkis/hadoop/common/conf/HadoopConf.scala
@@ -25,28 +25,16 @@ object HadoopConf {
 
   val KERBEROS_ENABLE = CommonVars("wds.linkis.keytab.enable", false).getValue
 
-  val KERBEROS_ENABLE_MAP =
-    CommonVars("linkis.keytab.enable.map", "cluster1=false,cluster2=true")
-
   val KEYTAB_FILE = CommonVars("wds.linkis.keytab.file", "/appcom/keytab/")
 
-  val EXTERNAL_KEYTAB_FILE_PREFIX =
-    CommonVars("linkis.external.keytab.file.prefix", "/appcom/config/external-conf/keytab")
-
   val KEYTAB_HOST = CommonVars("wds.linkis.keytab.host", "127.0.0.1")
 
-  val KEYTAB_HOST_MAP =
-    CommonVars("linkis.keytab.host.map", "cluster1=127.0.0.2,cluster2=127.0.0.3")
-
   val KEYTAB_HOST_ENABLED = CommonVars("wds.linkis.keytab.host.enabled", false)
 
   val KEYTAB_PROXYUSER_ENABLED = CommonVars("wds.linkis.keytab.proxyuser.enable", false)
 
   val KEYTAB_PROXYUSER_SUPERUSER = CommonVars("wds.linkis.keytab.proxyuser.superuser", "hadoop")
 
-  val KEYTAB_PROXYUSER_SUPERUSER_MAP =
-    CommonVars("linkis.keytab.proxyuser.superuser.map", "cluster1=hadoop1,cluster2=hadoop2")
-
   val hadoopConfDir =
     CommonVars("hadoop.config.dir", CommonVars("HADOOP_CONF_DIR", "").getValue).getValue
 

diff --git a/...ommon/src/main/scala/org/apache/linkis/hadoop/common/entity/HDFSFileSystemContainer.scala b/...ommon/src/main/scala/org/apache/linkis/hadoop/common/entity/HDFSFileSystemContainer.scala
@@ -21,7 +21,7 @@ import org.apache.linkis.hadoop.common.conf.HadoopConf
 
 import org.apache.hadoop.fs.FileSystem
 
-class HDFSFileSystemContainer(fs: FileSystem, user: String, label: String) {
+class HDFSFileSystemContainer(fs: FileSystem, user: String) {
 
   private var lastAccessTime: Long = System.currentTimeMillis()
 
@@ -31,8 +31,6 @@ class HDFSFileSystemContainer(fs: FileSystem, user: String, label: String) {
 
   def getUser: String = this.user
 
-  def getLabel: String = this.label
-
   def getLastAccessTime: Long = this.lastAccessTime
 
   def updateLastAccessTime: Unit = {