From 7a96f30fda6d20d65f843db5c3b4fed33b41ab26 Mon Sep 17 00:00:00 2001 From: wang_zh <643348094@qq.com> Date: Sun, 26 Apr 2020 11:45:29 +0800 Subject: [PATCH 001/148] queue api add user own queues --- .../restful/RMMonitorRest.scala | 2 + .../resourcemanager/utils/YarnUtil.scala | 38 +++++++++++++++++-- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/restful/RMMonitorRest.scala b/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/restful/RMMonitorRest.scala index 35ba51712..9a294d98c 100644 --- a/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/restful/RMMonitorRest.scala +++ b/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/restful/RMMonitorRest.scala @@ -236,6 +236,8 @@ class RMMonitorRest { val userConfiguration = UserConfiguration.getCacheMap(RequestQueryAppConfigWithGlobal(userName, null, null, true)) queues.add(RMConfiguration.USER_AVAILABLE_YARN_QUEUE_NAME.getValue(userConfiguration)) queues.add(RMConfiguration.USER_AVAILABLE_YARN_QUEUE_NAME.getValue) + // add own queues + YarnUtil.getOwnQueues(userName).map(queues.add(_)) appendMessageData(message, "queues", queues) } diff --git a/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/YarnUtil.scala b/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/YarnUtil.scala index ac367f4e6..9d759c72a 100644 --- a/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/YarnUtil.scala +++ b/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/YarnUtil.scala @@ -17,6 +17,7 @@ package com.webank.wedatasphere.linkis.resourcemanager.utils import java.net.ConnectException +import java.security.PrivilegedExceptionAction import com.fasterxml.jackson.core.JsonParseException import com.webank.wedatasphere.linkis.common.conf.CommonVars @@ -27,6 +28,9 @@ import com.webank.wedatasphere.linkis.resourcemanager.exception.{RMErrorExceptio import dispatch.{Http, as} import org.apache.commons.lang.StringUtils import org.apache.hadoop.fs.Path +import org.apache.hadoop.security.UserGroupInformation +import org.apache.hadoop.yarn.api.records.QueueACL +import org.apache.hadoop.yarn.client.api.YarnClient import org.apache.hadoop.yarn.conf.YarnConfiguration import org.apache.hadoop.yarn.util.RMHAUtils import org.json4s.JsonAST._ @@ -43,17 +47,23 @@ object YarnUtil extends Logging{ private implicit val executor = ExecutionContext.global private var yarnConf: YarnConfiguration = _ + private var yarnClient:YarnClient = _ private var rm_web_address: String = CommonVars("wds.linkis.yarn.rm.web.address", "").getValue private var hadoop_version:String = "2.7.2" implicit val format = DefaultFormats def init() = { + yarnConf = new YarnConfiguration() + yarnConf.addResource(new Path(hadoopConfDir, YarnConfiguration.CORE_SITE_CONFIGURATION_FILE)) + yarnConf.addResource(new Path(hadoopConfDir, YarnConfiguration.YARN_SITE_CONFIGURATION_FILE)) if(StringUtils.isBlank(this.rm_web_address)){ - yarnConf = new YarnConfiguration() - yarnConf.addResource(new Path(hadoopConfDir, YarnConfiguration.CORE_SITE_CONFIGURATION_FILE)) - yarnConf.addResource(new Path(hadoopConfDir, YarnConfiguration.YARN_SITE_CONFIGURATION_FILE)) reloadRMWebAddress() } + Utils.tryQuietly({ + yarnClient = YarnClient.createYarnClient(); + yarnClient.init(yarnConf) + yarnClient.start() + }) info(s"This yarn rm web address is:${this.rm_web_address}") Utils.tryAndErrorMsg(getHadoopVersion())("Failed to get HadoopVersion") } @@ -258,5 +268,27 @@ object YarnUtil extends Logging{ } + def getOwnQueues(userName: String): Array[String] = Utils.tryCatch { + val queuePrefix = "root." + UserGroupInformation.createRemoteUser(userName).doAs(new PrivilegedExceptionAction[Array[String]] { + override def run(): Array[String] = { + yarnClient.getQueueAclsInfo + .filter(info => info.getUserAcls.contains(QueueACL.ADMINISTER_QUEUE) || info.getUserAcls.contains(QueueACL.SUBMIT_APPLICATIONS)) + .map(info => { + val queueName = if (info.getQueueName.startsWith(queuePrefix)) { + info.getQueueName.substring(queuePrefix.length) + } else { + info.getQueueName + } + queueName + }).toArray + } + }) + } { + t: Throwable => { + warn("get own queues error, msg: {}", t) + Array() + } + } } -- Gitee From 4bc62dc5d317a98901ad7362f4ad9613e95120d8 Mon Sep 17 00:00:00 2001 From: wang_zh Date: Tue, 18 Feb 2020 10:10:52 +0800 Subject: [PATCH 002/148] spark cluster mode fix sender ask with timeout bug --- .../linkis/protocol/engine/ResponseNewEngine.scala | 5 +++++ .../wedatasphere/linkis/rpc/BaseRPCSender.scala | 2 +- .../engine/executors/SparkEngineExecutor.scala | 4 ++++ .../engine/factory/SparkEngineExecutorFactory.scala | 6 +++++- .../process/SparkSubmitProcessBuilder.scala | 3 ++- .../engine/DataWorkCloudEngineApplication.scala | 8 ++++++++ .../wedatasphere/linkis/engine/EngineReceiver.scala | 6 ++++-- .../engine/execute/EngineExecutorContext.scala | 12 ++++++++++-- .../enginemanager/AbstractEngineManager.scala | 5 +++-- .../wedatasphere/linkis/enginemanager/Engine.scala | 1 + .../enginemanager/EngineManagerReceiver.scala | 13 ++++++++++++- .../enginemanager/impl/EngineFactoryImpl.scala | 2 +- .../enginemanager/process/ProcessEngine.scala | 8 ++++++++ .../linkis/entrance/execute/EngineRequester.scala | 9 ++++++++- 14 files changed, 72 insertions(+), 12 deletions(-) diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/ResponseNewEngine.scala b/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/ResponseNewEngine.scala index 6e72475ba..167f50c53 100644 --- a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/ResponseNewEngine.scala +++ b/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/ResponseNewEngine.scala @@ -32,6 +32,11 @@ trait ResponseEngine extends RetryableProtocol { * @param pid */ case class ResponseEnginePid(port: Int, pid: String) extends RetryableProtocol +/** + * engine send to engineManager + * @param host + */ +case class ResponseEngineHost(port: Int, host: String) extends RetryableProtocol /** * engine send to engineManager * @param port diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/BaseRPCSender.scala b/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/BaseRPCSender.scala index 3d102bdd0..8bb7b36a3 100644 --- a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/BaseRPCSender.scala +++ b/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/BaseRPCSender.scala @@ -91,7 +91,7 @@ private[rpc] class BaseRPCSender extends Sender with Logging { val msg = RPCProduct.getRPCProduct.toMessage(message) msg.data("duration", timeout.toMillis) BaseRPCSender.addInstanceInfo(msg.getData) - val response = getRPC.receiveAndReply(msg) + val response = getRPC.receiveAndReplyInMills(msg) RPCConsumer.getRPCConsumer.toObject(response) } diff --git a/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/executors/SparkEngineExecutor.scala b/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/executors/SparkEngineExecutor.scala index afe3dfd5d..cec0428eb 100644 --- a/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/executors/SparkEngineExecutor.scala +++ b/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/executors/SparkEngineExecutor.scala @@ -20,6 +20,7 @@ import java.text.NumberFormat import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicLong +import com.webank.wedatasphere.linkis.common.conf.DWCArgumentsParser import com.webank.wedatasphere.linkis.common.utils.{ByteTimeUtils, Logging, Utils} import com.webank.wedatasphere.linkis.engine.configuration.SparkConfiguration import com.webank.wedatasphere.linkis.engine.exception.{NoSupportEngineException, SparkEngineException} @@ -156,6 +157,9 @@ class SparkEngineExecutor(val sc: SparkContext, id: Long, outputPrintLimit: Int, case runTypeExecuteRequest: RunTypeExecuteRequest => engineExecutorContext.addProperty("runType", runTypeExecuteRequest.runType) case _ => } + if (DWCArgumentsParser.getDWCOptionMap.contains("user") && DWCArgumentsParser.getDWCOptionMap.get("user").isDefined) { + engineExecutorContext.addProperty("user", DWCArgumentsParser.getDWCOptionMap.get("user").get) + } engineExecutorContext } diff --git a/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/factory/SparkEngineExecutorFactory.scala b/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/factory/SparkEngineExecutorFactory.scala index f74423645..c7fd433d0 100644 --- a/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/factory/SparkEngineExecutorFactory.scala +++ b/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/factory/SparkEngineExecutorFactory.scala @@ -53,7 +53,11 @@ class SparkEngineExecutorFactory extends EngineExecutorFactory with Logging{ info(s"------ Create new SparkContext {$master} -------") val pysparkBasePath = SparkConfiguration.SPARK_HOME.getValue val pysparkPath = new File(pysparkBasePath, "python" + File.separator + "lib") - val pythonLibUris = pysparkPath.listFiles().map(_.toURI.toString).filter(_.endsWith(".zip")) + val pythonLibUris = if(pysparkPath.exists()) { + pysparkPath.listFiles().map(_.toURI.toString).filter(_.endsWith(".zip")) + } else { + Array.empty[String] + } if (pythonLibUris.length == 2) { val confValue1 = Utils.tryQuietly(CommonVars("spark.yarn.dist.files","").getValue) val confValue2 = Utils.tryQuietly(conf.get("spark.yarn.dist.files")) diff --git a/ujes/definedEngines/spark/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/process/SparkSubmitProcessBuilder.scala b/ujes/definedEngines/spark/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/process/SparkSubmitProcessBuilder.scala index 99bac971d..9e1357eea 100644 --- a/ujes/definedEngines/spark/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/process/SparkSubmitProcessBuilder.scala +++ b/ujes/definedEngines/spark/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/process/SparkSubmitProcessBuilder.scala @@ -132,7 +132,7 @@ class SparkSubmitProcessBuilder extends ProcessEngineBuilder with Logging { val darResource: DriverAndYarnResource = engineRequest.getResource.asInstanceOf[DriverAndYarnResource] val properties = request.properties this.master("yarn") - this.deployMode("client") + this.deployMode(SPARK_DEPLOY_MODE.getValue(properties)) val driverJavaSet = "\"-Dwds.linkis.configuration=linkis-engine.properties " + SparkConfiguration.getJavaRemotePort + "\"" this.conf(SPARK_DRIVER_EXTRA_JAVA_OPTIONS.key, driverJavaSet) this.name(properties.getOrDefault("appName", "sparksqltest")) @@ -145,6 +145,7 @@ class SparkSubmitProcessBuilder extends ProcessEngineBuilder with Logging { this.numExecutors(DWC_SPARK_EXECUTOR_INSTANCES.getValue(properties)) properties.getOrDefault("files", "").split(",").map(RelativePath).foreach(file) properties.getOrDefault("jars", "").split(",").map(RelativePath).foreach(jar) + SPARK_APPLICATION_JARS.getValue(properties).split(",").map(RelativePath).foreach(jar) proxyUser(properties.getOrDefault("proxyUser", "")) this.queue(darResource.yarnResource.queueName) diff --git a/ujes/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/DataWorkCloudEngineApplication.scala b/ujes/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/DataWorkCloudEngineApplication.scala index 8696dff67..0870fc333 100644 --- a/ujes/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/DataWorkCloudEngineApplication.scala +++ b/ujes/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/DataWorkCloudEngineApplication.scala @@ -60,6 +60,8 @@ object DataWorkCloudEngineApplication { private val logger = LoggerFactory.getLogger(getClass) logger.info(s"Now log4j2 Rolling File is set to be $logName") logger.info(s"Now shortLogFile is set to be $shortLogFile") + + private val WAIT_LOCK = new Object; def main(args: Array[String]): Unit = { val parser = DWCArgumentsParser.parse(args) DWCArgumentsParser.setDWCOptionMap(parser.getDWCConfMap) @@ -69,5 +71,11 @@ object DataWorkCloudEngineApplication { else DataWorkCloudApplication.setProperty(ServerConfiguration.BDP_SERVER_EXCLUDE_PACKAGES.key, existsExcludePackages + ",com.webank.wedatasphere.linkis.enginemanager") DataWorkCloudApplication.main(DWCArgumentsParser.formatSpringOptions(parser.getSpringConfMap)) + + // spark cluster block main thread + Runtime.getRuntime.addShutdownHook(new Thread(new Runnable { + override def run(): Unit = WAIT_LOCK.synchronized { WAIT_LOCK.notifyAll() } + })) + WAIT_LOCK.synchronized { WAIT_LOCK.wait() } } } \ No newline at end of file diff --git a/ujes/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/EngineReceiver.scala b/ujes/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/EngineReceiver.scala index 255ac5974..3b077f44e 100644 --- a/ujes/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/EngineReceiver.scala +++ b/ujes/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/EngineReceiver.scala @@ -58,7 +58,8 @@ class EngineReceiver extends Receiver with JobListener with ProgressListener wit private val engineCallback = EngineCallback.mapToEngineCallback(DWCArgumentsParser.getDWCOptionMap) private val resourceManagerClient = new ResourceManagerClient(ServiceInstance(engineCallback.applicationName, engineCallback.instance)) - private implicit val userWithCreator = UserWithCreator(System.getProperty("user.name"), DWCArgumentsParser.getDWCOptionMap("creator")) +// private implicit val userWithCreator = UserWithCreator(System.getProperty("user.name"), DWCArgumentsParser.getDWCOptionMap("creator")) + private implicit val userWithCreator = UserWithCreator(DWCArgumentsParser.getDWCOptionMap("user"), DWCArgumentsParser.getDWCOptionMap("creator")) @Autowired private var engineServer: EngineServer = _ @EngineExecutorManagerAutowiredAnnotation @@ -66,7 +67,7 @@ class EngineReceiver extends Receiver with JobListener with ProgressListener wit private var engine: EngineExecutor = _ private var waitForReleaseLocks: Array[String] = _ private var parallelismEngineHeartbeat: Option[Future[_]] = None - + private val address = Sender.getThisInstance.substring(0, Sender.getThisInstance.lastIndexOf(":")) //Report the PID first(先上报PID) @PostConstruct @@ -81,6 +82,7 @@ class EngineReceiver extends Receiver with JobListener with ProgressListener wit throw new EngineErrorException(40015, "Cannot find the instance information of engineManager, can not complete the callback.(找不到engineManager的instance信息,不能完成callback.)") val sender = Sender.getSender(ServiceInstance(engineCallback.applicationName, engineCallback.instance)) sender.send(ResponseEnginePid(port, pid)) + sender.send(ResponseEngineHost(port, address)) //Timely report heartbeat(定时汇报心跳) val heartbeat = Utils.defaultScheduler.scheduleAtFixedRate(new Runnable { override def run(): Unit = { diff --git a/ujes/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/execute/EngineExecutorContext.scala b/ujes/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/execute/EngineExecutorContext.scala index 2e9a43c5d..1fa91f6d8 100644 --- a/ujes/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/execute/EngineExecutorContext.scala +++ b/ujes/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/execute/EngineExecutorContext.scala @@ -29,6 +29,7 @@ import com.webank.wedatasphere.linkis.protocol.engine.JobProgressInfo import com.webank.wedatasphere.linkis.rpc.Sender import com.webank.wedatasphere.linkis.scheduler.executer.{AliasOutputExecuteResponse, OutputExecuteResponse} import com.webank.wedatasphere.linkis.storage.resultset.{ResultSetFactory, ResultSetWriter} +import com.webank.wedatasphere.linkis.storage.utils.StorageUtils import com.webank.wedatasphere.linkis.storage.{LineMetaData, LineRecord} import org.apache.commons.io.IOUtils import org.apache.commons.lang.StringUtils @@ -117,8 +118,12 @@ class EngineExecutorContext(engineExecutor: EngineExecutor) extends Logging{ def addProperty(key:String, value:String):Unit = properties.put(key, value) protected def getDefaultStorePath: String = { + val user = properties.get("user") match { + case value:String => value + case _ => StorageUtils.getJvmUser + } val path = ENGINE_RESULT_SET_STORE_PATH.getValue - (if(path.endsWith("/")) path else path + "/") + "user" + "/" + + (if(path.endsWith("/")) path else path + "/") + user + "/" + DateFormatUtils.format(System.currentTimeMillis(), "yyyyMMdd") + "/" + Sender.getThisServiceInstance.getApplicationName + "/" + System.nanoTime } @@ -141,7 +146,10 @@ class EngineExecutorContext(engineExecutor: EngineExecutor) extends Logging{ val filePath = storePath.getOrElse(getDefaultStorePath) val fileName = if(StringUtils.isEmpty(alias)) "_" + aliasNum.getAndIncrement() else alias + "_" + aliasNum.getAndIncrement() val resultSetPath = resultSet.getResultSetPath(new FsPath(filePath), fileName) - val resultSetWriter = ResultSetWriter.getResultSetWriter(resultSet, ENGINE_RESULT_SET_MAX_CACHE.getValue.toLong, resultSetPath) + val resultSetWriter = properties.get("user") match { + case value:String => ResultSetWriter.getResultSetWriter(resultSet, ENGINE_RESULT_SET_MAX_CACHE.getValue.toLong, resultSetPath, value) + case _ => ResultSetWriter.getResultSetWriter(resultSet, ENGINE_RESULT_SET_MAX_CACHE.getValue.toLong, resultSetPath) + } resultSetWriters synchronized resultSetWriters += resultSetWriter resultSetWriter } diff --git a/ujes/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/AbstractEngineManager.scala b/ujes/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/AbstractEngineManager.scala index cc6a2b07e..5661807c6 100644 --- a/ujes/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/AbstractEngineManager.scala +++ b/ujes/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/AbstractEngineManager.scala @@ -88,8 +88,9 @@ abstract class AbstractEngineManager extends EngineManager with Logging { removeInInitPort() engineListener.foreach(_.onEngineInited(engine)) } - if(duration > 0 && System.currentTimeMillis - startTime < duration) - Utils.tryQuietly(Await.result(future, Duration(System.currentTimeMillis - startTime, TimeUnit.MILLISECONDS))) + val useTime = System.currentTimeMillis - startTime + if(duration > 0 && useTime < duration) + Utils.tryQuietly(Await.result(future, Duration(duration - useTime, TimeUnit.MILLISECONDS))) // if(duration > 0) { // val leftTime = duration - System.currentTimeMillis + startTime // Utils.tryThrow(Await.result(future, Duration(leftTime, TimeUnit.MILLISECONDS))) {t => diff --git a/ujes/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/Engine.scala b/ujes/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/Engine.scala index 3a3dff715..b893779e9 100644 --- a/ujes/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/Engine.scala +++ b/ujes/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/Engine.scala @@ -29,6 +29,7 @@ abstract class Engine { def setResource(resource: Resource): Unit = this.resource = resource def getResource = resource + def getHost: String def getPort: Int def init(): Unit def shutdown(): Unit diff --git a/ujes/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/EngineManagerReceiver.scala b/ujes/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/EngineManagerReceiver.scala index 86cce2f8a..c97752c4b 100644 --- a/ujes/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/EngineManagerReceiver.scala +++ b/ujes/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/EngineManagerReceiver.scala @@ -59,7 +59,10 @@ class EngineManagerReceiver extends Receiver with EngineListener with Logging wi engineManager.getEngineManagerContext.getOrCreateEngineFactory.list().find(_.getPort == port).map(_.asInstanceOf[ProcessEngine]) private def getMsg(state: EngineState, responseEngineStatusCallback: ResponseEngineStatusCallback): Any = { - val instance = EngineManagerReceiver.getInstanceByPort(responseEngineStatusCallback.port) + val instance = findEngine(responseEngineStatusCallback.port).get match { + case engine:ProcessEngine => EngineManagerReceiver.getInstanceByEngine(engine) + case _ => EngineManagerReceiver.getInstanceByPort(responseEngineStatusCallback.port) + } state match { case Idle | Busy => ResponseNewEngine(ENGINE_SPRING_APPLICATION_NAME.getValue, instance) @@ -71,6 +74,8 @@ class EngineManagerReceiver extends Receiver with EngineListener with Logging wi override def receive(message: Any, sender: Sender): Unit = message match { case ResponseEnginePid(port, pid) => findEngine(port).foreach(_.callback(pid, sender)) + case ResponseEngineHost(port, host) => + findEngine(port).foreach(_.callbackHost(host, sender)) case ResponseEngineStatusCallback(port, status, initErrorMsg) => findEngine(port).foreach(_.callback(status, initErrorMsg)) val obj = getMsg(EngineState(status), ResponseEngineStatusCallback(port, status, initErrorMsg)) @@ -187,6 +192,12 @@ object EngineManagerReceiver { private val address = Sender.getThisInstance.substring(0, Sender.getThisInstance.lastIndexOf(":")) def getInstanceByPort(port: Int): String = address + ":" + port + def getInstanceByEngine(engine: Engine): String = if (StringUtils.isNotBlank(engine.getHost)) { + engine.getHost + ":" + engine.getPort + } else { + getInstanceByPort(engine.getPort) + } + def isEngineBelongTo(instance: String): Boolean = instance.startsWith(address) private var applicationContext: ApplicationContext = _ diff --git a/ujes/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/impl/EngineFactoryImpl.scala b/ujes/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/impl/EngineFactoryImpl.scala index fc6ae5ade..abf59860f 100644 --- a/ujes/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/impl/EngineFactoryImpl.scala +++ b/ujes/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/impl/EngineFactoryImpl.scala @@ -59,7 +59,7 @@ class EngineFactoryImpl(rmClient: ResourceManagerClient) extends EngineFactory w engine.getInitedTime > 0 && System.currentTimeMillis - engine.getInitedTime > ENGINE_CAN_SCAN_AFTER_INIT.getValue.toLong} val existsEngineInstances = Sender.getInstances(ENGINE_SPRING_APPLICATION_NAME.getValue).map(_.getInstance) aliveEngines.filter{ case (port, engine) => - val instance = EngineManagerReceiver.getInstanceByPort(port) + val instance = EngineManagerReceiver.getInstanceByEngine(engine) if(!existsEngineInstances.contains(instance)) { warn(s"$engine has already been dead, now remove it, and unregister it for RM.") delete(engine) diff --git a/ujes/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/process/ProcessEngine.scala b/ujes/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/process/ProcessEngine.scala index d6e72ad74..826c9bbc3 100644 --- a/ujes/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/process/ProcessEngine.scala +++ b/ujes/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/process/ProcessEngine.scala @@ -44,6 +44,7 @@ trait ProcessEngine extends Engine with Logging { override val getCreateTime: Long = System.currentTimeMillis private var process: Process = _ private var pid: String = _ + private var host: String = _ private var sender: Sender = _ private var _state: EngineState = Starting private var initErrorMsg: String = _ @@ -57,6 +58,8 @@ trait ProcessEngine extends Engine with Logging { def setPort(port: Int) = this.port = port override def getPort = port + override def getHost = host + def setTicketId(ticketId: String) = this.ticketId = ticketId override def getTicketId = ticketId @@ -115,6 +118,11 @@ trait ProcessEngine extends Engine with Logging { if(this.sender == null) this.sender = sender } + def callbackHost(host: String, sender: Sender): Unit = { + if(StringUtils.isEmpty(this.host)) this.host = host + if(this.sender == null) this.sender = sender + } + def callback(status: Int, initErrorMsg: String): Unit = { val state = EngineState(status) info("Call back to change engine state"+status+" error msg is " + initErrorMsg) diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineRequester.scala b/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineRequester.scala index 474c25c95..01242e56e 100644 --- a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineRequester.scala +++ b/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineRequester.scala @@ -17,6 +17,7 @@ package com.webank.wedatasphere.linkis.entrance.execute import java.util +import java.util.concurrent.TimeUnit import com.webank.wedatasphere.linkis.common.exception.WarnException import com.webank.wedatasphere.linkis.common.log.LogUtils @@ -31,6 +32,8 @@ import com.webank.wedatasphere.linkis.scheduler.executer.ExecutorState._ import com.webank.wedatasphere.linkis.scheduler.listener.ExecutorListener import com.webank.wedatasphere.linkis.scheduler.queue.Job +import scala.concurrent.duration.{Duration, TimeUnit} + /** * Created by enjoyyin on 2018/9/10. @@ -48,7 +51,11 @@ abstract class EngineRequester extends Logging { def request(job: Job): Option[EntranceEngine] = { val requestEngine = createRequestEngine(job) - val engineInitThread = getSender.ask(requestEngine) match { + val response = requestEngine match { + case t: TimeoutRequestEngine => getSender.ask(requestEngine, Duration(t.timeout, TimeUnit.MILLISECONDS)) + case _ => getSender.ask(requestEngine) + } + val engineInitThread = response match { case ResponseNewEngineStatus(instance, responseEngineStatus) => new EngineInitThread(instance, requestEngine).notifyThread(responseEngineStatus) case r: ResponseNewEngine => -- Gitee From fd7c38be16c5f1d7d8c21f192c63642ad611ebf4 Mon Sep 17 00:00:00 2001 From: wang_zh Date: Sun, 23 Feb 2020 19:57:29 +0800 Subject: [PATCH 003/148] change spark cluster mode --- .../linkis/engine/executors/SparkEngineExecutor.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/executors/SparkEngineExecutor.scala b/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/executors/SparkEngineExecutor.scala index cec0428eb..48edbfbb4 100644 --- a/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/executors/SparkEngineExecutor.scala +++ b/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/executors/SparkEngineExecutor.scala @@ -157,7 +157,7 @@ class SparkEngineExecutor(val sc: SparkContext, id: Long, outputPrintLimit: Int, case runTypeExecuteRequest: RunTypeExecuteRequest => engineExecutorContext.addProperty("runType", runTypeExecuteRequest.runType) case _ => } - if (DWCArgumentsParser.getDWCOptionMap.contains("user") && DWCArgumentsParser.getDWCOptionMap.get("user").isDefined) { + if (DWCArgumentsParser.getDWCOptionMap.contains("user")) { engineExecutorContext.addProperty("user", DWCArgumentsParser.getDWCOptionMap.get("user").get) } engineExecutorContext -- Gitee From 2067299f1844e85b91231628efd387f226eceb26 Mon Sep 17 00:00:00 2001 From: wang_zh Date: Sat, 7 Mar 2020 12:06:16 +0800 Subject: [PATCH 004/148] Support more spark configurations --- .../linkis/common/conf/CommonVars.scala | 6 ++++++ .../process/SparkSubmitProcessBuilder.scala | 19 ++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/CommonVars.scala b/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/CommonVars.scala index dd7f80c93..39a5b9a5b 100644 --- a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/CommonVars.scala +++ b/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/CommonVars.scala @@ -27,6 +27,12 @@ case class CommonVars[T](key: String, defaultValue: T, value: T, description: St if(properties == null || !properties.containsKey(key) || properties.get(key) == null) getValue else BDPConfiguration.formatValue(defaultValue, Option(properties.get(key))).get } + + def getValueAndRemove(properties: java.util.Map[String, String]): T = { + if(properties == null || !properties.containsKey(key) || properties.get(key) == null) getValue + else BDPConfiguration.formatValue(defaultValue, Option(properties.remove(key))).get + } + def getValue(properties: Map[String, String]): T = getValue(mapAsJavaMap(properties)) def acquireNew: T = BDPConfiguration.getOption(this).getOrElse(defaultValue) } diff --git a/ujes/definedEngines/spark/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/process/SparkSubmitProcessBuilder.scala b/ujes/definedEngines/spark/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/process/SparkSubmitProcessBuilder.scala index 9e1357eea..b96c2cb4c 100644 --- a/ujes/definedEngines/spark/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/process/SparkSubmitProcessBuilder.scala +++ b/ujes/definedEngines/spark/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/process/SparkSubmitProcessBuilder.scala @@ -18,6 +18,7 @@ package com.webank.wedatasphere.linkis.enginemanager.process import java.lang.ProcessBuilder.Redirect +import java.util import com.webank.wedatasphere.linkis.common.utils.{ByteTimeUtils, Logging} import com.webank.wedatasphere.linkis.enginemanager.EngineResource @@ -32,6 +33,7 @@ import com.webank.wedatasphere.linkis.resourcemanager.DriverAndYarnResource import org.apache.commons.lang.StringUtils import scala.collection.mutable.ArrayBuffer +import scala.collection.JavaConversions._ /** * Created by allenlliu on 2019/4/8. @@ -130,22 +132,23 @@ class SparkSubmitProcessBuilder extends ProcessEngineBuilder with Logging { this.request = request userEngineResource = engineRequest.asInstanceOf[UserEngineResource] val darResource: DriverAndYarnResource = engineRequest.getResource.asInstanceOf[DriverAndYarnResource] - val properties = request.properties + val properties = new util.HashMap[String,String](request.properties) this.master("yarn") - this.deployMode(SPARK_DEPLOY_MODE.getValue(properties)) + this.deployMode(SPARK_DEPLOY_MODE.getValueAndRemove(properties)) val driverJavaSet = "\"-Dwds.linkis.configuration=linkis-engine.properties " + SparkConfiguration.getJavaRemotePort + "\"" this.conf(SPARK_DRIVER_EXTRA_JAVA_OPTIONS.key, driverJavaSet) this.name(properties.getOrDefault("appName", "sparksqltest")) this.className(properties.getOrDefault("className", "com.webank.wedatasphere.linkis.engine.DataWorkCloudEngineApplication")) properties.getOrDefault("archives", "").toString.split(",").map(RelativePath).foreach(this.archive) this.driverCores(DWC_SPARK_DRIVER_CORES) - this.driverMemory(DWC_SPARK_DRIVER_MEMORY.getValue(properties) + "G") - this.executorCores(DWC_SPARK_EXECUTOR_CORES.getValue(properties)) - this.executorMemory(DWC_SPARK_EXECUTOR_MEMORY.getValue(properties) + "G") - this.numExecutors(DWC_SPARK_EXECUTOR_INSTANCES.getValue(properties)) + this.driverMemory(DWC_SPARK_DRIVER_MEMORY.getValueAndRemove(properties) + "G") + this.executorCores(DWC_SPARK_EXECUTOR_CORES.getValueAndRemove(properties)) + this.executorMemory(DWC_SPARK_EXECUTOR_MEMORY.getValueAndRemove(properties) + "G") + this.numExecutors(DWC_SPARK_EXECUTOR_INSTANCES.getValueAndRemove(properties)) properties.getOrDefault("files", "").split(",").map(RelativePath).foreach(file) properties.getOrDefault("jars", "").split(",").map(RelativePath).foreach(jar) - SPARK_APPLICATION_JARS.getValue(properties).split(",").map(RelativePath).foreach(jar) + SPARK_APPLICATION_JARS.getValueAndRemove(properties).split(",").map(RelativePath).foreach(jar) + SPARK_EXTRA_JARS.getValueAndRemove(properties).split(",").map(RelativePath).foreach(jar) proxyUser(properties.getOrDefault("proxyUser", "")) this.queue(darResource.yarnResource.queueName) @@ -156,6 +159,8 @@ class SparkSubmitProcessBuilder extends ProcessEngineBuilder with Logging { this.redirectErrorStream(true) this.env("spark.app.name", properties.getOrDefault("appName", "dwc" + request.creator)) + properties.filter(i => (i._1.startsWith("spark.") || i._1.startsWith("hive.")) && StringUtils.isNotBlank(i._2)).foreach(i => conf(i._1, i._2)) + } def master(masterUrl: String): SparkSubmitProcessBuilder = { -- Gitee From 2bc8b97c33cac7e23b31c837f6eae8752af52766 Mon Sep 17 00:00:00 2001 From: wang_zh <643348094@qq.com> Date: Thu, 16 Apr 2020 15:50:05 +0800 Subject: [PATCH 005/148] Add the absolute path of classpath through class loader --- .../engine/executors/SparkScalaExecutor.scala | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/executors/SparkScalaExecutor.scala b/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/executors/SparkScalaExecutor.scala index f9b097b59..d3fca651b 100644 --- a/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/executors/SparkScalaExecutor.scala +++ b/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/executors/SparkScalaExecutor.scala @@ -17,6 +17,7 @@ package com.webank.wedatasphere.linkis.engine.executors import java.io.{File, IOException} +import java.net.URLClassLoader import com.webank.wedatasphere.linkis.common.utils.Utils import com.webank.wedatasphere.linkis.engine.configuration.SparkConfiguration._ @@ -34,6 +35,7 @@ import org.apache.spark.util.SparkUtils import org.apache.spark.{SparkConf, SparkContext} import _root_.scala.tools.nsc.GenericRunnerSettings +import scala.collection.mutable.ArrayBuffer import scala.concurrent.Future import scala.tools.nsc.interpreter.{ILoop, JPrintWriter, Results} @@ -205,10 +207,24 @@ class SparkScalaExecutor(val sparkConf: SparkConf) extends SparkExecutor{ } else { sparkJars.map(_.split(",")).map(_.filter(_.nonEmpty)).toSeq.flatten } + + // get root classpath + val cl = getClass.getClassLoader + var rootClassPath = new ArrayBuffer[String] + if (cl.isInstanceOf[URLClassLoader]) { + val urlLoader = cl.asInstanceOf[URLClassLoader] + for (url <- urlLoader.getURLs) { + if (url.getProtocol == "file") { + rootClassPath += url.getFile + } + } + rootClassPath.map(new File(_).getAbsolutePath) + } + val classpathJars = System.getProperty("java.class.path").split(":").filter(_.endsWith(".jar")) //.filterNot(f=> f.contains("spark-") || f.contains("datanucleus")) val classpath = jars.mkString(File.pathSeparator) + File.pathSeparator + - classpathJars.mkString(File.pathSeparator) + classpathJars.mkString(File.pathSeparator) + File.pathSeparator + rootClassPath.mkString(File.pathSeparator) debug("Spark shell add jars: " + classpath) settings.processArguments(List("-Yrepl-class-based", "-Yrepl-outdir", s"${outputDir.getAbsolutePath}","-classpath", classpath), true) -- Gitee From 0cbcabc32495b083b3523e0252de5fa016cc7c5f Mon Sep 17 00:00:00 2001 From: wang_zh Date: Sun, 23 Feb 2020 19:59:36 +0800 Subject: [PATCH 006/148] Support the use of variables in variables --- .../impl/CustomVariableUtils.scala | 84 ++++++++++--------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CustomVariableUtils.scala b/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CustomVariableUtils.scala index 99b6e9863..bfeb67c4c 100644 --- a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CustomVariableUtils.scala +++ b/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CustomVariableUtils.scala @@ -215,53 +215,57 @@ object CustomVariableUtils extends Logging { val codeReg = "\\$\\{\\s*[A-Za-z][A-Za-z0-9_]*\\s*[\\+\\-\\*/]?\\s*[A-Za-z0-9_\\.]*\\s*\\}".r val calReg = "(\\s*[A-Za-z][A-Za-z0-9_]*\\s*)([\\+\\-\\*/]?)(\\s*[A-Za-z0-9_\\.]*\\s*)".r - val parseCode = new StringBuilder - val codes = codeReg.split(code) val expressionCache = mutable.HashSet[String]() - - var i = 0 - - codeReg.findAllIn(code).foreach(str => { - calReg.findFirstMatchIn(str).foreach(ma => { - i = i + 1 - val name = ma.group(1) - val signal = ma.group(2) - val bValue = ma.group(3) - - if (name == null || name.trim.isEmpty) { - throw VarSubstitutionException(20041,s"[$str] replaced var is null") - } else { - var expression = name.trim - val varType = nameAndType.get(name.trim).orNull - if (varType == null) { - warn(s"Use undefined variables or use the set method: [$str](使用了未定义的变量或者使用了set方式:[$str])") - parseCode ++= codes(i - 1) ++ str + var targetCode = code + var noChange = false + while (!noChange && codeReg.findFirstIn(targetCode).isDefined) { + var i = 0 + val parseCode = new StringBuilder + val codes = codeReg.split(targetCode) + codeReg.findAllIn(targetCode).foreach(str => { + calReg.findFirstMatchIn(str).foreach(ma => { + i = i + 1 + val name = ma.group(1) + val signal = ma.group(2) + val bValue = ma.group(3) + + if (name == null || name.trim.isEmpty) { + throw VarSubstitutionException(20041,s"[$str] replaced var is null") } else { - var res: String = varType.getValue - if (signal != null && !signal.trim.isEmpty) { - if (bValue == null || bValue.trim.isEmpty) { - throw VarSubstitutionException(20042, s"[$str] expression is not right, please check") - } else { - expression = expression + "_" + signal.trim + "_" + bValue.trim - res = varType.calculator(signal.trim, bValue.trim) + var expression = name.trim + val varType = nameAndType.get(name.trim).orNull + if (varType == null) { + warn(s"Use undefined variables or use the set method: [$str](使用了未定义的变量或者使用了set方式:[$str])") + parseCode ++= codes(i - 1) ++ str + } else { + var res: String = varType.getValue + if (signal != null && !signal.trim.isEmpty) { + if (bValue == null || bValue.trim.isEmpty) { + throw VarSubstitutionException(20042, s"[$str] expression is not right, please check") + } else { + expression = expression + "_" + signal.trim + "_" + bValue.trim + res = varType.calculator(signal.trim, bValue.trim) + } } + if (!expressionCache.contains(expression)) { + info(s"Variable expression [$str] = $res(变量表达式[$str] = $res)") + //println(s"变量表达式[$str] = $res") + expressionCache += expression + } + //println(s"变量表达式序号:$i\t[$str] = $res") + parseCode ++= codes(i - 1) ++ res } - if (!expressionCache.contains(expression)) { - info(s"Variable expression [$str] = $res(变量表达式[$str] = $res)") - //println(s"变量表达式[$str] = $res") - expressionCache += expression - } - //println(s"变量表达式序号:$i\t[$str] = $res") - parseCode ++= codes(i - 1) ++ res } - } + }) }) - }) - if (i == codes.length - 1) { - parseCode ++= codes(i) + if (i == codes.length - 1) { + parseCode ++= codes(i) + } + val parsedCode = org.apache.commons.lang.StringUtils.strip(deleteUselessSemicolon(parseCode)) + if (targetCode.equals(parsedCode)) noChange = true + targetCode = parsedCode } - val parsedCode = deleteUselessSemicolon(parseCode) - org.apache.commons.lang.StringUtils.strip(parsedCode) + targetCode // Utils.trimBlank() } -- Gitee From 0bef68375a5f07aab4ddbd141e39bc08f5c5eadc Mon Sep 17 00:00:00 2001 From: wang_zh Date: Sun, 23 Feb 2020 20:05:29 +0800 Subject: [PATCH 007/148] Modify HiveQLProcessBuilder default "java.library.path" Modify SparkSubmitProcessBuilder empty path judgment --- .../hive/process/HiveQLProcessBuilder.scala | 4 +-- .../process/SparkSubmitProcessBuilder.scala | 27 ++++++++++++++----- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/ujes/definedEngines/hive/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/hive/process/HiveQLProcessBuilder.scala b/ujes/definedEngines/hive/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/hive/process/HiveQLProcessBuilder.scala index 1a8a358c5..94ae7afcf 100644 --- a/ujes/definedEngines/hive/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/hive/process/HiveQLProcessBuilder.scala +++ b/ujes/definedEngines/hive/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/hive/process/HiveQLProcessBuilder.scala @@ -20,7 +20,7 @@ import java.nio.file.Paths import com.webank.wedatasphere.linkis.common.conf.Configuration import com.webank.wedatasphere.linkis.enginemanager.{AbstractEngineCreator, EngineResource} -import com.webank.wedatasphere.linkis.enginemanager.conf.EnvConfiguration.{DEFAULT_JAVA_OPTS, ENGINE_CLIENT_MEMORY, JAVA_HOME, engineGCLogPath} +import com.webank.wedatasphere.linkis.enginemanager.conf.EnvConfiguration.{DEFAULT_JAVA_OPTS, ENGINE_CLIENT_MEMORY, HADOOP_LIB_NATIVE, JAVA_HOME, engineGCLogPath} import com.webank.wedatasphere.linkis.enginemanager.hive.conf.HiveEngineConfiguration import com.webank.wedatasphere.linkis.enginemanager.impl.UserEngineResource import com.webank.wedatasphere.linkis.enginemanager.process.JavaProcessEngineBuilder @@ -117,7 +117,7 @@ class HiveQLProcessBuilder extends JavaProcessEngineBuilder{ var classpath = getClasspath(request.properties, getExtractClasspath) classpath = classpath ++ request.properties.get("jars").split(",") classpathCheck(classpath) - commandLine += "-Djava.library.path=/appcom/Install/hadoop/lib/native" + commandLine += "-Djava.library.path=" + HADOOP_LIB_NATIVE.getValue commandLine += "-cp" commandLine += classpath.mkString(":") commandLine += "com.webank.wedatasphere.linkis.engine.DataWorkCloudEngineApplication" diff --git a/ujes/definedEngines/spark/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/process/SparkSubmitProcessBuilder.scala b/ujes/definedEngines/spark/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/process/SparkSubmitProcessBuilder.scala index b96c2cb4c..2a3d0383a 100644 --- a/ujes/definedEngines/spark/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/process/SparkSubmitProcessBuilder.scala +++ b/ujes/definedEngines/spark/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/process/SparkSubmitProcessBuilder.scala @@ -297,14 +297,16 @@ class SparkSubmitProcessBuilder extends ProcessEngineBuilder with Logging { addOpt("--deploy-mode", _deployMode) addOpt("--name", _name) //addOpt("--jars",Some(ENGINEMANAGER_JAR.getValue)) - info("No need to add jars for "+_jars.map(fromPath).exists(x => x.equals("hdfs:///")).toString()) - if(_jars.map(fromPath).exists(x => x.equals("hdfs:///")) != true) { + _jars = _jars.filter(_.isNotBlankPath()) + if(!_jars.isEmpty) { addList("--jars", _jars.map(fromPath)) } - if(_pyFiles.map(fromPath).exists(x => x.equals("hdfs:///")) != true) { + _pyFiles = _pyFiles.filter(_.isNotBlankPath()) + if(!_pyFiles.isEmpty) { addList("--py-files", _pyFiles.map(fromPath)) } - if(_files.map(fromPath).exists(x => x.equals("hdfs:///")) != true) { + _files = _files.filter(_.isNotBlankPath()) + if(!_files.isEmpty) { addList("--files", _files.map(fromPath)) } _conf.foreach { case (key, value) => if (key.startsWith("spark.")) addOpt("--conf", Option(f"""$key=$value""")) @@ -374,10 +376,21 @@ object SparkSubmitProcessBuilder { new SparkSubmitProcessBuilder } - sealed trait Path + sealed trait Path { - case class AbsolutePath(path: String) extends Path + def isNotBlankPath(): Boolean; - case class RelativePath(path: String) extends Path + protected def isNotBlankPath(path: String): Boolean = { + StringUtils.isNotBlank(path) && !"/".equals(path.trim) && !"hdfs:///".equals(path.trim) && !"file:///".equals(path.trim) + } + } + + case class AbsolutePath(path: String) extends Path { + override def isNotBlankPath(): Boolean = isNotBlankPath(path) + } + + case class RelativePath(path: String) extends Path { + override def isNotBlankPath(): Boolean = isNotBlankPath(path) + } } -- Gitee From 6a2d2d25c0513c3de334c2139acef5140d10b8b1 Mon Sep 17 00:00:00 2001 From: wang_zh Date: Sun, 23 Feb 2020 20:48:42 +0800 Subject: [PATCH 008/148] modify YarnUtil getChildQueues --- .../linkis/resourcemanager/utils/YarnUtil.scala | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/YarnUtil.scala b/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/YarnUtil.scala index ac367f4e6..f6971269f 100644 --- a/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/YarnUtil.scala +++ b/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/YarnUtil.scala @@ -150,12 +150,11 @@ object YarnUtil extends Logging{ case JNull | JNothing => None } def getChildQueues(resp:JValue):JValue = { - val queues = resp \ "childQueues" \ "queue" - - if(queues != null && queues != JNull && queues != JNothing ) { - info(s"test queue:$queues") - queues - } else resp \ "childQueues" + val queues = resp \ "childQueues" match { + case child: JObject => child \ "queue" + case children: JArray => children + } + queues } def getQueueOfCapacity(queues: JValue): Option[JValue] = { -- Gitee From b04b06aaef6437892ab76862d3d2519fc91c43b3 Mon Sep 17 00:00:00 2001 From: wang_zh Date: Sun, 23 Feb 2020 20:51:19 +0800 Subject: [PATCH 009/148] modify shared udf --- .../com/webank/wedatasphere/linkis/udf/api/UDFApi.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/api/UDFApi.java b/publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/api/UDFApi.java index ca0f763ef..6be47f29d 100644 --- a/publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/api/UDFApi.java +++ b/publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/api/UDFApi.java @@ -348,8 +348,14 @@ public class UDFApi { //Verify that the udf function has been shared(校验udf函数是否已经被分享) UDFInfo udfInfo = mapper.readValue(json.get("udfInfo"), UDFInfo.class); + UDFTree sharedTree; + Long shareParentId = json.get("shareParentId").getLongValue(); String category = udfInfo.getUdfType() == 3 || udfInfo.getUdfType() == 4 ? ConstantVar.FUNCTION : ConstantVar.UDF; - UDFTree sharedTree = udfTreeService.getSharedTree(category); + if (shareParentId > 0) { // 目录 + sharedTree = udfTreeService.getTreeById(shareParentId, userName, "share", category); + } else { + sharedTree = udfTreeService.getSharedTree(category); + } if (sharedTree == null){ throw new UDFException("No shared directories!(没有共享目录!)"); } @@ -360,7 +366,7 @@ public class UDFApi { throw new UDFException("This file is being shared!(该文件正在分享中!)"); } - String sharedPath = fileName +""; + String sharedPath = udfInfo.getPath(); //Verify sharing path---plus timestamp, it should not be repeated(校验分享路径---加上时间戳,应该不会重复) //Copy the file to a shared directory(将文件拷贝到共享目录下) -- Gitee From 67105fc4f1970855fc01070d88af7b050d5fd380 Mon Sep 17 00:00:00 2001 From: wang_zh Date: Sun, 1 Mar 2020 20:55:17 +0800 Subject: [PATCH 010/148] modify the implementation of Base64 --- .../webank/wedatasphere/linkis/common/utils/DESUtil.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/core/common/src/main/java/com/webank/wedatasphere/linkis/common/utils/DESUtil.java b/core/common/src/main/java/com/webank/wedatasphere/linkis/common/utils/DESUtil.java index 14efaf02c..ae8ba4ff5 100644 --- a/core/common/src/main/java/com/webank/wedatasphere/linkis/common/utils/DESUtil.java +++ b/core/common/src/main/java/com/webank/wedatasphere/linkis/common/utils/DESUtil.java @@ -17,8 +17,6 @@ package com.webank.wedatasphere.linkis.common.utils; import org.apache.commons.lang.StringUtils; -import sun.misc.BASE64Decoder; -import sun.misc.BASE64Encoder; import javax.crypto.Cipher; import javax.crypto.SecretKey; @@ -26,6 +24,7 @@ import javax.crypto.SecretKeyFactory; import javax.crypto.spec.DESKeySpec; import java.io.IOException; import java.security.SecureRandom; +import java.util.Base64; public class DESUtil { private final static String DES = "DES"; @@ -46,7 +45,7 @@ public class DESUtil { } } byte[] bt = encrypt(data.getBytes(), key.getBytes()); - String strs = new BASE64Encoder().encode(bt); + String strs = Base64.getEncoder().encodeToString(bt); return strs; } @@ -68,8 +67,7 @@ public class DESUtil { i++; } } - BASE64Decoder decoder = new BASE64Decoder(); - byte[] buf = decoder.decodeBuffer(data); + byte[] buf = Base64.getDecoder().decode(data); byte[] bt = decrypt(buf, key.getBytes()); return new String(bt); } -- Gitee From f46771bb2693c102bbdf159749d90c49d37eed2e Mon Sep 17 00:00:00 2001 From: wang_zh Date: Sun, 1 Mar 2020 20:59:02 +0800 Subject: [PATCH 011/148] add ldap userNameFormat --- .../wedatasphere/linkis/common/utils/LDAPUtils.scala | 7 +++++-- .../src/main/resources/linkis.properties | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/LDAPUtils.scala b/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/LDAPUtils.scala index 390558682..971bbab6f 100644 --- a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/LDAPUtils.scala +++ b/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/LDAPUtils.scala @@ -19,8 +19,8 @@ package com.webank.wedatasphere.linkis.common.utils import java.util.Hashtable import javax.naming.Context import javax.naming.ldap.InitialLdapContext - import com.webank.wedatasphere.linkis.common.conf.CommonVars +import org.apache.commons.lang.StringUtils /** @@ -30,9 +30,12 @@ object LDAPUtils extends Logging { val url = CommonVars("wds.linkis.ldap.proxy.url", "").getValue val baseDN = CommonVars("wds.linkis.ldap.proxy.baseDN", "").getValue + val userNameFormat = CommonVars("wds.linkis.ldap.proxy.userNameFormat", "").getValue def login(userID: String, password: String): Unit = { val env = new Hashtable[String, String]() - val bindDN = userID + val bindDN = if (StringUtils.isBlank(userNameFormat)) userID else { + userNameFormat.split("%s", -1).mkString(userID) + } val bindPassword = password env.put(Context.SECURITY_AUTHENTICATION, "simple") env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory") diff --git a/gateway/springcloudgateway/src/main/resources/linkis.properties b/gateway/springcloudgateway/src/main/resources/linkis.properties index e47babfa6..28dc7d8a4 100644 --- a/gateway/springcloudgateway/src/main/resources/linkis.properties +++ b/gateway/springcloudgateway/src/main/resources/linkis.properties @@ -19,6 +19,7 @@ wds.linkis.ldap.proxy.url= wds.linkis.ldap.proxy.baseDN= +#wds.linkis.ldap.proxy.userNameFormat=cn=%s@xxx.com,OU=xxx,DC=xxx,DC=com wds.linkis.server.restful.uri=/ -- Gitee From 45553c41ce3aa18d1bb430dee671d6021a58f070 Mon Sep 17 00:00:00 2001 From: wang_zh Date: Sun, 1 Mar 2020 21:11:34 +0800 Subject: [PATCH 012/148] modify HiveDriverProxy log --- .../linkis/engine/hive/executor/HiveEngineExecutor.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ujes/definedEngines/hive/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/hive/executor/HiveEngineExecutor.scala b/ujes/definedEngines/hive/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/hive/executor/HiveEngineExecutor.scala index c0ace13d2..a1ce3e2cb 100644 --- a/ujes/definedEngines/hive/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/hive/executor/HiveEngineExecutor.scala +++ b/ujes/definedEngines/hive/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/hive/executor/HiveEngineExecutor.scala @@ -369,11 +369,11 @@ object HiveDriverProxy extends Logging { private val COMMAND_NEED_RETRY_EXCEPTION_CLASS_STR = "org.apache.hadoop.hive.ql.CommandNeedRetryException" private val IDRIVER_CLASS_STR = "org.apache.hadoop.hive.ql.IDriver" - val COMMAND_NEED_RETRY_EXCEPTION_CLASS = Utils.tryAndWarn { + val COMMAND_NEED_RETRY_EXCEPTION_CLASS = Utils.tryQuietly { Thread.currentThread().getContextClassLoader .loadClass(COMMAND_NEED_RETRY_EXCEPTION_CLASS_STR) } - val IDRIVER_CLASS = Utils.tryAndWarn { + val IDRIVER_CLASS = Utils.tryQuietly { Thread.currentThread().getContextClassLoader .loadClass(IDRIVER_CLASS_STR) } -- Gitee From d2c9c49efb221816b91f1eaed6da683eee7c9c9a Mon Sep 17 00:00:00 2001 From: wang_zh Date: Sat, 7 Mar 2020 12:07:50 +0800 Subject: [PATCH 013/148] fix a VariableParser bug add yarn application id log --- .../wedatasphere/linkis/storage/script/VariableParser.scala | 2 +- .../linkis/engine/executors/SparkEngineExecutor.scala | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/VariableParser.scala b/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/VariableParser.scala index 2c8831430..304da0e77 100644 --- a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/VariableParser.scala +++ b/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/VariableParser.scala @@ -76,7 +76,7 @@ object VariableParser { } val params = new util.HashMap[String, Object] if(vars.size() >0)params += VARIABLE -> vars - if(vars.size() >0)params += CONFIGURATION -> confs + if(confs.size() >0)params += CONFIGURATION -> confs params } diff --git a/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/executors/SparkEngineExecutor.scala b/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/executors/SparkEngineExecutor.scala index 48edbfbb4..b5f7be916 100644 --- a/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/executors/SparkEngineExecutor.scala +++ b/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/executors/SparkEngineExecutor.scala @@ -123,6 +123,8 @@ class SparkEngineExecutor(val sc: SparkContext, id: Long, outputPrintLimit: Int, } var preCode = code //Pre-execution hook + info(s"yarn application id: ${sc.applicationId}") + engineExecutorContext.appendStdout(s"yarn application id: ${sc.applicationId}") SparkPreExecutionHook.getSparkPreExecutionHooks().foreach(hook => preCode = hook.callPreExecutionHook(engineExecutorContext,preCode)) val _code = Kind.getRealCode(preCode) info(s"Ready to run code with kind $kind.") -- Gitee From 2cf60af283b759384d2275b528db2f9a42c27bb3 Mon Sep 17 00:00:00 2001 From: wang_zh <643348094@qq.com> Date: Fri, 15 May 2020 17:54:00 +0800 Subject: [PATCH 014/148] fix jdbc engine executor write result set bug. --- .../entrance/executer/JDBCEngineExecutor.scala | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executer/JDBCEngineExecutor.scala b/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executer/JDBCEngineExecutor.scala index cdb089cde..73fbfd26f 100644 --- a/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executer/JDBCEngineExecutor.scala +++ b/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executer/JDBCEngineExecutor.scala @@ -23,7 +23,7 @@ import com.webank.wedatasphere.linkis.common.utils.Utils import com.webank.wedatasphere.linkis.entrance.conf.JDBCConfiguration.ENGINE_RESULT_SET_MAX_CACHE import com.webank.wedatasphere.linkis.entrance.conf.executer.ConnectionManager import com.webank.wedatasphere.linkis.entrance.exception.{JDBCSQLFeatureNotSupportedException, JDBCStateMentNotInitialException} -import com.webank.wedatasphere.linkis.entrance.execute.{EngineExecuteAsynReturn, EntranceEngine, JDBCJobExecuteRequest, StorePathExecuteRequest} +import com.webank.wedatasphere.linkis.entrance.execute.{EngineExecuteAsynReturn, EntranceEngine, EntranceJob, JDBCJobExecuteRequest, StorePathExecuteRequest} import com.webank.wedatasphere.linkis.entrance.persistence.EntranceResultSetEngine import com.webank.wedatasphere.linkis.protocol.engine.{JobProgressInfo, RequestTask} import com.webank.wedatasphere.linkis.rpc.Sender @@ -31,6 +31,8 @@ import com.webank.wedatasphere.linkis.scheduler.executer._ import com.webank.wedatasphere.linkis.storage.domain.{Column, DataType} import com.webank.wedatasphere.linkis.storage.resultset.table.{TableMetaData, TableRecord} import com.webank.wedatasphere.linkis.storage.resultset.{ResultSetFactory, ResultSetWriter} +import com.webank.wedatasphere.linkis.storage.utils.StorageUtils +import org.apache.commons.io.IOUtils import org.apache.commons.lang.StringUtils import org.slf4j.LoggerFactory @@ -50,6 +52,7 @@ class JDBCEngineExecutor(outputPrintLimit: Int, properties: util.HashMap[String, private var codeLine = 0 //total line number private var totalCodeLineNumber = 0 + private var executeUser: String = _ protected def executeLine(code: String, storePath: String, alias: String): ExecuteResponse = { val realCode = code.trim() @@ -80,7 +83,7 @@ class JDBCEngineExecutor(outputPrintLimit: Int, properties: util.HashMap[String, val metaData = new TableMetaData(columns) val resultSet = ResultSetFactory.getInstance.getResultSetByType(ResultSetFactory.TABLE_TYPE) val resultSetPath = resultSet.getResultSetPath(new FsPath(storePath), alias) - val resultSetWriter = ResultSetWriter.getResultSetWriter(resultSet, ENGINE_RESULT_SET_MAX_CACHE.getValue.toLong, resultSetPath) + val resultSetWriter = ResultSetWriter.getResultSetWriter(resultSet, ENGINE_RESULT_SET_MAX_CACHE.getValue.toLong, resultSetPath, executeUser) resultSetWriter.addMetaData(metaData) var count = 0 Utils.tryCatch({ @@ -103,6 +106,7 @@ class JDBCEngineExecutor(outputPrintLimit: Int, properties: util.HashMap[String, JDBCResultSet.close() statement.close() connection.close() + IOUtils.closeQuietly(resultSetWriter) } LOG.info("sql execute completed") AliasOutputExecuteResponse(alias, output) @@ -175,6 +179,11 @@ class JDBCEngineExecutor(outputPrintLimit: Int, properties: util.HashMap[String, case _ => "" } + this.executeUser = executeRequest match { + case jobExecuteRequest: JDBCJobExecuteRequest => jobExecuteRequest.job.asInstanceOf[EntranceJob].getUser + case _ => StorageUtils.getJvmUser + } + val codes = JDBCSQLCodeParser.parse(executeRequest.code) if (!codes.isEmpty) { -- Gitee From 6769333b788c1797540e6323b577120e13415211 Mon Sep 17 00:00:00 2001 From: Yogafire Date: Thu, 14 May 2020 18:27:34 +0800 Subject: [PATCH 015/148] linkis add presto engine support --- .gitignore | 1 + pom.xml | 2 + ujes/definedEngines/presto/entrance/pom.xml | 63 ++++++ .../src/main/resources/application.yml | 24 +++ .../src/main/resources/linkis.properties | 32 +++ .../src/main/resources/log4j.properties | 36 ++++ .../entrance/src/main/resources/log4j2.xml | 38 ++++ .../configuration/PrestoConfiguration.scala | 28 +++ .../PrestoSpringConfiguration.scala | 53 +++++ .../entrance/exception/PrestoException.scala | 8 + .../entrance/execute/PrestoEntranceJob.scala | 39 ++++ .../execute/PrestoEntranceParser.scala | 38 ++++ .../PrestoEntranceEngineExecutor.scala | 198 ++++++++++++++++++ .../PrestoEntranceEngineExecutorManager.scala | 98 +++++++++ .../linkis/entrance/utils/SqlCodeParser.scala | 54 +++++ 15 files changed, 712 insertions(+) create mode 100644 ujes/definedEngines/presto/entrance/pom.xml create mode 100644 ujes/definedEngines/presto/entrance/src/main/resources/application.yml create mode 100644 ujes/definedEngines/presto/entrance/src/main/resources/linkis.properties create mode 100644 ujes/definedEngines/presto/entrance/src/main/resources/log4j.properties create mode 100644 ujes/definedEngines/presto/entrance/src/main/resources/log4j2.xml create mode 100644 ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoConfiguration.scala create mode 100644 ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoSpringConfiguration.scala create mode 100644 ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/PrestoException.scala create mode 100644 ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceJob.scala create mode 100644 ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceParser.scala create mode 100644 ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutor.scala create mode 100644 ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutorManager.scala create mode 100644 ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/SqlCodeParser.scala diff --git a/.gitignore b/.gitignore index 3eace27cf..eb2870006 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,7 @@ ujes/definedEngines/python/entrance/target/ ujes/definedEngines/spark/engine/target/ ujes/definedEngines/spark/enginemanager/target/ ujes/definedEngines/spark/entrance/target/ +ujes/definedEngines/presto/entrance/target/ ujes/engine/target/ ujes/enginemanager/target/ ujes/entrance/target/ diff --git a/pom.xml b/pom.xml index 35d08eb76..d027cde2a 100644 --- a/pom.xml +++ b/pom.xml @@ -113,6 +113,7 @@ ujes/definedEngines/pipeline/enginemanager ujes/definedEngines/pipeline/entrance ujes/definedEngines/mlsql/entrance + ujes/definedEngines/presto/entrance assembly/public-module assembly @@ -121,6 +122,7 @@ 2.7.2 1.2.1 + 0.234 1.4.4.RELEASE 2.0.3.RELEASE 2.8.5 diff --git a/ujes/definedEngines/presto/entrance/pom.xml b/ujes/definedEngines/presto/entrance/pom.xml new file mode 100644 index 000000000..26c889725 --- /dev/null +++ b/ujes/definedEngines/presto/entrance/pom.xml @@ -0,0 +1,63 @@ + + + + linkis + com.webank.wedatasphere.linkis + 0.9.3 + + 4.0.0 + + linkis-presto-entrance + + + + com.facebook.presto + presto-client + ${presto.version} + + + com.webank.wedatasphere.linkis + linkis-ujes-entrance + ${linkis.version} + + + com.webank.wedatasphere.linkis + linkis-cloudRPC + ${linkis.version} + provided + + + com.webank.wedatasphere.linkis + linkis-storage + ${linkis.version} + provided + + + com.webank.wedatasphere.linkis + linkis-resourcemanager-client + ${linkis.version} + + + com.webank.wedatasphere.linkis + linkis-cloudRPC + + + + + + + + + net.alchim31.maven + scala-maven-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + + + + \ No newline at end of file diff --git a/ujes/definedEngines/presto/entrance/src/main/resources/application.yml b/ujes/definedEngines/presto/entrance/src/main/resources/application.yml new file mode 100644 index 000000000..f7d3ab28e --- /dev/null +++ b/ujes/definedEngines/presto/entrance/src/main/resources/application.yml @@ -0,0 +1,24 @@ +server: + port: 10010 +spring: + application: + name: prestoEntrance + + +eureka: + client: + serviceUrl: + defaultZone: http://localhost:20303/eureka/ + instance: + metadata-map: + test: enjoyyin + +management: + endpoints: + web: + exposure: + include: refresh,info +logging: + config: classpath:log4j2.xml +# register-with-eureka: false +# fetch-registry: false \ No newline at end of file diff --git a/ujes/definedEngines/presto/entrance/src/main/resources/linkis.properties b/ujes/definedEngines/presto/entrance/src/main/resources/linkis.properties new file mode 100644 index 000000000..63a8fc9ee --- /dev/null +++ b/ujes/definedEngines/presto/entrance/src/main/resources/linkis.properties @@ -0,0 +1,32 @@ +# +# Copyright 2019 WeBank +# +# Licensed 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. +# + +wds.linkis.server.restful.scan.packages=com.webank.wedatasphere.linkis.entrance.restful + +wds.linkis.engine.application.name=prestoEntrance +wds.linkis.enginemanager.application.name=presto + +wds.linkis.query.application.name=cloud-publicservice + +wds.linkis.console.config.application.name=cloud-publicservice +wds.linkis.engine.creation.wait.time.max=20m +wds.linkis.server.version=v1 +#hadoop.config.dir=/appcom/config/hadoop-config +wds.linkis.entrance.config.logPath=file:///tmp/linkis/ + +wds.linkis.resultSet.store.path=file:///tmp/linkis + +wds.linkis.server.socket.mode=true diff --git a/ujes/definedEngines/presto/entrance/src/main/resources/log4j.properties b/ujes/definedEngines/presto/entrance/src/main/resources/log4j.properties new file mode 100644 index 000000000..178f8dfa2 --- /dev/null +++ b/ujes/definedEngines/presto/entrance/src/main/resources/log4j.properties @@ -0,0 +1,36 @@ +# +# Copyright 2019 WeBank +# +# Licensed 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. +# + +### set log levels ### + +log4j.rootCategory=INFO,console + +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.Threshold=INFO +log4j.appender.console.layout=org.apache.log4j.PatternLayout +#log4j.appender.console.layout.ConversionPattern= %d{ISO8601} %-5p (%t) [%F:%M(%L)] - %m%n +log4j.appender.console.layout.ConversionPattern= %d{ISO8601} %-5p (%t) %p %c{1} - %m%n + + +log4j.appender.com.webank.bdp.ide.core=org.apache.log4j.DailyRollingFileAppender +log4j.appender.com.webank.bdp.ide.core.Threshold=INFO +log4j.additivity.com.webank.bdp.ide.core=false +log4j.appender.com.webank.bdp.ide.core.layout=org.apache.log4j.PatternLayout +log4j.appender.com.webank.bdp.ide.core.Append=true +log4j.appender.com.webank.bdp.ide.core.File=logs/linkis.log +log4j.appender.com.webank.bdp.ide.core.layout.ConversionPattern= %d{ISO8601} %-5p (%t) [%F:%M(%L)] - %m%n + +log4j.logger.org.springframework=INFO \ No newline at end of file diff --git a/ujes/definedEngines/presto/entrance/src/main/resources/log4j2.xml b/ujes/definedEngines/presto/entrance/src/main/resources/log4j2.xml new file mode 100644 index 000000000..ad88ea570 --- /dev/null +++ b/ujes/definedEngines/presto/entrance/src/main/resources/log4j2.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoConfiguration.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoConfiguration.scala new file mode 100644 index 000000000..1674d8922 --- /dev/null +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoConfiguration.scala @@ -0,0 +1,28 @@ +package com.webank.wedatasphere.linkis.entrance.configuration + +import java.lang + +import com.webank.wedatasphere.linkis.common.conf.{ByteType, CommonVars} + +/** + * Created by yogafire on 2020/4/30 + */ +object PrestoConfiguration { + + val PRESTO_HTTP_CONNECT_TIME_OUT = CommonVars[java.lang.Long]("wds.linkis.presto.http.connectTimeout", new lang.Long(60)) //单位秒 + val PRESTO_HTTP_READ_TIME_OUT = CommonVars[java.lang.Long]("wds.linkis.presto.http.readTimeout", new lang.Long(60)) + + + val PRESTO_DEFAULT_LIMIT = CommonVars("wds.linkis.presto.default.limit", 5000) + val PRESTO_URL = CommonVars("wds.linkis.presto.url", "http://127.0.0.1:8080") + val PRESTO_USER_NAME = CommonVars("wds.linkis.presto.username", "default") + val PRESTO_PASSWORD = CommonVars("wds.linkis.presto.password", "") + val PRESTO_CATALOG = CommonVars("wds.linkis.presto.catalog", "system") + val PRESTO_SCHEMA = CommonVars("wds.linkis.presto.schema", "") + val PRESTO_RESOURCE = CommonVars("wds.linkis.presto.resource", "global") + val PRESTO_RESULTS_MAX_CACHE = CommonVars("wds.linkis.presto.resultSet.cache.max", new ByteType("512k")) + + + val PRESTO_ENGINE_REQUEST_MEMORY = CommonVars[Int]("query_max_total_memory", 4) //单位GB + val PRESTO_ENGINE_QUEUE_NAME = CommonVars[String]("resource_group", "global") +} diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoSpringConfiguration.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoSpringConfiguration.scala new file mode 100644 index 000000000..274dbbdb2 --- /dev/null +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoSpringConfiguration.scala @@ -0,0 +1,53 @@ +package com.webank.wedatasphere.linkis.entrance.configuration + +import java.util.concurrent.TimeUnit + +import com.facebook.presto.client.SocketChannelSocketFactory +import com.webank.wedatasphere.linkis.entrance.EntranceParser +import com.webank.wedatasphere.linkis.entrance.annotation._ +import com.webank.wedatasphere.linkis.entrance.configuration.PrestoConfiguration._ +import com.webank.wedatasphere.linkis.entrance.execute._ +import com.webank.wedatasphere.linkis.entrance.executor.PrestoEntranceEngineExecutorManager +import com.webank.wedatasphere.linkis.scheduler.queue.GroupFactory +import okhttp3.{Credentials, Interceptor, OkHttpClient} +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.context.annotation.{Bean, Configuration} + + +/** + * Created by yogafire on 2020/5/13 + */ +@Configuration +class PrestoSpringConfiguration { + + @EntranceExecutorManagerBeanAnnotation + def generateEntranceExecutorManager(@GroupFactoryBeanAnnotation.GroupFactoryAutowiredAnnotation groupFactory: GroupFactory, + @EngineBuilderBeanAnnotation.EngineBuilderAutowiredAnnotation engineBuilder: EngineBuilder, + @EngineRequesterBeanAnnotation.EngineRequesterAutowiredAnnotation engineRequester: EngineRequester, + @EngineSelectorBeanAnnotation.EngineSelectorAutowiredAnnotation engineSelector: EngineSelector, + @EngineManagerBeanAnnotation.EngineManagerAutowiredAnnotation engineManager: EngineManager, + @Autowired entranceExecutorRulers: Array[EntranceExecutorRuler]): EntranceExecutorManager = + new PrestoEntranceEngineExecutorManager(groupFactory, engineBuilder, engineRequester, engineSelector, engineManager, entranceExecutorRulers) + + @EntranceParserBeanAnnotation + def generateEntranceParser(): EntranceParser = { + new PrestoEntranceParser() + } + + @Bean + def okHttpClient(): OkHttpClient = { + val builder = new OkHttpClient.Builder + builder.socketFactory(new SocketChannelSocketFactory) + .connectTimeout(PRESTO_HTTP_READ_TIME_OUT.getValue, TimeUnit.SECONDS) + .readTimeout(PRESTO_HTTP_READ_TIME_OUT.getValue, TimeUnit.SECONDS) + if (PRESTO_URL.getValue.toLowerCase.startsWith("https")) { + builder.addInterceptor((chain: Interceptor.Chain) => { + chain.proceed(chain.request().newBuilder() + .header("Authorization", Credentials.basic(PRESTO_USER_NAME.getValue, PRESTO_PASSWORD.getValue)).build()) + }) + //FIXME build https config + } + builder.build + } + +} diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/PrestoException.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/PrestoException.scala new file mode 100644 index 000000000..ef3744f3f --- /dev/null +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/PrestoException.scala @@ -0,0 +1,8 @@ +package com.webank.wedatasphere.linkis.entrance.exception + +/** + * Created by yogafire on 2020/5/14 + */ +class PrestoException(message: String) extends RuntimeException(message: String) { + +} diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceJob.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceJob.scala new file mode 100644 index 000000000..165045024 --- /dev/null +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceJob.scala @@ -0,0 +1,39 @@ +package com.webank.wedatasphere.linkis.entrance.execute + +import com.webank.wedatasphere.linkis.common.log.LogUtils +import com.webank.wedatasphere.linkis.common.utils.Utils +import com.webank.wedatasphere.linkis.entrance.job.EntranceExecutionJob +import com.webank.wedatasphere.linkis.scheduler.executer.{CompletedExecuteResponse, ErrorExecuteResponse} +import com.webank.wedatasphere.linkis.scheduler.queue.SchedulerEventState.Running + +/** + * Created by yogafire on 2020/5/12 + */ +class PrestoEntranceJob extends EntranceExecutionJob { + + //FIXME 可以把这个方法抽象进入EntranceExecutionJob + //use executor execute presto code (使用executor执行jdbc脚本代码) + override def run(): Unit = { + if (!isScheduled) return + startTime = System.currentTimeMillis + Utils.tryAndWarn(transition(Running)) + + val executeResponse = Utils.tryCatch(getExecutor.execute(jobToExecuteRequest())) { + case t: InterruptedException => + warn(s"job $toString is interrupted by user!", t) + getLogListener.foreach(_.onLogUpdate(this, LogUtils.generateERROR(s"job $toString is interrupted by user! ${t.getMessage}"))) + ErrorExecuteResponse("job is interrupted by user!", t) + case t: Exception => + warn(s"execute job $toString failed!", t) + getLogListener.foreach(_.onLogUpdate(this, LogUtils.generateERROR(s"execute job $toString failed! ${t.getMessage}"))) + ErrorExecuteResponse("execute job failed!", t) + } + executeResponse match { + case r: CompletedExecuteResponse => + setResultSize(0) + transitionCompleted(r) + case _ => logger.error("not completed") + } + } + +} diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceParser.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceParser.scala new file mode 100644 index 000000000..092340d65 --- /dev/null +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceParser.scala @@ -0,0 +1,38 @@ +package com.webank.wedatasphere.linkis.entrance.execute + +import java.util + +import com.webank.wedatasphere.linkis.common.utils.Logging +import com.webank.wedatasphere.linkis.entrance.parser.CommonEntranceParser +import com.webank.wedatasphere.linkis.protocol.query.RequestPersistTask +import com.webank.wedatasphere.linkis.protocol.task.Task +import com.webank.wedatasphere.linkis.scheduler.queue.Job + +/** + * Created by yogafire on 2020/5/14 + */ +class PrestoEntranceParser extends CommonEntranceParser with Logging { + + logger.info("Presto EntranceParser Registered") + + /** + * Parse a task into an executable job(将一个task解析成一个可执行的job) + * + * @param task + * @return + */ + override def parseToJob(task: Task): Job = { + val job = new PrestoEntranceJob + task match { + case requestPersistTask: RequestPersistTask => + job.setTask(task) + job.setUser(requestPersistTask.getUmUser) + job.setCreator(requestPersistTask.getRequestApplicationName) + job.setParams(requestPersistTask.getParams.asInstanceOf[util.Map[String, Any]]) + job.setEntranceListenerBus(getEntranceContext.getOrCreateEventListenerBus) + job.setListenerEventBus(null) + job.setProgress(0f) + } + job + } +} diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutor.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutor.scala new file mode 100644 index 000000000..cb4cd468b --- /dev/null +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutor.scala @@ -0,0 +1,198 @@ +package com.webank.wedatasphere.linkis.entrance.executor + +import java.sql.SQLException +import java.util.Objects + +import com.facebook.presto.client.{ClientSession, QueryStatusInfo, StatementClient, StatementClientFactory} +import com.webank.wedatasphere.linkis.common.io.FsPath +import com.webank.wedatasphere.linkis.common.log.LogUtils +import com.webank.wedatasphere.linkis.common.utils.{Logging, Utils} +import com.webank.wedatasphere.linkis.entrance.configuration.PrestoConfiguration +import com.webank.wedatasphere.linkis.entrance.exception.PrestoException +import com.webank.wedatasphere.linkis.entrance.execute.{EngineExecuteAsynReturn, EntranceEngine, EntranceJob, StorePathExecuteRequest} +import com.webank.wedatasphere.linkis.entrance.persistence.EntranceResultSetEngine +import com.webank.wedatasphere.linkis.entrance.utils.SqlCodeParser +import com.webank.wedatasphere.linkis.protocol.engine.{JobProgressInfo, RequestTask} +import com.webank.wedatasphere.linkis.scheduler.executer._ +import com.webank.wedatasphere.linkis.storage.domain.Column +import com.webank.wedatasphere.linkis.storage.resultset.table.{TableMetaData, TableRecord} +import com.webank.wedatasphere.linkis.storage.resultset.{ResultSetFactory, ResultSetWriter} +import okhttp3.OkHttpClient +import org.apache.commons.io.IOUtils +import org.apache.commons.lang.StringUtils + +import scala.collection.JavaConverters._ + + +/** + * Created by yogafire on 2020/4/30 + */ +class PrestoEntranceEngineExecutor(job: EntranceJob, clientSession: ClientSession, okHttpClient: OkHttpClient) extends EntranceEngine(id = 0) with SingleTaskOperateSupport with SingleTaskInfoSupport with Logging { + private var statement: StatementClient = _ + private val persistEngine = new EntranceResultSetEngine() + //execute line number,as alias and progress line + private var codeLine = 0 + //total line number + private var totalCodeLineNumber = 0 + + override def execute(executeRequest: ExecuteRequest): ExecuteResponse = { + if (StringUtils.isEmpty(executeRequest.code)) { + return IncompleteExecuteResponse("execute codes can not be empty)") + } + val storePath = executeRequest match { + case storePathExecuteRequest: StorePathExecuteRequest => storePathExecuteRequest.storePath + case _ => "" + } + + val codes = SqlCodeParser.parse(executeRequest.code) + if (!codes.isEmpty) { + totalCodeLineNumber = codes.length + codeLine = 0 + codes.foreach(code => { + try { + val executeRes = executeLine(code, storePath, codeLine.toString) + executeRes match { + case aliasOutputExecuteResponse: AliasOutputExecuteResponse => + persistEngine.persistResultSet(job, aliasOutputExecuteResponse) + case SuccessExecuteResponse() => + info(s"sql execute successfully : $code") + case IncompleteExecuteResponse(_) => + error(s"sql execute failed : $code") + case _ => + warn("no matching exception") + } + codeLine = codeLine + 1 + } catch { + case e: Exception => + totalCodeLineNumber = 0 + error("Presto Exception", e) + job.getLogListener.foreach(_.onLogUpdate(job, LogUtils.generateERROR(e.getMessage))) + return ErrorExecuteResponse("Presto execute exception", e) + case t: Throwable => + totalCodeLineNumber = 0 + error("Presto execute failed", t) + job.getLogListener.foreach(_.onLogUpdate(job, LogUtils.generateERROR(t.getMessage))) + return ErrorExecuteResponse("Presto execute failed", t) + } finally { + Utils.tryQuietly({ + statement.close() + }) + } + }) + } + totalCodeLineNumber = 0 + SuccessExecuteResponse() + } + + private def executeLine(code: String, storePath: String, alias: String): ExecuteResponse = { + val realCode = code.trim + info(s"presto client begins to run psql code:\n $realCode") + + statement = StatementClientFactory.newStatementClient(okHttpClient, clientSession, realCode) + + initialStatusUpdates(statement) + + var response: ExecuteResponse = SuccessExecuteResponse() + if (statement.isRunning || (statement.isFinished && statement.finalStatusInfo().getError == null)) { + if (statement.currentStatusInfo().getUpdateType == null) { + response = queryOutput(statement, storePath, alias) + } else { + while (statement.isRunning) { + statement.advance() + } + } + } + //FIXME 客户端异常校验 + verifyServerError(statement) + response + } + + override def kill(): Boolean = { + close() + true + } + + override def close(): Unit = { + statement.close() + } + + override def progress(): Float = (codeLine.toFloat / totalCodeLineNumber) * statement.getStats.getProgressPercentage.getAsDouble.toFloat + + override def getProgressInfo: Array[JobProgressInfo] = { + val totalSplits = statement.getStats.getTotalSplits + val runningSplits = statement.getStats.getRunningSplits + val completedSplits = statement.getStats.getCompletedSplits + //FIXME presto有没有failed splits? + Array[JobProgressInfo](JobProgressInfo(statement.currentStatusInfo().getId, totalSplits, runningSplits, 0, completedSplits)) + } + + + override protected def callExecute(request: RequestTask): EngineExecuteAsynReturn = ??? + + override def log(): String = "Presto entrance is running" + + override def pause(): Boolean = ??? + + override def resume(): Boolean = ??? + + def initialStatusUpdates(statement: StatementClient): Unit = { + while (statement.isRunning && statement.currentData().getData == null) { + statement.advance() + } + } + + def queryOutput(statement: StatementClient, storePath: String, alias: String): AliasOutputExecuteResponse = { + var columnCount = 0 + var rows = 0 + val resultSet = ResultSetFactory.getInstance.getResultSetByType(ResultSetFactory.TABLE_TYPE) + val resultSetPath = resultSet.getResultSetPath(new FsPath(storePath), alias) + val resultSetWriter = ResultSetWriter.getResultSetWriter(resultSet, PrestoConfiguration.PRESTO_RESULTS_MAX_CACHE.getValue.toLong, resultSetPath, job.asInstanceOf[EntranceJob].getUser) + Utils.tryFinally({ + var results: QueryStatusInfo = null + if (statement.isRunning) { + results = statement.currentStatusInfo() + } else { + results = statement.finalStatusInfo() + } + if (results.getColumns == null) { + throw new RuntimeException("presto columns is null.") + } + val columns = results.getColumns.asScala + .map(column => Column(column.getName, column.getType, "")).toArray[Column] + columnCount = columns.length + resultSetWriter.addMetaData(new TableMetaData(columns)) + while (statement.isRunning) { + val data = statement.currentData().getData + if (data != null) for (row <- data.asScala) { + val rowArray = row.asScala.map(r => String.valueOf(r)) + resultSetWriter.addRecord(new TableRecord(rowArray.toArray)) + rows += 1 + } + statement.advance() + } + })(IOUtils.closeQuietly(resultSetWriter)) + + info(s"Fetched $columnCount col(s) : $rows row(s) in presto") + job.getLogListener.foreach(_.onLogUpdate(job, LogUtils.generateInfo(s"Fetched $columnCount col(s) : $rows row(s) in presto"))) + val output = if (resultSetWriter != null) resultSetWriter.toString else null + AliasOutputExecuteResponse(alias, output) + } + + // check server error + def verifyServerError(statement: StatementClient): Unit = { + if (statement.isFinished) { + val info: QueryStatusInfo = statement.finalStatusInfo() + if (info.getError != null) { + val error = Objects.requireNonNull(info.getError); + val message: String = s"Presto execute failed (#${info.getId}): ${error.getMessage}" + var cause: Throwable = null + if (error.getFailureInfo != null) { + cause = error.getFailureInfo.toException + } + throw new SQLException(message, error.getSqlState, error.getErrorCode, cause) + } + } else { + throw new PrestoException("Presto status error, execute is not finished.") + } + } +} diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutorManager.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutorManager.scala new file mode 100644 index 000000000..b2c67a438 --- /dev/null +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutorManager.scala @@ -0,0 +1,98 @@ +package com.webank.wedatasphere.linkis.entrance.executor + +import java.net.URI +import java.util +import java.util.concurrent.TimeUnit +import java.util.{Locale, Optional, TimeZone} + +import com.facebook.presto.client.ClientSession +import com.facebook.presto.spi.security.SelectedRole +import com.webank.wedatasphere.linkis.common.conf.CommonVars +import com.webank.wedatasphere.linkis.common.utils.Logging +import com.webank.wedatasphere.linkis.entrance.configuration.PrestoConfiguration._ +import com.webank.wedatasphere.linkis.entrance.execute._ +import com.webank.wedatasphere.linkis.entrance.execute.impl.EntranceExecutorManagerImpl +import com.webank.wedatasphere.linkis.scheduler.executer.Executor +import com.webank.wedatasphere.linkis.scheduler.listener.ExecutorListener +import com.webank.wedatasphere.linkis.scheduler.queue.{GroupFactory, SchedulerEvent} +import okhttp3.OkHttpClient +import org.apache.commons.lang.StringUtils +import org.springframework.beans.factory.annotation.Autowired + +import scala.collection.JavaConversions._ +import scala.concurrent.duration.Duration + + +/** + * Created by yogafire on 2020/4/30 + */ +class PrestoEntranceEngineExecutorManager(groupFactory: GroupFactory, + engineBuilder: EngineBuilder, + engineRequester: EngineRequester, + engineSelector: EngineSelector, + engineManager: EngineManager, + entranceExecutorRulers: Array[EntranceExecutorRuler]) + extends EntranceExecutorManagerImpl(groupFactory, engineBuilder, engineRequester, + engineSelector, engineManager, entranceExecutorRulers) with Logging { + info("Presto ExecutorManager Registered") + + @Autowired + private var okHttpClient: OkHttpClient = _ + + override def setExecutorListener(executorListener: ExecutorListener): Unit = super.setExecutorListener(executorListener) + + override def askExecutor(schedulerEvent: SchedulerEvent): Option[Executor] = schedulerEvent match { + case job: EntranceJob => Some(createExecutor(job)) + case _ => None + } + + override def askExecutor(schedulerEvent: SchedulerEvent, wait: Duration): Option[Executor] = { + askExecutor(schedulerEvent) + } + + override protected def createExecutor(schedulerEvent: SchedulerEvent): EntranceEngine = schedulerEvent match { + case job: EntranceJob => + //FIXME 校验resourcemanager + + //FIXME 之后替换为获取datasource + val runTimeParams = job.getParams.get("configuration").asInstanceOf[util.Map[String, Any]] + .get("runtime").asInstanceOf[util.Map[String, String]] + val clientSession = getClientSession(runTimeParams) + new PrestoEntranceEngineExecutor(job, clientSession, okHttpClient) + } + + def getClientSession(config: util.Map[String, String]): ClientSession = { + val httpUri: URI = URI.create(getFinalConfig(config, PRESTO_URL)) + val user: String = PRESTO_USER_NAME.getValue + val clientInfo: String = getFinalConfig(config, PRESTO_RESOURCE) + val catalog: String = getFinalConfig(config, PRESTO_CATALOG) + val schema: String = getFinalConfig(config, PRESTO_SCHEMA) + val properties: java.util.Map[String, String] = config.filter(entry => StringUtils.isNotEmpty(entry._1) && entry._1.trim.startsWith("wds.linkis.presto")) + + val transactionId: String = null + val traceToken: java.util.Optional[String] = Optional.empty() + val source: String = "linkis" + val clientTags: java.util.Set[String] = Set[String]() + val timeZonId = TimeZone.getDefault.getID + val locale: Locale = Locale.getDefault + val resourceEstimates: java.util.Map[String, String] = new util.HashMap[String, String](1, 1) + val preparedStatements: java.util.Map[String, String] = new util.HashMap[String, String](1, 1) + val roles: java.util.Map[String, SelectedRole] = new util.HashMap[String, SelectedRole](1, 1) + val extraCredentials: java.util.Map[String, String] = new util.HashMap[String, String](1, 1) + //0不设限 + val clientRequestTimeout: io.airlift.units.Duration = new io.airlift.units.Duration(0, TimeUnit.MILLISECONDS) + + new ClientSession(httpUri, user, source, traceToken, clientTags, clientInfo, catalog, schema, timeZonId, locale, + resourceEstimates, properties, preparedStatements, roles, extraCredentials, transactionId, clientRequestTimeout) + } + + private def getFinalConfig(config: util.Map[String, String], key: CommonVars[String]): String = { + val value = config.get(key) + if (StringUtils.isEmpty(value)) { + key.getValue + } else { + value + } + } + +} diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/SqlCodeParser.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/SqlCodeParser.scala new file mode 100644 index 000000000..8a0610154 --- /dev/null +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/SqlCodeParser.scala @@ -0,0 +1,54 @@ +package com.webank.wedatasphere.linkis.entrance.utils + +import com.webank.wedatasphere.linkis.entrance.configuration.PrestoConfiguration +import org.apache.commons.lang.StringUtils + +import scala.collection.mutable.ArrayBuffer + +/** + * Created by yogafire on 2020/5/11 + */ +//FIXME 能不能把parser统一到common包里? +object SqlCodeParser { + val separator = ";" + val defaultLimit: Int = PrestoConfiguration.PRESTO_DEFAULT_LIMIT.getValue + + def parse(code: String): Array[String] = { + val codeBuffer = new ArrayBuffer[String]() + + def appendStatement(sqlStatement: String): Unit = { + codeBuffer.append(sqlStatement) + } + + if (StringUtils.contains(code, separator)) { + StringUtils.split(code, ";").foreach { + case s if StringUtils.isBlank(s) => + case s if isSelectCmdNoLimit(s) => appendStatement(s + " limit " + defaultLimit); + case s => appendStatement(s); + } + } else { + code match { + case s if StringUtils.isBlank(s) => + case s if isSelectCmdNoLimit(s) => appendStatement(s + " limit " + defaultLimit); + case s => appendStatement(s); + } + } + codeBuffer.toArray + } + + def isSelectCmdNoLimit(cmd: String): Boolean = { + var code = cmd.trim + if (!cmd.split("\\s+")(0).equalsIgnoreCase("select")) return false + if (code.contains("limit")) code = code.substring(code.lastIndexOf("limit")).trim + else if (code.contains("LIMIT")) code = code.substring(code.lastIndexOf("LIMIT")).trim.toLowerCase + else return true + val hasLimit = code.matches("limit\\s+\\d+\\s*;?") + if (hasLimit) { + if (code.indexOf(";") > 0) code = code.substring(5, code.length - 1).trim + else code = code.substring(5).trim + val limitNum = code.toInt + if (limitNum > defaultLimit) throw new IllegalArgumentException("We at most allowed to limit " + defaultLimit + ", but your SQL has been over the max rows.") + } + !hasLimit + } +} -- Gitee From 2a8843a836d2ed854ed00f68ba20658ceec158b5 Mon Sep 17 00:00:00 2001 From: Yogafire Date: Mon, 18 May 2020 10:57:51 +0800 Subject: [PATCH 016/148] codes simplification for presto-engine --- .../src/main/resources/application.yml | 2 +- .../src/main/resources/linkis.properties | 2 +- .../configuration/PrestoConfiguration.scala | 2 +- .../PrestoSpringConfiguration.scala | 8 +-- .../entrance/exception/PrestoException.scala | 6 +-- .../entrance/execute/PrestoEntranceJob.scala | 39 --------------- .../execute/PrestoEntranceParser.scala | 38 -------------- .../PrestoEntranceEngineExecutor.scala | 14 +++--- .../PrestoEntranceEngineExecutorManager.scala | 49 ++++++++++--------- .../linkis/entrance/utils/SqlCodeParser.scala | 1 - 10 files changed, 40 insertions(+), 121 deletions(-) delete mode 100644 ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceJob.scala delete mode 100644 ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceParser.scala diff --git a/ujes/definedEngines/presto/entrance/src/main/resources/application.yml b/ujes/definedEngines/presto/entrance/src/main/resources/application.yml index f7d3ab28e..99e3aae08 100644 --- a/ujes/definedEngines/presto/entrance/src/main/resources/application.yml +++ b/ujes/definedEngines/presto/entrance/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 10010 + port: 9116 spring: application: name: prestoEntrance diff --git a/ujes/definedEngines/presto/entrance/src/main/resources/linkis.properties b/ujes/definedEngines/presto/entrance/src/main/resources/linkis.properties index 63a8fc9ee..a25918e5c 100644 --- a/ujes/definedEngines/presto/entrance/src/main/resources/linkis.properties +++ b/ujes/definedEngines/presto/entrance/src/main/resources/linkis.properties @@ -16,7 +16,7 @@ wds.linkis.server.restful.scan.packages=com.webank.wedatasphere.linkis.entrance.restful -wds.linkis.engine.application.name=prestoEntrance +wds.linkis.engine.application.name=prestoEngine wds.linkis.enginemanager.application.name=presto wds.linkis.query.application.name=cloud-publicservice diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoConfiguration.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoConfiguration.scala index 1674d8922..66d12e204 100644 --- a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoConfiguration.scala +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoConfiguration.scala @@ -19,7 +19,7 @@ object PrestoConfiguration { val PRESTO_PASSWORD = CommonVars("wds.linkis.presto.password", "") val PRESTO_CATALOG = CommonVars("wds.linkis.presto.catalog", "system") val PRESTO_SCHEMA = CommonVars("wds.linkis.presto.schema", "") - val PRESTO_RESOURCE = CommonVars("wds.linkis.presto.resource", "global") + val PRESTO_RESOURCE = CommonVars("wds.linkis.presto.source", "global") val PRESTO_RESULTS_MAX_CACHE = CommonVars("wds.linkis.presto.resultSet.cache.max", new ByteType("512k")) diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoSpringConfiguration.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoSpringConfiguration.scala index 274dbbdb2..03794d294 100644 --- a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoSpringConfiguration.scala +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoSpringConfiguration.scala @@ -3,7 +3,6 @@ package com.webank.wedatasphere.linkis.entrance.configuration import java.util.concurrent.TimeUnit import com.facebook.presto.client.SocketChannelSocketFactory -import com.webank.wedatasphere.linkis.entrance.EntranceParser import com.webank.wedatasphere.linkis.entrance.annotation._ import com.webank.wedatasphere.linkis.entrance.configuration.PrestoConfiguration._ import com.webank.wedatasphere.linkis.entrance.execute._ @@ -29,11 +28,6 @@ class PrestoSpringConfiguration { @Autowired entranceExecutorRulers: Array[EntranceExecutorRuler]): EntranceExecutorManager = new PrestoEntranceEngineExecutorManager(groupFactory, engineBuilder, engineRequester, engineSelector, engineManager, entranceExecutorRulers) - @EntranceParserBeanAnnotation - def generateEntranceParser(): EntranceParser = { - new PrestoEntranceParser() - } - @Bean def okHttpClient(): OkHttpClient = { val builder = new OkHttpClient.Builder @@ -45,7 +39,7 @@ class PrestoSpringConfiguration { chain.proceed(chain.request().newBuilder() .header("Authorization", Credentials.basic(PRESTO_USER_NAME.getValue, PRESTO_PASSWORD.getValue)).build()) }) - //FIXME build https config + //TODO build https config } builder.build } diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/PrestoException.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/PrestoException.scala index ef3744f3f..9e7f23d73 100644 --- a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/PrestoException.scala +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/PrestoException.scala @@ -1,8 +1,8 @@ package com.webank.wedatasphere.linkis.entrance.exception +import com.webank.wedatasphere.linkis.common.exception.ErrorException + /** * Created by yogafire on 2020/5/14 */ -class PrestoException(message: String) extends RuntimeException(message: String) { - -} +case class PrestoStateInvalidException(message: String) extends ErrorException(60011, message: String) diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceJob.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceJob.scala deleted file mode 100644 index 165045024..000000000 --- a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceJob.scala +++ /dev/null @@ -1,39 +0,0 @@ -package com.webank.wedatasphere.linkis.entrance.execute - -import com.webank.wedatasphere.linkis.common.log.LogUtils -import com.webank.wedatasphere.linkis.common.utils.Utils -import com.webank.wedatasphere.linkis.entrance.job.EntranceExecutionJob -import com.webank.wedatasphere.linkis.scheduler.executer.{CompletedExecuteResponse, ErrorExecuteResponse} -import com.webank.wedatasphere.linkis.scheduler.queue.SchedulerEventState.Running - -/** - * Created by yogafire on 2020/5/12 - */ -class PrestoEntranceJob extends EntranceExecutionJob { - - //FIXME 可以把这个方法抽象进入EntranceExecutionJob - //use executor execute presto code (使用executor执行jdbc脚本代码) - override def run(): Unit = { - if (!isScheduled) return - startTime = System.currentTimeMillis - Utils.tryAndWarn(transition(Running)) - - val executeResponse = Utils.tryCatch(getExecutor.execute(jobToExecuteRequest())) { - case t: InterruptedException => - warn(s"job $toString is interrupted by user!", t) - getLogListener.foreach(_.onLogUpdate(this, LogUtils.generateERROR(s"job $toString is interrupted by user! ${t.getMessage}"))) - ErrorExecuteResponse("job is interrupted by user!", t) - case t: Exception => - warn(s"execute job $toString failed!", t) - getLogListener.foreach(_.onLogUpdate(this, LogUtils.generateERROR(s"execute job $toString failed! ${t.getMessage}"))) - ErrorExecuteResponse("execute job failed!", t) - } - executeResponse match { - case r: CompletedExecuteResponse => - setResultSize(0) - transitionCompleted(r) - case _ => logger.error("not completed") - } - } - -} diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceParser.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceParser.scala deleted file mode 100644 index 092340d65..000000000 --- a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceParser.scala +++ /dev/null @@ -1,38 +0,0 @@ -package com.webank.wedatasphere.linkis.entrance.execute - -import java.util - -import com.webank.wedatasphere.linkis.common.utils.Logging -import com.webank.wedatasphere.linkis.entrance.parser.CommonEntranceParser -import com.webank.wedatasphere.linkis.protocol.query.RequestPersistTask -import com.webank.wedatasphere.linkis.protocol.task.Task -import com.webank.wedatasphere.linkis.scheduler.queue.Job - -/** - * Created by yogafire on 2020/5/14 - */ -class PrestoEntranceParser extends CommonEntranceParser with Logging { - - logger.info("Presto EntranceParser Registered") - - /** - * Parse a task into an executable job(将一个task解析成一个可执行的job) - * - * @param task - * @return - */ - override def parseToJob(task: Task): Job = { - val job = new PrestoEntranceJob - task match { - case requestPersistTask: RequestPersistTask => - job.setTask(task) - job.setUser(requestPersistTask.getUmUser) - job.setCreator(requestPersistTask.getRequestApplicationName) - job.setParams(requestPersistTask.getParams.asInstanceOf[util.Map[String, Any]]) - job.setEntranceListenerBus(getEntranceContext.getOrCreateEventListenerBus) - job.setListenerEventBus(null) - job.setProgress(0f) - } - job - } -} diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutor.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutor.scala index cb4cd468b..b54aee686 100644 --- a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutor.scala +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutor.scala @@ -4,11 +4,12 @@ import java.sql.SQLException import java.util.Objects import com.facebook.presto.client.{ClientSession, QueryStatusInfo, StatementClient, StatementClientFactory} +import com.webank.wedatasphere.linkis.common.ServiceInstance import com.webank.wedatasphere.linkis.common.io.FsPath import com.webank.wedatasphere.linkis.common.log.LogUtils import com.webank.wedatasphere.linkis.common.utils.{Logging, Utils} import com.webank.wedatasphere.linkis.entrance.configuration.PrestoConfiguration -import com.webank.wedatasphere.linkis.entrance.exception.PrestoException +import com.webank.wedatasphere.linkis.entrance.exception.PrestoStateInvalidException import com.webank.wedatasphere.linkis.entrance.execute.{EngineExecuteAsynReturn, EntranceEngine, EntranceJob, StorePathExecuteRequest} import com.webank.wedatasphere.linkis.entrance.persistence.EntranceResultSetEngine import com.webank.wedatasphere.linkis.entrance.utils.SqlCodeParser @@ -35,6 +36,8 @@ class PrestoEntranceEngineExecutor(job: EntranceJob, clientSession: ClientSessio //total line number private var totalCodeLineNumber = 0 + override def getModuleInstance: ServiceInstance = ServiceInstance("prestoEngine", "") + override def execute(executeRequest: ExecuteRequest): ExecuteResponse = { if (StringUtils.isEmpty(executeRequest.code)) { return IncompleteExecuteResponse("execute codes can not be empty)") @@ -56,8 +59,6 @@ class PrestoEntranceEngineExecutor(job: EntranceJob, clientSession: ClientSessio persistEngine.persistResultSet(job, aliasOutputExecuteResponse) case SuccessExecuteResponse() => info(s"sql execute successfully : $code") - case IncompleteExecuteResponse(_) => - error(s"sql execute failed : $code") case _ => warn("no matching exception") } @@ -81,6 +82,7 @@ class PrestoEntranceEngineExecutor(job: EntranceJob, clientSession: ClientSessio }) } totalCodeLineNumber = 0 + job.setResultSize(0) SuccessExecuteResponse() } @@ -102,7 +104,6 @@ class PrestoEntranceEngineExecutor(job: EntranceJob, clientSession: ClientSessio } } } - //FIXME 客户端异常校验 verifyServerError(statement) response } @@ -122,7 +123,6 @@ class PrestoEntranceEngineExecutor(job: EntranceJob, clientSession: ClientSessio val totalSplits = statement.getStats.getTotalSplits val runningSplits = statement.getStats.getRunningSplits val completedSplits = statement.getStats.getCompletedSplits - //FIXME presto有没有failed splits? Array[JobProgressInfo](JobProgressInfo(statement.currentStatusInfo().getId, totalSplits, runningSplits, 0, completedSplits)) } @@ -178,7 +178,7 @@ class PrestoEntranceEngineExecutor(job: EntranceJob, clientSession: ClientSessio AliasOutputExecuteResponse(alias, output) } - // check server error + // check presto error def verifyServerError(statement: StatementClient): Unit = { if (statement.isFinished) { val info: QueryStatusInfo = statement.finalStatusInfo() @@ -192,7 +192,7 @@ class PrestoEntranceEngineExecutor(job: EntranceJob, clientSession: ClientSessio throw new SQLException(message, error.getSqlState, error.getErrorCode, cause) } } else { - throw new PrestoException("Presto status error, execute is not finished.") + throw PrestoStateInvalidException("Presto status error. execute is not finished.") } } } diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutorManager.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutorManager.scala index b2c67a438..be20045df 100644 --- a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutorManager.scala +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutorManager.scala @@ -3,7 +3,7 @@ package com.webank.wedatasphere.linkis.entrance.executor import java.net.URI import java.util import java.util.concurrent.TimeUnit -import java.util.{Locale, Optional, TimeZone} +import java.util.{Collections, Locale, Optional, TimeZone} import com.facebook.presto.client.ClientSession import com.facebook.presto.spi.security.SelectedRole @@ -19,7 +19,7 @@ import okhttp3.OkHttpClient import org.apache.commons.lang.StringUtils import org.springframework.beans.factory.annotation.Autowired -import scala.collection.JavaConversions._ +import scala.collection.JavaConverters._ import scala.concurrent.duration.Duration @@ -52,33 +52,36 @@ class PrestoEntranceEngineExecutorManager(groupFactory: GroupFactory, override protected def createExecutor(schedulerEvent: SchedulerEvent): EntranceEngine = schedulerEvent match { case job: EntranceJob => - //FIXME 校验resourcemanager + //TODO check resourcemanager - //FIXME 之后替换为获取datasource - val runTimeParams = job.getParams.get("configuration").asInstanceOf[util.Map[String, Any]] + //TODO replace datasource config + val startupConf = job.getParams.get("configuration").asInstanceOf[util.Map[String, Any]] + .get("startup").asInstanceOf[util.Map[String, String]] + val runtimeConf = job.getParams.get("configuration").asInstanceOf[util.Map[String, Any]] .get("runtime").asInstanceOf[util.Map[String, String]] - val clientSession = getClientSession(runTimeParams) + val clientSession = getClientSession(startupConf, runtimeConf) new PrestoEntranceEngineExecutor(job, clientSession, okHttpClient) } - def getClientSession(config: util.Map[String, String]): ClientSession = { - val httpUri: URI = URI.create(getFinalConfig(config, PRESTO_URL)) - val user: String = PRESTO_USER_NAME.getValue - val clientInfo: String = getFinalConfig(config, PRESTO_RESOURCE) - val catalog: String = getFinalConfig(config, PRESTO_CATALOG) - val schema: String = getFinalConfig(config, PRESTO_SCHEMA) - val properties: java.util.Map[String, String] = config.filter(entry => StringUtils.isNotEmpty(entry._1) && entry._1.trim.startsWith("wds.linkis.presto")) + def getClientSession(startupConf: util.Map[String, String], runtimeConf: util.Map[String, String]): ClientSession = { + val httpUri: URI = URI.create(getFinalConfig(startupConf, PRESTO_URL)) + val user: String = getFinalConfig(startupConf, PRESTO_USER_NAME) + val source: String = getFinalConfig(startupConf, PRESTO_RESOURCE) + val catalog: String = getFinalConfig(startupConf, PRESTO_CATALOG) + val schema: String = getFinalConfig(startupConf, PRESTO_SCHEMA) + val properties: util.Map[String, String] = runtimeConf + + val clientInfo: String = "Linkis" val transactionId: String = null - val traceToken: java.util.Optional[String] = Optional.empty() - val source: String = "linkis" - val clientTags: java.util.Set[String] = Set[String]() + val traceToken: util.Optional[String] = Optional.empty() + val clientTags: util.Set[String] = Collections.emptySet() val timeZonId = TimeZone.getDefault.getID val locale: Locale = Locale.getDefault - val resourceEstimates: java.util.Map[String, String] = new util.HashMap[String, String](1, 1) - val preparedStatements: java.util.Map[String, String] = new util.HashMap[String, String](1, 1) - val roles: java.util.Map[String, SelectedRole] = new util.HashMap[String, SelectedRole](1, 1) - val extraCredentials: java.util.Map[String, String] = new util.HashMap[String, String](1, 1) + val resourceEstimates: util.Map[String, String] = Collections.emptyMap() + val preparedStatements: util.Map[String, String] = Collections.emptyMap() + val roles: java.util.Map[String, SelectedRole] = Collections.emptyMap() + val extraCredentials: util.Map[String, String] = Collections.emptyMap() //0不设限 val clientRequestTimeout: io.airlift.units.Duration = new io.airlift.units.Duration(0, TimeUnit.MILLISECONDS) @@ -86,10 +89,10 @@ class PrestoEntranceEngineExecutorManager(groupFactory: GroupFactory, resourceEstimates, properties, preparedStatements, roles, extraCredentials, transactionId, clientRequestTimeout) } - private def getFinalConfig(config: util.Map[String, String], key: CommonVars[String]): String = { - val value = config.get(key) + private def getFinalConfig(config: util.Map[String, String], vars: CommonVars[String]): String = { + val value = config.get(vars.key) if (StringUtils.isEmpty(value)) { - key.getValue + vars.getValue } else { value } diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/SqlCodeParser.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/SqlCodeParser.scala index 8a0610154..4024eb416 100644 --- a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/SqlCodeParser.scala +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/SqlCodeParser.scala @@ -8,7 +8,6 @@ import scala.collection.mutable.ArrayBuffer /** * Created by yogafire on 2020/5/11 */ -//FIXME 能不能把parser统一到common包里? object SqlCodeParser { val separator = ";" val defaultLimit: Int = PrestoConfiguration.PRESTO_DEFAULT_LIMIT.getValue -- Gitee From 8dccf88715c4d4c951b27fc200d1ed4edeecea83 Mon Sep 17 00:00:00 2001 From: Yogafire Date: Fri, 12 Jun 2020 18:09:29 +0800 Subject: [PATCH 017/148] update presto-entrance: add presto resource & fix some bugs --- db/linkis_dml.sql | 22 +- .../entrance/bin/start-presto-entrance.sh | 38 +++ .../entrance/bin/stop-presto-entrance.sh | 47 +++ ujes/definedEngines/presto/entrance/pom.xml | 40 +++ .../src/main/assembly/distribution.xml | 320 ++++++++++++++++++ .../configuration/PrestoConfiguration.scala | 13 +- .../PrestoSpringConfiguration.scala | 53 ++- .../entrance/exception/PrestoException.scala | 4 + .../execute/PrestoEntranceManager.scala | 77 +++++ .../PrestoEntranceEngineExecutor.scala | 106 ++++-- .../PrestoEntranceEngineExecutorManager.scala | 93 +++-- .../entrance/utils/PrestoResourceUtils.scala | 27 ++ 12 files changed, 756 insertions(+), 84 deletions(-) create mode 100644 ujes/definedEngines/presto/entrance/bin/start-presto-entrance.sh create mode 100644 ujes/definedEngines/presto/entrance/bin/stop-presto-entrance.sh create mode 100644 ujes/definedEngines/presto/entrance/src/main/assembly/distribution.xml create mode 100644 ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceManager.scala create mode 100644 ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/PrestoResourceUtils.scala diff --git a/db/linkis_dml.sql b/db/linkis_dml.sql index fb000d023..7701c89b2 100644 --- a/db/linkis_dml.sql +++ b/db/linkis_dml.sql @@ -5,6 +5,7 @@ INSERT INTO `linkis_application` (`id`, `name`, `chinese_name`, `description`) V INSERT INTO `linkis_application` (`id`, `name`, `chinese_name`, `description`) VALUES (0, 'storage', NULL, NULL); INSERT INTO `linkis_application` (`id`, `name`, `chinese_name`, `description`) VALUES (0, 'python', NULL, NULL); INSERT INTO `linkis_application` (`id`, `name`, `chinese_name`, `description`) VALUES (0, 'tidb', NULL, NULL); +INSERT INTO `linkis_application` (`id`, `name`, `chinese_name`, `description`) VALUES (0, 'presto', NULL, NULL); SELECT @application_id := id from linkis_application where name = '通用设置'; INSERT INTO `linkis_config_tree` (`id`, `parent_id`, `name`, `description`, `application_id`) VALUES (0, '0', '队列资源', NULL, @application_id); @@ -30,6 +31,9 @@ INSERT INTO `linkis_config_tree` (`id`, `parent_id`, `name`, `description`, `app INSERT INTO `linkis_config_tree` (`id`, `parent_id`, `name`, `description`, `application_id`) VALUES (0, '0', 'spark引擎设置', NULL, @application_id); INSERT INTO `linkis_config_tree` (`id`, `parent_id`, `name`, `description`, `application_id`) VALUES (0, '0', 'spark资源设置', NULL, @application_id); +SELECT @application_id := id from linkis_application where name = 'presto'; +INSERT INTO `linkis_config_tree` (`id`, `parent_id`, `name`, `description`, `application_id`) VALUES (0, '0', 'presto引擎设置', NULL, @application_id); +INSERT INTO `linkis_config_tree` (`id`, `parent_id`, `name`, `description`, `application_id`) VALUES (0, '0', 'presto资源设置', NULL, @application_id); SELECT @application_id := id from linkis_application where name = '通用设置'; @@ -74,6 +78,9 @@ INSERT INTO `linkis_config_key` (`id`, `key`, `description`, `name`, `applicatio INSERT INTO `linkis_config_key` (`id`, `key`, `description`, `name`, `application_id`, `default_value`, `validate_type`, `validate_range`, `is_hidden`, `is_advanced`, `level`) VALUES (0, 'spark.tispark.tidb.port', NULL, NULL, @application_id, '4000', 'None', NULL, '0', '0', '1'); INSERT INTO `linkis_config_key` (`id`, `key`, `description`, `name`, `application_id`, `default_value`, `validate_type`, `validate_range`, `is_hidden`, `is_advanced`, `level`) VALUES (0, 'spark.tispark.tidb.user', NULL, NULL, @application_id, 'root', 'None', NULL, '0', '0', '1'); +INSERT INTO `linkis_config_key` (`id`, `key`, `description`, `name`, `application_id`, `default_value`, `validate_type`, `validate_range`, `is_hidden`, `is_advanced`, `level`) VALUES (0, 'wds.linkis.instance', '范围:1-20,单位:个', 'presto引擎最大并发数', @application_id, '20', 'NumInterval', '[1,20]', '0', '0', '1'); +INSERT INTO `linkis_config_key` (`id`, `key`, `description`, `name`, `application_id`, `default_value`, `validate_type`, `validate_range`, `is_hidden`, `is_advanced`, `level`) VALUES (0, 'presto.session.query_max_total_memory', '取值范围:1-100,单位:GB/MB', 'presto单次任务最大使用内存', @application_id, '20G', 'Regex', '^([1-9]\\d{0,2}|1000)(GB|MB|gb|mb)$', '0', '0', '1'); +INSERT INTO `linkis_config_key` (`id`, `key`, `description`, `name`, `application_id`, `default_value`, `validate_type`, `validate_range`, `is_hidden`, `is_advanced`, `level`) VALUES (0, 'presto.session.query_max_run_time', '单位:s(秒)/m(分)', 'presto单次任务最大耗时', @application_id, '30m', 'Regex', '^([1-9]\\d{0,2}|1000)(m|s)$', '0', '0', '1'); #---------------------------------------全局设置------------------ @@ -233,4 +240,17 @@ SELECT @tree_id1:=t.id from linkis_config_tree t LEFT JOIN linkis_application a insert into `linkis_config_key_tree` VALUES(NULL,@key_id1,@tree_id1); insert into `linkis_config_key_tree` VALUES(NULL,@key_id2,@tree_id1); -insert into `linkis_config_key_tree` VALUES(NULL,@key_id3,@tree_id1); \ No newline at end of file +insert into `linkis_config_key_tree` VALUES(NULL,@key_id3,@tree_id1); + +#------------------------presto--------------------- +SELECT @key_id := k.id from linkis_config_key k left join linkis_application a on k.application_id = a.id WHERE k.`name` = 'presto引擎最大并发数' and a.name = 'IDE' ; +SELECT @tree_id := t.id from linkis_config_tree t left join linkis_application a on t.application_id = a.id WHERE t.`name` = 'presto引擎设置' and a.name = 'presto' ; +INSERT INTO `linkis_config_key_tree` (`id`, `key_id`, `tree_id`) VALUES (0, @key_id, @tree_id); + +SELECT @key_id := k.id from linkis_config_key k left join linkis_application a on k.application_id = a.id WHERE k.`key` = 'presto.session.query_max_total_memory' and a.name = 'IDE' ; +SELECT @tree_id := t.id from linkis_config_tree t left join linkis_application a on t.application_id = a.id WHERE t.`name` = 'presto资源设置' and a.name = 'presto' ; +INSERT INTO `linkis_config_key_tree` (`id`, `key_id`, `tree_id`) VALUES (0, @key_id, @tree_id); + +SELECT @key_id := k.id from linkis_config_key k left join linkis_application a on k.application_id = a.id WHERE k.`key` = 'presto.session.query_max_run_time' and a.name = 'IDE'; +SELECT @tree_id := t.id from linkis_config_tree t left join linkis_application a on t.application_id = a.id WHERE t.`name` = 'presto资源设置' and a.name = 'presto' ; +INSERT INTO `linkis_config_key_tree` (`id`, `key_id`, `tree_id`) VALUES (0, @key_id, @tree_id); \ No newline at end of file diff --git a/ujes/definedEngines/presto/entrance/bin/start-presto-entrance.sh b/ujes/definedEngines/presto/entrance/bin/start-presto-entrance.sh new file mode 100644 index 000000000..f68ee8c7b --- /dev/null +++ b/ujes/definedEngines/presto/entrance/bin/start-presto-entrance.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +cd `dirname $0` +cd .. +HOME=`pwd` + +export SERVER_PID=$HOME/bin/linkis.pid +export SERVER_LOG_PATH=$HOME/logs +export SERVER_CLASS=com.webank.wedatasphere.linkis.DataWorkCloudApplication + +if test -z "$SERVER_HEAP_SIZE" +then + export SERVER_HEAP_SIZE="1G" +fi + +if test -z "$SERVER_JAVA_OPTS" +then + export SERVER_JAVA_OPTS=" -Xmx$SERVER_HEAP_SIZE -XX:+UseG1GC -Xloggc:$HOME/logs/linkis-gc.log" +fi + +if [[ -f "${SERVER_PID}" ]]; then + pid=$(cat ${SERVER_PID}) + if kill -0 ${pid} >/dev/null 2>&1; then + echo "Server is already running." + exit 1 + fi +fi + +nohup java $SERVER_JAVA_OPTS -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS 2>&1 > $SERVER_LOG_PATH/linkis.out & +pid=$! +if [[ -z "${pid}" ]]; then + echo "server $SERVER_NAME start failed!" + exit 1 +else + echo "server $SERVER_NAME start succeeded!" + echo $pid > $SERVER_PID + sleep 1 +fi \ No newline at end of file diff --git a/ujes/definedEngines/presto/entrance/bin/stop-presto-entrance.sh b/ujes/definedEngines/presto/entrance/bin/stop-presto-entrance.sh new file mode 100644 index 000000000..f03288711 --- /dev/null +++ b/ujes/definedEngines/presto/entrance/bin/stop-presto-entrance.sh @@ -0,0 +1,47 @@ +#!/bin/bash + +cd `dirname $0` +cd .. +HOME=`pwd` + +export SERVER_PID=$HOME/bin/linkis.pid + +function wait_for_server_to_die() { + local pid + local count + pid=$1 + timeout=$2 + count=0 + timeoutTime=$(date "+%s") + let "timeoutTime+=$timeout" + currentTime=$(date "+%s") + forceKill=1 + + while [[ $currentTime -lt $timeoutTime ]]; do + $(kill ${pid} > /dev/null 2> /dev/null) + if kill -0 ${pid} > /dev/null 2>&1; then + sleep 3 + else + forceKill=0 + break + fi + currentTime=$(date "+%s") + done + + if [[ forceKill -ne 0 ]]; then + $(kill -9 ${pid} > /dev/null 2> /dev/null) + fi +} + +if [[ ! -f "${SERVER_PID}" ]]; then + echo "server $SERVER_NAME is not running" +else + pid=$(cat ${SERVER_PID}) + if [[ -z "${pid}" ]]; then + echo "server $SERVER_NAME is not running" + else + wait_for_server_to_die $pid 40 + $(rm -f ${SERVER_PID}) + echo "server $SERVER_NAME is stopped." + fi +fi \ No newline at end of file diff --git a/ujes/definedEngines/presto/entrance/pom.xml b/ujes/definedEngines/presto/entrance/pom.xml index 26c889725..e8dc5df49 100644 --- a/ujes/definedEngines/presto/entrance/pom.xml +++ b/ujes/definedEngines/presto/entrance/pom.xml @@ -17,6 +17,11 @@ presto-client ${presto.version} + + com.facebook.presto + presto-resource-group-managers + ${presto.version} + com.webank.wedatasphere.linkis linkis-ujes-entrance @@ -57,7 +62,42 @@ org.apache.maven.plugins maven-jar-plugin + + org.apache.maven.plugins + maven-assembly-plugin + 2.3 + false + + + make-assembly + package + + single + + + + src/main/assembly/distribution.xml + + + + + + false + linkis-ujes-presto-entrance + false + false + + src/main/assembly/distribution.xml + + + + + + ${basedir}/src/main/resources + + + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/ujes/definedEngines/presto/entrance/src/main/assembly/distribution.xml b/ujes/definedEngines/presto/entrance/src/main/assembly/distribution.xml new file mode 100644 index 000000000..c0e16842f --- /dev/null +++ b/ujes/definedEngines/presto/entrance/src/main/assembly/distribution.xml @@ -0,0 +1,320 @@ + + + + linkis-ujes-presto-entrance + + zip + + true + linkis-ujes-presto-entrance + + + + + + lib + true + true + false + true + true + + + + + + + + ${basedir}/../entrance/src/main/resources + + * + + 0777 + conf + unix + + + ${basedir}/bin + + * + + 0777 + bin + unix + + + . + + */** + + logs + + + + \ No newline at end of file diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoConfiguration.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoConfiguration.scala index 66d12e204..9d54e06a4 100644 --- a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoConfiguration.scala +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoConfiguration.scala @@ -9,20 +9,21 @@ import com.webank.wedatasphere.linkis.common.conf.{ByteType, CommonVars} */ object PrestoConfiguration { + val ENTRANCE_MAX_JOB_INSTANCE = CommonVars[Int]("wds.linkis.entrance.max.job.instance", 100) + val ENTRANCE_PROTECTED_JOB_INSTANCE = CommonVars[Int]("wds.linkis.entrance.protected.job.instance", 0) + val ENTRANCE_RESULTS_MAX_CACHE = CommonVars("wds.linkis.presto.resultSet.cache.max", new ByteType("512k")) + val PRESTO_HTTP_CONNECT_TIME_OUT = CommonVars[java.lang.Long]("wds.linkis.presto.http.connectTimeout", new lang.Long(60)) //单位秒 val PRESTO_HTTP_READ_TIME_OUT = CommonVars[java.lang.Long]("wds.linkis.presto.http.readTimeout", new lang.Long(60)) val PRESTO_DEFAULT_LIMIT = CommonVars("wds.linkis.presto.default.limit", 5000) val PRESTO_URL = CommonVars("wds.linkis.presto.url", "http://127.0.0.1:8080") + val PRESTO_RESOURCE_CONFIG_PATH = CommonVars("wds.linkis.presto.resource.config", ""); val PRESTO_USER_NAME = CommonVars("wds.linkis.presto.username", "default") val PRESTO_PASSWORD = CommonVars("wds.linkis.presto.password", "") val PRESTO_CATALOG = CommonVars("wds.linkis.presto.catalog", "system") val PRESTO_SCHEMA = CommonVars("wds.linkis.presto.schema", "") - val PRESTO_RESOURCE = CommonVars("wds.linkis.presto.source", "global") - val PRESTO_RESULTS_MAX_CACHE = CommonVars("wds.linkis.presto.resultSet.cache.max", new ByteType("512k")) - - - val PRESTO_ENGINE_REQUEST_MEMORY = CommonVars[Int]("query_max_total_memory", 4) //单位GB - val PRESTO_ENGINE_QUEUE_NAME = CommonVars[String]("resource_group", "global") + val PRESTO_SOURCE = CommonVars("wds.linkis.presto.source", "global") + val PRESTO_REQUEST_MEMORY = CommonVars("presto.session.query_max_total_memory", "8GB") } diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoSpringConfiguration.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoSpringConfiguration.scala index 03794d294..11a77191f 100644 --- a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoSpringConfiguration.scala +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoSpringConfiguration.scala @@ -3,12 +3,19 @@ package com.webank.wedatasphere.linkis.entrance.configuration import java.util.concurrent.TimeUnit import com.facebook.presto.client.SocketChannelSocketFactory +import com.webank.wedatasphere.linkis.common.utils.{Logging, ShutdownUtils, Utils} import com.webank.wedatasphere.linkis.entrance.annotation._ import com.webank.wedatasphere.linkis.entrance.configuration.PrestoConfiguration._ import com.webank.wedatasphere.linkis.entrance.execute._ import com.webank.wedatasphere.linkis.entrance.executor.PrestoEntranceEngineExecutorManager +import com.webank.wedatasphere.linkis.resourcemanager.client.ResourceManagerClient +import com.webank.wedatasphere.linkis.resourcemanager.domain.ModuleInfo +import com.webank.wedatasphere.linkis.resourcemanager.{InstanceAndPrestoResource, InstanceResource, ResourceRequestPolicy} +import com.webank.wedatasphere.linkis.rpc.Sender import com.webank.wedatasphere.linkis.scheduler.queue.GroupFactory -import okhttp3.{Credentials, Interceptor, OkHttpClient} +import com.webank.wedatasphere.linkis.scheduler.queue.parallelqueue.ParallelScheduler +import com.webank.wedatasphere.linkis.scheduler.{Scheduler, SchedulerContext} +import okhttp3.OkHttpClient import org.springframework.beans.factory.annotation.Autowired import org.springframework.context.annotation.{Bean, Configuration} @@ -17,7 +24,7 @@ import org.springframework.context.annotation.{Bean, Configuration} * Created by yogafire on 2020/5/13 */ @Configuration -class PrestoSpringConfiguration { +class PrestoSpringConfiguration extends Logging { @EntranceExecutorManagerBeanAnnotation def generateEntranceExecutorManager(@GroupFactoryBeanAnnotation.GroupFactoryAutowiredAnnotation groupFactory: GroupFactory, @@ -28,20 +35,40 @@ class PrestoSpringConfiguration { @Autowired entranceExecutorRulers: Array[EntranceExecutorRuler]): EntranceExecutorManager = new PrestoEntranceEngineExecutorManager(groupFactory, engineBuilder, engineRequester, engineSelector, engineManager, entranceExecutorRulers) + @SchedulerBeanAnnotation + def generateScheduler(@SchedulerContextBeanAnnotation.SchedulerContextAutowiredAnnotation schedulerContext: SchedulerContext): Scheduler = { + val scheduler = new ParallelScheduler(schedulerContext) + scheduler.init() + scheduler.start() + ShutdownUtils.addShutdownHook({ + info("scheduler shutdown...") + scheduler.shutdown() + }) + scheduler + } + + @Bean(Array("resources")) + def createResource(@Autowired rmClient: ResourceManagerClient): ModuleInfo = { + Utils.tryQuietly(rmClient.unregister()) + Utils.addShutdownHook({ + info("rmClient shutdown, unregister resource..") + rmClient.unregister() + }) + val totalResource = new InstanceAndPrestoResource(new InstanceResource(ENTRANCE_MAX_JOB_INSTANCE.getValue), null) + val protectResource = new InstanceAndPrestoResource(new InstanceResource(ENTRANCE_PROTECTED_JOB_INSTANCE.getValue), null) + info(s"create presto entrance resources. totalResource is $totalResource, protectResource is $protectResource") + ModuleInfo(Sender.getThisServiceInstance, totalResource, protectResource, ResourceRequestPolicy.InstanceAndPresto) + } + + @EngineManagerBeanAnnotation + def generateEngineManager(@Autowired resources: ModuleInfo) = new PrestoEntranceManager(resources) + @Bean def okHttpClient(): OkHttpClient = { - val builder = new OkHttpClient.Builder - builder.socketFactory(new SocketChannelSocketFactory) - .connectTimeout(PRESTO_HTTP_READ_TIME_OUT.getValue, TimeUnit.SECONDS) + new OkHttpClient.Builder().socketFactory(new SocketChannelSocketFactory) + .connectTimeout(PRESTO_HTTP_CONNECT_TIME_OUT.getValue, TimeUnit.SECONDS) .readTimeout(PRESTO_HTTP_READ_TIME_OUT.getValue, TimeUnit.SECONDS) - if (PRESTO_URL.getValue.toLowerCase.startsWith("https")) { - builder.addInterceptor((chain: Interceptor.Chain) => { - chain.proceed(chain.request().newBuilder() - .header("Authorization", Credentials.basic(PRESTO_USER_NAME.getValue, PRESTO_PASSWORD.getValue)).build()) - }) - //TODO build https config - } - builder.build + .build() } } diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/PrestoException.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/PrestoException.scala index 9e7f23d73..9baa60e5f 100644 --- a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/PrestoException.scala +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/PrestoException.scala @@ -6,3 +6,7 @@ import com.webank.wedatasphere.linkis.common.exception.ErrorException * Created by yogafire on 2020/5/14 */ case class PrestoStateInvalidException(message: String) extends ErrorException(60011, message: String) + +case class PrestoClientException(message: String) extends ErrorException(60012, message: String) + +case class PrestoSourceGroupException(message: String) extends ErrorException(60013, message: String) diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceManager.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceManager.scala new file mode 100644 index 000000000..3a8e27d09 --- /dev/null +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceManager.scala @@ -0,0 +1,77 @@ +package com.webank.wedatasphere.linkis.entrance.execute + +import java.util + +import com.webank.wedatasphere.linkis.common.utils.Logging +import com.webank.wedatasphere.linkis.entrance.event.EntranceEvent +import com.webank.wedatasphere.linkis.resourcemanager.domain.ModuleInfo +import com.webank.wedatasphere.linkis.resourcemanager.service.annotation.{EnableResourceManager, RegisterResource} +import com.webank.wedatasphere.linkis.scheduler.executer.ExecutorState.ExecutorState +import com.webank.wedatasphere.linkis.scheduler.executer.{Executor, ExecutorState} +import org.apache.commons.io.IOUtils + +import scala.collection.JavaConverters._ + +/** + * Created by yogafire on 2020/5/19 + */ +@EnableResourceManager +class PrestoEntranceManager(resource: ModuleInfo) extends EngineManager with Logging { + + @RegisterResource + def registerResources(): ModuleInfo = resource + + private val idToEngines = new util.HashMap[Long, EntranceEngine] + + /** + * The user initializes the operation. When the entance is started for the first time, all the engines are obtained through this method, and the initialization operation is completed. + * 用户初始化操作,第一次启动entrance时,将通过该方法,拿到所有的engine,完成初始化操作 + */ + override def readAliveEngines(): Unit = {} + + override def get(id: Long): EntranceEngine = idToEngines.get(id) + + override def get(instance: String): Option[EntranceEngine] = ??? + + override def listEngines(op: EntranceEngine => Boolean): Array[EntranceEngine] = + idToEngines.values().asScala.filter(e => op(e)).toArray + + override def addNotExistsEngines(engine: EntranceEngine*): Unit = + engine.foreach { e => + if (!idToEngines.containsKey(e.getId)) idToEngines synchronized { + if (!idToEngines.containsKey(e.getId)) { + idToEngines.put(e.getId, e) + info(toString + ":add a new executor => " + e) + } + } + } + + override def delete(id: Long): Unit = if (idToEngines.containsKey(id)) idToEngines synchronized { + if (idToEngines.containsKey(id)) { + val engine = idToEngines.remove(id) + IOUtils.closeQuietly(engine) + info(s"deleted executor $engine.") + } + } + + override def onExecutorCreated(executor: Executor): Unit = executor match { + case engine: EntranceEngine => addNotExistsEngines(engine) + } + + override def onExecutorCompleted(executor: Executor, message: String): Unit = executor match { + case engine: EntranceEngine => delete(engine.getId) + } + + override def onExecutorStateChanged(executor: Executor, fromState: ExecutorState, toState: ExecutorState): Unit = executor match { + case _: EntranceEngine => + toState match { + case state if ExecutorState.isCompleted(state) => + delete(executor.getId) + case _ => + } + } + + override def onEvent(event: EntranceEvent): Unit = {} + + override def onEventError(event: EntranceEvent, t: Throwable): Unit = error(s"deal event") +} diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutor.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutor.scala index b54aee686..dcdea341a 100644 --- a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutor.scala +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutor.scala @@ -9,34 +9,43 @@ import com.webank.wedatasphere.linkis.common.io.FsPath import com.webank.wedatasphere.linkis.common.log.LogUtils import com.webank.wedatasphere.linkis.common.utils.{Logging, Utils} import com.webank.wedatasphere.linkis.entrance.configuration.PrestoConfiguration -import com.webank.wedatasphere.linkis.entrance.exception.PrestoStateInvalidException +import com.webank.wedatasphere.linkis.entrance.exception.{PrestoClientException, PrestoStateInvalidException} import com.webank.wedatasphere.linkis.entrance.execute.{EngineExecuteAsynReturn, EntranceEngine, EntranceJob, StorePathExecuteRequest} import com.webank.wedatasphere.linkis.entrance.persistence.EntranceResultSetEngine import com.webank.wedatasphere.linkis.entrance.utils.SqlCodeParser import com.webank.wedatasphere.linkis.protocol.engine.{JobProgressInfo, RequestTask} import com.webank.wedatasphere.linkis.scheduler.executer._ +import com.webank.wedatasphere.linkis.scheduler.queue.SchedulerEventState import com.webank.wedatasphere.linkis.storage.domain.Column import com.webank.wedatasphere.linkis.storage.resultset.table.{TableMetaData, TableRecord} import com.webank.wedatasphere.linkis.storage.resultset.{ResultSetFactory, ResultSetWriter} import okhttp3.OkHttpClient import org.apache.commons.io.IOUtils import org.apache.commons.lang.StringUtils +import org.apache.commons.lang.exception.ExceptionUtils import scala.collection.JavaConverters._ +import scala.collection.mutable /** * Created by yogafire on 2020/4/30 */ -class PrestoEntranceEngineExecutor(job: EntranceJob, clientSession: ClientSession, okHttpClient: OkHttpClient) extends EntranceEngine(id = 0) with SingleTaskOperateSupport with SingleTaskInfoSupport with Logging { +class PrestoEntranceEngineExecutor(id: Long, job: EntranceJob, clientSession: ClientSession, okHttpClient: OkHttpClient, releaseResource: () => Unit) extends EntranceEngine(id = id) with SingleTaskOperateSupport with SingleTaskInfoSupport with Logging { private var statement: StatementClient = _ private val persistEngine = new EntranceResultSetEngine() //execute line number,as alias and progress line private var codeLine = 0 //total line number private var totalCodeLineNumber = 0 + private val jobProgressInfos = mutable.ListBuffer[JobProgressInfo]() + private val serviceInstance: ServiceInstance = ServiceInstance("prestoEngine", "") - override def getModuleInstance: ServiceInstance = ServiceInstance("prestoEngine", "") + override def getModuleInstance: ServiceInstance = serviceInstance + + override def setServiceInstance(applicationName: String, instance: String): Unit = {} + + override def toString: String = s"${serviceInstance.getApplicationName}Entrance($getId, $getUser, $getCreator, ${serviceInstance.getInstance})" override def execute(executeRequest: ExecuteRequest): ExecuteResponse = { if (StringUtils.isEmpty(executeRequest.code)) { @@ -50,10 +59,10 @@ class PrestoEntranceEngineExecutor(job: EntranceJob, clientSession: ClientSessio val codes = SqlCodeParser.parse(executeRequest.code) if (!codes.isEmpty) { totalCodeLineNumber = codes.length - codeLine = 0 + transition(ExecutorState.Busy) codes.foreach(code => { try { - val executeRes = executeLine(code, storePath, codeLine.toString) + val executeRes = executeLine(code, storePath, s"_$codeLine") executeRes match { case aliasOutputExecuteResponse: AliasOutputExecuteResponse => persistEngine.persistResultSet(job, aliasOutputExecuteResponse) @@ -62,27 +71,17 @@ class PrestoEntranceEngineExecutor(job: EntranceJob, clientSession: ClientSessio case _ => warn("no matching exception") } - codeLine = codeLine + 1 + codeLine += 1 } catch { - case e: Exception => - totalCodeLineNumber = 0 - error("Presto Exception", e) - job.getLogListener.foreach(_.onLogUpdate(job, LogUtils.generateERROR(e.getMessage))) - return ErrorExecuteResponse("Presto execute exception", e) case t: Throwable => - totalCodeLineNumber = 0 error("Presto execute failed", t) - job.getLogListener.foreach(_.onLogUpdate(job, LogUtils.generateERROR(t.getMessage))) + job.getLogListener.foreach(_.onLogUpdate(job, LogUtils.generateERROR(ExceptionUtils.getFullStackTrace(t)))) + close() return ErrorExecuteResponse("Presto execute failed", t) - } finally { - Utils.tryQuietly({ - statement.close() - }) } }) } - totalCodeLineNumber = 0 - job.setResultSize(0) + close() SuccessExecuteResponse() } @@ -96,14 +95,9 @@ class PrestoEntranceEngineExecutor(job: EntranceJob, clientSession: ClientSessio var response: ExecuteResponse = SuccessExecuteResponse() if (statement.isRunning || (statement.isFinished && statement.finalStatusInfo().getError == null)) { - if (statement.currentStatusInfo().getUpdateType == null) { - response = queryOutput(statement, storePath, alias) - } else { - while (statement.isRunning) { - statement.advance() - } - } + response = queryOutput(statement, storePath, alias) } + verifyServerError(statement) response } @@ -115,38 +109,70 @@ class PrestoEntranceEngineExecutor(job: EntranceJob, clientSession: ClientSessio override def close(): Unit = { statement.close() + totalCodeLineNumber = 0 + transition(ExecutorState.Dead) + job.setResultSize(0) + releaseResource.apply() } - override def progress(): Float = (codeLine.toFloat / totalCodeLineNumber) * statement.getStats.getProgressPercentage.getAsDouble.toFloat + def shutdown(): Unit = { + close() + job.afterStateChanged(job.getState, SchedulerEventState.Cancelled) + } + + override def progress(): Float = { + Utils.tryCatch({ + val progress = (codeLine.toFloat + (statement.getStats.getProgressPercentage.orElse(0) * 0.01f).toFloat) / totalCodeLineNumber + return progress + }) { + t: Throwable => warn(s"get presto progress error. ${t.getMessage}") + } + 0 + } override def getProgressInfo: Array[JobProgressInfo] = { - val totalSplits = statement.getStats.getTotalSplits - val runningSplits = statement.getStats.getRunningSplits - val completedSplits = statement.getStats.getCompletedSplits - Array[JobProgressInfo](JobProgressInfo(statement.currentStatusInfo().getId, totalSplits, runningSplits, 0, completedSplits)) + Utils.tryCatch({ + var statusInfo: QueryStatusInfo = null + if (statement.isFinished) { + statusInfo = statement.finalStatusInfo() + } else { + statusInfo = statement.currentStatusInfo() + } + val progressInfo = JobProgressInfo(statusInfo.getId, statement.getStats.getTotalSplits, statement.getStats.getRunningSplits, 0, statement.getStats.getCompletedSplits) + if (jobProgressInfos.size > codeLine) { + jobProgressInfos(codeLine) = progressInfo + } else { + jobProgressInfos += progressInfo + } + }) { + t: Throwable => warn(s"update presto progressInfo error. ${t.getMessage}") + } + jobProgressInfos.toArray } override protected def callExecute(request: RequestTask): EngineExecuteAsynReturn = ??? - override def log(): String = "Presto entrance is running" + override def log(): String = "" override def pause(): Boolean = ??? override def resume(): Boolean = ??? def initialStatusUpdates(statement: StatementClient): Unit = { - while (statement.isRunning && statement.currentData().getData == null) { + while (statement.isRunning + && (statement.currentData().getData == null || statement.currentStatusInfo().getUpdateType != null)) { + job.getProgressListener.foreach(_.onProgressUpdate(job, progress(), getProgressInfo)) statement.advance() } } - def queryOutput(statement: StatementClient, storePath: String, alias: String): AliasOutputExecuteResponse = { + private def queryOutput(statement: StatementClient, storePath: String, alias: String): AliasOutputExecuteResponse = { var columnCount = 0 var rows = 0 val resultSet = ResultSetFactory.getInstance.getResultSetByType(ResultSetFactory.TABLE_TYPE) val resultSetPath = resultSet.getResultSetPath(new FsPath(storePath), alias) - val resultSetWriter = ResultSetWriter.getResultSetWriter(resultSet, PrestoConfiguration.PRESTO_RESULTS_MAX_CACHE.getValue.toLong, resultSetPath, job.asInstanceOf[EntranceJob].getUser) + val resultSetWriter = ResultSetWriter.getResultSetWriter(resultSet, PrestoConfiguration.ENTRANCE_RESULTS_MAX_CACHE.getValue.toLong, resultSetPath, job.getUser) Utils.tryFinally({ var results: QueryStatusInfo = null if (statement.isRunning) { @@ -168,6 +194,7 @@ class PrestoEntranceEngineExecutor(job: EntranceJob, clientSession: ClientSessio resultSetWriter.addRecord(new TableRecord(rowArray.toArray)) rows += 1 } + job.getProgressListener.foreach(_.onProgressUpdate(job, progress(), getProgressInfo)) statement.advance() } })(IOUtils.closeQuietly(resultSetWriter)) @@ -179,7 +206,8 @@ class PrestoEntranceEngineExecutor(job: EntranceJob, clientSession: ClientSessio } // check presto error - def verifyServerError(statement: StatementClient): Unit = { + private def verifyServerError(statement: StatementClient): Unit = { + job.getProgressListener.foreach(_.onProgressUpdate(job, progress(), getProgressInfo)) if (statement.isFinished) { val info: QueryStatusInfo = statement.finalStatusInfo() if (info.getError != null) { @@ -191,8 +219,12 @@ class PrestoEntranceEngineExecutor(job: EntranceJob, clientSession: ClientSessio } throw new SQLException(message, error.getSqlState, error.getErrorCode, cause) } + } else if (statement.isClientAborted) { + warn(s"Presto statement is killed by ${job.getUser}") + } else if (statement.isClientError) { + throw PrestoClientException("Presto client error.") } else { - throw PrestoStateInvalidException("Presto status error. execute is not finished.") + throw PrestoStateInvalidException("Presto status error. Statement is not finished.") } } } diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutorManager.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutorManager.scala index be20045df..a87039bd6 100644 --- a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutorManager.scala +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutorManager.scala @@ -3,20 +3,31 @@ package com.webank.wedatasphere.linkis.entrance.executor import java.net.URI import java.util import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicLong import java.util.{Collections, Locale, Optional, TimeZone} import com.facebook.presto.client.ClientSession +import com.facebook.presto.spi.resourceGroups.SelectionCriteria import com.facebook.presto.spi.security.SelectedRole -import com.webank.wedatasphere.linkis.common.conf.CommonVars +import com.facebook.presto.spi.session.ResourceEstimates +import com.webank.wedatasphere.linkis.common.conf.ByteType +import com.webank.wedatasphere.linkis.common.log.LogUtils import com.webank.wedatasphere.linkis.common.utils.Logging +import com.webank.wedatasphere.linkis.entrance.conf.EntranceConfiguration import com.webank.wedatasphere.linkis.entrance.configuration.PrestoConfiguration._ import com.webank.wedatasphere.linkis.entrance.execute._ import com.webank.wedatasphere.linkis.entrance.execute.impl.EntranceExecutorManagerImpl -import com.webank.wedatasphere.linkis.scheduler.executer.Executor +import com.webank.wedatasphere.linkis.entrance.utils.PrestoResourceUtils +import com.webank.wedatasphere.linkis.protocol.config.{RequestQueryAppConfigWithGlobal, ResponseQueryConfig} +import com.webank.wedatasphere.linkis.protocol.utils.TaskUtils +import com.webank.wedatasphere.linkis.resourcemanager._ +import com.webank.wedatasphere.linkis.resourcemanager.client.ResourceManagerClient +import com.webank.wedatasphere.linkis.resourcemanager.exception.RMWarnException +import com.webank.wedatasphere.linkis.rpc.Sender +import com.webank.wedatasphere.linkis.scheduler.executer.{Executor, ExecutorState} import com.webank.wedatasphere.linkis.scheduler.listener.ExecutorListener import com.webank.wedatasphere.linkis.scheduler.queue.{GroupFactory, SchedulerEvent} import okhttp3.OkHttpClient -import org.apache.commons.lang.StringUtils import org.springframework.beans.factory.annotation.Autowired import scala.collection.JavaConverters._ @@ -38,11 +49,18 @@ class PrestoEntranceEngineExecutorManager(groupFactory: GroupFactory, @Autowired private var okHttpClient: OkHttpClient = _ + @Autowired + private var rmClient: ResourceManagerClient = _ + + private val idGenerator = new AtomicLong(0) override def setExecutorListener(executorListener: ExecutorListener): Unit = super.setExecutorListener(executorListener) override def askExecutor(schedulerEvent: SchedulerEvent): Option[Executor] = schedulerEvent match { - case job: EntranceJob => Some(createExecutor(job)) + case job: EntranceJob => + val executor = createExecutor(job) + initialEntranceEngine(executor) + Some(executor) case _ => None } @@ -52,25 +70,49 @@ class PrestoEntranceEngineExecutorManager(groupFactory: GroupFactory, override protected def createExecutor(schedulerEvent: SchedulerEvent): EntranceEngine = schedulerEvent match { case job: EntranceJob => - //TODO check resourcemanager - - //TODO replace datasource config - val startupConf = job.getParams.get("configuration").asInstanceOf[util.Map[String, Any]] - .get("startup").asInstanceOf[util.Map[String, String]] - val runtimeConf = job.getParams.get("configuration").asInstanceOf[util.Map[String, Any]] - .get("runtime").asInstanceOf[util.Map[String, String]] - val clientSession = getClientSession(startupConf, runtimeConf) - new PrestoEntranceEngineExecutor(job, clientSession, okHttpClient) + //FIXME replace datasource config + val configMap = getUserConfig(job) + + val clientSession = getClientSession(job.getUser, configMap) + + val criteria = new SelectionCriteria(true, job.getUser, Optional.of(clientSession.getSource), Collections.emptySet(), new ResourceEstimates(Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty()), Optional.empty()) + val memory: Long = new ByteType(configMap.asScala.filter(config => PRESTO_REQUEST_MEMORY.key.equals(config._1)).values.head).toLong + val groupName = PrestoResourceUtils.getGroupName(criteria, PRESTO_RESOURCE_CONFIG_PATH.getValue(configMap)) + val requestResource = new InstanceAndPrestoResource(new InstanceResource(1), new PrestoResource(memory, 1, groupName, PRESTO_URL.getValue)) + rmClient.requestResource(job.getUser, job.getCreator, requestResource) match { + case NotEnoughResource(reason) => throw new RMWarnException(40001, LogUtils.generateWarn(reason)) + case AvailableResource(ticketId) => + rmClient.resourceInited(UserResultResource(ticketId, job.getUser), requestResource) + new PrestoEntranceEngineExecutor(idGenerator.getAndIncrement(), job, clientSession, okHttpClient, () => rmClient.resourceReleased(UserResultResource(ticketId, job.getUser))) + } } - def getClientSession(startupConf: util.Map[String, String], runtimeConf: util.Map[String, String]): ClientSession = { - val httpUri: URI = URI.create(getFinalConfig(startupConf, PRESTO_URL)) - val user: String = getFinalConfig(startupConf, PRESTO_USER_NAME) - val source: String = getFinalConfig(startupConf, PRESTO_RESOURCE) - val catalog: String = getFinalConfig(startupConf, PRESTO_CATALOG) - val schema: String = getFinalConfig(startupConf, PRESTO_SCHEMA) + private def getUserConfig(job: EntranceJob): util.Map[String, String] = { + val configMap = new util.HashMap[String, String]() + val runtimeMap: util.Map[String, Any] = TaskUtils.getRuntimeMap(job.getParams) + val startupMap: util.Map[String, Any] = TaskUtils.getStartupMap(job.getParams) + startupMap.forEach((k, v) => if (v != null) configMap.put(k, v.toString)) + runtimeMap.forEach((k, v) => if (v != null) configMap.put(k, v.toString)) + + val sender = Sender.getSender(EntranceConfiguration.CLOUD_CONSOLE_CONFIGURATION_SPRING_APPLICATION_NAME.getValue) + val response = sender.ask(RequestQueryAppConfigWithGlobal(job.getUser, job.getCreator, "presto", isMerge = true)).asInstanceOf[ResponseQueryConfig] + val appConfig = response.getKeyAndValue + if (appConfig != null) { + appConfig.forEach((k, v) => if (!configMap.containsKey(k)) configMap.put(k, v)) + } + configMap + } + + private def getClientSession(user: String, configMap: util.Map[String, String]): ClientSession = { + val httpUri: URI = URI.create(PRESTO_URL.getValue(configMap)) + val source: String = PRESTO_SOURCE.getValue(configMap) + val catalog: String = PRESTO_CATALOG.getValue(configMap) + val schema: String = PRESTO_SCHEMA.getValue(configMap) - val properties: util.Map[String, String] = runtimeConf + val properties: util.Map[String, String] = configMap.asScala + .filter(tuple => tuple._1.startsWith("presto.session.")) + .map(tuple => (tuple._1.substring("presto.session.".length), tuple._2)) + .asJava val clientInfo: String = "Linkis" val transactionId: String = null @@ -89,13 +131,10 @@ class PrestoEntranceEngineExecutorManager(groupFactory: GroupFactory, resourceEstimates, properties, preparedStatements, roles, extraCredentials, transactionId, clientRequestTimeout) } - private def getFinalConfig(config: util.Map[String, String], vars: CommonVars[String]): String = { - val value = config.get(vars.key) - if (StringUtils.isEmpty(value)) { - vars.getValue - } else { - value - } + override def shutdown(): Unit = { + super.shutdown() + engineManager.listEngines(engine => ExecutorState.isAvailable(engine.state)) + .foreach(engine => engine.asInstanceOf[PrestoEntranceEngineExecutor].shutdown()) } } diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/PrestoResourceUtils.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/PrestoResourceUtils.scala new file mode 100644 index 000000000..75b826c46 --- /dev/null +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/PrestoResourceUtils.scala @@ -0,0 +1,27 @@ +package com.webank.wedatasphere.linkis.entrance.utils + +import com.facebook.presto.resourceGroups.{FileResourceGroupConfig, FileResourceGroupConfigurationManager} +import com.facebook.presto.spi.resourceGroups.SelectionCriteria +import com.webank.wedatasphere.linkis.entrance.exception.PrestoSourceGroupException + +import scala.collection.mutable + +/** + * Created by yogafire on 2020/5/21 + */ +object PrestoResourceUtils { + + private val groupManagerMap = mutable.Map[String, FileResourceGroupConfigurationManager]() + + def getGroupName(criteria: SelectionCriteria, filePath: String): String = { + //FIXME add LRU cache; update cache + if (!groupManagerMap.contains(filePath)) { + val config = new FileResourceGroupConfig() + config.setConfigFile(filePath) + groupManagerMap += (filePath -> new FileResourceGroupConfigurationManager((_, _) => {}, config)) + } + groupManagerMap(filePath).`match`(criteria) + .orElseThrow(() => PrestoSourceGroupException("Presto resource group not found.")) + .getResourceGroupId.toString + } +} -- Gitee From 4ce82540d40f47a24643bf03cfae3dfc40a5f00c Mon Sep 17 00:00:00 2001 From: Yogafire Date: Fri, 12 Jun 2020 18:26:49 +0800 Subject: [PATCH 018/148] update linkis-ujes-entrance: interceptor match presto/es & fix some bugs --- .../entrance/persistence/QueryPersistenceManager.java | 3 +++ .../linkis/entrance/restful/EntranceRestfulApi.java | 6 +++--- .../entrance/interceptor/impl/CommentInterceptor.scala | 5 ++--- .../entrance/interceptor/impl/CustomVariableUtils.scala | 4 ++-- .../entrance/interceptor/impl/SQLCodeCheckInterceptor.scala | 2 +- .../interceptor/impl/SQLLimitEntranceInterceptor.scala | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/persistence/QueryPersistenceManager.java b/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/persistence/QueryPersistenceManager.java index 9a89ff86d..f6059c75c 100644 --- a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/persistence/QueryPersistenceManager.java +++ b/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/persistence/QueryPersistenceManager.java @@ -130,6 +130,9 @@ public class QueryPersistenceManager extends PersistenceManager{ @Override public void onProgressUpdate(Job job, float progress, JobProgressInfo[] progressInfo) { job.setProgress(progress); + if (job instanceof EntranceJob){ + ((EntranceJob) job).setProgressInfo(progressInfo); + } updateJobStatus(job); } diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/restful/EntranceRestfulApi.java b/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/restful/EntranceRestfulApi.java index 2a23bb542..40d40a01c 100644 --- a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/restful/EntranceRestfulApi.java +++ b/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/restful/EntranceRestfulApi.java @@ -139,20 +139,20 @@ public class EntranceRestfulApi implements EntranceRestfulRemote { Option job = entranceServer.getJob(realId); if (job.isDefined()){ JobProgressInfo[] jobProgressInfos = ((EntranceJob)job.get()).getProgressInfo(); - Map map = new HashMap<>(); if (jobProgressInfos == null){ message = Message.error("Can not get the corresponding progress information, it may be that the corresponding progress information has not been generated(不能获取相应的进度信息,可能是相应的进度信息还未生成)"); message.setMethod("/api/entrance/" + id + "/progress"); }else{ + List> list = new ArrayList<>(); for(JobProgressInfo jobProgressInfo : jobProgressInfos){ + Map map = new HashMap<>(); map.put("id", jobProgressInfo.id()); map.put("succeedTasks", jobProgressInfo.succeedTasks()); map.put("failedTasks", jobProgressInfo.failedTasks()); map.put("runningTasks", jobProgressInfo.runningTasks()); map.put("totalTasks", jobProgressInfo.totalTasks()); + list.add(map); } - List> list = new ArrayList<>(); - list.add(map); message = Message.ok(); message.setMethod("/api/entrance/" + id + "/progress"); message.data("progress",job.get().getProgress()).data("execID", id).data("progressInfo", list); diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CommentInterceptor.scala b/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CommentInterceptor.scala index 0fa8c97cb..1db9502f3 100644 --- a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CommentInterceptor.scala +++ b/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CommentInterceptor.scala @@ -44,10 +44,9 @@ class CommentInterceptor extends EntranceInterceptor { */ override def apply(task: Task, logAppender: lang.StringBuilder): Task = task match { case requestPersistTask:RequestPersistTask => requestPersistTask.getRunType match { - case "sql" | "hql" => requestPersistTask.setExecutionCode(SQLCommentHelper.dealComment(requestPersistTask.getExecutionCode)) + case "sql" | "hql" | "psql" | "essql" => requestPersistTask.setExecutionCode(SQLCommentHelper.dealComment(requestPersistTask.getExecutionCode)) case "python" | "py" => requestPersistTask.setExecutionCode(PythonCommentHelper.dealComment(requestPersistTask.getExecutionCode)) - case "scala" | "java" => requestPersistTask.setExecutionCode(ScalaCommentHelper.dealComment(requestPersistTask.getExecutionCode)) - case "sh" | "shell" => + case "scala" | "java" | "esjson" => requestPersistTask.setExecutionCode(ScalaCommentHelper.dealComment(requestPersistTask.getExecutionCode)) case _ => requestPersistTask.setExecutionCode(SQLCommentHelper.dealComment(requestPersistTask.getExecutionCode)) } requestPersistTask diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CustomVariableUtils.scala b/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CustomVariableUtils.scala index bfeb67c4c..d65f729e0 100644 --- a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CustomVariableUtils.scala +++ b/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CustomVariableUtils.scala @@ -76,10 +76,10 @@ object CustomVariableUtils extends Logging { val umUser:String = task.asInstanceOf[RequestPersistTask].getUmUser var codeType = SQL_TYPE runType match { - case "hql" | "sql" | "jdbc" | "hive" => codeType = SQL_TYPE + case "hql" | "sql" | "jdbc" | "hive" | "psql" | "essql" => codeType = SQL_TYPE case "python" => codeType = PY_TYPE case "java" => codeType = JAVA_TYPE - case "scala" => codeType = SCALA_TYPE + case "scala" | "esjson" => codeType = SCALA_TYPE case _ => return (false, code) } diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/SQLCodeCheckInterceptor.scala b/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/SQLCodeCheckInterceptor.scala index 1a6465398..e087b0574 100644 --- a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/SQLCodeCheckInterceptor.scala +++ b/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/SQLCodeCheckInterceptor.scala @@ -30,7 +30,7 @@ class SQLCodeCheckInterceptor extends EntranceInterceptor{ override def apply(task: Task, logAppender: java.lang.StringBuilder): Task = task match { case requestPersistTask:RequestPersistTask => requestPersistTask.getEngineType.toLowerCase() match { - case "hql" | "sql" | "jdbc"|"hive" => + case "hql" | "sql" | "jdbc"|"hive" | "psql" | "essql" => val sb:StringBuilder = new StringBuilder val isAuth:Boolean = SQLExplain.authPass(requestPersistTask.getExecutionCode, sb) if (!isAuth) { diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/SQLLimitEntranceInterceptor.scala b/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/SQLLimitEntranceInterceptor.scala index 3b6076d19..d43f076d3 100644 --- a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/SQLLimitEntranceInterceptor.scala +++ b/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/SQLLimitEntranceInterceptor.scala @@ -29,7 +29,7 @@ class SQLLimitEntranceInterceptor extends EntranceInterceptor { override def apply(task: Task, logAppender: java.lang.StringBuilder): Task = { task match { case requestPersistTask:RequestPersistTask => requestPersistTask.getEngineType.toLowerCase() match { - case "hql" | "sql" | "jdbc"|"hive" => val executionCode = requestPersistTask.getExecutionCode + case "hql" | "sql" | "jdbc"|"hive" | "psql" | "essql" => val executionCode = requestPersistTask.getExecutionCode SQLExplain.dealSQLLimit(executionCode, requestPersistTask, logAppender) case _ => } -- Gitee From 88082d966cfd0c90bcc5d776d66db009ac776d8b Mon Sep 17 00:00:00 2001 From: Yogafire Date: Mon, 15 Jun 2020 09:47:08 +0800 Subject: [PATCH 019/148] update resource-manager: add presto resource --- .../linkis/resourcemanager/Resource.scala | 222 +++++++++++++++++- .../ResourceRequestPolicy.scala | 2 +- .../utils/RMConfiguration.scala | 4 + .../RequestResourceService.scala | 69 +++++- .../metadata/DefaultUserMetaData.scala | 3 + .../service/rm/DefaultResourceManager.scala | 7 +- .../utils/PrestoResourceUtil.scala | 36 +++ 7 files changed, 336 insertions(+), 7 deletions(-) create mode 100644 resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/PrestoResourceUtil.scala diff --git a/resourceManager/resourcemanagercommon/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/Resource.scala b/resourceManager/resourcemanagercommon/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/Resource.scala index c18f9294e..21ee4a71f 100644 --- a/resourceManager/resourcemanagercommon/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/Resource.scala +++ b/resourceManager/resourcemanagercommon/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/Resource.scala @@ -46,6 +46,8 @@ abstract class Resource { def moreThan(r: Resource): Boolean + def moreThanOrEquals(r: Resource): Boolean + /** * Part is greater than(部分大于) * @@ -70,7 +72,7 @@ abstract class Resource { def >(r: Resource) = moreThan(r) - def >=(r: Resource) = equalsTo(r) || moreThan(r) + def >=(r: Resource) = moreThanOrEquals(r) def <(r: Resource) = ! >=(r) @@ -87,6 +89,8 @@ object Resource extends Logging { case Load => new LoadResource(0, 0) case Instance => new InstanceResource(0) case LoadInstance => new LoadInstanceResource(0, 0, 0) + case Presto => new PrestoResource(0,0) + case InstanceAndPresto => new InstanceAndPrestoResource(new InstanceResource(0), new PrestoResource(0,0)) case Yarn => new YarnResource(0, 0, 0) case DriverAndYarn => new DriverAndYarnResource(new LoadInstanceResource(0, 0, 0), new YarnResource(0, 0, 0)) case Special => new SpecialResource(new java.util.HashMap[String, AnyVal]()) @@ -100,6 +104,8 @@ object Resource extends Logging { case i: InstanceResource => new InstanceResource(0) case l: LoadResource => new LoadResource(0, 0) case li: LoadInstanceResource => new LoadInstanceResource(0, 0, 0) + case p: PrestoResource => new PrestoResource(0,0) + case ip: InstanceAndPrestoResource => new InstanceAndPrestoResource(new InstanceResource(0), new PrestoResource(0,0)) case yarn: YarnResource => new YarnResource(0, 0, 0) case dy: DriverAndYarnResource => if (dy.yarnResource != null && dy.yarnResource.queueName != null) { @@ -144,6 +150,8 @@ class MemoryResource(val memory: Long) extends Resource { override def moreThan(r: Resource): Boolean = memory > r.memory + override def moreThanOrEquals(r: Resource): Boolean = memory >= r.memory + /** * Part is greater than(部分大于) * @@ -182,6 +190,8 @@ class CPUResource(val cores: Int) extends Resource { override def moreThan(r: Resource): Boolean = cores > r.cores + override def moreThanOrEquals(r: Resource): Boolean = cores >= r.cores + /** * Part is greater than(部分大于) * @@ -224,6 +234,9 @@ class LoadResource(val memory: Long, val cores: Int) extends Resource { def moreThan(r: Resource): Boolean = memory > r.memory && cores > r.cores + def moreThanOrEquals(r: Resource): Boolean = + memory >= r.memory && cores >= r.cores + def caseMore(r: Resource): Boolean = memory > r.memory || cores > r.cores @@ -263,6 +276,10 @@ class LoadInstanceResource(val memory: Long, val cores: Int, val instances: Int) def moreThan(r: Resource): Boolean = memory > r.memory && cores > r.cores && instances > r.instances + def moreThanOrEquals(r: Resource): Boolean = { + memory >= r.memory && cores >= r.cores && instances >= r.instances + } + def caseMore(r: Resource): Boolean = memory > r.memory || cores > r.cores || instances > r.instances @@ -278,11 +295,175 @@ class LoadInstanceResource(val memory: Long, val cores: Int, val instances: Int) class InstanceResource(val instances: Int) extends CPUResource(instances) { override protected def toResource(cores: Int): Resource = new InstanceResource(cores) - override def toJson: String = s"Instance:$instances" + override def toJson: String = s"""{"instances":$instances}""" override def toString: String = toJson } +/** + * Presto resource information, no initial registration, only user resource usage limit + * Presto资源信息,无初始化注册,只有用户资源使用上限 + * @param groupMemory + * @param groupInstances + * @param groupName + */ +class PrestoResource(val groupMemory: Long, val groupInstances: Int, val groupName: String = "global", val prestoUrl: String = "") extends Resource { + implicit def toPrestoResource(r: Resource): PrestoResource = r match { + case t: PrestoResource => t + case _ => new PrestoResource(0, 0) + } + + override def add(r: Resource): PrestoResource = { + new PrestoResource(groupMemory + r.groupMemory, groupInstances + r.groupInstances, groupName, prestoUrl) + } + + override def minus(r: Resource): PrestoResource = { + new PrestoResource(groupMemory - r.groupMemory, groupInstances - r.groupInstances, groupName, prestoUrl) + } + + override def multiplied(r: Resource): PrestoResource = { + new PrestoResource(groupMemory * r.groupMemory, groupInstances * r.groupInstances, groupName, prestoUrl) + } + + override def multiplied(rate: Float): PrestoResource = { + new PrestoResource((groupMemory * rate).toLong, (groupInstances * rate).toInt, groupName, prestoUrl) + } + + override def divide(r: Resource): PrestoResource = { + new PrestoResource(groupMemory / r.groupMemory, groupInstances / r.groupInstances, groupName, prestoUrl) + } + + override def divide(rate: Int): PrestoResource = { + new PrestoResource(groupMemory / rate, groupInstances / rate, groupName, prestoUrl) + } + + override def moreThan(r: Resource): Boolean = { + groupMemory > r.groupMemory && groupInstances > r.groupInstances + } + + override def moreThanOrEquals(r: Resource): Boolean = groupMemory >= r.groupMemory && groupInstances >= r.groupInstances + + + /** + * Part is greater than(部分大于) + * + * @param r + * @return + */ + override def caseMore(r: Resource): Boolean = { + groupMemory > r.groupMemory || groupInstances > r.groupInstances + } + + override def equalsTo(r: Resource): Boolean = { + groupMemory == r.groupMemory && groupInstances > r.groupInstances + } + + override def toJson: String = s"""{"prestoUrl":"$prestoUrl","groupName":"$groupName","memory":"${ByteTimeUtils.bytesToString(groupMemory)}", "groupInstances":$groupInstances}""" + + override def toString: String = s"Presto url(Presto集群):$prestoUrl,Resource group name(资源组):$groupName,group memory(组内存):${RMByteTimeUtils.bytesToString(groupMemory)},Group instances(组任务数):$groupInstances" +} + +class InstanceAndPrestoResource(val instanceResource: InstanceResource, val prestoResource: PrestoResource) extends Resource with Logging { + + private implicit def InstanceAndPrestoResource(r: Resource): InstanceAndPrestoResource = r match { + case t: InstanceAndPrestoResource => t + case _ => new InstanceAndPrestoResource(new InstanceResource(0), new PrestoResource(0, 0)) + } + + def isModuleOperate(r: Resource): Boolean = { + if (this.prestoResource != null && r.prestoResource != null && + StringUtils.isNotEmpty(this.prestoResource.groupName) && + StringUtils.isNotEmpty(r.prestoResource.groupName) && this.prestoResource.groupName.equals(r.prestoResource.groupName)) { + info(s"Not module operate this:$this other:$r") + false + } + else + true + } + + def isModuleOperate: Boolean = { + if (this.prestoResource != null && StringUtils.isNotEmpty(this.prestoResource.groupName)) + false + else + true + } + + override def add(r: Resource): InstanceAndPrestoResource = { + if (isModuleOperate(r)) { + new InstanceAndPrestoResource(this.instanceResource.add(r.instanceResource).asInstanceOf[InstanceResource], this.prestoResource) + } else { + new InstanceAndPrestoResource(this.instanceResource.add(r.instanceResource).asInstanceOf[InstanceResource], this.prestoResource.add(r.prestoResource)) + } + } + + override def minus(r: Resource): Resource = { + if (isModuleOperate(r)) { + new InstanceAndPrestoResource(this.instanceResource.minus(r.instanceResource).asInstanceOf[InstanceResource], this.prestoResource) + } else { + new InstanceAndPrestoResource(this.instanceResource.minus(r.instanceResource).asInstanceOf[InstanceResource], this.prestoResource.minus(r.prestoResource)) + } + } + + override def multiplied(r: Resource): Resource = { + throw new RMWarnException(111002, "Unsupported operation: multiplied") + } + + override def multiplied(rate: Float): Resource = { + if (isModuleOperate) { + new InstanceAndPrestoResource(this.instanceResource.multiplied(rate).asInstanceOf[InstanceResource], this.prestoResource) + } else { + new InstanceAndPrestoResource(this.instanceResource.multiplied(rate).asInstanceOf[InstanceResource], this.prestoResource.multiplied(rate)) + } + } + + override def divide(r: Resource): Resource = throw new RMWarnException(111002, "Unsupported operation: multiplied") + + override def divide(rate: Int): Resource = if (isModuleOperate) { + new InstanceAndPrestoResource(this.instanceResource.divide(rate).asInstanceOf[InstanceResource], this.prestoResource) + } else { + new InstanceAndPrestoResource(this.instanceResource.divide(rate).asInstanceOf[InstanceResource], this.prestoResource.divide(rate)) + } + + override def moreThan(r: Resource): Boolean = { + if (isModuleOperate(r)) { + this.instanceResource.moreThan(r.instanceResource) + } else { + this.instanceResource.moreThan(r.instanceResource) && this.prestoResource.moreThan(r.prestoResource) + } + } + + override def moreThanOrEquals(r: Resource): Boolean = { + if (isModuleOperate(r)) { + this.instanceResource.moreThanOrEquals(r.instanceResource) + } else { + this.instanceResource.moreThanOrEquals(r.instanceResource) && this.prestoResource.moreThanOrEquals(r.prestoResource) + } + } + + override def caseMore(r: Resource): Boolean = if (isModuleOperate(r)) { + this.instanceResource.caseMore(r.instanceResource) + } else { + this.instanceResource.caseMore(r.instanceResource) || this.prestoResource.caseMore(r.prestoResource) + } + + override def equalsTo(r: Resource): Boolean = if (isModuleOperate(r)) { + this.instanceResource.equalsTo(r.instanceResource) + } else { + this.instanceResource.equalsTo(r.instanceResource) && this.prestoResource.equalsTo(r.prestoResource) + } + + override def toJson: String = { + var instance = "null" + var presto = "null" + if (instanceResource != null) instance = instanceResource.toJson + if (prestoResource != null) presto = prestoResource.toJson + s"""{"instance":${instance}, "presto":${presto}}""" + } + + override def toString: String = s"Instance resources(entrance资源):$instanceResource,Group resource(队列资源):$prestoResource" +} + + /** * Queue resource information, no initial registration, only user resource usage limit * 队列资源信息,无初始化注册,只有用户资源使用上限 @@ -335,6 +516,10 @@ class YarnResource(val queueMemory: Long, val queueCores: Int, val queueInstance queueMemory > r.queueMemory && queueCores > r.queueCores && queueInstances >= r.queueInstances } + def moreThanOrEquals(r: Resource): Boolean = { + queueMemory >= r.queueMemory && queueCores >= r.queueCores && queueInstances >= r.queueInstances + } + def caseMore(r: Resource): Boolean = { // if (!queueName.equals(r.queueName)) // throw new RMWarnException(111001,s"This queue queueName(${this.queueName}) is different: ${r.queueName} ") @@ -418,6 +603,14 @@ class DriverAndYarnResource(val loadInstanceResource: LoadInstanceResource, val } } + override def moreThanOrEquals(r: Resource): Boolean = { + if (isModuleOperate(r)) { + this.loadInstanceResource.moreThanOrEquals(r.loadInstanceResource) + } else { + this.loadInstanceResource.moreThanOrEquals(r.loadInstanceResource) && this.yarnResource.moreThanOrEquals(r.yarnResource) + } + } + override def caseMore(r: Resource): Boolean = if (isModuleOperate(r)) { this.loadInstanceResource.caseMore(r.loadInstanceResource) } else { @@ -523,6 +716,20 @@ class SpecialResource(val resources: java.util.Map[String, AnyVal]) extends Reso case _ => true } + override def moreThanOrEquals(r: Resource): Boolean = r match { + case s: SpecialResource => + val rs = s.resources + !JavaConversions.mapAsScalaMap(resources).exists { + case (k, i: Int) => i < rs.get(k).asInstanceOf[Int] + case (k, d: Double) => d < rs.get(k).asInstanceOf[Double] + case (k, l: Long) => l < rs.get(k).asInstanceOf[Long] + case (k, f: Float) => f < rs.get(k).asInstanceOf[Float] + case (k, s: Short) => s < rs.get(k).asInstanceOf[Short] + case (k, v) => throw new RMWarnException(111003, "not supported resource type: " + v.getClass) + } + case _ => true + } + /** * Part is greater than(部分大于) * @@ -562,11 +769,15 @@ class SpecialResource(val resources: java.util.Map[String, AnyVal]) extends Reso object ResourceSerializer extends CustomSerializer[Resource](implicit formats => ( { case JObject(List(("memory", memory))) => new MemoryResource(memory.extract[Long]) + case JObject(List(("instances", instances))) => new InstanceResource(instances.extract[Int]) case JObject(List(("cores", cores))) => new CPUResource(cores.extract[Int]) - case JObject(List(("instance", instances))) => new InstanceResource(instances.extract[Int]) case JObject(List(("memory", memory), ("cores", cores))) => new LoadResource(memory.extract[Long], cores.extract[Int]) case JObject(List(("memory", memory), ("cores", cores), ("instance", instances))) => new LoadInstanceResource(memory.extract[Long], cores.extract[Int], instances.extract[Int]) + case JObject(List(("groupMemory", groupMemory), ("groupInstances",groupInstances), ("groupName",groupName) ,("prestoUrl", prestoUrl))) => + new PrestoResource(groupMemory.extract[Long], groupInstances.extract[Int], groupName.extract[String], prestoUrl.extract[String]) + case JObject(List(("InstanceAndPrestoResource", JObject(List(("instanceResource", instanceResource), ("prestoResource", prestoResource)))))) => + new InstanceAndPrestoResource(instanceResource.extract[InstanceResource], prestoResource.extract[PrestoResource]) case JObject(List(("applicationId", applicationId), ("queueName", queueName), ("queueMemory", queueMemory), ("queueCores", queueCores), ("queueInstances", queueInstances))) => new YarnResource(queueMemory.extract[Long], queueCores.extract[Int], queueInstances.extract[Int], queueName.extract[String], applicationId.extract[String]) case JObject(List(("DriverAndYarnResource", JObject(List(("loadInstanceResource", loadInstanceResource), ("yarnResource", yarnResource)))))) => @@ -578,10 +789,13 @@ object ResourceSerializer extends CustomSerializer[Resource](implicit formats => case JObject(list) => throw new RMWarnException(111003, "not supported resource serializable string " + list) }, { case m: MemoryResource => ("memory", m.memory) + case i: InstanceResource => ("instances", i.instances) case c: CPUResource => ("cores", c.cores) - case i: InstanceResource => ("instance", i.instances) case l: LoadResource => ("memory", l.memory) ~ ("cores", l.cores) case li: LoadInstanceResource => ("memory", li.memory) ~ ("cores", li.cores) ~ ("instance", li.instances) + case p: PrestoResource => ("groupMemory", p.groupMemory) ~ ("groupInstances", p.groupInstances) ~ ("groupName", p.groupName) ~ ("prestoUrl", p.prestoUrl) + case ip: InstanceAndPrestoResource => + ("InstanceAndPrestoResource", new JObject(List(("instanceResource", Extraction.decompose(ip.instanceResource)), ("prestoResource", Extraction.decompose(ip.prestoResource))))) case yarn: YarnResource => ("applicationId", yarn.applicationId) ~ ("queueName", yarn.queueName) ~ ("queueMemory", yarn.queueMemory) ~ ("queueCores", yarn.queueCores) ~ ("queueInstances", yarn.queueInstances) case dy: DriverAndYarnResource => implicit val formats = DefaultFormats diff --git a/resourceManager/resourcemanagercommon/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/ResourceRequestPolicy.scala b/resourceManager/resourcemanagercommon/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/ResourceRequestPolicy.scala index dd8d58e87..f3a2d7a50 100644 --- a/resourceManager/resourcemanagercommon/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/ResourceRequestPolicy.scala +++ b/resourceManager/resourcemanagercommon/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/ResourceRequestPolicy.scala @@ -21,5 +21,5 @@ package com.webank.wedatasphere.linkis.resourcemanager */ object ResourceRequestPolicy extends Enumeration { type ResourceRequestPolicy = Value - val Default, Memory, CPU, Load, Instance, LoadInstance, Yarn, DriverAndYarn, Special = Value + val Default, Memory, CPU, Load, Instance, LoadInstance, Yarn, DriverAndYarn, Presto, InstanceAndPresto, Special = Value } \ No newline at end of file diff --git a/resourceManager/resourcemanagercommon/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/RMConfiguration.scala b/resourceManager/resourcemanagercommon/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/RMConfiguration.scala index ab305111e..d46f31b39 100644 --- a/resourceManager/resourcemanagercommon/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/RMConfiguration.scala +++ b/resourceManager/resourcemanagercommon/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/RMConfiguration.scala @@ -66,4 +66,8 @@ object RMConfiguration { //configuration val CLOUD_CONSOLE_CONFIGURATION_SPRING_APPLICATION_NAME = CommonVars("wds.linkis.rm.conf.application.name", "cloud-publicservice") + + //presto + val USER_AVAILABLE_PRESTO_MEMORY = CommonVars[ByteType]("wds.linkis.presto.max.memory", new ByteType("100GB")) + val USER_AVAILABLE_PRESTO_INSTANCES = CommonVars[Int]("wds.linkis.presto.max.instances", 20) } diff --git a/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/RequestResourceService.scala b/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/RequestResourceService.scala index 28056dd93..12bcfba1d 100644 --- a/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/RequestResourceService.scala +++ b/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/RequestResourceService.scala @@ -16,12 +16,15 @@ package com.webank.wedatasphere.linkis.resourcemanager +import java.util.concurrent.ExecutionException + +import com.fasterxml.jackson.core.JsonParseException import com.webank.wedatasphere.linkis.common.ServiceInstance import com.webank.wedatasphere.linkis.common.utils.{ByteTimeUtils, Logging} import com.webank.wedatasphere.linkis.resourcemanager.ResourceRequestPolicy.ResourceRequestPolicy import com.webank.wedatasphere.linkis.resourcemanager.exception.{RMErrorException, RMWarnException} import com.webank.wedatasphere.linkis.resourcemanager.service.metadata.{ModuleResourceRecordService, UserMetaData, UserResourceRecordService} -import com.webank.wedatasphere.linkis.resourcemanager.utils.YarnUtil +import com.webank.wedatasphere.linkis.resourcemanager.utils.{PrestoResourceUtil, YarnUtil} import org.json4s.DefaultFormats import org.json4s.jackson.JsonMethods._ import org.springframework.beans.factory.annotation.Autowired @@ -115,6 +118,70 @@ class DefaultReqResourceService(userMetaData: UserMetaData, userResourceRecordSe } } +class PrestoReqResourceService(userMetaData: UserMetaData,userResourceRecordService: UserResourceRecordService,moduleResourceRecordService: ModuleResourceRecordService,val userResourceManager: UserResourceManager, + val moduleResourceManager: ModuleResourceManager) extends RequestResourceService(userMetaData, userResourceRecordService, moduleResourceRecordService, userResourceManager, moduleResourceManager) { + override val requestPolicy: ResourceRequestPolicy = Presto + + override def canRequest(moduleInstance: ServiceInstance, user: String, creator: String, requestResource: Resource): Boolean = { + if (!super.canRequest(moduleInstance, user, creator, requestResource)) return false + val prestoResource: PrestoResource = requestResource.asInstanceOf[PrestoResource] + try { + val (maxCapacity, usedCapacity) = PrestoResourceUtil.getGroupInfo(prestoResource.groupName, prestoResource.prestoUrl) + info(s"This group:${maxCapacity.groupName} used resource:$usedCapacity and max resource:$maxCapacity") + val queueLeftResource = maxCapacity - usedCapacity + if (queueLeftResource < prestoResource) { + info(s"User: $user request group (${maxCapacity.groupName}) resource $prestoResource is greater than group (${maxCapacity.groupName}) remaining resources $queueLeftResource(用户:$user 请求的队列(${maxCapacity.groupName})资源$prestoResource 大于队列(${maxCapacity.groupName})剩余资源$queueLeftResource) ") + throw new RMWarnException(111007, s"${generateNotEnoughMessage(prestoResource, queueLeftResource)}") + } else { + true + } + } catch { + case e: ExecutionException => + if(e.getCause.isInstanceOf[JsonParseException] && e.getCause.getMessage.contains("does not exist")){ + //The caller must ensure that the resource group exists. + warn(s"Resource group: ${prestoResource.groupName} needs to be initialized in presto server: ${prestoResource.prestoUrl}") + true + }else{ + throw e + } + case t: Throwable => throw t + } + } +} + + +class InstanceAndPrestoReqResourceService(userMetaData: UserMetaData,userResourceRecordService: UserResourceRecordService,moduleResourceRecordService: ModuleResourceRecordService,val userResourceManager: UserResourceManager, + val moduleResourceManager: ModuleResourceManager) extends RequestResourceService(userMetaData, userResourceRecordService, moduleResourceRecordService, userResourceManager, moduleResourceManager) { + override val requestPolicy: ResourceRequestPolicy = InstanceAndPresto + + override def canRequest(moduleInstance: ServiceInstance, user: String, creator: String, requestResource: Resource): Boolean = { + if (!super.canRequest(moduleInstance, user, creator, requestResource)) return false + val instanceAndPresto = requestResource.asInstanceOf[InstanceAndPrestoResource] + val prestoResource = instanceAndPresto.prestoResource + try { + val (maxCapacity, usedCapacity) = PrestoResourceUtil.getGroupInfo(prestoResource.groupName, prestoResource.prestoUrl) + info(s"This group:${maxCapacity.groupName} used resource:$usedCapacity and max resource:$maxCapacity") + val queueLeftResource = maxCapacity - usedCapacity + if (queueLeftResource < prestoResource) { + info(s"User: $user request group (${maxCapacity.groupName}) resource $prestoResource is greater than group (${maxCapacity.groupName}) remaining resources $queueLeftResource(用户:$user 请求的队列(${maxCapacity.groupName})资源$prestoResource 大于队列(${maxCapacity.groupName})剩余资源$queueLeftResource) ") + throw new RMWarnException(111007, s"${generateNotEnoughMessage(prestoResource, queueLeftResource)}") + } else { + true + } + } catch { + case e: ExecutionException => + if(e.getCause.isInstanceOf[JsonParseException] && e.getCause.getMessage.contains("does not exist")){ + //The caller must ensure that the resource group exists. + warn(s"Resource group: ${prestoResource.groupName} needs to be initialized in presto server: ${prestoResource.prestoUrl}") + true + }else{ + throw e + } + case t: Throwable => throw t + } + } +} + class YarnReqResourceService(userMetaData: UserMetaData, userResourceRecordService: UserResourceRecordService, moduleResourceRecordService: ModuleResourceRecordService, val userResourceManager: UserResourceManager, val moduleResourceManager: ModuleResourceManager) extends RequestResourceService(userMetaData, userResourceRecordService, moduleResourceRecordService, userResourceManager, moduleResourceManager) { diff --git a/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/service/metadata/DefaultUserMetaData.scala b/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/service/metadata/DefaultUserMetaData.scala index de98472a3..fc59a367c 100644 --- a/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/service/metadata/DefaultUserMetaData.scala +++ b/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/service/metadata/DefaultUserMetaData.scala @@ -68,6 +68,9 @@ class DefaultUserMetaData extends UserMetaData with Logging { new YarnResource(USER_AVAILABLE_YARN_INSTANCE_MEMORY.getValue(userConfiguration).toLong, USER_AVAILABLE_YARN_INSTANCE_CPU.getValue(userConfiguration), USER_AVAILABLE_YARN_INSTANCE.getValue(userConfiguration), USER_AVAILABLE_YARN_QUEUE_NAME.getValue(userConfiguration))) + case Presto => new PrestoResource(USER_AVAILABLE_PRESTO_MEMORY.getValue.toLong, USER_AVAILABLE_PRESTO_INSTANCES.getValue) + case InstanceAndPresto => new InstanceAndPrestoResource(new InstanceResource(USER_AVAILABLE_INSTANCE.getValue(userConfiguration)) + ,new PrestoResource(USER_AVAILABLE_PRESTO_MEMORY.getValue(userConfiguration).toLong, USER_AVAILABLE_PRESTO_INSTANCES.getValue(userConfiguration))) case Special => new SpecialResource(new java.util.HashMap[String, AnyVal]()) case _ => throw new RMWarnException(111003, "not supported resource result policy ") } diff --git a/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/service/rm/DefaultResourceManager.scala b/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/service/rm/DefaultResourceManager.scala index 055c4a1da..f02aba7b2 100644 --- a/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/service/rm/DefaultResourceManager.scala +++ b/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/service/rm/DefaultResourceManager.scala @@ -63,7 +63,10 @@ class DefaultResourceManager extends ResourceManager with Logging with Initializ override def afterPropertiesSet(): Unit = { requestResourceServices = Array(new DefaultReqResourceService(userMetaData, userResourceRecordService, moduleResourceRecordService, userResourceManager, moduleResourceManager), new YarnReqResourceService(userMetaData, userResourceRecordService, moduleResourceRecordService, userResourceManager, moduleResourceManager), - new DriverAndYarnReqResourceService(userMetaData, userResourceRecordService, moduleResourceRecordService, userResourceManager, moduleResourceManager)) + new DriverAndYarnReqResourceService(userMetaData, userResourceRecordService, moduleResourceRecordService, userResourceManager, moduleResourceManager), + new PrestoReqResourceService(userMetaData, userResourceRecordService, moduleResourceRecordService, userResourceManager, moduleResourceManager), + new InstanceAndPrestoReqResourceService(userMetaData, userResourceRecordService, moduleResourceRecordService, userResourceManager, moduleResourceManager) + ) future = Utils.defaultScheduler.scheduleAtFixedRate(new Runnable { override def run(): Unit = { @@ -411,6 +414,8 @@ class DefaultResourceManager extends ResourceManager with Logging with Initializ def getRequestResourceService(moduleInstance: ServiceInstance): RequestResourceService = { //2.Can I apply?(是否可以申请) val requestResourceService = moduleResourceRecordService.getModulePolicy(moduleInstance.getApplicationName) match { + case Presto => requestResourceServices.find(requestResourceService => requestResourceService != null && requestResourceService.requestPolicy == Presto) + case InstanceAndPresto => requestResourceServices.find(requestResourceService => requestResourceService != null && requestResourceService.requestPolicy == InstanceAndPresto) case Yarn => requestResourceServices.find(requestResourceService => requestResourceService != null && requestResourceService.requestPolicy == Yarn) case DriverAndYarn => requestResourceServices.find(requestResourceService => requestResourceService != null && requestResourceService.requestPolicy == DriverAndYarn) case _ => requestResourceServices.find(requestResourceService => requestResourceService != null && requestResourceService.requestPolicy == Default) diff --git a/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/PrestoResourceUtil.scala b/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/PrestoResourceUtil.scala new file mode 100644 index 000000000..7f9fe6f57 --- /dev/null +++ b/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/PrestoResourceUtil.scala @@ -0,0 +1,36 @@ +package com.webank.wedatasphere.linkis.resourcemanager.utils + +import java.util.concurrent.TimeUnit + +import com.webank.wedatasphere.linkis.common.conf.ByteType +import com.webank.wedatasphere.linkis.resourcemanager.PrestoResource +import dispatch.{Http, as} +import org.json4s.JsonAST.{JInt, JString} + +import scala.concurrent.duration.Duration +import scala.concurrent.{Await, ExecutionContext} + +/** + * Created by yogafire on 2020/5/8 + */ +object PrestoResourceUtil { + + private implicit val executor = ExecutionContext.global + + def getGroupInfo(groupName: String, prestoUrl: String): (PrestoResource, PrestoResource) = { + val url = dispatch.url(prestoUrl + "/v1/resourceGroupState/" + groupName.replaceAll("\\.", "/")) + + val future = Http(url > as.json4s.Json).map { resp => + val maxMemory: Long = new ByteType((resp \ "softMemoryLimit").asInstanceOf[JString].values).toLong + val maxInstances: Int = (resp \ "hardConcurrencyLimit").asInstanceOf[JInt].values.toInt + (resp \ "maxQueuedQueries").asInstanceOf[JInt].values.toInt + val maxResource = new PrestoResource(maxMemory, maxInstances, groupName, prestoUrl) + + val usedMemory: Long = new ByteType((resp \ "memoryUsage").asInstanceOf[JString].values).toLong + val usedInstances: Int = (resp \ "numRunningQueries").asInstanceOf[JInt].values.toInt + (resp \ "numQueuedQueries").asInstanceOf[JInt].values.toInt + val usedResource = new PrestoResource(usedMemory, usedInstances, groupName, prestoUrl) + (maxResource, usedResource) + } + + Await.result(future, Duration(10, TimeUnit.SECONDS)) + } +} \ No newline at end of file -- Gitee From 7182407c4838c49c679bd88b096d41572c69a3f3 Mon Sep 17 00:00:00 2001 From: Yogafire Date: Wed, 15 Apr 2020 16:02:08 +0800 Subject: [PATCH 020/148] fix jdbc bug --- .../JDBCEngineExecutorManagerImpl.scala | 30 ++----------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executer/JDBCEngineExecutorManagerImpl.scala b/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executer/JDBCEngineExecutorManagerImpl.scala index 6828a8873..b8c4c2f80 100644 --- a/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executer/JDBCEngineExecutorManagerImpl.scala +++ b/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executer/JDBCEngineExecutorManagerImpl.scala @@ -38,7 +38,6 @@ class JDBCEngineExecutorManagerImpl(groupFactory: GroupFactory, entranceExecutorRulers: Array[EntranceExecutorRuler]) extends EntranceExecutorManagerImpl(groupFactory,engineBuilder, engineRequester, engineSelector, engineManager, entranceExecutorRulers) with Logging{ - private val JDBCEngineExecutor = new util.HashMap[String, JDBCEngineExecutor]() logger.info("JDBC EngineManager Registered") override protected def createExecutor(event: SchedulerEvent): EntranceEngine = event match { case job: JDBCEntranceJob => @@ -68,7 +67,6 @@ class JDBCEngineExecutorManagerImpl(groupFactory: GroupFactory, JDBCParams.put("jdbc.username",userName) JDBCParams.put("jdbc.password",password) if (!StringUtils.isEmpty(url) && !StringUtils.isEmpty(userName) && !StringUtils.isEmpty(password)) { - JDBCEngineExecutor.put(url + ":" + userName + ":" + password, new JDBCEngineExecutor(5000, JDBCParams)) new JDBCEngineExecutor(5000, JDBCParams) }else { logger.error(s"jdbc url is $url, jdbc username is $userName") @@ -94,32 +92,8 @@ class JDBCEngineExecutorManagerImpl(groupFactory: GroupFactory, private def findUsefulExecutor(job: Job): Option[Executor] = job match{ case job:JDBCEntranceJob => - val params: util.Map[String, Any] = job.getParams - logger.info("BEGAIN TO GET configuration:" +params.get("configuration")) - val tmpParams=params.get("configuration").asInstanceOf[util.Map[String, Any]].get("runtime").asInstanceOf[util.Map[String, Any]] - var url="" - var userName="" - var password ="" - if(tmpParams != null){ - if(tmpParams.get("jdbc.url") != null &&tmpParams.get("jdbc.username") != null&& tmpParams.get("jdbc.password") != null){ - url = tmpParams.get("jdbc.url").toString - userName = tmpParams.get("jdbc.username").toString - password = tmpParams.get("jdbc.password").toString - } - } - //如果jobparams中没有jdbc连接,从configuration中获取 - if(StringUtils.isEmpty(url)||StringUtils.isEmpty(userName)||StringUtils.isEmpty(password)){ - val jdbcConfiguration = UserConfiguration.getCacheMap(RequestQueryAppConfigWithGlobal(job.getUser,job.getCreator,"jdbc",true)) - url = jdbcConfiguration.get("jdbc.url") - userName = jdbcConfiguration.get("jdbc.username") - password = jdbcConfiguration.get("jdbc.password") - } - val key = url + ":" + userName + ":" + password - if (JDBCEngineExecutor.containsKey(key)){ - Some(JDBCEngineExecutor.get(key)) - }else{ - None - } + Some(createExecutor(job)) + case _ => None } override def getById(id: Long): Option[Executor] = ??? -- Gitee From 5f4e4f5bb3c9b56235b82be08448f6f37372d25b Mon Sep 17 00:00:00 2001 From: Yogafire Date: Fri, 17 Apr 2020 11:02:10 +0800 Subject: [PATCH 021/148] modify datasource cache key; set jdbc driver configuration --- .../conf/executer/ConnectionManager.java | 18 ++++++++---------- .../entrance/conf/JDBCConfiguration.scala | 1 + .../JDBCEngineExecutorManagerImpl.scala | 7 ++++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ujes/definedEngines/jdbc/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/conf/executer/ConnectionManager.java b/ujes/definedEngines/jdbc/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/conf/executer/ConnectionManager.java index 793f4c54d..062129746 100644 --- a/ujes/definedEngines/jdbc/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/conf/executer/ConnectionManager.java +++ b/ujes/definedEngines/jdbc/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/conf/executer/ConnectionManager.java @@ -15,6 +15,7 @@ */ package com.webank.wedatasphere.linkis.entrance.conf.executer; +import com.webank.wedatasphere.linkis.entrance.conf.JDBCConfiguration; import org.apache.commons.dbcp.BasicDataSource; import org.apache.commons.dbcp.BasicDataSourceFactory; import org.apache.commons.lang.StringUtils; @@ -25,8 +26,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,8 +53,7 @@ public class ConnectionManager { } { - String supportedDBString ="mysql=>com.mysql.jdbc.Driver,postgresql=>org.postgresql.Driver," + - "oracle=>oracle.jdbc.driver.OracleDriver,hive2=>org.apache.hive.jdbc.HiveDriver"; + String supportedDBString = JDBCConfiguration.JDBC_SUPPORT_DBS().getValue(); String[] supportedDBs = supportedDBString.split(","); for (String supportedDB : supportedDBs) { String[] supportedDBInfo = supportedDB.split("=>"); @@ -87,11 +85,12 @@ public class ConnectionManager { throw new IllegalArgumentException("Illegal url or not supported url type (url: " + url + ")."); } - private final Pattern pattern = Pattern.compile("^(jdbc:\\w+://\\S+:[0-9]+)\\s*"); private String getRealURL(String url) { - Matcher matcher = pattern.matcher(url.trim()); - matcher.find(); - return matcher.group(1); + int index = url.indexOf("?"); + if (index < 0) { + index = url.length(); + } + return url.substring(0, index); } @@ -102,7 +101,7 @@ public class ConnectionManager { validateURL(url); int index = url.indexOf(":") + 1; String dbType = url.substring(index, url.indexOf(":", index)); - System.out.println(String.format("Try to Create a new %s JDBC DBCP with url(%s), username(%s), password(%s).", dbType, url, username, password)); + logger.info(String.format("Try to Create a new %s JDBC DBCP with url(%s), username(%s), password(%s).", dbType, url, username, password)); Properties props = new Properties(); props.put("driverClassName", supportedDBs.get(dbType)); props.put("url", url.trim()); @@ -115,7 +114,6 @@ public class ConnectionManager { props.put("testOnBorrow", false); props.put("testWhileIdle", true); props.put("validationQuery", "select 1"); - props.put("initialSize", 1); BasicDataSource dataSource; try { dataSource = (BasicDataSource) BasicDataSourceFactory.createDataSource(props); diff --git a/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/JDBCConfiguration.scala b/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/JDBCConfiguration.scala index 3cb26e2eb..53faf934e 100644 --- a/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/JDBCConfiguration.scala +++ b/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/JDBCConfiguration.scala @@ -21,4 +21,5 @@ object JDBCConfiguration { val ENGINE_RESULT_SET_MAX_CACHE = CommonVars("wds.linkis.resultSet.cache.max", new ByteType("512k")) val ENGINE_DEFAULT_LIMIT = CommonVars("wds.linkis.jdbc.default.limit", 5000) val JDBC_QUERY_TIMEOUT = CommonVars("wds.linkis.jdbc.query.timeout", 1800) + val JDBC_SUPPORT_DBS = CommonVars("wds.linkis.jdbc.support.dbs", "mysql=>com.mysql.jdbc.Driver,postgresql=>org.postgresql.Driver,oracle=>oracle.jdbc.driver.OracleDriver,hive2=>org.apache.hive.jdbc.HiveDriver,presto=>com.facebook.presto.jdbc.PrestoDriver") } diff --git a/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executer/JDBCEngineExecutorManagerImpl.scala b/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executer/JDBCEngineExecutorManagerImpl.scala index b8c4c2f80..658c772b6 100644 --- a/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executer/JDBCEngineExecutorManagerImpl.scala +++ b/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executer/JDBCEngineExecutorManagerImpl.scala @@ -19,6 +19,7 @@ import java.util import com.webank.wedatasphere.linkis.common.utils.Logging import com.webank.wedatasphere.linkis.entrance.cache.UserConfiguration +import com.webank.wedatasphere.linkis.entrance.conf.JDBCConfiguration import com.webank.wedatasphere.linkis.entrance.exception.JDBCParamsIllegalException import com.webank.wedatasphere.linkis.entrance.execute._ import com.webank.wedatasphere.linkis.entrance.execute.impl.EntranceExecutorManagerImpl @@ -61,13 +62,13 @@ class JDBCEngineExecutorManagerImpl(groupFactory: GroupFactory, val jdbcConfiguration = UserConfiguration.getCacheMap(RequestQueryAppConfigWithGlobal(job.getUser,job.getCreator,"jdbc",true)) url = jdbcConfiguration.get("jdbc.url") userName = jdbcConfiguration.get("jdbc.username") - password = jdbcConfiguration.get("jdbc.password") + password = if (jdbcConfiguration.get("jdbc.password") == null) "" else jdbcConfiguration.get("jdbc.password") } JDBCParams.put("jdbc.url",url) JDBCParams.put("jdbc.username",userName) JDBCParams.put("jdbc.password",password) - if (!StringUtils.isEmpty(url) && !StringUtils.isEmpty(userName) && !StringUtils.isEmpty(password)) { - new JDBCEngineExecutor(5000, JDBCParams) + if (!StringUtils.isEmpty(url) && !StringUtils.isEmpty(userName)) { + new JDBCEngineExecutor(JDBCConfiguration.ENGINE_DEFAULT_LIMIT.getValue, JDBCParams) }else { logger.error(s"jdbc url is $url, jdbc username is $userName") throw JDBCParamsIllegalException("jdbc url or username or password may be null at least") -- Gitee From 148d6fc50422863f30f559f97bed1dab5f83a719 Mon Sep 17 00:00:00 2001 From: wang_zh <643348094@qq.com> Date: Fri, 15 May 2020 17:33:42 +0800 Subject: [PATCH 022/148] linkis-es-entrance first commit --- ujes/definedEngines/es/entrance/pom.xml | 153 +++++++++ .../src/main/assembly/distribution.xml | 320 ++++++++++++++++++ .../src/main/resources/application.yml | 24 ++ .../src/main/resources/linkis.properties | 36 ++ .../src/main/resources/log4j.properties | 36 ++ .../es/entrance/src/main/resources/log4j2.xml | 38 +++ .../conf/EsEntranceConfiguration.scala | 32 ++ .../entrance/conf/EsSpringConfiguration.scala | 41 +++ .../EsConvertResponseException.scala | 10 + .../exception/EsParamsIllegalException.scala | 10 + .../entrance/execute/EsEngineManager.scala | 60 ++++ .../entrance/execute/EsEngineRequester.scala | 75 ++++ .../entrance/execute/EsEntranceEngine.scala | 133 ++++++++ .../execute/EsEntranceExecutorManager.scala | 35 ++ .../entrance/execute/EsEntranceJob.scala | 15 + .../entrance/executor/EsEngineExecutor.scala | 24 ++ .../entrance/executor/ResponseHandler.scala | 65 ++++ .../executor/codeparser/CodeParser.scala | 115 +++++++ .../entrance/executor/esclient/EsClient.scala | 103 ++++++ .../executor/esclient/EsClientFactory.scala | 155 +++++++++ .../executor/impl/EsEngineExecutorImpl.scala | 81 +++++ .../executor/impl/ResponseHandlerImpl.scala | 173 ++++++++++ .../entrance/src/test/resources/entrance.http | 43 +++ .../src/test/resources/http-client.env.json | 9 + .../execute/EsEntranceEngineTests.scala | 49 +++ .../esclient/EsClientFactoryTests.scala | 49 +++ 26 files changed, 1884 insertions(+) create mode 100644 ujes/definedEngines/es/entrance/pom.xml create mode 100644 ujes/definedEngines/es/entrance/src/main/assembly/distribution.xml create mode 100644 ujes/definedEngines/es/entrance/src/main/resources/application.yml create mode 100644 ujes/definedEngines/es/entrance/src/main/resources/linkis.properties create mode 100644 ujes/definedEngines/es/entrance/src/main/resources/log4j.properties create mode 100644 ujes/definedEngines/es/entrance/src/main/resources/log4j2.xml create mode 100644 ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsEntranceConfiguration.scala create mode 100644 ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsSpringConfiguration.scala create mode 100644 ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsConvertResponseException.scala create mode 100644 ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsParamsIllegalException.scala create mode 100644 ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineManager.scala create mode 100644 ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineRequester.scala create mode 100644 ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngine.scala create mode 100644 ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceExecutorManager.scala create mode 100644 ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceJob.scala create mode 100644 ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/EsEngineExecutor.scala create mode 100644 ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/ResponseHandler.scala create mode 100644 ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/codeparser/CodeParser.scala create mode 100644 ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClient.scala create mode 100644 ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactory.scala create mode 100644 ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/EsEngineExecutorImpl.scala create mode 100644 ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/ResponseHandlerImpl.scala create mode 100644 ujes/definedEngines/es/entrance/src/test/resources/entrance.http create mode 100644 ujes/definedEngines/es/entrance/src/test/resources/http-client.env.json create mode 100644 ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngineTests.scala create mode 100644 ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactoryTests.scala diff --git a/ujes/definedEngines/es/entrance/pom.xml b/ujes/definedEngines/es/entrance/pom.xml new file mode 100644 index 000000000..78521903e --- /dev/null +++ b/ujes/definedEngines/es/entrance/pom.xml @@ -0,0 +1,153 @@ + + + + linkis + com.webank.wedatasphere.linkis + 0.9.3 + + 4.0.0 + + + 7.6.2 + + + linkis-es-entrance + + + + com.webank.wedatasphere.linkis + linkis-ujes-entrance + ${linkis.version} + + + + com.webank.wedatasphere.linkis + linkis-cloudRPC + ${linkis.version} + provided + + + + com.webank.wedatasphere.linkis + linkis-storage + ${linkis.version} + provided + + + + com.webank.wedatasphere.linkis + linkis-resourcemanager-client + ${linkis.version} + + + com.webank.wedatasphere.linkis + linkis-cloudRPC + + + + + + org.elasticsearch.client + elasticsearch-rest-client + ${es.version} + + + + org.elasticsearch.client + elasticsearch-rest-client-sniffer + ${es.version} + + + jackson-core + com.fasterxml.jackson.core + + + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + ${fasterxml.jackson.version} + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-cbor + ${fasterxml.jackson.version} + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-smile + ${fasterxml.jackson.version} + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-csv + ${fasterxml.jackson.version} + + + + junit + junit + 4.11 + test + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + + + net.alchim31.maven + scala-maven-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + + org.apache.maven.plugins + maven-assembly-plugin + 2.3 + false + + + make-assembly + package + + single + + + + src/main/assembly/distribution.xml + + + + + + false + linkis-ujes-es-entrance + false + false + + src/main/assembly/distribution.xml + + + + + + + ${basedir}/src/main/resources + + + ${project.artifactId}-${project.version} + + \ No newline at end of file diff --git a/ujes/definedEngines/es/entrance/src/main/assembly/distribution.xml b/ujes/definedEngines/es/entrance/src/main/assembly/distribution.xml new file mode 100644 index 000000000..2a642e01b --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/main/assembly/distribution.xml @@ -0,0 +1,320 @@ + + + + linkis-ujes-es-entrance + + zip + + true + linkis-ujes-es-entrance + + + + + + lib + true + true + false + true + true + + + + + + + + ${basedir}/../entrance/src/main/resources + + * + + 0777 + conf + unix + + + ${basedir}/bin + + * + + 0777 + bin + unix + + + . + + */** + + logs + + + + \ No newline at end of file diff --git a/ujes/definedEngines/es/entrance/src/main/resources/application.yml b/ujes/definedEngines/es/entrance/src/main/resources/application.yml new file mode 100644 index 000000000..b8950b815 --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/main/resources/application.yml @@ -0,0 +1,24 @@ +server: + port: 10009 +spring: + application: + name: esEntrance + + +eureka: + client: + serviceUrl: + defaultZone: http://localhost:20303/eureka/ + instance: + metadata-map: + test: enjoyyin + +management: + endpoints: + web: + exposure: + include: refresh,info +logging: + config: classpath:log4j2.xml +# register-with-eureka: false +# fetch-registry: false \ No newline at end of file diff --git a/ujes/definedEngines/es/entrance/src/main/resources/linkis.properties b/ujes/definedEngines/es/entrance/src/main/resources/linkis.properties new file mode 100644 index 000000000..2d3c0e29a --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/main/resources/linkis.properties @@ -0,0 +1,36 @@ +# +# Copyright 2019 WeBank +# +# Licensed 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. +# + + +wds.linkis.server.restful.scan.packages=com.webank.wedatasphere.linkis.entrance.restful + +wds.linkis.query.application.name=cloud-publicservice + +wds.linkis.console.config.application.name=cloud-publicservice +wds.linkis.engine.creation.wait.time.max=20m +wds.linkis.server.version=v1 + +#hadoop config dir +hadoop.config.dir=/appcom/config/hadoop-config + +wds.linkis.entrance.config.logPath=file:///tmp/linkis/ + +wds.linkis.resultSet.store.path=file:///tmp/linkis + +wds.linkis.server.socket.mode=true + +# es entrance config +# wds.linkis.es.cluster=127.0.0.1:9200 diff --git a/ujes/definedEngines/es/entrance/src/main/resources/log4j.properties b/ujes/definedEngines/es/entrance/src/main/resources/log4j.properties new file mode 100644 index 000000000..178f8dfa2 --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/main/resources/log4j.properties @@ -0,0 +1,36 @@ +# +# Copyright 2019 WeBank +# +# Licensed 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. +# + +### set log levels ### + +log4j.rootCategory=INFO,console + +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.Threshold=INFO +log4j.appender.console.layout=org.apache.log4j.PatternLayout +#log4j.appender.console.layout.ConversionPattern= %d{ISO8601} %-5p (%t) [%F:%M(%L)] - %m%n +log4j.appender.console.layout.ConversionPattern= %d{ISO8601} %-5p (%t) %p %c{1} - %m%n + + +log4j.appender.com.webank.bdp.ide.core=org.apache.log4j.DailyRollingFileAppender +log4j.appender.com.webank.bdp.ide.core.Threshold=INFO +log4j.additivity.com.webank.bdp.ide.core=false +log4j.appender.com.webank.bdp.ide.core.layout=org.apache.log4j.PatternLayout +log4j.appender.com.webank.bdp.ide.core.Append=true +log4j.appender.com.webank.bdp.ide.core.File=logs/linkis.log +log4j.appender.com.webank.bdp.ide.core.layout.ConversionPattern= %d{ISO8601} %-5p (%t) [%F:%M(%L)] - %m%n + +log4j.logger.org.springframework=INFO \ No newline at end of file diff --git a/ujes/definedEngines/es/entrance/src/main/resources/log4j2.xml b/ujes/definedEngines/es/entrance/src/main/resources/log4j2.xml new file mode 100644 index 000000000..ad88ea570 --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/main/resources/log4j2.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsEntranceConfiguration.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsEntranceConfiguration.scala new file mode 100644 index 000000000..dd87d5332 --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsEntranceConfiguration.scala @@ -0,0 +1,32 @@ +package com.webank.wedatasphere.linkis.entrance.conf + +import com.webank.wedatasphere.linkis.common.conf.{ByteType, CommonVars} + +/** + * + * @author wang_zh + * @date 2020/5/6 + */ +object EsEntranceConfiguration { + + // es client + val ES_CLUSTER = CommonVars("wds.linkis.es.cluster", "") + val ES_DATASOURCE_NAME = CommonVars("wds.linkis.es.datasource", "default_datasource") + val ES_AUTH_CACHE = CommonVars("wds.linkis.es.auth.cache", true) + val ES_USERNAME = CommonVars("wds.linkis.es.username", "") + val ES_PASSWORD = CommonVars("wds.linkis.es.password", "") + val ES_SNIFFER_ENABLE = CommonVars("wds.linkis.es.sniffer.enable", true) + val ES_HTTP_METHOD = CommonVars("wds.linkis.es.http.method", "GET") + val ES_HTTP_ENDPOINT = CommonVars("wds.linkis.es.http.endpoint", "/_search") + val ES_HTTP_SQL_ENDPOINT = CommonVars("wds.linkis.es.sql.endpoint", "/_sql") + val ES_SQL_FORMAT = CommonVars("wds.linkis.es.sql.format", "{\"query\": \"%s\"}") + val ES_HTTP_HEADER_PREFIX = "wds.linkis.es.headers." + + // entrance resource + val ENTRANCE_MAX_JOB_INSTANCE = CommonVars("wds.linkis.entrance.max.job.instance", 100) + val ENTRANCE_PROTECTED_JOB_INSTANCE = CommonVars("wds.linkis.entrance.protected.job.instance", 80) + val ENGINE_DEFAULT_LIMIT = CommonVars("wds.linkis.engine.default.limit", 5000) + + // resultSet + val ENGINE_RESULT_SET_MAX_CACHE = CommonVars("wds.linkis.resultSet.cache.max", new ByteType("512k")) +} diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsSpringConfiguration.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsSpringConfiguration.scala new file mode 100644 index 000000000..2273c176c --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsSpringConfiguration.scala @@ -0,0 +1,41 @@ +package com.webank.wedatasphere.linkis.entrance.conf + +import com.webank.wedatasphere.linkis.common.utils.Logging +import com.webank.wedatasphere.linkis.entrance.annotation._ +import com.webank.wedatasphere.linkis.entrance.execute._ +import com.webank.wedatasphere.linkis.entrance.execute.impl.EngineRequesterImpl +import com.webank.wedatasphere.linkis.resourcemanager.domain.ModuleInfo +import com.webank.wedatasphere.linkis.resourcemanager.{InstanceResource, ResourceRequestPolicy} +import com.webank.wedatasphere.linkis.rpc.Sender +import com.webank.wedatasphere.linkis.scheduler.queue.GroupFactory +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.context.annotation.{Bean, Configuration} + +@Configuration +class EsSpringConfiguration extends Logging{ + + @EntranceExecutorManagerBeanAnnotation + def generateEntranceExecutorManager(@GroupFactoryBeanAnnotation.GroupFactoryAutowiredAnnotation groupFactory: GroupFactory, + @EngineBuilderBeanAnnotation.EngineBuilderAutowiredAnnotation engineBuilder: EngineBuilder, + @EngineRequesterBeanAnnotation.EngineRequesterAutowiredAnnotation engineRequester: EngineRequester, + @EngineSelectorBeanAnnotation.EngineSelectorAutowiredAnnotation engineSelector: EngineSelector, + @EngineManagerBeanAnnotation.EngineManagerAutowiredAnnotation engineManager: EngineManager, + @Autowired entranceExecutorRulers: Array[EntranceExecutorRuler]): EntranceExecutorManager = + new EsEntranceExecutorManager(groupFactory, engineBuilder, engineRequester, engineSelector, engineManager, entranceExecutorRulers) + + @EngineRequesterBeanAnnotation + def generateEngineRequester(@GroupFactoryBeanAnnotation.GroupFactoryAutowiredAnnotation groupFactory: GroupFactory) = new EsEngineRequester(groupFactory) + + + @Bean(Array("resources")) + def createResource(): ModuleInfo = { + val totalResource = new InstanceResource(EsEntranceConfiguration.ENTRANCE_MAX_JOB_INSTANCE.getValue) + val protectResource = new InstanceResource(EsEntranceConfiguration.ENTRANCE_PROTECTED_JOB_INSTANCE.getValue) + info(s"create resource for es engine totalResource is $totalResource, protectResource is $protectResource") + ModuleInfo(Sender.getThisServiceInstance, totalResource, protectResource, ResourceRequestPolicy.LoadInstance) + } + + @EngineManagerBeanAnnotation + def generateEngineManager(@Autowired resources: ModuleInfo): EngineManager = new EsEngineManager(resources) + +} diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsConvertResponseException.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsConvertResponseException.scala new file mode 100644 index 000000000..528797a05 --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsConvertResponseException.scala @@ -0,0 +1,10 @@ +package com.webank.wedatasphere.linkis.entrance.exception + +import com.webank.wedatasphere.linkis.common.exception.ErrorException + +/** + * + * @author wang_zh + * @date 2020/5/12 + */ +case class EsConvertResponseException(errorMsg: String) extends ErrorException(70113, errorMsg) \ No newline at end of file diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsParamsIllegalException.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsParamsIllegalException.scala new file mode 100644 index 000000000..d3e4d11be --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsParamsIllegalException.scala @@ -0,0 +1,10 @@ +package com.webank.wedatasphere.linkis.entrance.exception + +import com.webank.wedatasphere.linkis.common.exception.ErrorException + +/** + * + * @author wang_zh + * @date 2020/5/6 + */ +case class EsParamsIllegalException(errorMsg: String) extends ErrorException(70112, errorMsg) diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineManager.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineManager.scala new file mode 100644 index 000000000..54e5ce7ac --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineManager.scala @@ -0,0 +1,60 @@ +package com.webank.wedatasphere.linkis.entrance.execute + +import java.util + +import com.webank.wedatasphere.linkis.common.utils.Logging +import com.webank.wedatasphere.linkis.entrance.event.EntranceEvent +import com.webank.wedatasphere.linkis.resourcemanager.domain.ModuleInfo +import com.webank.wedatasphere.linkis.resourcemanager.service.annotation.{EnableResourceManager, RegisterResource} +import com.webank.wedatasphere.linkis.scheduler.executer.Executor +import com.webank.wedatasphere.linkis.scheduler.executer.ExecutorState.ExecutorState + +/** + * + * @author wang_zh + * @date 2020/5/11 + */ +@EnableResourceManager +class EsEngineManager(resources: ModuleInfo) extends EngineManager with Logging { + + private val idToEngines = new util.HashMap[Long, EntranceEngine] + + // TODO 修正 EntranceEngine 使用的 resources + + + + /** + * The user initializes the operation. When the entance is started for the first time, all the engines are obtained through this method, and the initialization operation is completed. + * 用户初始化操作,第一次启动entrance时,将通过该方法,拿到所有的engine,完成初始化操作 + */ + override def readAliveEngines(): Unit = { } + + override def get(id: Long): EntranceEngine = ??? + + override def get(instance: String): Option[EntranceEngine] = ??? + + override def listEngines(op: EntranceEngine => Boolean): Array[EntranceEngine] = ??? + + override def addNotExistsEngines(engine: EntranceEngine*): Unit = {} + + override def delete(id: Long): Unit = ??? + + override def onEvent(event: EntranceEvent): Unit = { } + + override def onEventError(event: EntranceEvent, t: Throwable): Unit = { + error(s"deal event $event failed!", t) + } + + override def onExecutorCreated(executor: Executor): Unit = {} + + override def onExecutorCompleted(executor: Executor, message: String): Unit = {} + + override def onExecutorStateChanged(executor: Executor, fromState: ExecutorState, toState: ExecutorState): Unit = {} + + /** + * Registered resources(注册资源) + */ + @RegisterResource + def registerResources(): ModuleInfo = resources + +} diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineRequester.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineRequester.scala new file mode 100644 index 000000000..fb6d67128 --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineRequester.scala @@ -0,0 +1,75 @@ +package com.webank.wedatasphere.linkis.entrance.execute +import java.util +import java.util.concurrent.atomic.AtomicLong + +import com.webank.wedatasphere.linkis.entrance.conf.EntranceConfiguration +import com.webank.wedatasphere.linkis.entrance.scheduler.EntranceGroupFactory +import com.webank.wedatasphere.linkis.protocol.config.{RequestQueryGlobalConfig, ResponseQueryConfig} +import com.webank.wedatasphere.linkis.protocol.constants.TaskConstant +import com.webank.wedatasphere.linkis.protocol.engine.{RequestEngine, RequestNewEngine, TimeoutRequestNewEngine} +import com.webank.wedatasphere.linkis.protocol.utils.TaskUtils +import com.webank.wedatasphere.linkis.rpc.Sender +import com.webank.wedatasphere.linkis.scheduler.executer.ExecutorState +import com.webank.wedatasphere.linkis.scheduler.queue.{GroupFactory, Job} +import com.webank.wedatasphere.linkis.server.JMap + +import scala.collection.JavaConverters._ + +/** + * + * @author wang_zh + * @date 2020/5/11 + */ +class EsEngineRequester(groupFactory: GroupFactory) extends EngineRequester { + + private val idGenerator = new AtomicLong(0) + + override def request(job: Job): Option[EntranceEngine] = job match { + case entranceJob: EntranceJob => { + val requestEngine = createRequestEngine(job); + + // TODO request resource manager + val engine = new EsEntranceEngine(idGenerator.incrementAndGet(), new util.HashMap[String, String](requestEngine.properties)) + engine.setGroup(groupFactory.getOrCreateGroup(getGroupName(requestEngine.creator, requestEngine.user))) + engine.setUser(requestEngine.user) + engine.setCreator(requestEngine.creator) + engine.updateState(ExecutorState.Starting, ExecutorState.Idle, null, null) + engine.setJob(entranceJob) + engine.init() + Option(engine) + + } + case _ => null + } + + private def getGroupName(creator: String, user: String): String = EntranceGroupFactory.getGroupName(creator, user) + + override protected def createRequestEngine(job: Job): RequestEngine = job match { + case entranceJob: EntranceJob => + val sender = Sender.getSender(EntranceConfiguration.CLOUD_CONSOLE_CONFIGURATION_SPRING_APPLICATION_NAME.getValue) + val requestQueryGlobalConfig = RequestQueryGlobalConfig(entranceJob.getUser) + val responseQueryGlobalConfig = sender.ask(requestQueryGlobalConfig).asInstanceOf[ResponseQueryConfig] + val keyAndValue = responseQueryGlobalConfig.getKeyAndValue + + // TODO get datasoure config + + val properties = if(entranceJob.getParams == null) new util.HashMap[String, String] + else { + val startupMap = TaskUtils.getStartupMap(entranceJob.getParams) + val runtimeMap = TaskUtils.getRuntimeMap(entranceJob.getParams) + val properties = new JMap[String, String] + startupMap.forEach {case (k, v) => if(v != null) properties.put(k, v.toString)} + runtimeMap.forEach {case (k, v) => if(v != null) properties.put(k, v.toString)} + properties + } + + val runType:String = entranceJob.getParams.getOrDefault(TaskConstant.RUNTYPE, "esjson").asInstanceOf[String] + properties.put(TaskConstant.RUNTYPE, runType) + properties.put(TaskConstant.UMUSER, entranceJob.getUser) + + properties.put(RequestEngine.REQUEST_ENTRANCE_INSTANCE, Sender.getThisServiceInstance.getApplicationName + "," + Sender.getThisServiceInstance.getInstance) + RequestNewEngine(entranceJob.getCreator, entranceJob.getUser, properties) + case _ => null + } + +} diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngine.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngine.scala new file mode 100644 index 000000000..c667d3e46 --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngine.scala @@ -0,0 +1,133 @@ +package com.webank.wedatasphere.linkis.entrance.execute + +import com.webank.wedatasphere.linkis.common.ServiceInstance +import com.webank.wedatasphere.linkis.common.log.LogUtils +import com.webank.wedatasphere.linkis.entrance.executor.EsEngineExecutor +import com.webank.wedatasphere.linkis.entrance.executor.esclient.{EsClient, EsClientFactory} +import com.webank.wedatasphere.linkis.entrance.executor.impl.EsEngineExecutorImpl +import com.webank.wedatasphere.linkis.entrance.persistence.EntranceResultSetEngine +import com.webank.wedatasphere.linkis.protocol.constants.TaskConstant +import com.webank.wedatasphere.linkis.protocol.engine.{JobProgressInfo, RequestTask} +import com.webank.wedatasphere.linkis.scheduler.executer.{AliasOutputExecuteResponse, ErrorExecuteResponse, ExecuteRequest, ExecuteResponse, IncompleteExecuteResponse, SingleTaskInfoSupport, SingleTaskOperateSupport, SuccessExecuteResponse} +import com.webank.wedatasphere.linkis.server.JMap +import org.apache.commons.lang.StringUtils +import org.apache.commons.lang.exception.ExceptionUtils + +/** + * + * @author wang_zh + * @date 2020/5/11 + */ +class EsEntranceEngine(id: Long, properties: JMap[String, String]) extends EntranceEngine(id) with SingleTaskOperateSupport with SingleTaskInfoSupport { + + private var client: EsClient = _ + private var engineExecutor: EsEngineExecutor = _ + private var runType: String = _ + private var storePath: String = _ + private val persistEngine = new EntranceResultSetEngine() + private var totalCodeLineNumber: Int = 0 + private var codeLine = 0 + + + override def getModuleInstance: ServiceInstance = ServiceInstance("EsEntranceEngine", "") + + private var job: EntranceJob = _ + def setJob(job: EntranceJob) = this.job = job + + override def execute(executeRequest: ExecuteRequest): ExecuteResponse = { + if (StringUtils.isEmpty(executeRequest.code)) { + return IncompleteExecuteResponse("execute codes can not be empty)") + } + + this.storePath = executeRequest match { + case storePathExecuteRequest: StorePathExecuteRequest => storePathExecuteRequest.storePath + case _ => "" + } + + val codes = this.engineExecutor.parse(executeRequest.code) + if (!codes.isEmpty) { + totalCodeLineNumber = codes.length + codeLine = 0 + codes.foreach { code => + try { + val executeRes = executeLine(code) + executeRes match { + case aliasOutputExecuteResponse: AliasOutputExecuteResponse => + persistEngine.persistResultSet(job, aliasOutputExecuteResponse) + case SuccessExecuteResponse() => + info(s"execute execute successfully : ${code}") + case IncompleteExecuteResponse(_) => + error(s"execute execute failed : ${code}") + job.getLogListener.foreach(_.onLogUpdate(job, LogUtils.generateERROR( s"execute execute failed : ${code}"))) + case e: ErrorExecuteResponse => + error(s"execute code $code failed!", e.t) + job.getLogListener.foreach(_.onLogUpdate(job, LogUtils.generateERROR( s"execute code $code failed!" + ExceptionUtils.getFullStackTrace(e.t)))) + case _ => + warn("no matching exception") + job.getLogListener.foreach(_.onLogUpdate(job, LogUtils.generateERROR( "no matching exception"))) + } + codeLine = codeLine + 1 + } catch { + case t: Throwable => + return ErrorExecuteResponse("EsEntranceEngine ,execute exception ", t) + } finally { + + } + } + } + this.close() + SuccessExecuteResponse() + } + + protected def executeLine(code: String): ExecuteResponse = this.engineExecutor.executeLine(code, storePath, codeLine.toString) + + override protected def callExecute(request: RequestTask): EngineExecuteAsynReturn = ??? + + def init(): Unit = { + this.client = EsClientFactory.getRestClient(properties) + this.runType = this.properties.getOrDefault(TaskConstant.RUNTYPE, "esjson") + this.engineExecutor = new EsEngineExecutorImpl(this.runType, this.client, properties) + this.engineExecutor.open + } + + + override def progress(): Float = if (totalCodeLineNumber != 0) { + codeLine / totalCodeLineNumber.asInstanceOf[Float] + } else { + 0.0f + } + + override def getProgressInfo: Array[JobProgressInfo] = Array.empty[JobProgressInfo] + + override def log(): String = "Es Engine is running" + + override def kill(): Boolean = { + this.close() + true + } + + override def pause(): Boolean = ??? + + override def resume(): Boolean = ??? + + + override def toString: String = s"EsEntranceEngine($id)" + + // used by EsEngineManager to correct EntranceEngine used resources(用于 EsEngineManager 修正 Engine 使用的资源) + @volatile var isClose = false + + override def close(): Unit = { + try { + this.job.setResultSize(0) + + this.engineExecutor.close + // TODO 释放资源 + + } catch { + case _: Throwable => + } finally { + this.isClose = true + } + } + +} diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceExecutorManager.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceExecutorManager.scala new file mode 100644 index 000000000..51c2a956d --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceExecutorManager.scala @@ -0,0 +1,35 @@ +package com.webank.wedatasphere.linkis.entrance.execute + +import com.webank.wedatasphere.linkis.common.utils.Logging +import com.webank.wedatasphere.linkis.entrance.execute.impl.EntranceExecutorManagerImpl +import com.webank.wedatasphere.linkis.scheduler.executer.Executor +import com.webank.wedatasphere.linkis.scheduler.queue.{GroupFactory, Job, SchedulerEvent} + +/** + * + * @author wang_zh + * @date 2020/5/11 + */ +class EsEntranceExecutorManager(groupFactory: GroupFactory, + engineBuilder: EngineBuilder, + engineRequester: EngineRequester, + engineSelector: EngineSelector, + engineManager: EngineManager, + entranceExecutorRulers: Array[EntranceExecutorRuler]) extends EntranceExecutorManagerImpl(groupFactory, engineBuilder, engineRequester, engineSelector, engineManager, entranceExecutorRulers) with Logging { + + override protected def createExecutor(schedulerEvent: SchedulerEvent): EntranceEngine = schedulerEvent match { + case job: Job => + val newEngine = getOrCreateEngineRequester().request(job) + newEngine.foreach(initialEntranceEngine) + newEngine.orNull + case _ => null + } + + override def askExecutor(schedulerEvent: SchedulerEvent): Option[Executor] = schedulerEvent match{ + case event: SchedulerEvent => + Some(createExecutor(event)) + case _ => None + } + + override def shutdown(): Unit = super.shutdown() +} \ No newline at end of file diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceJob.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceJob.scala new file mode 100644 index 000000000..28fc32c45 --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceJob.scala @@ -0,0 +1,15 @@ +package com.webank.wedatasphere.linkis.entrance.execute + +import com.webank.wedatasphere.linkis.entrance.job.EntranceExecutionJob +import com.webank.wedatasphere.linkis.scheduler.executer.ExecuteRequest + +/** + * + * @author wang_zh + * @date 2020/5/11 + */ +class EsEntranceJob extends EntranceExecutionJob { + + override def jobToExecuteRequest(): ExecuteRequest = super.jobToExecuteRequest() + +} diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/EsEngineExecutor.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/EsEngineExecutor.scala new file mode 100644 index 000000000..54ff8a804 --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/EsEngineExecutor.scala @@ -0,0 +1,24 @@ +package com.webank.wedatasphere.linkis.entrance.executor + +import java.io.IOException + +import com.webank.wedatasphere.linkis.common.utils.Logging +import com.webank.wedatasphere.linkis.scheduler.executer.ExecuteResponse + +/** + * + * @author wang_zh + * @date 2020/5/12 + */ +trait EsEngineExecutor extends Logging { + + @throws(classOf[IOException]) + def open : Unit + + def parse(code: String): Array[String] + + def executeLine(code: String, storePath: String, alias: String): ExecuteResponse + + def close: Unit + +} diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/ResponseHandler.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/ResponseHandler.scala new file mode 100644 index 000000000..002fc52b5 --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/ResponseHandler.scala @@ -0,0 +1,65 @@ +package com.webank.wedatasphere.linkis.entrance.executor + +import com.fasterxml.jackson.databind.{JsonNode, ObjectMapper} +import com.fasterxml.jackson.databind.node.JsonNodeType +import com.fasterxml.jackson.dataformat.cbor.CBORFactory +import com.fasterxml.jackson.dataformat.csv.CsvMapper +import com.fasterxml.jackson.dataformat.smile.SmileFactory +import com.fasterxml.jackson.dataformat.yaml.YAMLMapper +import com.webank.wedatasphere.linkis.common.utils.Logging +import com.webank.wedatasphere.linkis.entrance.executor.impl.ResponseHandlerImpl +import com.webank.wedatasphere.linkis.storage.domain._ +import org.elasticsearch.client.Response + +/** + * + * @author wang_zh + * @date 2020/5/12 + */ +trait ResponseHandler extends Logging { + + def handle(response: Response, storePath: String, alias: String): String + + def handle(response: Response, storePath: String, alias: String, proxyUser: String): String + +} + + +object ResponseHandler { + + val RESPONSE_HANDLER = new ResponseHandlerImpl() + + val jsonMapper = new ObjectMapper() + val yamlMapper = new YAMLMapper() + val cborMapper = new ObjectMapper(new CBORFactory()) + val smileMapper = new ObjectMapper(new SmileFactory()) + val csvMapper = new CsvMapper() + + def getNodeDataType(node: JsonNode): DataType = node.getNodeType match { + case JsonNodeType.ARRAY => ArrayType + case JsonNodeType.BINARY => BinaryType + case JsonNodeType.BOOLEAN => BooleanType + case JsonNodeType.NULL => NullType + case JsonNodeType.NUMBER => DecimalType + case JsonNodeType.OBJECT => StructType + case JsonNodeType.POJO => StructType + case JsonNodeType.STRING => StringType + case JsonNodeType.MISSING => StringType + case _ => StringType + } + + def getNodeTypeByEsType(estype: String): DataType = estype.toLowerCase match { + case "long" | "integer" | "short" | "byte" | "double" | "float" | "half_float" | "scaled_float" => DecimalType + case "text" | "keyword" => StringType + case "date" => DateType + case "binary" => BinaryType + case _ => StringType + } + + def getNodeValue(node: JsonNode): Any = node.getNodeType match { + case JsonNodeType.NUMBER => node.asDouble() + case JsonNodeType.NULL => null + case _ => node.toString().replaceAll("\n|\t", " ") + } + +} \ No newline at end of file diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/codeparser/CodeParser.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/codeparser/CodeParser.scala new file mode 100644 index 000000000..f853297ed --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/codeparser/CodeParser.scala @@ -0,0 +1,115 @@ +package com.webank.wedatasphere.linkis.entrance.executor.codeparser + +import com.webank.wedatasphere.linkis.entrance.conf.EsEntranceConfiguration +import org.apache.commons.lang.StringUtils + +import scala.collection.mutable.ArrayBuffer + +/** + * + * @author wang_zh + * @date 2020/5/11 + */ +trait CodeParser { + + def parse(code: String): Array[String] + +} + +class EsJsonCodeParser extends CodeParser { + + def parse(code: String): Array[String] = { + // parse json code + val codeBuffer = new ArrayBuffer[String]() + val statementBuffer = new ArrayBuffer[Char]() + + var status = 0 + var isBegin = false + code.trim.chars().forEach{ + case '{' => { + if (status == 0) { + if (isBegin && !statementBuffer.isEmpty) { + codeBuffer.append(new String(statementBuffer.toArray)) + statementBuffer.clear() + } else { + isBegin = true + } + } + status -= 1 + statementBuffer.append('{') + } + case '}' => { + status += 1 + statementBuffer.append('}') + } + case char: Int => if (status == 0 && isBegin && !statementBuffer.isEmpty) { + codeBuffer.append(new String(statementBuffer.toArray)) + statementBuffer.clear() + isBegin = false + } else { + statementBuffer.append(char.toChar) + } + } + + if(statementBuffer.nonEmpty) codeBuffer.append(new String(statementBuffer.toArray)) + + codeBuffer.toArray + } +} + +class EsSQLCodeParser extends CodeParser { + + val SQL_FORMAT = EsEntranceConfiguration.ES_SQL_FORMAT.getValue + + override def parse(code: String): Array[String] = { + // sql to request body + parseSql(code).map(String.format(SQL_FORMAT, _)) + } + + val separator = ";" + val defaultLimit:Int = EsEntranceConfiguration.ENGINE_DEFAULT_LIMIT.getValue + def parseSql(code: String): Array[String] = { + //val realCode = StringUtils.substringAfter(code, "\n") + val codeBuffer = new ArrayBuffer[String]() + def appendStatement(sqlStatement: String): Unit ={ + codeBuffer.append(sqlStatement) + } + if (StringUtils.contains(code, separator)) { + StringUtils.split(code, ";").foreach{ + case s if StringUtils.isBlank(s) => + case s if isSelectCmdNoLimit(s) => appendStatement(s + " limit " + defaultLimit); + case s => appendStatement(s); + } + } else { + code match { + case s if StringUtils.isBlank(s) => + case s if isSelectCmdNoLimit(s) => appendStatement(s + " limit " + defaultLimit); + case s => appendStatement(s); + } + } + codeBuffer.toArray + } + + def isSelectCmdNoLimit(cmd: String): Boolean = { + var code = cmd.trim + if(!cmd.split("\\s+")(0).equalsIgnoreCase("select")) return false + if (code.contains("limit")) code = code.substring(code.lastIndexOf("limit")).trim + else if (code.contains("LIMIT")) code = code.substring(code.lastIndexOf("LIMIT")).trim.toLowerCase + else return true + val hasLimit = code.matches("limit\\s+\\d+\\s*;?") + if (hasLimit) { + if (code.indexOf(";") > 0) code = code.substring(5, code.length - 1).trim + else code = code.substring(5).trim + val limitNum = code.toInt + if (limitNum > defaultLimit) throw new IllegalArgumentException("We at most allowed to limit " + defaultLimit + ", but your SQL has been over the max rows.") + } + !hasLimit + } +} + +object CodeParser { + + val ESSQL_CODE_PARSER = new EsSQLCodeParser + val ESJSON_CODE_PARSER = new EsJsonCodeParser + +} diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClient.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClient.scala new file mode 100644 index 000000000..657a93246 --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClient.scala @@ -0,0 +1,103 @@ +package com.webank.wedatasphere.linkis.entrance.executor.esclient + +import java.nio.charset.StandardCharsets.UTF_8 + +import com.webank.wedatasphere.linkis.common.utils.Utils +import com.webank.wedatasphere.linkis.entrance.conf.EsEntranceConfiguration._ +import com.webank.wedatasphere.linkis.server.JMap +import org.apache.commons.codec.binary.Base64 +import org.apache.commons.lang.StringUtils +import org.apache.http.Header +import org.apache.http.auth.{AUTH, Credentials, UsernamePasswordCredentials} +import org.apache.http.message.BufferedHeader +import org.apache.http.util.{Args, CharArrayBuffer, EncodingUtils} +import org.elasticsearch.client.sniff.Sniffer +import org.elasticsearch.client.{Cancellable, Request, RequestOptions, ResponseListener, RestClient} + +import scala.collection.JavaConversions._ + + +/** + * + * @author wang_zh + * @date 2020/5/6 + */ + +trait EsClientOperate { + + def execute(code: String, options: JMap[String, String], responseListener: ResponseListener): Cancellable + + def close(): Unit + +} + +abstract class EsClient(datasourceName:String, client: RestClient, sniffer: Sniffer) extends EsClientOperate { + + def getDatasourceName: String = datasourceName + + def getRestClient: RestClient = client + + def getSniffer: Sniffer = sniffer + + override def close(): Unit = Utils.tryQuietly { + sniffer match { + case s: Sniffer => s.close() + case _ => + } + client match { + case c: RestClient => c.close() + case _ => + } + } + +} + +class EsClientImpl(datasourceName:String, client: RestClient, sniffer: Sniffer) + extends EsClient(datasourceName, client, sniffer) { + + override def execute(code: String, options: JMap[String, String], responseListener: ResponseListener): Cancellable = { + val request = createRequest(code, options) + client.performRequestAsync(request, responseListener) + } + + private def createRequest(code: String, options: JMap[String, String]): Request = { + val endpoint = ES_HTTP_ENDPOINT.getValue(options) + val method = ES_HTTP_METHOD.getValue(options) + val request = new Request(method, endpoint) + request.setOptions(getRequestOptions(options)) + request.setJsonEntity(code) + request + } + + private def getRequestOptions(options: JMap[String, String]): RequestOptions = { + val builder = RequestOptions.DEFAULT.toBuilder() + + val username = ES_USERNAME.getValue(options) + val password = ES_PASSWORD.getValue(options) + // username / password convert to base auth + if (!ES_AUTH_CACHE.getValue && StringUtils.isNotBlank(username) && StringUtils.isNotBlank(password)) { + val authHeader = authenticate(new UsernamePasswordCredentials(username, password), UTF_8.name()) + builder.addHeader(authHeader.getName, authHeader.getValue) + } + + options.filter(entry => entry._1 != null && entry._2 != null && entry._1.startsWith(ES_HTTP_HEADER_PREFIX)) + .foreach(entry => builder.addHeader(entry._1, entry._2)) + + builder.build() + } + + private def authenticate(credentials: Credentials, charset: String): Header = { + val tmp = new StringBuilder + tmp.append(credentials.getUserPrincipal.getName) + tmp.append(":") + tmp.append(if (credentials.getPassword == null) "null" + else credentials.getPassword) + val base64password = Base64.encodeBase64(EncodingUtils.getBytes(tmp.toString, charset), false) + val buffer = new CharArrayBuffer(32) + buffer.append(AUTH.WWW_AUTH_RESP) + buffer.append(": Basic ") + buffer.append(base64password, 0, base64password.length) + new BufferedHeader(buffer) + } + +} diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactory.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactory.scala new file mode 100644 index 000000000..3c692a6a7 --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactory.scala @@ -0,0 +1,155 @@ +package com.webank.wedatasphere.linkis.entrance.executor.esclient + +import java.util +import java.util.Map + +import com.webank.wedatasphere.linkis.common.conf.CommonVars +import com.webank.wedatasphere.linkis.entrance.conf.EsEntranceConfiguration._ +import com.webank.wedatasphere.linkis.entrance.exception.EsParamsIllegalException +import com.webank.wedatasphere.linkis.server.JMap +import org.apache.commons.lang.StringUtils +import org.apache.http.{Header, HttpHost} +import org.apache.http.auth.{AuthScope, UsernamePasswordCredentials} +import org.apache.http.client.CredentialsProvider +import org.apache.http.impl.client.BasicCredentialsProvider +import org.apache.http.impl.nio.client.HttpAsyncClientBuilder +import org.apache.http.message.BasicHeader +import org.elasticsearch.client.RestClient +import org.elasticsearch.client.sniff.Sniffer + +import scala.collection.JavaConversions._ + +/** + * + * @author wang_zh + * @date 2020/5/6 + */ +object EsClientFactory { + + def getRestClient(options: JMap[String, String]): EsClient = { + val key = getDatasourceName(options) + if (StringUtils.isBlank(key)) { + return defaultClient + } + + if (!ES_CLIENT_MAP.contains(key)) { + ES_CLIENT_MAP synchronized { + if (!ES_CLIENT_MAP.contains(key)) { + cacheClient(createRestClient(options)) + } + } + } + + ES_CLIENT_MAP.get(key) + } + + private val MAX_CACHE_CLIENT_SIZE = 20 + private val ES_CLIENT_MAP: Map[String, EsClient] = new util.LinkedHashMap[String, EsClient]() { + override def removeEldestEntry(eldest: Map.Entry[String, EsClient]): Boolean = if (size > MAX_CACHE_CLIENT_SIZE) { + eldest.getValue.close() + true + } else { + false + } + } + + private def getDatasourceName(options: JMap[String, String]): String = { + options.getOrDefault(ES_DATASOURCE_NAME.key, "") + } + + private def cacheClient(client: EsClient) = { + ES_CLIENT_MAP.put(client.getDatasourceName, client) + } + + private def createRestClient(options: JMap[String, String]): EsClient = { + val clusterStr = options.get(ES_CLUSTER.key) + if (StringUtils.isBlank(clusterStr)) { + throw EsParamsIllegalException("cluster is blank!") + } + val cluster = getCluster(clusterStr) + if (cluster.isEmpty) { + throw EsParamsIllegalException("cluster is empty!") + } + val username = options.get(ES_USERNAME.key) + val password = options.get(ES_PASSWORD.key) + + if (ES_AUTH_CACHE.getValue) { + setAuthScope(cluster, username, password) + } + + val httpHosts = cluster.map(item => new HttpHost(item._1, item._2)) + val builder = RestClient.builder(httpHosts: _*) + .setHttpClientConfigCallback((httpClientBuilder: HttpAsyncClientBuilder) => { + if(!ES_AUTH_CACHE.getValue) { + httpClientBuilder.disableAuthCaching + } +// httpClientBuilder.setDefaultRequestConfig(RequestConfig.DEFAULT) +// httpClientBuilder.setDefaultConnectionConfig(ConnectionConfig.DEFAULT) + httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider) + + }) + if (defaultHeaders != null) { + builder.setDefaultHeaders(defaultHeaders) + } + val client = builder.build + + val sniffer = if (ES_SNIFFER_ENABLE.getValue) { + Sniffer.builder(client).build + } else null + + val datasourceName = getDatasourceName(options) + new EsClientImpl(datasourceName, client, sniffer) + } + + // default cluster + private val defaultCluster:Array[(String, Int)] = getCluster(ES_CLUSTER.getValue) + + private val credentialsProvider: CredentialsProvider = { + val credentialsProvider = new BasicCredentialsProvider() + setAuthScope(defaultCluster, ES_USERNAME.getValue, ES_PASSWORD.getValue) + credentialsProvider + } + + private val defaultClient = { + val cluster = ES_CLUSTER.getValue + if (StringUtils.isBlank(cluster)) { + null + } else { + val defaultOpts = new util.HashMap[String, String]() + defaultOpts.put(ES_CLUSTER.key, cluster) + defaultOpts.put(ES_DATASOURCE_NAME.key, ES_DATASOURCE_NAME.getValue) + defaultOpts.put(ES_USERNAME.key, ES_USERNAME.getValue) + defaultOpts.put(ES_PASSWORD.key, ES_PASSWORD.getValue) + val client = createRestClient(defaultOpts) + cacheClient(client) + client + } + } + + private val defaultHeaders: Array[Header] = CommonVars.properties.entrySet() + .filter(entry => entry.getKey != null && entry.getValue != null && entry.getKey.toString.startsWith(ES_HTTP_HEADER_PREFIX)) + .map(entry => new BasicHeader(entry.getKey.toString, entry.getValue.toString)).toArray[Header] + + // host1:port1,host2:port2 -> [(host1,port1),(host2,port2)] + private def getCluster(clusterStr: String): Array[(String, Int)] = if (StringUtils.isNotBlank(clusterStr)) { + clusterStr.split(",") + .map(value => { + val arr = value.split(":") + (arr(0), arr(1).toInt) + }) + } else Array() + + // set cluster auth + private def setAuthScope(cluster: Array[(String, Int)], username: String, password: String): Unit = if (cluster != null && !cluster.isEmpty + && StringUtils.isNotBlank(username) + && StringUtils.isNotBlank(password)) { + cluster.foreach{ + case (host, port) => { + credentialsProvider.setCredentials(new AuthScope(host, port, AuthScope.ANY_REALM, AuthScope.ANY_SCHEME) + , new UsernamePasswordCredentials(username, password)) + } + case _ => + } + } + +} diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/EsEngineExecutorImpl.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/EsEngineExecutorImpl.scala new file mode 100644 index 000000000..c60e2b01a --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/EsEngineExecutorImpl.scala @@ -0,0 +1,81 @@ +package com.webank.wedatasphere.linkis.entrance.executor.impl + +import java.util.concurrent.CountDownLatch + +import com.webank.wedatasphere.linkis.common.utils.Utils +import com.webank.wedatasphere.linkis.entrance.conf.EsEntranceConfiguration +import com.webank.wedatasphere.linkis.entrance.exception.EsConvertResponseException +import com.webank.wedatasphere.linkis.entrance.executor.codeparser.CodeParser +import com.webank.wedatasphere.linkis.entrance.executor.esclient.EsClient +import com.webank.wedatasphere.linkis.entrance.executor.{EsEngineExecutor, ResponseHandler} +import com.webank.wedatasphere.linkis.protocol.constants.TaskConstant +import com.webank.wedatasphere.linkis.scheduler.executer.{AliasOutputExecuteResponse, ErrorExecuteResponse, ExecuteResponse, SuccessExecuteResponse} +import com.webank.wedatasphere.linkis.server.JMap +import com.webank.wedatasphere.linkis.storage.utils.StorageUtils +import org.elasticsearch.client.{Cancellable, Response, ResponseListener} + +/** + * + * @author wang_zh + * @date 2020/5/11 + */ +class EsEngineExecutorImpl(runType:String, client: EsClient, properties: JMap[String, String]) extends EsEngineExecutor { + + private var cancelable: Cancellable = _ + private var codeParser: CodeParser = _ + private var user: String = _ + + override def open: Unit = { + this.codeParser = runType.trim.toLowerCase match { + case "esjson" | "json" => CodeParser.ESJSON_CODE_PARSER + case "essql" | "sql" => { + // set default sql endpoint + properties.putIfAbsent(EsEntranceConfiguration.ES_HTTP_ENDPOINT.key, EsEntranceConfiguration.ES_HTTP_SQL_ENDPOINT.getValue) + CodeParser.ESSQL_CODE_PARSER + } + case _ => CodeParser.ESJSON_CODE_PARSER + } + this.user = properties.get(TaskConstant.UMUSER, StorageUtils.getJvmUser) + } + + override def parse(code: String): Array[String] = { + codeParser.parse(code) + } + + override def executeLine(code: String, storePath: String, alias: String): ExecuteResponse = { + val realCode = code.trim() + info(s"es client begins to run $runType code:\n ${realCode.trim}") + val countDown = new CountDownLatch(1) + var executeResponse: ExecuteResponse = SuccessExecuteResponse() + cancelable = client.execute(realCode, properties, new ResponseListener { + override def onSuccess(response: Response): Unit = { + executeResponse = convertResponse(response, storePath, alias) + countDown.countDown() + } + override def onFailure(exception: Exception): Unit = { + executeResponse = ErrorExecuteResponse("EsEngineExecutor execute fail. ", exception) + countDown.countDown() + } + }) + countDown.await() + executeResponse + } + + // convert response to executeResponse + private def convertResponse(response: Response, storePath: String, alias: String): ExecuteResponse = Utils.tryCatch[ExecuteResponse]{ + if (response.getStatusLine.getStatusCode == 200) { + val output = ResponseHandler.RESPONSE_HANDLER.handle(response, storePath, alias, this.user) + AliasOutputExecuteResponse(alias, output) + } else { + throw EsConvertResponseException("EsEngineExecutor convert response fail. response code: " + response.getStatusLine.getStatusCode) + } + } { + case t: Throwable => ErrorExecuteResponse("EsEngineExecutor execute fail.", t) + } + + override def close: Unit = cancelable match { + case c: Cancellable => c.cancel() + case _ => + } + +} \ No newline at end of file diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/ResponseHandlerImpl.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/ResponseHandlerImpl.scala new file mode 100644 index 000000000..c8a6641a5 --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/ResponseHandlerImpl.scala @@ -0,0 +1,173 @@ +package com.webank.wedatasphere.linkis.entrance.executor.impl + +import java.nio.charset.Charset + +import com.fasterxml.jackson.databind.node.{ArrayNode, ObjectNode} +import com.webank.wedatasphere.linkis.common.io.FsPath +import com.webank.wedatasphere.linkis.common.utils.Utils +import com.webank.wedatasphere.linkis.entrance.conf.EsEntranceConfiguration +import com.webank.wedatasphere.linkis.entrance.exception.EsConvertResponseException +import com.webank.wedatasphere.linkis.entrance.executor.ResponseHandler +import com.webank.wedatasphere.linkis.entrance.executor.ResponseHandler._ +import com.webank.wedatasphere.linkis.storage.LineRecord +import com.webank.wedatasphere.linkis.storage.domain._ +import com.webank.wedatasphere.linkis.storage.resultset.table.{TableMetaData, TableRecord} +import com.webank.wedatasphere.linkis.storage.resultset.{ResultSetFactory, ResultSetWriter} +import com.webank.wedatasphere.linkis.storage.utils.StorageUtils +import org.apache.commons.io.IOUtils +import org.apache.http.entity.ContentType +import org.apache.http.util.EntityUtils +import org.elasticsearch.client.Response + +import scala.collection.mutable.ArrayBuffer + +/** + * + * @author wang_zh + * @date 2020/5/12 + */ +class ResponseHandlerImpl extends ResponseHandler { + + override def handle(response: Response, storePath: String, alias: String): String = { + handle(response, storePath, alias, StorageUtils.getJvmUser) + } + + override def handle(response: Response, storePath: String, alias: String, proxyUser: String): String = { + val contentType = ContentType.get(response.getEntity).getMimeType.toLowerCase + val charSet = ContentType.get(response.getEntity).getCharset match { + case c: Charset => c + case _ => Charset.forName("UTF-8") + } + val contentBytes = EntityUtils.toByteArray(response.getEntity) + + if (contentBytes == null || contentBytes.isEmpty) { + throw EsConvertResponseException("EsEngineExecutor convert response fail, response content is empty.") + } + + val jsonNode = Utils.tryCatch{ contentType match { + case "application/yaml" => + yamlMapper.readTree(contentBytes) + case "application/cbor" => + cborMapper.readTree(contentBytes) + case "application/smile" => + smileMapper.readTree(contentBytes) +// case "text/csv" => +// csvMapper.readTree(contentBytes) +// case "text/tab-separated-values" => +// csvMapper.readTree(contentBytes) +// val schema = csvMapper.schemaFor(classOf[Array[Byte]]).withColumnSeparator('\t') +// val reader = csvMapper.readerFor(classOf[Array[Byte]]).`with`(schema) +// reader.readValue(contentBytes) + case _ => + jsonMapper.readTree(contentBytes) + } + } { + case t: Throwable => { + warn("deserialize response content error, {}", t) + null + } + } + + if (jsonNode == null) { + return writeText(new String(contentBytes, charSet), storePath, alias, proxyUser) + } + + var isTable = false + val columns = ArrayBuffer[Column]() + val records = new ArrayBuffer[TableRecord] + + // es json runType response + jsonNode.at("/hits/hits") match { + case hits: ArrayNode => { + isTable = true + columns += Column("_index", StringType, "") + columns += Column("_type", StringType, "") + columns += Column("_id", StringType, "") + columns += Column("_score", DoubleType, "") + hits.forEach { + case obj: ObjectNode => { + val lineValues = ArrayBuffer[Any]("", "", "", 0.0) + obj.fields().forEachRemaining(entry => { + val key = entry.getKey + val value = entry.getValue + if ("_source".equals(key.trim)) { + value.fields().forEachRemaining(sourceEntry => { + val sourcekey = sourceEntry.getKey + val sourcevalue = sourceEntry.getValue + val index = columns.indexWhere(_.columnName.equals(sourcekey)) + if (index < 0) { + columns += Column(sourcekey, getNodeDataType(sourcevalue), "") + lineValues += getNodeValue(sourcevalue) + } else { + lineValues(index) = getNodeValue(sourcevalue) + } + }) + } else { + val index = columns.indexWhere(_.columnName.equals(key)) + if (index < 0) { + columns += Column(key, getNodeDataType(value), "") + lineValues += getNodeValue(value) + } else { + lineValues(index) = getNodeValue(value) + } + } + }) + records += new TableRecord(lineValues.toArray) + } + case _ => + } + } + case _ => + } + + // es sql runType response + jsonNode.at("/rows") match { + case rows: ArrayNode => { + isTable = true + jsonNode.get("columns").asInstanceOf[ArrayNode] + .forEach(node => { + val name = node.get("name").asText() + val estype = node.get("type").asText().trim + columns += Column(name, getNodeTypeByEsType(estype), "") + }) + rows.forEach { + case row: ArrayNode => { + val lineValues = new ArrayBuffer[Any]() + row.forEach(node => lineValues += getNodeValue(node)) + records += new TableRecord(lineValues.toArray) + } + case _ => + } + } + case _ => + } + + // write result + if (isTable) { + writeTable(new TableMetaData(columns.toArray), records, storePath, alias, proxyUser) + } else { + writeText(new String(contentBytes, charSet), storePath, alias, proxyUser) + } + } + + def writeText(content: String, storePath: String, alias: String, proxyUser: String): String = { + val resultSet = ResultSetFactory.getInstance.getResultSetByType(ResultSetFactory.TEXT_TYPE) + val resultSetPath = resultSet.getResultSetPath(new FsPath(storePath), alias) + val writer = ResultSetWriter.getResultSetWriter(resultSet, EsEntranceConfiguration.ENGINE_RESULT_SET_MAX_CACHE.getValue.toLong, resultSetPath, proxyUser) + writer.addMetaData(null) + content.split("\\n").foreach(item => writer.addRecord(new LineRecord(item))) + IOUtils.closeQuietly(writer) + writer.toString() + } + + def writeTable(metaData: TableMetaData, records: ArrayBuffer[TableRecord], storePath: String, alias: String, proxyUser: String): String = { + val resultSet = ResultSetFactory.getInstance.getResultSetByType(ResultSetFactory.TABLE_TYPE) + val resultSetPath = resultSet.getResultSetPath(new FsPath(storePath), alias) + val writer = ResultSetWriter.getResultSetWriter(resultSet, EsEntranceConfiguration.ENGINE_RESULT_SET_MAX_CACHE.getValue.toLong, resultSetPath, proxyUser) + writer.addMetaData(metaData) + records.foreach(writer.addRecord) + IOUtils.closeQuietly(writer) + writer.toString() + } + +} diff --git a/ujes/definedEngines/es/entrance/src/test/resources/entrance.http b/ujes/definedEngines/es/entrance/src/test/resources/entrance.http new file mode 100644 index 000000000..a605d0ec5 --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/test/resources/entrance.http @@ -0,0 +1,43 @@ +### execute es json +POST {{host}}/api/rest_j/v1/entrance/execute +Content-Type: application/json + +{ + "executeApplicationName": "esentrance", + "executionCode": "{\"query\":{\"match_all\":{}}}", + "runType": "esjson", + "params": { + "runType": "esjson", + "variable": {}, + "configuration": { + "runtime": { + "wds.linkis.es.http.endpoint": "_search?format=text&pretty" + }, + "startup": {} + } + }, + "scriptPath": "hdfs:///linkis/workspace/wang_zh/test.esjson" +} + +### execute es sql +POST {{host}}/api/rest_j/v1/entrance/execute +Content-Type: application/json + +{ + "executeApplicationName": "esentrance", + "executionCode": "SELECT * FROM test1", + "runType": "essql", + "params": { + "runType": "essql", + "variable": {}, + "configuration": { + "runtime": { + "wds.linkis.es.http.endpoint": "_sql?format=smile" + }, + "startup": {} + } + }, + "scriptPath": "hdfs:///linkis/workspace/wang_zh/test.esjson" +} + +### \ No newline at end of file diff --git a/ujes/definedEngines/es/entrance/src/test/resources/http-client.env.json b/ujes/definedEngines/es/entrance/src/test/resources/http-client.env.json new file mode 100644 index 000000000..eeaa650d6 --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/test/resources/http-client.env.json @@ -0,0 +1,9 @@ +{ + "test": { + "host": "http://127.0.0.1:10010", + "show_env": "1", + + "username": "", + "password": "" + } +} \ No newline at end of file diff --git a/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngineTests.scala b/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngineTests.scala new file mode 100644 index 000000000..13e5872f8 --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngineTests.scala @@ -0,0 +1,49 @@ +package com.webank.wedatasphere.linkis.entrance.execute + +import java.util + +import com.webank.wedatasphere.linkis.common.conf.CommonVars +import com.webank.wedatasphere.linkis.entrance.conf.EsEntranceConfiguration +import com.webank.wedatasphere.linkis.scheduler.executer.{ExecuteRequest, JobExecuteRequest, RunTypeExecuteRequest, SuccessExecuteResponse} +import com.webank.wedatasphere.linkis.server.JMap +import org.junit.{Before, Test} + +/** + * + * @author wang_zh + * @date 2020/5/14 + */ +@Test +class EsEntranceEngineTests { + + val STORE_PATH = "/tmp/test" + var entranceEngine: EsEntranceEngine = _ + var options: JMap[String, String] = _ + @Before + def init(): Unit = { + options = new util.HashMap[String, String]() + options.put("wds.linkis.es.cluster", "127.0.0.1:9200") + options.put("wds.linkis.es.datasource", "test") + + options.put("runType", "esjson") + + entranceEngine = new EsEntranceEngine(1, options) + entranceEngine.init() + } + + @Test + def test() = { +// val query = "{\"query\":{\"match_all\":{}}}" + val query = "{\"query\":{\"match_all\":{}}}{\"query\":{\"match_all\":{}}}" + + options.put("wds.linkis.es.http.endpoint", "_search?format=text&pretty") + val executeRequest = new ExecuteRequest with StorePathExecuteRequest with RunTypeExecuteRequest { + override val code: String = query + override val storePath: String = STORE_PATH + override val runType: String = "esjson" + } + + val response = entranceEngine.execute(executeRequest) + } + +} diff --git a/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactoryTests.scala b/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactoryTests.scala new file mode 100644 index 000000000..55089a5b4 --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactoryTests.scala @@ -0,0 +1,49 @@ +package com.webank.wedatasphere.linkis.entrance.executor.esclient + +import java.util +import java.util.concurrent.{CountDownLatch, TimeUnit} + +import com.webank.wedatasphere.linkis.server.JMap +import org.apache.http.util.EntityUtils +import org.elasticsearch.client.{Response, ResponseListener} +import org.junit.Test + +/** + * + * @author wang_zh + * @date 2020/5/14 + */ +@Test +class EsClientFactoryTests { + + val options: JMap[String, String] = new util.HashMap[String, String]() + options.put("wds.linkis.es.cluster", "127.0.0.1:9200") + options.put("wds.linkis.es.datasource", "test") + + @Test + def test() = { + options.put("wds.linkis.es.http.endpoint", "_search?format=text&pretty") + + val code = "{\"query\":{\"match_all\":{}}}" + + val client = EsClientFactory.getRestClient(options) + val countDown = new CountDownLatch(1) + + val cancellable = client.execute(code, options, new ResponseListener { + override def onSuccess(response: Response): Unit = { + print(EntityUtils.toString(response.getEntity())) + countDown.countDown() + } + + override def onFailure(exception: Exception): Unit = { + countDown.countDown() + } + }) + + countDown.await(10, TimeUnit.SECONDS) + + cancellable.cancel() + } + + +} -- Gitee From 0044d56216ccb9d8ff55596718d264b4dd4ea4f4 Mon Sep 17 00:00:00 2001 From: wang_zh <643348094@qq.com> Date: Thu, 21 May 2020 18:31:30 +0800 Subject: [PATCH 023/148] linkis-es-entrance modify --- .../conf/EsEntranceConfiguration.scala | 2 +- .../entrance/conf/EsSpringConfiguration.scala | 36 ++++++++--- .../exception/EsEngineException.scala | 10 ++++ .../entrance/execute/EsEngineManager.scala | 54 +++++++++++++---- .../entrance/execute/EsEngineRequester.scala | 59 ++++++++++++------- .../entrance/execute/EsEntranceEngine.scala | 28 +++++---- .../execute/EsEntranceExecutorManager.scala | 9 ++- .../executor/codeparser/CodeParser.scala | 3 +- .../executor/esclient/EsClientFactory.scala | 2 +- .../executor/impl/ResponseHandlerImpl.scala | 17 +++--- .../execute/EsEntranceEngineTests.scala | 2 +- 11 files changed, 156 insertions(+), 66 deletions(-) create mode 100644 ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsEngineException.scala diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsEntranceConfiguration.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsEntranceConfiguration.scala index dd87d5332..e8f75b9ab 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsEntranceConfiguration.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsEntranceConfiguration.scala @@ -15,7 +15,7 @@ object EsEntranceConfiguration { val ES_AUTH_CACHE = CommonVars("wds.linkis.es.auth.cache", true) val ES_USERNAME = CommonVars("wds.linkis.es.username", "") val ES_PASSWORD = CommonVars("wds.linkis.es.password", "") - val ES_SNIFFER_ENABLE = CommonVars("wds.linkis.es.sniffer.enable", true) + val ES_SNIFFER_ENABLE = CommonVars("wds.linkis.es.sniffer.enable", false) val ES_HTTP_METHOD = CommonVars("wds.linkis.es.http.method", "GET") val ES_HTTP_ENDPOINT = CommonVars("wds.linkis.es.http.endpoint", "/_search") val ES_HTTP_SQL_ENDPOINT = CommonVars("wds.linkis.es.sql.endpoint", "/_sql") diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsSpringConfiguration.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsSpringConfiguration.scala index 2273c176c..85d8eb6e1 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsSpringConfiguration.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsSpringConfiguration.scala @@ -1,13 +1,15 @@ package com.webank.wedatasphere.linkis.entrance.conf -import com.webank.wedatasphere.linkis.common.utils.Logging +import com.webank.wedatasphere.linkis.common.utils.{Logging, ShutdownUtils, Utils} import com.webank.wedatasphere.linkis.entrance.annotation._ import com.webank.wedatasphere.linkis.entrance.execute._ -import com.webank.wedatasphere.linkis.entrance.execute.impl.EngineRequesterImpl +import com.webank.wedatasphere.linkis.resourcemanager.client.ResourceManagerClient import com.webank.wedatasphere.linkis.resourcemanager.domain.ModuleInfo import com.webank.wedatasphere.linkis.resourcemanager.{InstanceResource, ResourceRequestPolicy} import com.webank.wedatasphere.linkis.rpc.Sender +import com.webank.wedatasphere.linkis.scheduler.{Scheduler, SchedulerContext} import com.webank.wedatasphere.linkis.scheduler.queue.GroupFactory +import com.webank.wedatasphere.linkis.scheduler.queue.parallelqueue.ParallelScheduler import org.springframework.beans.factory.annotation.Autowired import org.springframework.context.annotation.{Bean, Configuration} @@ -24,18 +26,38 @@ class EsSpringConfiguration extends Logging{ new EsEntranceExecutorManager(groupFactory, engineBuilder, engineRequester, engineSelector, engineManager, entranceExecutorRulers) @EngineRequesterBeanAnnotation - def generateEngineRequester(@GroupFactoryBeanAnnotation.GroupFactoryAutowiredAnnotation groupFactory: GroupFactory) = new EsEngineRequester(groupFactory) - + def generateEngineRequester(@GroupFactoryBeanAnnotation.GroupFactoryAutowiredAnnotation groupFactory: GroupFactory, + @Autowired rmClient: ResourceManagerClient) = { + new EsEngineRequester(groupFactory, rmClient) + } @Bean(Array("resources")) - def createResource(): ModuleInfo = { + def createResource(@Autowired rmClient: ResourceManagerClient): ModuleInfo = { + // Clean up resources before creating resources to prevent dirty data when exiting abnormally (创造资源之前进行资源清理,防止异常退出时产生了脏数据) + Utils.tryQuietly(rmClient.unregister()) + Utils.addShutdownHook({ + info("rmClient shutdown, unregister resource...") + rmClient.unregister + }) val totalResource = new InstanceResource(EsEntranceConfiguration.ENTRANCE_MAX_JOB_INSTANCE.getValue) val protectResource = new InstanceResource(EsEntranceConfiguration.ENTRANCE_PROTECTED_JOB_INSTANCE.getValue) info(s"create resource for es engine totalResource is $totalResource, protectResource is $protectResource") - ModuleInfo(Sender.getThisServiceInstance, totalResource, protectResource, ResourceRequestPolicy.LoadInstance) + ModuleInfo(Sender.getThisServiceInstance, totalResource, protectResource, ResourceRequestPolicy.Instance) + } + + @SchedulerBeanAnnotation + def generateScheduler(@SchedulerContextBeanAnnotation.SchedulerContextAutowiredAnnotation schedulerContext: SchedulerContext): Scheduler = { + val scheduler = new ParallelScheduler(schedulerContext) + scheduler.init() + scheduler.start() + Utils.addShutdownHook({ + info("scheduler shutdown...") + scheduler.shutdown + }) + scheduler } @EngineManagerBeanAnnotation - def generateEngineManager(@Autowired resources: ModuleInfo): EngineManager = new EsEngineManager(resources) + def generateEngineManager(@Autowired resources: ModuleInfo) = new EsEngineManager(resources) } diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsEngineException.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsEngineException.scala new file mode 100644 index 000000000..27077c8e8 --- /dev/null +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsEngineException.scala @@ -0,0 +1,10 @@ +package com.webank.wedatasphere.linkis.entrance.exception + +import com.webank.wedatasphere.linkis.common.exception.ErrorException + +/** + * + * @author wang_zh + * @date 2020/5/20 + */ +case class EsEngineException(errorMsg: String) extends ErrorException(70114, errorMsg) diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineManager.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineManager.scala index 54e5ce7ac..04794e2bf 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineManager.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineManager.scala @@ -6,8 +6,11 @@ import com.webank.wedatasphere.linkis.common.utils.Logging import com.webank.wedatasphere.linkis.entrance.event.EntranceEvent import com.webank.wedatasphere.linkis.resourcemanager.domain.ModuleInfo import com.webank.wedatasphere.linkis.resourcemanager.service.annotation.{EnableResourceManager, RegisterResource} -import com.webank.wedatasphere.linkis.scheduler.executer.Executor -import com.webank.wedatasphere.linkis.scheduler.executer.ExecutorState.ExecutorState +import com.webank.wedatasphere.linkis.scheduler.executer.{Executor, ExecutorState} +import com.webank.wedatasphere.linkis.scheduler.executer.ExecutorState.{Busy, ExecutorState, Idle} +import org.apache.commons.io.IOUtils + +import scala.collection.JavaConversions._ /** * @@ -21,23 +24,35 @@ class EsEngineManager(resources: ModuleInfo) extends EngineManager with Logging // TODO 修正 EntranceEngine 使用的 resources - - /** * The user initializes the operation. When the entance is started for the first time, all the engines are obtained through this method, and the initialization operation is completed. * 用户初始化操作,第一次启动entrance时,将通过该方法,拿到所有的engine,完成初始化操作 */ override def readAliveEngines(): Unit = { } - override def get(id: Long): EntranceEngine = ??? + override def get(id: Long): EntranceEngine = idToEngines.get(id) override def get(instance: String): Option[EntranceEngine] = ??? - override def listEngines(op: EntranceEngine => Boolean): Array[EntranceEngine] = ??? - - override def addNotExistsEngines(engine: EntranceEngine*): Unit = {} - - override def delete(id: Long): Unit = ??? + override def listEngines(op: EntranceEngine => Boolean): Array[EntranceEngine] = idToEngines.entrySet().map(_.getValue).filter(e => op(e)).toArray + + override def addNotExistsEngines(engine: EntranceEngine*): Unit = + engine.foreach{e => + if(!idToEngines.containsKey(e.getId)) idToEngines synchronized { + if(!idToEngines.containsKey(e.getId)) { + idToEngines.put(e.getId, e) + info(toString + ":add a new engine => " + e) + } + } + } + + override def delete(id: Long): Unit = if(idToEngines.containsKey(id)) idToEngines synchronized { + if(idToEngines.containsKey(id)) { + val engine = idToEngines.remove(id) + IOUtils.closeQuietly(engine) + info(s"deleted engine $engine.") + } + } override def onEvent(event: EntranceEvent): Unit = { } @@ -45,11 +60,24 @@ class EsEngineManager(resources: ModuleInfo) extends EngineManager with Logging error(s"deal event $event failed!", t) } - override def onExecutorCreated(executor: Executor): Unit = {} + override def onExecutorCreated(executor: Executor): Unit = executor match { + case engine: EntranceEngine => addNotExistsEngines(engine) + } - override def onExecutorCompleted(executor: Executor, message: String): Unit = {} + override def onExecutorCompleted(executor: Executor, message: String): Unit = executor match { + case engine: EntranceEngine => delete(engine.getId) + } - override def onExecutorStateChanged(executor: Executor, fromState: ExecutorState, toState: ExecutorState): Unit = {} + override def onExecutorStateChanged(executor: Executor, fromState: ExecutorState, toState: ExecutorState): Unit = executor match { + case engine: EntranceEngine => + toState match { +// case Idle => +// case Busy => + case state if ExecutorState.isCompleted(state) => + delete(executor.getId) + case _ => + } + } /** * Registered resources(注册资源) diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineRequester.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineRequester.scala index fb6d67128..8756dc01d 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineRequester.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineRequester.scala @@ -2,44 +2,59 @@ package com.webank.wedatasphere.linkis.entrance.execute import java.util import java.util.concurrent.atomic.AtomicLong +import com.webank.wedatasphere.linkis.common.log.LogUtils import com.webank.wedatasphere.linkis.entrance.conf.EntranceConfiguration +import com.webank.wedatasphere.linkis.entrance.exception.EsEngineException import com.webank.wedatasphere.linkis.entrance.scheduler.EntranceGroupFactory import com.webank.wedatasphere.linkis.protocol.config.{RequestQueryGlobalConfig, ResponseQueryConfig} import com.webank.wedatasphere.linkis.protocol.constants.TaskConstant import com.webank.wedatasphere.linkis.protocol.engine.{RequestEngine, RequestNewEngine, TimeoutRequestNewEngine} +import com.webank.wedatasphere.linkis.protocol.query.RequestPersistTask import com.webank.wedatasphere.linkis.protocol.utils.TaskUtils +import com.webank.wedatasphere.linkis.resourcemanager.{AvailableResource, InstanceResource, NotEnoughResource, UserResultResource} +import com.webank.wedatasphere.linkis.resourcemanager.client.ResourceManagerClient import com.webank.wedatasphere.linkis.rpc.Sender import com.webank.wedatasphere.linkis.scheduler.executer.ExecutorState +import com.webank.wedatasphere.linkis.scheduler.listener.ExecutorListener import com.webank.wedatasphere.linkis.scheduler.queue.{GroupFactory, Job} import com.webank.wedatasphere.linkis.server.JMap -import scala.collection.JavaConverters._ +import scala.collection.JavaConversions._ /** * * @author wang_zh * @date 2020/5/11 */ -class EsEngineRequester(groupFactory: GroupFactory) extends EngineRequester { - +class EsEngineRequester(groupFactory: GroupFactory, rmClient: ResourceManagerClient) extends EngineRequester { private val idGenerator = new AtomicLong(0) + private var executorListener: Option[ExecutorListener] = None + + override def setExecutorListener(executorListener: ExecutorListener): Unit = + this.executorListener = Some(executorListener) override def request(job: Job): Option[EntranceEngine] = job match { case entranceJob: EntranceJob => { val requestEngine = createRequestEngine(job); - - // TODO request resource manager - val engine = new EsEntranceEngine(idGenerator.incrementAndGet(), new util.HashMap[String, String](requestEngine.properties)) - engine.setGroup(groupFactory.getOrCreateGroup(getGroupName(requestEngine.creator, requestEngine.user))) - engine.setUser(requestEngine.user) - engine.setCreator(requestEngine.creator) - engine.updateState(ExecutorState.Starting, ExecutorState.Idle, null, null) - engine.setJob(entranceJob) - engine.init() - Option(engine) - + // request resource manager + rmClient.requestResource(requestEngine.user, requestEngine.creator, new InstanceResource(1)) match { + case NotEnoughResource(reason) => + throw EsEngineException(LogUtils.generateWarn(reason)) + case AvailableResource(ticketId) => { + val engine = new EsEntranceEngine(idGenerator.incrementAndGet(), new util.HashMap[String, String](requestEngine.properties) + , () => {rmClient.resourceReleased(UserResultResource(ticketId, requestEngine.user))}) + engine.setGroup(groupFactory.getOrCreateGroup(getGroupName(requestEngine.creator, requestEngine.user))) + engine.setUser(requestEngine.user) + engine.setCreator(requestEngine.creator) + engine.updateState(ExecutorState.Starting, ExecutorState.Idle, null, null) + engine.setJob(entranceJob) + engine.init() + executorListener.foreach(_.onExecutorCreated(engine)) + Option(engine) + } + } } - case _ => null + case _ => None } private def getGroupName(creator: String, user: String): String = EntranceGroupFactory.getGroupName(creator, user) @@ -51,20 +66,24 @@ class EsEngineRequester(groupFactory: GroupFactory) extends EngineRequester { val responseQueryGlobalConfig = sender.ask(requestQueryGlobalConfig).asInstanceOf[ResponseQueryConfig] val keyAndValue = responseQueryGlobalConfig.getKeyAndValue - // TODO get datasoure config + // TODO get datasource config val properties = if(entranceJob.getParams == null) new util.HashMap[String, String] else { val startupMap = TaskUtils.getStartupMap(entranceJob.getParams) val runtimeMap = TaskUtils.getRuntimeMap(entranceJob.getParams) val properties = new JMap[String, String] - startupMap.forEach {case (k, v) => if(v != null) properties.put(k, v.toString)} - runtimeMap.forEach {case (k, v) => if(v != null) properties.put(k, v.toString)} + startupMap.foreach {case (k, v) => if(v != null) properties.put(k, v.toString)} + runtimeMap.foreach {case (k, v) => if(v != null) properties.put(k, v.toString)} properties } - val runType:String = entranceJob.getParams.getOrDefault(TaskConstant.RUNTYPE, "esjson").asInstanceOf[String] - properties.put(TaskConstant.RUNTYPE, runType) + entranceJob.getTask match { + case requestPersistTask: RequestPersistTask => { + properties.put(TaskConstant.RUNTYPE, requestPersistTask.getRunType) + } + case _ => + } properties.put(TaskConstant.UMUSER, entranceJob.getUser) properties.put(RequestEngine.REQUEST_ENTRANCE_INSTANCE, Sender.getThisServiceInstance.getApplicationName + "," + Sender.getThisServiceInstance.getInstance) diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngine.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngine.scala index c667d3e46..3540640db 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngine.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngine.scala @@ -18,7 +18,7 @@ import org.apache.commons.lang.exception.ExceptionUtils * @author wang_zh * @date 2020/5/11 */ -class EsEntranceEngine(id: Long, properties: JMap[String, String]) extends EntranceEngine(id) with SingleTaskOperateSupport with SingleTaskInfoSupport { +class EsEntranceEngine(id: Long, properties: JMap[String, String], resourceRelease: () => Unit) extends EntranceEngine(id) with SingleTaskOperateSupport with SingleTaskInfoSupport { private var client: EsClient = _ private var engineExecutor: EsEngineExecutor = _ @@ -56,20 +56,25 @@ class EsEntranceEngine(id: Long, properties: JMap[String, String]) extends Entra persistEngine.persistResultSet(job, aliasOutputExecuteResponse) case SuccessExecuteResponse() => info(s"execute execute successfully : ${code}") - case IncompleteExecuteResponse(_) => - error(s"execute execute failed : ${code}") - job.getLogListener.foreach(_.onLogUpdate(job, LogUtils.generateERROR( s"execute execute failed : ${code}"))) - case e: ErrorExecuteResponse => - error(s"execute code $code failed!", e.t) - job.getLogListener.foreach(_.onLogUpdate(job, LogUtils.generateERROR( s"execute code $code failed!" + ExceptionUtils.getFullStackTrace(e.t)))) + case incompleteResponse: IncompleteExecuteResponse => + warn(s"execute execute failed, code: ${code}, msg: ${incompleteResponse.message}") + val msg = if(StringUtils.isNotEmpty(incompleteResponse.message)) incompleteResponse.message else "incomplete code." + job.getLogListener.foreach(_.onLogUpdate(job, LogUtils.generateWarn( s"execute incomplete code, code: ${code}, msg: ${msg}"))) + case errorResponse: ErrorExecuteResponse => + error(s"execute code $code failed!", errorResponse.t) + job.getLogListener.foreach(_.onLogUpdate(job, LogUtils.generateERROR( s"execute code $code failed!" + ExceptionUtils.getFullStackTrace(errorResponse.t)))) + return errorResponse case _ => warn("no matching exception") - job.getLogListener.foreach(_.onLogUpdate(job, LogUtils.generateERROR( "no matching exception"))) + job.getLogListener.foreach(_.onLogUpdate(job, LogUtils.generateERROR( s"execute code $code failed! no matching exception"))) + return ErrorExecuteResponse("no matching exception", null) } codeLine = codeLine + 1 + // update progress + job.getProgressListener.map(_.onProgressUpdate(job, progress, getProgressInfo)) } catch { case t: Throwable => - return ErrorExecuteResponse("EsEntranceEngine ,execute exception ", t) + return ErrorExecuteResponse("EsEntranceEngine execute exception. ", t) } finally { } @@ -119,10 +124,9 @@ class EsEntranceEngine(id: Long, properties: JMap[String, String]) extends Entra override def close(): Unit = { try { this.job.setResultSize(0) - this.engineExecutor.close - // TODO 释放资源 - + // 释放资源 + resourceRelease() } catch { case _: Throwable => } finally { diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceExecutorManager.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceExecutorManager.scala index 51c2a956d..1175a1bdc 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceExecutorManager.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceExecutorManager.scala @@ -2,8 +2,9 @@ package com.webank.wedatasphere.linkis.entrance.execute import com.webank.wedatasphere.linkis.common.utils.Logging import com.webank.wedatasphere.linkis.entrance.execute.impl.EntranceExecutorManagerImpl -import com.webank.wedatasphere.linkis.scheduler.executer.Executor +import com.webank.wedatasphere.linkis.scheduler.executer.{Executor, ExecutorState} import com.webank.wedatasphere.linkis.scheduler.queue.{GroupFactory, Job, SchedulerEvent} +import org.apache.commons.io.IOUtils /** * @@ -31,5 +32,9 @@ class EsEntranceExecutorManager(groupFactory: GroupFactory, case _ => None } - override def shutdown(): Unit = super.shutdown() + override def shutdown(): Unit = { + super.shutdown() + getOrCreateEngineManager.listEngines(engine => ExecutorState.isAvailable(engine.state)) + .foreach(engine => IOUtils.closeQuietly(engine)) + } } \ No newline at end of file diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/codeparser/CodeParser.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/codeparser/CodeParser.scala index f853297ed..14af0e444 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/codeparser/CodeParser.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/codeparser/CodeParser.scala @@ -4,6 +4,7 @@ import com.webank.wedatasphere.linkis.entrance.conf.EsEntranceConfiguration import org.apache.commons.lang.StringUtils import scala.collection.mutable.ArrayBuffer +import scala.collection.JavaConversions._ /** * @@ -25,7 +26,7 @@ class EsJsonCodeParser extends CodeParser { var status = 0 var isBegin = false - code.trim.chars().forEach{ + code.trim.chars().forEach { case '{' => { if (status == 0) { if (isBegin && !statementBuffer.isEmpty) { diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactory.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactory.scala index 3c692a6a7..29583dae7 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactory.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactory.scala @@ -93,7 +93,7 @@ object EsClientFactory { } val client = builder.build - val sniffer = if (ES_SNIFFER_ENABLE.getValue) { + val sniffer = if (ES_SNIFFER_ENABLE.getValue(options)) { Sniffer.builder(client).build } else null diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/ResponseHandlerImpl.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/ResponseHandlerImpl.scala index c8a6641a5..681dc1102 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/ResponseHandlerImpl.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/ResponseHandlerImpl.scala @@ -18,8 +18,9 @@ import org.apache.commons.io.IOUtils import org.apache.http.entity.ContentType import org.apache.http.util.EntityUtils import org.elasticsearch.client.Response - import scala.collection.mutable.ArrayBuffer +import scala.collection.JavaConversions._ + /** * @@ -84,14 +85,14 @@ class ResponseHandlerImpl extends ResponseHandler { columns += Column("_type", StringType, "") columns += Column("_id", StringType, "") columns += Column("_score", DoubleType, "") - hits.forEach { + hits.foreach { case obj: ObjectNode => { - val lineValues = ArrayBuffer[Any]("", "", "", 0.0) - obj.fields().forEachRemaining(entry => { + val lineValues = new Array[Any](columns.length).toBuffer + obj.fields().foreach(entry => { val key = entry.getKey val value = entry.getValue if ("_source".equals(key.trim)) { - value.fields().forEachRemaining(sourceEntry => { + value.fields().foreach(sourceEntry => { val sourcekey = sourceEntry.getKey val sourcevalue = sourceEntry.getValue val index = columns.indexWhere(_.columnName.equals(sourcekey)) @@ -125,15 +126,15 @@ class ResponseHandlerImpl extends ResponseHandler { case rows: ArrayNode => { isTable = true jsonNode.get("columns").asInstanceOf[ArrayNode] - .forEach(node => { + .foreach(node => { val name = node.get("name").asText() val estype = node.get("type").asText().trim columns += Column(name, getNodeTypeByEsType(estype), "") }) - rows.forEach { + rows.foreach { case row: ArrayNode => { val lineValues = new ArrayBuffer[Any]() - row.forEach(node => lineValues += getNodeValue(node)) + row.foreach(node => lineValues += getNodeValue(node)) records += new TableRecord(lineValues.toArray) } case _ => diff --git a/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngineTests.scala b/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngineTests.scala index 13e5872f8..3264093d7 100644 --- a/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngineTests.scala +++ b/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngineTests.scala @@ -27,7 +27,7 @@ class EsEntranceEngineTests { options.put("runType", "esjson") - entranceEngine = new EsEntranceEngine(1, options) + entranceEngine = new EsEntranceEngine(1, options, () => {}) entranceEngine.init() } -- Gitee From 053c79c0df44ebc0d744bf31ea9b7fc99b1051fd Mon Sep 17 00:00:00 2001 From: wang_zh <643348094@qq.com> Date: Tue, 9 Jun 2020 12:11:14 +0800 Subject: [PATCH 024/148] change some default configuration add resource init EsEntranceEngine add exception close fix others --- .../src/main/resources/application.yml | 2 +- .../conf/EsEntranceConfiguration.scala | 4 ++-- .../entrance/execute/EsEngineRequester.scala | 1 + .../entrance/execute/EsEntranceEngine.scala | 19 ++++++++++--------- .../executor/codeparser/CodeParser.scala | 2 +- .../entrance/executor/esclient/EsClient.scala | 2 +- .../executor/impl/EsEngineExecutorImpl.scala | 2 +- 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/ujes/definedEngines/es/entrance/src/main/resources/application.yml b/ujes/definedEngines/es/entrance/src/main/resources/application.yml index b8950b815..31cdc217f 100644 --- a/ujes/definedEngines/es/entrance/src/main/resources/application.yml +++ b/ujes/definedEngines/es/entrance/src/main/resources/application.yml @@ -2,7 +2,7 @@ server: port: 10009 spring: application: - name: esEntrance + name: elasticsearchEntrance eureka: diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsEntranceConfiguration.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsEntranceConfiguration.scala index e8f75b9ab..1bb75c712 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsEntranceConfiguration.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsEntranceConfiguration.scala @@ -12,7 +12,7 @@ object EsEntranceConfiguration { // es client val ES_CLUSTER = CommonVars("wds.linkis.es.cluster", "") val ES_DATASOURCE_NAME = CommonVars("wds.linkis.es.datasource", "default_datasource") - val ES_AUTH_CACHE = CommonVars("wds.linkis.es.auth.cache", true) + val ES_AUTH_CACHE = CommonVars("wds.linkis.es.auth.cache", false) val ES_USERNAME = CommonVars("wds.linkis.es.username", "") val ES_PASSWORD = CommonVars("wds.linkis.es.password", "") val ES_SNIFFER_ENABLE = CommonVars("wds.linkis.es.sniffer.enable", false) @@ -24,7 +24,7 @@ object EsEntranceConfiguration { // entrance resource val ENTRANCE_MAX_JOB_INSTANCE = CommonVars("wds.linkis.entrance.max.job.instance", 100) - val ENTRANCE_PROTECTED_JOB_INSTANCE = CommonVars("wds.linkis.entrance.protected.job.instance", 80) + val ENTRANCE_PROTECTED_JOB_INSTANCE = CommonVars("wds.linkis.entrance.protected.job.instance", 20) val ENGINE_DEFAULT_LIMIT = CommonVars("wds.linkis.engine.default.limit", 5000) // resultSet diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineRequester.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineRequester.scala index 8756dc01d..4d23228f4 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineRequester.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineRequester.scala @@ -50,6 +50,7 @@ class EsEngineRequester(groupFactory: GroupFactory, rmClient: ResourceManagerCli engine.setJob(entranceJob) engine.init() executorListener.foreach(_.onExecutorCreated(engine)) + rmClient.resourceInited(UserResultResource(ticketId, requestEngine.user), new InstanceResource(1)) Option(engine) } } diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngine.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngine.scala index 3540640db..095410c45 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngine.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngine.scala @@ -48,8 +48,8 @@ class EsEntranceEngine(id: Long, properties: JMap[String, String], resourceRelea if (!codes.isEmpty) { totalCodeLineNumber = codes.length codeLine = 0 - codes.foreach { code => - try { + try { + codes.foreach { code => val executeRes = executeLine(code) executeRes match { case aliasOutputExecuteResponse: AliasOutputExecuteResponse => @@ -72,19 +72,20 @@ class EsEntranceEngine(id: Long, properties: JMap[String, String], resourceRelea codeLine = codeLine + 1 // update progress job.getProgressListener.map(_.onProgressUpdate(job, progress, getProgressInfo)) - } catch { - case t: Throwable => - return ErrorExecuteResponse("EsEntranceEngine execute exception. ", t) - } finally { - } + } catch { + case t: Throwable => + return ErrorExecuteResponse("EsEntranceEngine execute exception. ", t) + } finally { + this.close() } + } else { + this.close() } - this.close() SuccessExecuteResponse() } - protected def executeLine(code: String): ExecuteResponse = this.engineExecutor.executeLine(code, storePath, codeLine.toString) + protected def executeLine(code: String): ExecuteResponse = this.engineExecutor.executeLine(code, storePath, s"_$codeLine") override protected def callExecute(request: RequestTask): EngineExecuteAsynReturn = ??? diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/codeparser/CodeParser.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/codeparser/CodeParser.scala index 14af0e444..df0684790 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/codeparser/CodeParser.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/codeparser/CodeParser.scala @@ -64,7 +64,7 @@ class EsSQLCodeParser extends CodeParser { override def parse(code: String): Array[String] = { // sql to request body - parseSql(code).map(String.format(SQL_FORMAT, _)) + parseSql(code).map(item => item.trim.replaceAll("\\s+", " ")).map(String.format(SQL_FORMAT, _)) } val separator = ";" diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClient.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClient.scala index 657a93246..7c3f7cfec 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClient.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClient.scala @@ -75,7 +75,7 @@ class EsClientImpl(datasourceName:String, client: RestClient, sniffer: Sniffer) val username = ES_USERNAME.getValue(options) val password = ES_PASSWORD.getValue(options) // username / password convert to base auth - if (!ES_AUTH_CACHE.getValue && StringUtils.isNotBlank(username) && StringUtils.isNotBlank(password)) { + if (StringUtils.isNotBlank(username) && StringUtils.isNotBlank(password)) { val authHeader = authenticate(new UsernamePasswordCredentials(username, password), UTF_8.name()) builder.addHeader(authHeader.getName, authHeader.getValue) } diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/EsEngineExecutorImpl.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/EsEngineExecutorImpl.scala index c60e2b01a..2f94b13cb 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/EsEngineExecutorImpl.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/EsEngineExecutorImpl.scala @@ -35,7 +35,7 @@ class EsEngineExecutorImpl(runType:String, client: EsClient, properties: JMap[St } case _ => CodeParser.ESJSON_CODE_PARSER } - this.user = properties.get(TaskConstant.UMUSER, StorageUtils.getJvmUser) + this.user = properties.getOrDefault(TaskConstant.UMUSER, StorageUtils.getJvmUser) } override def parse(code: String): Array[String] = { -- Gitee From d55d6ca34d7121cce127759dd8f53d5997469f88 Mon Sep 17 00:00:00 2001 From: wang_zh <643348094@qq.com> Date: Tue, 9 Jun 2020 12:26:54 +0800 Subject: [PATCH 025/148] EsEntranceEngine add hashcode EsEntranceEngine close method update Engine state remove EsEntranceJob, never used --- .../linkis/entrance/execute/EsEngineManager.scala | 4 +--- .../entrance/execute/EsEngineRequester.scala | 2 +- .../entrance/execute/EsEntranceEngine.scala | 11 ++++++----- .../linkis/entrance/execute/EsEntranceJob.scala | 15 --------------- 4 files changed, 8 insertions(+), 24 deletions(-) delete mode 100644 ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceJob.scala diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineManager.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineManager.scala index 04794e2bf..03b427123 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineManager.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineManager.scala @@ -22,8 +22,6 @@ class EsEngineManager(resources: ModuleInfo) extends EngineManager with Logging private val idToEngines = new util.HashMap[Long, EntranceEngine] - // TODO 修正 EntranceEngine 使用的 resources - /** * The user initializes the operation. When the entance is started for the first time, all the engines are obtained through this method, and the initialization operation is completed. * 用户初始化操作,第一次启动entrance时,将通过该方法,拿到所有的engine,完成初始化操作 @@ -34,7 +32,7 @@ class EsEngineManager(resources: ModuleInfo) extends EngineManager with Logging override def get(instance: String): Option[EntranceEngine] = ??? - override def listEngines(op: EntranceEngine => Boolean): Array[EntranceEngine] = idToEngines.entrySet().map(_.getValue).filter(e => op(e)).toArray + override def listEngines(op: EntranceEngine => Boolean): Array[EntranceEngine] = idToEngines.values().filter(e => op(e)).toArray override def addNotExistsEngines(engine: EntranceEngine*): Unit = engine.foreach{e => diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineRequester.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineRequester.scala index 4d23228f4..f507bd439 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineRequester.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineRequester.scala @@ -46,7 +46,7 @@ class EsEngineRequester(groupFactory: GroupFactory, rmClient: ResourceManagerCli engine.setGroup(groupFactory.getOrCreateGroup(getGroupName(requestEngine.creator, requestEngine.user))) engine.setUser(requestEngine.user) engine.setCreator(requestEngine.creator) - engine.updateState(ExecutorState.Starting, ExecutorState.Idle, null, null) +// engine.updateState(ExecutorState.Starting, ExecutorState.Idle, null, null) engine.setJob(entranceJob) engine.init() executorListener.foreach(_.onExecutorCreated(engine)) diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngine.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngine.scala index 095410c45..0fb1535c7 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngine.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngine.scala @@ -8,7 +8,7 @@ import com.webank.wedatasphere.linkis.entrance.executor.impl.EsEngineExecutorImp import com.webank.wedatasphere.linkis.entrance.persistence.EntranceResultSetEngine import com.webank.wedatasphere.linkis.protocol.constants.TaskConstant import com.webank.wedatasphere.linkis.protocol.engine.{JobProgressInfo, RequestTask} -import com.webank.wedatasphere.linkis.scheduler.executer.{AliasOutputExecuteResponse, ErrorExecuteResponse, ExecuteRequest, ExecuteResponse, IncompleteExecuteResponse, SingleTaskInfoSupport, SingleTaskOperateSupport, SuccessExecuteResponse} +import com.webank.wedatasphere.linkis.scheduler.executer.{AliasOutputExecuteResponse, ErrorExecuteResponse, ExecuteRequest, ExecuteResponse, ExecutorState, IncompleteExecuteResponse, SingleTaskInfoSupport, SingleTaskOperateSupport, SuccessExecuteResponse} import com.webank.wedatasphere.linkis.server.JMap import org.apache.commons.lang.StringUtils import org.apache.commons.lang.exception.ExceptionUtils @@ -119,9 +119,6 @@ class EsEntranceEngine(id: Long, properties: JMap[String, String], resourceRelea override def toString: String = s"EsEntranceEngine($id)" - // used by EsEngineManager to correct EntranceEngine used resources(用于 EsEngineManager 修正 Engine 使用的资源) - @volatile var isClose = false - override def close(): Unit = { try { this.job.setResultSize(0) @@ -131,8 +128,12 @@ class EsEntranceEngine(id: Long, properties: JMap[String, String], resourceRelea } catch { case _: Throwable => } finally { - this.isClose = true + this.updateState(ExecutorState.Starting, ExecutorState.Dead, null, null) } } + override def hashCode(): Int = { + val state = Seq(id) + state.map(_.hashCode()).foldLeft(0)((a, b) => 31 * a + b) + } } diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceJob.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceJob.scala deleted file mode 100644 index 28fc32c45..000000000 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceJob.scala +++ /dev/null @@ -1,15 +0,0 @@ -package com.webank.wedatasphere.linkis.entrance.execute - -import com.webank.wedatasphere.linkis.entrance.job.EntranceExecutionJob -import com.webank.wedatasphere.linkis.scheduler.executer.ExecuteRequest - -/** - * - * @author wang_zh - * @date 2020/5/11 - */ -class EsEntranceJob extends EntranceExecutionJob { - - override def jobToExecuteRequest(): ExecuteRequest = super.jobToExecuteRequest() - -} -- Gitee From 270c450d9ef6f938f00cb81ccbd32f5b83b9f6a9 Mon Sep 17 00:00:00 2001 From: wang_zh <643348094@qq.com> Date: Fri, 12 Jun 2020 18:03:11 +0800 Subject: [PATCH 026/148] change datasource key name --- .../linkis/entrance/conf/EsEntranceConfiguration.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsEntranceConfiguration.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsEntranceConfiguration.scala index 1bb75c712..b17f6cc6e 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsEntranceConfiguration.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsEntranceConfiguration.scala @@ -11,7 +11,7 @@ object EsEntranceConfiguration { // es client val ES_CLUSTER = CommonVars("wds.linkis.es.cluster", "") - val ES_DATASOURCE_NAME = CommonVars("wds.linkis.es.datasource", "default_datasource") + val ES_DATASOURCE_NAME = CommonVars("wds.linkis.datasource", "default_datasource") val ES_AUTH_CACHE = CommonVars("wds.linkis.es.auth.cache", false) val ES_USERNAME = CommonVars("wds.linkis.es.username", "") val ES_PASSWORD = CommonVars("wds.linkis.es.password", "") -- Gitee From 08ed2bb80f2216ecb38543c84351456adfc52641 Mon Sep 17 00:00:00 2001 From: wang_zh <643348094@qq.com> Date: Fri, 12 Jun 2020 18:11:26 +0800 Subject: [PATCH 027/148] first add gateway datasource ruler --- .../ujes/route/EntranceGatewayRouter.scala | 14 ++- .../route/EntranceGatewayRouterRuler.scala | 14 +++ .../gateway-ujes-datasource-ruler/pom.xml | 87 +++++++++++++++++++ .../datasource/cache/DatasourceMapCache.java | 84 ++++++++++++++++++ .../datasource/dao/DatasourceMapMapper.java | 29 +++++++ .../dao/impl/datasourceMapMapper.xml | 57 ++++++++++++ .../datasource/entity/DatasourceMap.java | 63 ++++++++++++++ .../service/DatasourceMapService.java | 15 ++++ .../impl/DatasourceMapServiceImpl.java | 62 +++++++++++++ .../DatasourceGatewayRouterRuler.scala | 75 ++++++++++++++++ 10 files changed, 498 insertions(+), 2 deletions(-) create mode 100644 gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/EntranceGatewayRouterRuler.scala create mode 100644 gateway/plugins/gateway-ujes-datasource-ruler/pom.xml create mode 100644 gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/cache/DatasourceMapCache.java create mode 100644 gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/dao/DatasourceMapMapper.java create mode 100644 gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/dao/impl/datasourceMapMapper.xml create mode 100644 gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/entity/DatasourceMap.java create mode 100644 gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/DatasourceMapService.java create mode 100644 gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/impl/DatasourceMapServiceImpl.java create mode 100644 gateway/plugins/gateway-ujes-datasource-ruler/src/main/scala/com/webank/wedatasphere/linkis/gateway/ruler/datasource/DatasourceGatewayRouterRuler.scala diff --git a/gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/EntranceGatewayRouter.scala b/gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/EntranceGatewayRouter.scala index 9b42a03cb..23badec2d 100644 --- a/gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/EntranceGatewayRouter.scala +++ b/gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/EntranceGatewayRouter.scala @@ -19,10 +19,11 @@ package com.webank.wedatasphere.linkis.gateway.ujes.route import com.webank.wedatasphere.linkis.common.ServiceInstance import com.webank.wedatasphere.linkis.gateway.exception.TooManyServiceException import com.webank.wedatasphere.linkis.gateway.http.GatewayContext -import com.webank.wedatasphere.linkis.gateway.route.AbstractGatewayRouter +import com.webank.wedatasphere.linkis.gateway.route.{AbstractGatewayRouter, GatewayRouter} import com.webank.wedatasphere.linkis.gateway.ujes.parser.EntranceExecutionGatewayParser import com.webank.wedatasphere.linkis.protocol.constants.TaskConstant import org.apache.commons.lang.StringUtils +import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Component /** @@ -31,6 +32,9 @@ import org.springframework.stereotype.Component @Component class EntranceGatewayRouter extends AbstractGatewayRouter { + @Autowired(required = false) + private var rules: Array[EntranceGatewayRouterRuler] = _ + protected def findEntranceService(parsedServiceId: String) = findService(parsedServiceId, list => { val services = list.filter(_.toLowerCase.contains("entrance")) if(services.length == 1) Some(services.head) @@ -52,7 +56,13 @@ class EntranceGatewayRouter extends AbstractGatewayRouter { warn(s"Cannot find a service which named $creator, now redirect to $applicationName entrance.") findEntranceService(applicationName) } - serviceId.map(ServiceInstance(_, gatewayContext.getGatewayRoute.getServiceInstance.getInstance)).orNull + serviceId.map(applicationName => { + rules match { + case array: Array[EntranceGatewayRouterRuler] => array.foreach(_.rule(applicationName, gatewayContext)) + case _ => + } + ServiceInstance(applicationName, gatewayContext.getGatewayRoute.getServiceInstance.getInstance) + }).orNull case _ => null } } diff --git a/gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/EntranceGatewayRouterRuler.scala b/gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/EntranceGatewayRouterRuler.scala new file mode 100644 index 000000000..07c600534 --- /dev/null +++ b/gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/EntranceGatewayRouterRuler.scala @@ -0,0 +1,14 @@ +package com.webank.wedatasphere.linkis.gateway.ujes.route + +import com.webank.wedatasphere.linkis.gateway.http.GatewayContext + +/** + * + * @author wang_zh + * @date 2020/5/21 + */ +trait EntranceGatewayRouterRuler { + + def rule(serviceId: String, gatewayContext: GatewayContext) + +} diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/pom.xml b/gateway/plugins/gateway-ujes-datasource-ruler/pom.xml new file mode 100644 index 000000000..098a74a2e --- /dev/null +++ b/gateway/plugins/gateway-ujes-datasource-ruler/pom.xml @@ -0,0 +1,87 @@ + + + + linkis + com.webank.wedatasphere.linkis + 0.9.3 + + 4.0.0 + + linkis-gateway-ujes-datasource-ruler + + + + com.webank.wedatasphere.linkis + linkis-gateway-ujes-support + ${linkis.version} + provided + + + + com.webank.wedatasphere.linkis + linkis-mybatis + ${linkis.version} + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + + + net.alchim31.maven + scala-maven-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.10 + + + copy-dependencies + package + + copy-dependencies + + + target/lib + provided + + + + + + + + + src/main/java + + **/*.xml + + + + src/main/resources + + **/*.properties + **/application.yml + **/bootstrap.yml + **/log4j2.xml + + + + + + + \ No newline at end of file diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/cache/DatasourceMapCache.java b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/cache/DatasourceMapCache.java new file mode 100644 index 000000000..f09acfd9a --- /dev/null +++ b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/cache/DatasourceMapCache.java @@ -0,0 +1,84 @@ +package com.webank.wedatasphere.linkis.gateway.ruler.datasource.cache; + +import com.webank.wedatasphere.linkis.common.ServiceInstance; +import com.webank.wedatasphere.linkis.common.utils.Utils; +import com.webank.wedatasphere.linkis.gateway.ruler.datasource.dao.DatasourceMapMapper; +import com.webank.wedatasphere.linkis.gateway.ruler.datasource.entity.DatasourceMap; +import com.webank.wedatasphere.linkis.rpc.interceptor.ServiceInstanceUtils; +import com.webank.wedatasphere.linkis.rpc.sender.eureka.EurekaClientRefreshUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.TimeUnit; + +/** + * @author wang_zh + * @date 2020/5/22 + */ +@Component +public class DatasourceMapCache { + + private Logger logger = LoggerFactory.getLogger(DatasourceMapCache.class); + + private Map DATASOURCE_MAP_CACHE = new ConcurrentHashMap<>(); + + public void cache(DatasourceMap datasourceMap) { + DATASOURCE_MAP_CACHE.put(datasourceMap.getDatasourceName(), datasourceMap); + } + + public DatasourceMap get(String datasourceName) { + return DATASOURCE_MAP_CACHE.get(datasourceName); + } + + @Autowired + private DatasourceMapMapper datasourceMapMapper; + + private final static long CLEAN_PERIOD = 3 * 60 * 1000; + + @PostConstruct + public void init() { + datasourceMapMapper.createTableIfNotExists(); + + // init load all datasourceMap to cache + List datasourceMapList = datasourceMapMapper.listAll(); + if (datasourceMapList != null && !datasourceMapList.isEmpty()) { + datasourceMapList.forEach(item -> cache(item)); + } + + // add a scheduler task to clean up datasourceMap + Utils.defaultScheduler().scheduleWithFixedDelay(new CleanRunnable(), CLEAN_PERIOD, CLEAN_PERIOD, TimeUnit.MILLISECONDS); + } + + class CleanRunnable implements Runnable { + + @Override + public void run() { + Set datasourceMaps = new HashSet<>(DATASOURCE_MAP_CACHE.values()); + try { + EurekaClientRefreshUtils.apply().refreshEurekaClient(); + } catch (Throwable t) { + logger.warn("DatasourceMapCache clean runner refresh eureka client error, {}", t); + } + + Set badInstances = new HashSet<>(); + datasourceMaps.forEach(datasourceMap -> { + String instance = datasourceMap.getInstance(); + if (badInstances.contains(instance)) return; + ServiceInstance[] serviceInstances = ServiceInstanceUtils.getRPCServerLoader() + .getServiceInstances(datasourceMap.getServiceId()); + if (serviceInstances == null || serviceInstances.length < 1 || !Arrays.asList(serviceInstances).contains(instance)) { + badInstances.add(datasourceMap.getInstance()); + } + }); + + if (!badInstances.isEmpty()) + datasourceMapMapper.cleanBadInstances(badInstances); + } + } + +} diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/dao/DatasourceMapMapper.java b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/dao/DatasourceMapMapper.java new file mode 100644 index 000000000..965b63dc9 --- /dev/null +++ b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/dao/DatasourceMapMapper.java @@ -0,0 +1,29 @@ +package com.webank.wedatasphere.linkis.gateway.ruler.datasource.dao; + +import com.webank.wedatasphere.linkis.gateway.ruler.datasource.entity.DatasourceMap; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Set; + +/** + * @author wang_zh + * @date 2020/5/22 + */ +@Repository +public interface DatasourceMapMapper { + + void createTableIfNotExists(); + + List listAll(); + + void insert(DatasourceMap datasourceMap); + + long countByInstance(@Param("instance") String instance); + + DatasourceMap getByDatasource(@Param("datasourceName") String datasourceName); + + void cleanBadInstances(@Param("badInstances") Set badInstances); + +} diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/dao/impl/datasourceMapMapper.xml b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/dao/impl/datasourceMapMapper.xml new file mode 100644 index 000000000..d54a3fbb9 --- /dev/null +++ b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/dao/impl/datasourceMapMapper.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + CREATE TABLE IF NOT EXISTS linkis.linkis_datasource_map ( + `datasource_name` varchar(50), + `instance` varchar(50), + `service_id` varchar(50), + PRIMARY KEY (`datasource_name`) + ) + + + + insert into linkis_datasource_map(datasource_name, instance, service_id) values (#{datasourceName}, #{instance}, #{serviceId}) + + + + + + + + + delete from linkis_datasource_map + where instance in + + item + + + + \ No newline at end of file diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/entity/DatasourceMap.java b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/entity/DatasourceMap.java new file mode 100644 index 000000000..4859ff00d --- /dev/null +++ b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/entity/DatasourceMap.java @@ -0,0 +1,63 @@ +package com.webank.wedatasphere.linkis.gateway.ruler.datasource.entity; + +import java.util.Objects; + +/** + * @author wang_zh + * @date 2020/5/22 + */ +public class DatasourceMap { + + public DatasourceMap() {} + + public DatasourceMap(String datasourceName, String instance, String serviceId) { + this.datasourceName = datasourceName; + this.instance = instance; + this.serviceId = serviceId; + } + + private String datasourceName; + + private String instance; + + private String serviceId; + + public String getDatasourceName() { + return datasourceName; + } + + public void setDatasourceName(String datasourceName) { + this.datasourceName = datasourceName; + } + + public String getInstance() { + return instance; + } + + public void setInstance(String instance) { + this.instance = instance; + } + + public String getServiceId() { + return serviceId; + } + + public void setServiceId(String serviceId) { + this.serviceId = serviceId; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + DatasourceMap that = (DatasourceMap) o; + return Objects.equals(datasourceName, that.datasourceName) && + Objects.equals(instance, that.instance) && + Objects.equals(serviceId, that.serviceId); + } + + @Override + public int hashCode() { + return Objects.hash(datasourceName, instance, serviceId); + } +} diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/DatasourceMapService.java b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/DatasourceMapService.java new file mode 100644 index 000000000..3c0252d7a --- /dev/null +++ b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/DatasourceMapService.java @@ -0,0 +1,15 @@ +package com.webank.wedatasphere.linkis.gateway.ruler.datasource.service; + +/** + * @author wang_zh + * @date 2020/5/22 + */ +public interface DatasourceMapService { + + String getInstanceByDatasource(String datasourceName); + + long countByInstance(String instance); + + String insertDatasourceMap(String datasourceName, String instance, String serviceId); + +} diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/impl/DatasourceMapServiceImpl.java b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/impl/DatasourceMapServiceImpl.java new file mode 100644 index 000000000..9455412b4 --- /dev/null +++ b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/impl/DatasourceMapServiceImpl.java @@ -0,0 +1,62 @@ +package com.webank.wedatasphere.linkis.gateway.ruler.datasource.service.impl; + +import com.webank.wedatasphere.linkis.gateway.ruler.datasource.cache.DatasourceMapCache; +import com.webank.wedatasphere.linkis.gateway.ruler.datasource.dao.DatasourceMapMapper; +import com.webank.wedatasphere.linkis.gateway.ruler.datasource.entity.DatasourceMap; +import com.webank.wedatasphere.linkis.gateway.ruler.datasource.service.DatasourceMapService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; +import org.springframework.stereotype.Service; + +import javax.annotation.PostConstruct; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * @author wang_zh + * @date 2020/5/22 + */ +@Service +public class DatasourceMapServiceImpl implements DatasourceMapService { + + @Autowired + private DatasourceMapMapper datasourceMapMapper; + + @Autowired + private DatasourceMapCache datasourceMapCache; + + private Map DATASOURCE_MAP_CACHE = new ConcurrentHashMap<>(); + + public String getInstanceByDatasource(String datasourceName) { + DatasourceMap datasourceMap = datasourceMapCache.get(datasourceName); + if (datasourceMap != null) return datasourceMap.getInstance(); + datasourceMap = datasourceMapMapper.getByDatasource(datasourceName); + if (datasourceMap == null) return null; + datasourceMapCache.cache(datasourceMap); + return datasourceMap.getInstance(); + } + + @Override + public long countByInstance(String instance) { + return datasourceMapMapper.countByInstance(instance); + } + + @Override + public String insertDatasourceMap(String datasourceName, String instance, String serviceId) { + try { + DatasourceMap datasourceMap = new DatasourceMap(datasourceName, instance, serviceId); + datasourceMapMapper.insert(datasourceMap); + datasourceMapCache.cache(datasourceMap); + return instance; + } catch (DuplicateKeyException e) { + return getInstanceByDatasource(datasourceName); + } + } + + @PostConstruct + public void init() { + // create linkis_datasource_map table if not exists + datasourceMapMapper.createTableIfNotExists(); + } + +} diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/scala/com/webank/wedatasphere/linkis/gateway/ruler/datasource/DatasourceGatewayRouterRuler.scala b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/scala/com/webank/wedatasphere/linkis/gateway/ruler/datasource/DatasourceGatewayRouterRuler.scala new file mode 100644 index 000000000..d634f8b8b --- /dev/null +++ b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/scala/com/webank/wedatasphere/linkis/gateway/ruler/datasource/DatasourceGatewayRouterRuler.scala @@ -0,0 +1,75 @@ +package com.webank.wedatasphere.linkis.gateway.ruler.datasource + +import java.util + +import com.webank.wedatasphere.linkis.common.utils.Logging +import com.webank.wedatasphere.linkis.gateway.http.GatewayContext +import com.webank.wedatasphere.linkis.gateway.ruler.datasource.service.DatasourceMapService +import com.webank.wedatasphere.linkis.gateway.ujes.route.EntranceGatewayRouterRuler +import com.webank.wedatasphere.linkis.protocol.constants.TaskConstant +import com.webank.wedatasphere.linkis.protocol.utils.TaskUtils +import com.webank.wedatasphere.linkis.rpc.interceptor.ServiceInstanceUtils +import com.webank.wedatasphere.linkis.server.{BDPJettyServerHelper, JMap} +import org.apache.commons.lang.StringUtils +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.stereotype.Component + +import scala.collection.JavaConversions._ +/** + * + * @author wang_zh + * @date 2020/5/22 + */ +@Component +class DatasourceGatewayRouterRuler extends EntranceGatewayRouterRuler with Logging { + + @Autowired + var datasourceMapService: DatasourceMapService = _ + + override def rule(serviceId: String, gatewayContext: GatewayContext): Unit = if(StringUtils.isNotBlank(gatewayContext.getRequest.getRequestBody)) { + val datasourceName = getDatasourceName(gatewayContext.getRequest.getRequestBody) + if (StringUtils.isBlank(datasourceName)) return + debug(s"datasourceName: $datasourceName") + datasourceMapService.getInstanceByDatasource(datasourceName) match { + case i: String if StringUtils.isNotBlank(i) => gatewayContext.getGatewayRoute.getServiceInstance.setInstance(i) + case _ => { + val newInstance = ServiceInstanceUtils.getRPCServerLoader.getServiceInstances(serviceId) + .map(item => (item, datasourceMapService.countByInstance(item.getInstance))) + .sortBy(_._2).map(_._1.getInstance).headOption match { + case Some(item) => datasourceMapService.insertDatasourceMap(datasourceName, item, serviceId) + case None => null + } + debug(s"newInstance: $newInstance") + if (StringUtils.isNotBlank(newInstance)) { + gatewayContext.getGatewayRoute.getServiceInstance.setInstance(newInstance) + } + } + } + } + + def getDatasourceName(body: String): String = if(StringUtils.isNotBlank(body)) { + val requestObject = BDPJettyServerHelper.gson.fromJson(body, classOf[util.Map[String, Any]]) + if (requestObject == null || requestObject.get(TaskConstant.PARAMS) == null) return null + val paramsObject = requestObject.get(TaskConstant.PARAMS).asInstanceOf[util.Map[String, Any]] + var datasourceName: String = null + val startupMap = TaskUtils.getStartupMap(paramsObject) + val runtimeMap = TaskUtils.getRuntimeMap(paramsObject) + val properties = new JMap[String, String] + startupMap.foreach {case (k, v) => if(v != null) properties.put(k, v.toString)} + runtimeMap.foreach {case (k, v) => if(v != null) properties.put(k, v.toString)} + properties.get(DatasourceGatewayRouterRuler.DATASOURCE_NAME_KEY) match { + case s: String => datasourceName = s + case _ => + } + datasourceName + } else { + null + } + +} + +object DatasourceGatewayRouterRuler { + + val DATASOURCE_NAME_KEY = "wds.linkis.datasource" + +} \ No newline at end of file -- Gitee From 29db2b086013f6bfd4677541ea5d17d9160afd80 Mon Sep 17 00:00:00 2001 From: houjunxiong <542025993@qq.com> Date: Fri, 19 Jun 2020 11:28:28 +0800 Subject: [PATCH 028/148] Python Engine BML zip file support --- .../linkis/bml/conf/BmlHookConf.scala | 3 ++- .../bml/hook/BmlEnginePreExecuteHook.scala | 22 ++++++++++++++----- .../linkis/bml/utils/BmlHookUtils.scala | 2 -- .../hook/PythonBmlEnginePreExecuteHook.scala | 13 +++++++++++ .../main/resources/linkis-engine.properties | 3 ++- 5 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 ujes/definedEngines/python/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/hook/PythonBmlEnginePreExecuteHook.scala diff --git a/bml/bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/conf/BmlHookConf.scala b/bml/bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/conf/BmlHookConf.scala index a8d04c834..6ba4f2f9c 100644 --- a/bml/bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/conf/BmlHookConf.scala +++ b/bml/bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/conf/BmlHookConf.scala @@ -1,5 +1,6 @@ package com.webank.wedatasphere.linkis.bml.conf +import com.webank.wedatasphere.linkis.bml.utils.BmlHookUtils import com.webank.wedatasphere.linkis.common.conf.CommonVars /** @@ -7,5 +8,5 @@ import com.webank.wedatasphere.linkis.common.conf.CommonVars * Description: */ object BmlHookConf { - val WORK_DIR_STR = CommonVars("wds.linkis.bml.work.dir", "user.dir") + val WORK_DIR_STR = CommonVars("wds.linkis.bml.work.dir", BmlHookUtils.getCurrentWorkDir) } diff --git a/bml/bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/hook/BmlEnginePreExecuteHook.scala b/bml/bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/hook/BmlEnginePreExecuteHook.scala index 22ed4b4cc..398d857f7 100644 --- a/bml/bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/hook/BmlEnginePreExecuteHook.scala +++ b/bml/bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/hook/BmlEnginePreExecuteHook.scala @@ -4,6 +4,7 @@ import java.io.File import java.util import com.webank.wedatasphere.linkis.bml.client.{BmlClient, BmlClientFactory} +import com.webank.wedatasphere.linkis.bml.conf.BmlHookConf import com.webank.wedatasphere.linkis.bml.exception.BmlHookDownloadException import com.webank.wedatasphere.linkis.bml.utils.BmlHookUtils import com.webank.wedatasphere.linkis.common.exception.ErrorException @@ -42,12 +43,13 @@ class BmlEnginePreExecuteHook extends EnginePreExecuteHook with Logging{ val pathType:String = "file://" override def callPreExecuteHook(engineExecutorContext: EngineExecutorContext, executeRequest: ExecuteRequest, code: String): String = { - val workDir = BmlHookUtils.getCurrentWorkDir + val workDir = BmlHookConf.WORK_DIR_STR.getValue val jobId = engineExecutorContext.getJobId + var hookCode = code executeRequest match { case resourceExecuteRequest:ResourceExecuteRequest => val resources = resourceExecuteRequest.resources - if (null == resources) return code - resources foreach { + if (null == resources) return hookCode + val resourcePaths = resources map { case resource:util.Map[String, Object] => val fileName = resource.get(FILE_NAME_STR).toString val resourceId = resource.get(RESOURCE_ID_STR).toString val version = resource.get(VERSION_STR).toString @@ -65,13 +67,23 @@ class BmlEnginePreExecuteHook extends EnginePreExecuteHook with Logging{ } if (response.isSuccess){ logger.info(s"for job $jobId resourceId $resourceId version $version download to path $fullPath ok") + fullPath }else{ logger.warn(s"for job $jobId resourceId $resourceId version $version download to path $fullPath Failed") + null } - case _ => logger.warn("job resource cannot download") + case _ => + logger.warn("job resource cannot download") + null } + hookCode = if (StringUtils.isNotBlank(hookCode)) hookCode else executeRequest.code + hookCode = callResourcesDownloadedHook(resourcePaths.toArray, engineExecutorContext, executeRequest, hookCode) case _ => } - if (StringUtils.isNotBlank(code)) code else executeRequest.code + if (StringUtils.isNotBlank(hookCode)) hookCode else executeRequest.code + } + + def callResourcesDownloadedHook(resourcePaths: Array[String], engineExecutorContext: EngineExecutorContext, executeRequest: ExecuteRequest, code: String): String = { + code } } diff --git a/bml/bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/utils/BmlHookUtils.scala b/bml/bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/utils/BmlHookUtils.scala index d82b46bd0..6e0d9707d 100644 --- a/bml/bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/utils/BmlHookUtils.scala +++ b/bml/bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/utils/BmlHookUtils.scala @@ -1,7 +1,5 @@ package com.webank.wedatasphere.linkis.bml.utils -import com.webank.wedatasphere.linkis.common.utils.Utils - /** * created by cooperyang on 2019/9/24 * Description: diff --git a/ujes/definedEngines/python/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/hook/PythonBmlEnginePreExecuteHook.scala b/ujes/definedEngines/python/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/hook/PythonBmlEnginePreExecuteHook.scala new file mode 100644 index 000000000..bedfdc1bb --- /dev/null +++ b/ujes/definedEngines/python/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/hook/PythonBmlEnginePreExecuteHook.scala @@ -0,0 +1,13 @@ +package com.webank.wedatasphere.linkis.engine.hook + +import com.webank.wedatasphere.linkis.bml.hook.BmlEnginePreExecuteHook +import com.webank.wedatasphere.linkis.common.io.FsPath +import com.webank.wedatasphere.linkis.engine.execute.EngineExecutorContext +import com.webank.wedatasphere.linkis.scheduler.executer.ExecuteRequest + +class PythonBmlEnginePreExecuteHook extends BmlEnginePreExecuteHook { + override def callResourcesDownloadedHook(resourcePaths: Array[String], engineExecutorContext: EngineExecutorContext, + executeRequest: ExecuteRequest, code: String): String = { + (resourcePaths.map(path => s"sys.path.insert(0, '${new FsPath(path).getPath}')") ++ Array(code)).mkString("\n") + } +} diff --git a/ujes/definedEngines/python/enginemanager/src/main/resources/linkis-engine.properties b/ujes/definedEngines/python/enginemanager/src/main/resources/linkis-engine.properties index 374ad477e..9e0ea6f5c 100644 --- a/ujes/definedEngines/python/enginemanager/src/main/resources/linkis-engine.properties +++ b/ujes/definedEngines/python/enginemanager/src/main/resources/linkis-engine.properties @@ -21,4 +21,5 @@ wds.linkis.server.component.exclude.packages=com.webank.wedatasphere.linkis.engi wds.linkis.server.component.exclude.classes=com.webank.wedatasphere.linkis.resourcemanager.service.annotation.RMAnnotationParser python.script=python #hadoop.config.dir=/appcom/config/hadoop-config -wds.linkis.server.version=v1 \ No newline at end of file +wds.linkis.server.version=v1 +wds.linkis.engine.pre.hook.class=com.webank.wedatasphere.linkis.engine.hook.PythonBmlEnginePreExecuteHook \ No newline at end of file -- Gitee From f648cda1b8e44be215fd3c76d1036f0c0370e675 Mon Sep 17 00:00:00 2001 From: wang_zh <643348094@qq.com> Date: Thu, 18 Jun 2020 11:54:27 +0800 Subject: [PATCH 029/148] add license --- .../ujes/route/EntranceGatewayRouterRuler.scala | 16 ++++++++++++++++ .../datasource/cache/DatasourceMapCache.java | 15 +++++++++++++++ .../datasource/dao/DatasourceMapMapper.java | 15 +++++++++++++++ .../ruler/datasource/entity/DatasourceMap.java | 15 +++++++++++++++ .../datasource/service/DatasourceMapService.java | 15 +++++++++++++++ .../service/impl/DatasourceMapServiceImpl.java | 15 +++++++++++++++ .../DatasourceGatewayRouterRuler.scala | 15 +++++++++++++++ .../utils/PrestoResourceUtil.scala | 16 ++++++++++++++++ .../entrance/conf/EsEntranceConfiguration.scala | 15 +++++++++++++++ .../entrance/conf/EsSpringConfiguration.scala | 15 +++++++++++++++ .../exception/EsConvertResponseException.scala | 15 +++++++++++++++ .../entrance/exception/EsEngineException.scala | 15 +++++++++++++++ .../exception/EsParamsIllegalException.scala | 15 +++++++++++++++ .../entrance/execute/EsEngineManager.scala | 15 +++++++++++++++ .../entrance/execute/EsEngineRequester.scala | 15 +++++++++++++++ .../entrance/execute/EsEntranceEngine.scala | 15 +++++++++++++++ .../execute/EsEntranceExecutorManager.scala | 15 +++++++++++++++ .../entrance/executor/EsEngineExecutor.scala | 15 +++++++++++++++ .../entrance/executor/ResponseHandler.scala | 15 +++++++++++++++ .../executor/codeparser/CodeParser.scala | 15 +++++++++++++++ .../entrance/executor/esclient/EsClient.scala | 15 +++++++++++++++ .../executor/esclient/EsClientFactory.scala | 15 +++++++++++++++ .../executor/impl/EsEngineExecutorImpl.scala | 15 +++++++++++++++ .../executor/impl/ResponseHandlerImpl.scala | 15 +++++++++++++++ .../entrance/execute/EsEntranceEngineTests.scala | 15 +++++++++++++++ .../executor/esclient/EsClientFactoryTests.scala | 15 +++++++++++++++ .../configuration/PrestoConfiguration.scala | 15 +++++++++++++++ .../PrestoSpringConfiguration.scala | 15 +++++++++++++++ .../entrance/exception/PrestoException.scala | 15 +++++++++++++++ .../entrance/execute/PrestoEntranceManager.scala | 15 +++++++++++++++ .../executor/PrestoEntranceEngineExecutor.scala | 15 +++++++++++++++ .../PrestoEntranceEngineExecutorManager.scala | 15 +++++++++++++++ .../entrance/utils/PrestoResourceUtils.scala | 15 +++++++++++++++ .../linkis/entrance/utils/SqlCodeParser.scala | 15 +++++++++++++++ 34 files changed, 512 insertions(+) diff --git a/gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/EntranceGatewayRouterRuler.scala b/gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/EntranceGatewayRouterRuler.scala index 07c600534..9b819cd3b 100644 --- a/gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/EntranceGatewayRouterRuler.scala +++ b/gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/EntranceGatewayRouterRuler.scala @@ -1,3 +1,19 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.gateway.ujes.route import com.webank.wedatasphere.linkis.gateway.http.GatewayContext diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/cache/DatasourceMapCache.java b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/cache/DatasourceMapCache.java index f09acfd9a..2cc604a77 100644 --- a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/cache/DatasourceMapCache.java +++ b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/cache/DatasourceMapCache.java @@ -1,3 +1,18 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.gateway.ruler.datasource.cache; import com.webank.wedatasphere.linkis.common.ServiceInstance; diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/dao/DatasourceMapMapper.java b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/dao/DatasourceMapMapper.java index 965b63dc9..aca209fce 100644 --- a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/dao/DatasourceMapMapper.java +++ b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/dao/DatasourceMapMapper.java @@ -1,3 +1,18 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.gateway.ruler.datasource.dao; import com.webank.wedatasphere.linkis.gateway.ruler.datasource.entity.DatasourceMap; diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/entity/DatasourceMap.java b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/entity/DatasourceMap.java index 4859ff00d..39ca2c5a6 100644 --- a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/entity/DatasourceMap.java +++ b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/entity/DatasourceMap.java @@ -1,3 +1,18 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.gateway.ruler.datasource.entity; import java.util.Objects; diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/DatasourceMapService.java b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/DatasourceMapService.java index 3c0252d7a..d51d2598b 100644 --- a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/DatasourceMapService.java +++ b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/DatasourceMapService.java @@ -1,3 +1,18 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.gateway.ruler.datasource.service; /** diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/impl/DatasourceMapServiceImpl.java b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/impl/DatasourceMapServiceImpl.java index 9455412b4..461c147bb 100644 --- a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/impl/DatasourceMapServiceImpl.java +++ b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/impl/DatasourceMapServiceImpl.java @@ -1,3 +1,18 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.gateway.ruler.datasource.service.impl; import com.webank.wedatasphere.linkis.gateway.ruler.datasource.cache.DatasourceMapCache; diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/scala/com/webank/wedatasphere/linkis/gateway/ruler/datasource/DatasourceGatewayRouterRuler.scala b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/scala/com/webank/wedatasphere/linkis/gateway/ruler/datasource/DatasourceGatewayRouterRuler.scala index d634f8b8b..d769d8511 100644 --- a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/scala/com/webank/wedatasphere/linkis/gateway/ruler/datasource/DatasourceGatewayRouterRuler.scala +++ b/gateway/plugins/gateway-ujes-datasource-ruler/src/main/scala/com/webank/wedatasphere/linkis/gateway/ruler/datasource/DatasourceGatewayRouterRuler.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.gateway.ruler.datasource import java.util diff --git a/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/PrestoResourceUtil.scala b/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/PrestoResourceUtil.scala index 7f9fe6f57..3c7c64d86 100644 --- a/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/PrestoResourceUtil.scala +++ b/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/PrestoResourceUtil.scala @@ -1,3 +1,19 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.resourcemanager.utils import java.util.concurrent.TimeUnit diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsEntranceConfiguration.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsEntranceConfiguration.scala index b17f6cc6e..78f0e3fb6 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsEntranceConfiguration.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsEntranceConfiguration.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.conf import com.webank.wedatasphere.linkis.common.conf.{ByteType, CommonVars} diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsSpringConfiguration.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsSpringConfiguration.scala index 85d8eb6e1..addb03fae 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsSpringConfiguration.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EsSpringConfiguration.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.conf import com.webank.wedatasphere.linkis.common.utils.{Logging, ShutdownUtils, Utils} diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsConvertResponseException.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsConvertResponseException.scala index 528797a05..1777f9650 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsConvertResponseException.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsConvertResponseException.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.exception import com.webank.wedatasphere.linkis.common.exception.ErrorException diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsEngineException.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsEngineException.scala index 27077c8e8..717422fd9 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsEngineException.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsEngineException.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.exception import com.webank.wedatasphere.linkis.common.exception.ErrorException diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsParamsIllegalException.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsParamsIllegalException.scala index d3e4d11be..f1124efdf 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsParamsIllegalException.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EsParamsIllegalException.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.exception import com.webank.wedatasphere.linkis.common.exception.ErrorException diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineManager.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineManager.scala index 03b427123..efe955c16 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineManager.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineManager.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.execute import java.util diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineRequester.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineRequester.scala index f507bd439..77c8407bb 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineRequester.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEngineRequester.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.execute import java.util import java.util.concurrent.atomic.AtomicLong diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngine.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngine.scala index 0fb1535c7..6f1b15c4c 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngine.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngine.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.execute import com.webank.wedatasphere.linkis.common.ServiceInstance diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceExecutorManager.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceExecutorManager.scala index 1175a1bdc..23d22f666 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceExecutorManager.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceExecutorManager.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.execute import com.webank.wedatasphere.linkis.common.utils.Logging diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/EsEngineExecutor.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/EsEngineExecutor.scala index 54ff8a804..a6e9c500e 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/EsEngineExecutor.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/EsEngineExecutor.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.executor import java.io.IOException diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/ResponseHandler.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/ResponseHandler.scala index 002fc52b5..f262b5431 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/ResponseHandler.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/ResponseHandler.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.executor import com.fasterxml.jackson.databind.{JsonNode, ObjectMapper} diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/codeparser/CodeParser.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/codeparser/CodeParser.scala index df0684790..606af1f6b 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/codeparser/CodeParser.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/codeparser/CodeParser.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.executor.codeparser import com.webank.wedatasphere.linkis.entrance.conf.EsEntranceConfiguration diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClient.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClient.scala index 7c3f7cfec..b0020fb25 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClient.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClient.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.executor.esclient import java.nio.charset.StandardCharsets.UTF_8 diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactory.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactory.scala index 29583dae7..9811b6149 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactory.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactory.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.executor.esclient import java.util diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/EsEngineExecutorImpl.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/EsEngineExecutorImpl.scala index 2f94b13cb..afff36752 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/EsEngineExecutorImpl.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/EsEngineExecutorImpl.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.executor.impl import java.util.concurrent.CountDownLatch diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/ResponseHandlerImpl.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/ResponseHandlerImpl.scala index 681dc1102..8135b54f6 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/ResponseHandlerImpl.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/ResponseHandlerImpl.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.executor.impl import java.nio.charset.Charset diff --git a/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngineTests.scala b/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngineTests.scala index 3264093d7..1570b6e63 100644 --- a/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngineTests.scala +++ b/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngineTests.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.execute import java.util diff --git a/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactoryTests.scala b/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactoryTests.scala index 55089a5b4..fe579f2ef 100644 --- a/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactoryTests.scala +++ b/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactoryTests.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.executor.esclient import java.util diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoConfiguration.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoConfiguration.scala index 9d54e06a4..909e53934 100644 --- a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoConfiguration.scala +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoConfiguration.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.configuration import java.lang diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoSpringConfiguration.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoSpringConfiguration.scala index 11a77191f..e1634477d 100644 --- a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoSpringConfiguration.scala +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/configuration/PrestoSpringConfiguration.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.configuration import java.util.concurrent.TimeUnit diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/PrestoException.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/PrestoException.scala index 9baa60e5f..89d72dbdb 100644 --- a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/PrestoException.scala +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/PrestoException.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.exception import com.webank.wedatasphere.linkis.common.exception.ErrorException diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceManager.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceManager.scala index 3a8e27d09..025afbbd6 100644 --- a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceManager.scala +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/PrestoEntranceManager.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.execute import java.util diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutor.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutor.scala index dcdea341a..99a5776b9 100644 --- a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutor.scala +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutor.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.executor import java.sql.SQLException diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutorManager.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutorManager.scala index a87039bd6..f3a72dee2 100644 --- a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutorManager.scala +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutorManager.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.executor import java.net.URI diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/PrestoResourceUtils.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/PrestoResourceUtils.scala index 75b826c46..05f610310 100644 --- a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/PrestoResourceUtils.scala +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/PrestoResourceUtils.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.utils import com.facebook.presto.resourceGroups.{FileResourceGroupConfig, FileResourceGroupConfigurationManager} diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/SqlCodeParser.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/SqlCodeParser.scala index 4024eb416..fe755055d 100644 --- a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/SqlCodeParser.scala +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/SqlCodeParser.scala @@ -1,3 +1,18 @@ +/** + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.entrance.utils import com.webank.wedatasphere.linkis.entrance.configuration.PrestoConfiguration -- Gitee From 4be83f6cbf295aee871e9825da02b7e58e73ca37 Mon Sep 17 00:00:00 2001 From: wang_zh <643348094@qq.com> Date: Thu, 18 Jun 2020 12:02:29 +0800 Subject: [PATCH 030/148] add es entrance start and stop script files --- .../es/entrance/bin/start-es-entrance.sh | 38 +++++++++++++++ .../es/entrance/bin/stop-es-entrance.sh | 47 +++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 ujes/definedEngines/es/entrance/bin/start-es-entrance.sh create mode 100644 ujes/definedEngines/es/entrance/bin/stop-es-entrance.sh diff --git a/ujes/definedEngines/es/entrance/bin/start-es-entrance.sh b/ujes/definedEngines/es/entrance/bin/start-es-entrance.sh new file mode 100644 index 000000000..56cab6df0 --- /dev/null +++ b/ujes/definedEngines/es/entrance/bin/start-es-entrance.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +cd `dirname $0` +cd .. +HOME=`pwd` + +export SERVER_PID=$HOME/bin/linkis.pid +export SERVER_LOG_PATH=$HOME/logs +export SERVER_CLASS=com.webank.wedatasphere.linkis.DataWorkCloudApplication + +if test -z "$SERVER_HEAP_SIZE" +then + export SERVER_HEAP_SIZE="512M" +fi + +if test -z "$SERVER_JAVA_OPTS" +then + export SERVER_JAVA_OPTS=" -Xmx$SERVER_HEAP_SIZE -XX:+UseG1GC -Xloggc:$HOME/logs/linkis-gc.log" +fi + +if [[ -f "${SERVER_PID}" ]]; then + pid=$(cat ${SERVER_PID}) + if kill -0 ${pid} >/dev/null 2>&1; then + echo "Server is already running." + exit 1 + fi +fi + +nohup java $SERVER_JAVA_OPTS -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS 2>&1 > $SERVER_LOG_PATH/linkis.out & +pid=$! +if [[ -z "${pid}" ]]; then + echo "server $SERVER_NAME start failed!" + exit 1 +else + echo "server $SERVER_NAME start succeeded!" + echo $pid > $SERVER_PID + sleep 1 +fi \ No newline at end of file diff --git a/ujes/definedEngines/es/entrance/bin/stop-es-entrance.sh b/ujes/definedEngines/es/entrance/bin/stop-es-entrance.sh new file mode 100644 index 000000000..f03288711 --- /dev/null +++ b/ujes/definedEngines/es/entrance/bin/stop-es-entrance.sh @@ -0,0 +1,47 @@ +#!/bin/bash + +cd `dirname $0` +cd .. +HOME=`pwd` + +export SERVER_PID=$HOME/bin/linkis.pid + +function wait_for_server_to_die() { + local pid + local count + pid=$1 + timeout=$2 + count=0 + timeoutTime=$(date "+%s") + let "timeoutTime+=$timeout" + currentTime=$(date "+%s") + forceKill=1 + + while [[ $currentTime -lt $timeoutTime ]]; do + $(kill ${pid} > /dev/null 2> /dev/null) + if kill -0 ${pid} > /dev/null 2>&1; then + sleep 3 + else + forceKill=0 + break + fi + currentTime=$(date "+%s") + done + + if [[ forceKill -ne 0 ]]; then + $(kill -9 ${pid} > /dev/null 2> /dev/null) + fi +} + +if [[ ! -f "${SERVER_PID}" ]]; then + echo "server $SERVER_NAME is not running" +else + pid=$(cat ${SERVER_PID}) + if [[ -z "${pid}" ]]; then + echo "server $SERVER_NAME is not running" + else + wait_for_server_to_die $pid 40 + $(rm -f ${SERVER_PID}) + echo "server $SERVER_NAME is stopped." + fi +fi \ No newline at end of file -- Gitee From 0486a9abf3c2c2e1261195e41e758f5b9f0f9c78 Mon Sep 17 00:00:00 2001 From: wang_zh <643348094@qq.com> Date: Thu, 18 Jun 2020 12:35:36 +0800 Subject: [PATCH 031/148] modify sparkSubmitVersion method --- .../linkis/engine/spark/utils/EngineUtils.scala | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/spark/utils/EngineUtils.scala b/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/spark/utils/EngineUtils.scala index 4c4e3331c..474e30f4e 100644 --- a/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/spark/utils/EngineUtils.scala +++ b/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/spark/utils/EngineUtils.scala @@ -49,11 +49,17 @@ object EngineUtils { Utils.tryFinally(socket.getLocalPort){ Utils.tryQuietly(socket.close())} } + private val sparkVersionVar = CommonVars("wds.linkis.engine.spark.version", "") + def sparkSubmitVersion(): String = { if(sparkVersion != null) { return sparkVersion } - val sparkSubmit = CommonVars("wds.linkis.server.spark-submit", "spark-submit").getValue + if (sparkVersionVar.getValue != null && !"".equals(sparkVersionVar.getValue.trim)) { + sparkVersion = sparkVersionVar.getValue.trim + return sparkVersion + } + val sparkSubmit = CommonVars("wds.linkis.engine.spark.submit.cmd", "spark-submit").getValue val pb = new ProcessBuilder(sparkSubmit, "--version") pb.redirectErrorStream(true) pb.redirectInput(ProcessBuilder.Redirect.PIPE) @@ -62,7 +68,7 @@ object EngineUtils { val exitCode = process.waitFor() val output = process.inputIterator.mkString("\n") - val regex = """version (.*)""".r.unanchored + val regex = """version ([\d.]*)""".r.unanchored sparkVersion = output match { case regex(version) => version -- Gitee From 7f671e75608c72d8feea77d25d9bf1650f5fa96e Mon Sep 17 00:00:00 2001 From: wang_zh <643348094@qq.com> Date: Mon, 22 Jun 2020 17:31:26 +0800 Subject: [PATCH 032/148] modify jdbc result set path change "wds.linkis.resultSet.cache.max" default value --- .../wedatasphere/linkis/entrance/conf/JDBCConfiguration.scala | 2 +- .../linkis/entrance/executer/JDBCEngineExecutor.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/JDBCConfiguration.scala b/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/JDBCConfiguration.scala index 53faf934e..fe074b7a2 100644 --- a/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/JDBCConfiguration.scala +++ b/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/JDBCConfiguration.scala @@ -18,7 +18,7 @@ package com.webank.wedatasphere.linkis.entrance.conf import com.webank.wedatasphere.linkis.common.conf.{ByteType, CommonVars} object JDBCConfiguration { - val ENGINE_RESULT_SET_MAX_CACHE = CommonVars("wds.linkis.resultSet.cache.max", new ByteType("512k")) + val ENGINE_RESULT_SET_MAX_CACHE = CommonVars("wds.linkis.resultSet.cache.max", new ByteType("0k")) val ENGINE_DEFAULT_LIMIT = CommonVars("wds.linkis.jdbc.default.limit", 5000) val JDBC_QUERY_TIMEOUT = CommonVars("wds.linkis.jdbc.query.timeout", 1800) val JDBC_SUPPORT_DBS = CommonVars("wds.linkis.jdbc.support.dbs", "mysql=>com.mysql.jdbc.Driver,postgresql=>org.postgresql.Driver,oracle=>oracle.jdbc.driver.OracleDriver,hive2=>org.apache.hive.jdbc.HiveDriver,presto=>com.facebook.presto.jdbc.PrestoDriver") diff --git a/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executer/JDBCEngineExecutor.scala b/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executer/JDBCEngineExecutor.scala index 73fbfd26f..8d1aad518 100644 --- a/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executer/JDBCEngineExecutor.scala +++ b/ujes/definedEngines/jdbc/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executer/JDBCEngineExecutor.scala @@ -191,7 +191,7 @@ class JDBCEngineExecutor(outputPrintLimit: Int, properties: util.HashMap[String, codeLine = 0 codes.foreach { code => try { - val executeRes = executeLine(code, storePath, codeLine.toString) + val executeRes = executeLine(code, storePath, s"_$codeLine") executeRes match { case aliasOutputExecuteResponse: AliasOutputExecuteResponse => persistEngine.persistResultSet(executeRequest.asInstanceOf[JDBCJobExecuteRequest].job, aliasOutputExecuteResponse) -- Gitee From 2830dca2956d02f0ea46ff1337f558b20fbcf394 Mon Sep 17 00:00:00 2001 From: wForget <643348094@qq.com> Date: Mon, 20 Jul 2020 11:50:41 +0800 Subject: [PATCH 033/148] fix yarn own queues bug add auto get acl queues config --- .../utils/RMConfiguration.scala | 1 + .../restful/RMMonitorRest.scala | 6 ++- .../resourcemanager/utils/YarnUtil.scala | 37 ++++++++++--------- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/resourceManager/resourcemanagercommon/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/RMConfiguration.scala b/resourceManager/resourcemanagercommon/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/RMConfiguration.scala index d46f31b39..088911aec 100644 --- a/resourceManager/resourcemanagercommon/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/RMConfiguration.scala +++ b/resourceManager/resourcemanagercommon/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/RMConfiguration.scala @@ -46,6 +46,7 @@ object RMConfiguration { val USER_AVAILABLE_YARN_INSTANCE_MEMORY = CommonVars("wds.linkis.yarnqueue.memory.max", new ByteType("100g")) val USER_AVAILABLE_YARN_INSTANCE = CommonVars("wds.linkis.yarn.instance.max", 3) val USER_AVAILABLE_YARN_QUEUE_NAME = CommonVars("wds.linkis.yarnqueue", "ide") + val USER_AVAILABLE_YARN_QUEUE_ACLS_AUTO = CommonVars("wds.linkis.yarnqueue.acls.auto", false) val USER_MODULE_WAIT_USED = CommonVars("wds.linkis.rm.user.module.wait.used", 60 * 10L) val USER_MODULE_WAIT_RELEASE = CommonVars("wds.linkis.rm.user.module.wait.used", -1L) diff --git a/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/restful/RMMonitorRest.scala b/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/restful/RMMonitorRest.scala index 9a294d98c..130aebd78 100644 --- a/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/restful/RMMonitorRest.scala +++ b/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/restful/RMMonitorRest.scala @@ -236,8 +236,10 @@ class RMMonitorRest { val userConfiguration = UserConfiguration.getCacheMap(RequestQueryAppConfigWithGlobal(userName, null, null, true)) queues.add(RMConfiguration.USER_AVAILABLE_YARN_QUEUE_NAME.getValue(userConfiguration)) queues.add(RMConfiguration.USER_AVAILABLE_YARN_QUEUE_NAME.getValue) - // add own queues - YarnUtil.getOwnQueues(userName).map(queues.add(_)) + // auto add acl queues + if (RMConfiguration.USER_AVAILABLE_YARN_QUEUE_ACLS_AUTO.getValue) { + YarnUtil.getOwnQueues(userName).map(queues.add(_)) + } appendMessageData(message, "queues", queues) } diff --git a/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/YarnUtil.scala b/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/YarnUtil.scala index 27fdcd18e..d4733df0a 100644 --- a/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/YarnUtil.scala +++ b/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/YarnUtil.scala @@ -47,7 +47,6 @@ object YarnUtil extends Logging{ private implicit val executor = ExecutionContext.global private var yarnConf: YarnConfiguration = _ - private var yarnClient:YarnClient = _ private var rm_web_address: String = CommonVars("wds.linkis.yarn.rm.web.address", "").getValue private var hadoop_version:String = "2.7.2" implicit val format = DefaultFormats @@ -59,11 +58,6 @@ object YarnUtil extends Logging{ if(StringUtils.isBlank(this.rm_web_address)){ reloadRMWebAddress() } - Utils.tryQuietly({ - yarnClient = YarnClient.createYarnClient(); - yarnClient.init(yarnConf) - yarnClient.start() - }) info(s"This yarn rm web address is:${this.rm_web_address}") Utils.tryAndErrorMsg(getHadoopVersion())("Failed to get HadoopVersion") } @@ -266,21 +260,30 @@ object YarnUtil extends Logging{ }) } - def getOwnQueues(userName: String): Array[String] = Utils.tryCatch { val queuePrefix = "root." UserGroupInformation.createRemoteUser(userName).doAs(new PrivilegedExceptionAction[Array[String]] { override def run(): Array[String] = { - yarnClient.getQueueAclsInfo - .filter(info => info.getUserAcls.contains(QueueACL.ADMINISTER_QUEUE) || info.getUserAcls.contains(QueueACL.SUBMIT_APPLICATIONS)) - .map(info => { - val queueName = if (info.getQueueName.startsWith(queuePrefix)) { - info.getQueueName.substring(queuePrefix.length) - } else { - info.getQueueName - } - queueName - }).toArray + val yarnClient = YarnClient.createYarnClient(); + try { + yarnClient.init(yarnConf) + yarnClient.start() + yarnClient.getQueueAclsInfo + .filter(aclsInfo => { +// info(s"""queue: ${aclsInfo.getQueueName}, acls: ${aclsInfo.getUserAcls.mkString(",")}""") + aclsInfo.getUserAcls.contains(QueueACL.ADMINISTER_QUEUE) || aclsInfo.getUserAcls.contains(QueueACL.SUBMIT_APPLICATIONS) + }) + .map(info => { + val queueName = if (info.getQueueName.startsWith(queuePrefix)) { + info.getQueueName.substring(queuePrefix.length) + } else { + info.getQueueName + } + queueName + }).toArray + } finally { + yarnClient.close() + } } }) } { -- Gitee From afefb2a052947c36f27e09db2e0034f2036c779c Mon Sep 17 00:00:00 2001 From: wForget <643348094@qq.com> Date: Mon, 20 Jul 2020 11:53:30 +0800 Subject: [PATCH 034/148] remove org.scalactic.Pass dependents --- ujes/definedEngines/python/engine/pom.xml | 5 ----- .../webank/wedatasphere/linkis/engine/PythonSession.scala | 2 -- 2 files changed, 7 deletions(-) diff --git a/ujes/definedEngines/python/engine/pom.xml b/ujes/definedEngines/python/engine/pom.xml index 33b6fba55..ba876169a 100644 --- a/ujes/definedEngines/python/engine/pom.xml +++ b/ujes/definedEngines/python/engine/pom.xml @@ -61,11 +61,6 @@ 0.10.4 - - org.scalatest - scalatest_2.11 - 2.2.6 - com.webank.wedatasphere.linkis linkis-bml-hook diff --git a/ujes/definedEngines/python/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/PythonSession.scala b/ujes/definedEngines/python/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/PythonSession.scala index 86c7763d7..e4e58a2c0 100644 --- a/ujes/definedEngines/python/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/PythonSession.scala +++ b/ujes/definedEngines/python/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/PythonSession.scala @@ -43,7 +43,6 @@ import com.webank.wedatasphere.linkis.storage.domain._ import com.webank.wedatasphere.linkis.storage.resultset.{ResultSetFactory, ResultSetWriter} import com.webank.wedatasphere.linkis.storage.resultset.table.{TableMetaData, TableRecord} import org.apache.commons.io.IOUtils -import org.scalactic.Pass import scala.collection.JavaConversions._ import scala.collection.JavaConverters @@ -131,7 +130,6 @@ class PythonSession extends Logging { logger.info("result is {} ", res) if (StringUtils.isNotBlank(res)) engineExecutorContext.appendStdout(res) } - Pass }) } -- Gitee From 203fc9900b34c8188f5688fb5cbc52926ab94def Mon Sep 17 00:00:00 2001 From: wForget <643348094@qq.com> Date: Wed, 29 Jul 2020 10:16:36 +0800 Subject: [PATCH 035/148] fix regexp StackOverflowError --- .../linkis/entrance/interceptor/impl/CommentInterceptor.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CommentInterceptor.scala b/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CommentInterceptor.scala index 1db9502f3..69f58fe53 100644 --- a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CommentInterceptor.scala +++ b/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CommentInterceptor.scala @@ -105,7 +105,7 @@ object PythonCommentHelper extends CommentHelper{ object ScalaCommentHelper extends CommentHelper{ override val commentPattern: Regex = """^\s*//.+\s*""".r.unanchored - private val scalaCommentPattern:String = "(?ms)([\"'](?:|[^'])*['\"])|//.*?$|/\\*.*?\\*/" + private val scalaCommentPattern: String = "(?ms)(([\"][^\"]*[\"])|(['][^']*[']))|//.*?$|/\\*.*?\\*/" override def dealComment(code: String): String = { val p = Pattern.compile(scalaCommentPattern) p.matcher(code).replaceAll("$1") -- Gitee From ed4cd7f8f1dc9b74f94aa7bd7ea620be128c3383 Mon Sep 17 00:00:00 2001 From: wForget <643348094@qq.com> Date: Sat, 5 Sep 2020 17:21:47 +0800 Subject: [PATCH 036/148] fix compile problem --- .../entrance/executor/codeparser/CodeParser.scala | 6 +++--- .../executor/esclient/EsClientFactory.scala | 15 ++++++++------- .../PrestoEntranceEngineExecutorManager.scala | 7 ++++--- .../entrance/utils/PrestoResourceUtils.scala | 11 +++++++++-- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/codeparser/CodeParser.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/codeparser/CodeParser.scala index 606af1f6b..0e69a4aff 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/codeparser/CodeParser.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/codeparser/CodeParser.scala @@ -41,7 +41,7 @@ class EsJsonCodeParser extends CodeParser { var status = 0 var isBegin = false - code.trim.chars().forEach { + code.trim.toCharArray().foreach { case '{' => { if (status == 0) { if (isBegin && !statementBuffer.isEmpty) { @@ -58,12 +58,12 @@ class EsJsonCodeParser extends CodeParser { status += 1 statementBuffer.append('}') } - case char: Int => if (status == 0 && isBegin && !statementBuffer.isEmpty) { + case char: Char => if (status == 0 && isBegin && !statementBuffer.isEmpty) { codeBuffer.append(new String(statementBuffer.toArray)) statementBuffer.clear() isBegin = false } else { - statementBuffer.append(char.toChar) + statementBuffer.append(char) } } diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactory.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactory.scala index 9811b6149..012d6b0c6 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactory.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactory.scala @@ -29,7 +29,7 @@ import org.apache.http.client.CredentialsProvider import org.apache.http.impl.client.BasicCredentialsProvider import org.apache.http.impl.nio.client.HttpAsyncClientBuilder import org.apache.http.message.BasicHeader -import org.elasticsearch.client.RestClient +import org.elasticsearch.client.{RestClient, RestClientBuilder} import org.elasticsearch.client.sniff.Sniffer import scala.collection.JavaConversions._ @@ -94,14 +94,15 @@ object EsClientFactory { val httpHosts = cluster.map(item => new HttpHost(item._1, item._2)) val builder = RestClient.builder(httpHosts: _*) - .setHttpClientConfigCallback((httpClientBuilder: HttpAsyncClientBuilder) => { - if(!ES_AUTH_CACHE.getValue) { - httpClientBuilder.disableAuthCaching - } + .setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() { + override def customizeHttpClient(httpAsyncClientBuilder: HttpAsyncClientBuilder): HttpAsyncClientBuilder = { + if(!ES_AUTH_CACHE.getValue) { + httpAsyncClientBuilder.disableAuthCaching + } // httpClientBuilder.setDefaultRequestConfig(RequestConfig.DEFAULT) // httpClientBuilder.setDefaultConnectionConfig(ConnectionConfig.DEFAULT) - httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider) - + httpAsyncClientBuilder.setDefaultCredentialsProvider(credentialsProvider) + } }) if (defaultHeaders != null) { builder.setDefaultHeaders(defaultHeaders) diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutorManager.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutorManager.scala index f3a72dee2..3c3936337 100644 --- a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutorManager.scala +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/PrestoEntranceEngineExecutorManager.scala @@ -46,6 +46,7 @@ import okhttp3.OkHttpClient import org.springframework.beans.factory.annotation.Autowired import scala.collection.JavaConverters._ +import scala.collection.JavaConversions._ import scala.concurrent.duration.Duration @@ -106,14 +107,14 @@ class PrestoEntranceEngineExecutorManager(groupFactory: GroupFactory, val configMap = new util.HashMap[String, String]() val runtimeMap: util.Map[String, Any] = TaskUtils.getRuntimeMap(job.getParams) val startupMap: util.Map[String, Any] = TaskUtils.getStartupMap(job.getParams) - startupMap.forEach((k, v) => if (v != null) configMap.put(k, v.toString)) - runtimeMap.forEach((k, v) => if (v != null) configMap.put(k, v.toString)) + startupMap.foreach(item => if (item._2 != null) configMap.put(item._1, item._2.toString)) + runtimeMap.foreach(item => if (item._2 != null) configMap.put(item._1, item._2.toString)) val sender = Sender.getSender(EntranceConfiguration.CLOUD_CONSOLE_CONFIGURATION_SPRING_APPLICATION_NAME.getValue) val response = sender.ask(RequestQueryAppConfigWithGlobal(job.getUser, job.getCreator, "presto", isMerge = true)).asInstanceOf[ResponseQueryConfig] val appConfig = response.getKeyAndValue if (appConfig != null) { - appConfig.forEach((k, v) => if (!configMap.containsKey(k)) configMap.put(k, v)) + appConfig.foreach(item => if (!configMap.containsKey(item._1)) configMap.put(item._1, item._2)) } configMap } diff --git a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/PrestoResourceUtils.scala b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/PrestoResourceUtils.scala index 05f610310..bada59312 100644 --- a/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/PrestoResourceUtils.scala +++ b/ujes/definedEngines/presto/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/PrestoResourceUtils.scala @@ -15,7 +15,10 @@ */ package com.webank.wedatasphere.linkis.entrance.utils +import java.util.function.{Consumer, Supplier} + import com.facebook.presto.resourceGroups.{FileResourceGroupConfig, FileResourceGroupConfigurationManager} +import com.facebook.presto.spi.memory.{ClusterMemoryPoolManager, MemoryPoolId, MemoryPoolInfo} import com.facebook.presto.spi.resourceGroups.SelectionCriteria import com.webank.wedatasphere.linkis.entrance.exception.PrestoSourceGroupException @@ -33,10 +36,14 @@ object PrestoResourceUtils { if (!groupManagerMap.contains(filePath)) { val config = new FileResourceGroupConfig() config.setConfigFile(filePath) - groupManagerMap += (filePath -> new FileResourceGroupConfigurationManager((_, _) => {}, config)) + groupManagerMap += (filePath -> new FileResourceGroupConfigurationManager(new ClusterMemoryPoolManager { + override def addChangeListener(poolId: MemoryPoolId, listener: Consumer[MemoryPoolInfo]): Unit = {} + }, config)) } groupManagerMap(filePath).`match`(criteria) - .orElseThrow(() => PrestoSourceGroupException("Presto resource group not found.")) + .orElseThrow(new Supplier[Throwable] { + override def get(): Throwable = PrestoSourceGroupException("Presto resource group not found.") + }) .getResourceGroupId.toString } } -- Gitee From 50db8e74c01fd4aa9b37c460a96f5af32d100fd4 Mon Sep 17 00:00:00 2001 From: zhuguosheng Date: Tue, 27 Oct 2020 18:24:01 +0800 Subject: [PATCH 037/148] =?UTF-8?q?fix-=E7=8E=AF=E5=A2=83=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E8=AE=BE=E7=BD=AE=E6=97=A0=E6=95=88=20#456?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wedatasphere/linkis/storage/script/VariableParser.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/VariableParser.scala b/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/VariableParser.scala index 81bc6a0a2..c175d7a24 100644 --- a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/VariableParser.scala +++ b/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/VariableParser.scala @@ -72,7 +72,7 @@ object VariableParser { } val params = new util.HashMap[String, Object] if(vars.size() >0)params += VARIABLE -> vars - if(vars.size() >0)params += CONFIGURATION -> confs + if(confs.size() >0)params += CONFIGURATION -> confs params } -- Gitee From 467f3221919a0c10b9a3503fc3d9f8f7a7cb2ade Mon Sep 17 00:00:00 2001 From: xufei Date: Thu, 19 Nov 2020 22:03:56 +0800 Subject: [PATCH 038/148] fix pyspark on spark3.0 --- .../src/main/resources/python/mix_pyspark.py | 28 ++++++++++++------- .../executors/SparkPythonExecutor.scala | 22 +++++++++++++-- .../linkis/engine/imexport/CsvRelation.scala | 25 +++++++++++++++-- 3 files changed, 61 insertions(+), 14 deletions(-) diff --git a/ujes/definedEngines/spark/engine/src/main/resources/python/mix_pyspark.py b/ujes/definedEngines/spark/engine/src/main/resources/python/mix_pyspark.py index 4b1a341df..63c44b2f3 100644 --- a/ujes/definedEngines/spark/engine/src/main/resources/python/mix_pyspark.py +++ b/ujes/definedEngines/spark/engine/src/main/resources/python/mix_pyspark.py @@ -1,12 +1,12 @@ import sys, getopt, traceback, json, re import os os.environ['PYSPARK_ALLOW_INSECURE_GATEWAY']='1' -zipPaths = sys.argv[3] +zipPaths = sys.argv[4] paths = zipPaths.split(':') for i in range(len(paths)): sys.path.insert(0, paths[i]) -from py4j.java_gateway import java_import, JavaGateway, GatewayClient +from py4j.java_gateway import java_import, JavaGateway, GatewayClient, GatewayParameters from py4j.protocol import Py4JJavaError from pyspark.conf import SparkConf from pyspark.context import SparkContext @@ -88,17 +88,20 @@ class SparkVersion(object): def isImportAllPackageUnderSparkSql(self): return self.version >= self.SPARK_1_3_0 +try: + client = GatewayClient(port=int(sys.argv[1])) +except: + client = GatewayClient(port=int(sys.argv[1]), + gateway_parameters=GatewayParameters(port = int(sys.argv[1]), auto_convert = True, auth_token = sys.argv[3])) -output = Logger() -errorOutput = ErrorLogger() -sys.stdout = output -sys.stderr = errorOutput - -client = GatewayClient(port=int(sys.argv[1])) sparkVersion = SparkVersion(int(sys.argv[2])) if sparkVersion.isAutoConvertEnabled(): - gateway = JavaGateway(client, auto_convert = True) + try: + gateway = JavaGateway(client, auto_field = True, auto_convert = True, + gateway_parameters=GatewayParameters(port = int(sys.argv[1]), auto_convert = True, auth_token = sys.argv[3])) + except: + gateway = JavaGateway(client, auto_convert = True) else: gateway = JavaGateway(client) @@ -121,6 +124,11 @@ else: jobGroup = "" +output = Logger() +errorOutput = ErrorLogger() +sys.stdout = output +sys.stderr = errorOutput + def show(obj): from pyspark.sql import DataFrame if isinstance(obj, DataFrame): @@ -181,7 +189,7 @@ spark = SparkSession(sc, intp.getSparkSession()) ##add pyfiles try: - pyfile = sys.argv[4] + pyfile = sys.argv[5] pyfiles = pyfile.split(',') for i in range(len(pyfiles)): if ""!=pyfiles[i]: diff --git a/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/executors/SparkPythonExecutor.scala b/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/executors/SparkPythonExecutor.scala index 65c5b43c8..7a70b559a 100644 --- a/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/executors/SparkPythonExecutor.scala +++ b/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/executors/SparkPythonExecutor.scala @@ -17,6 +17,7 @@ package com.webank.wedatasphere.linkis.engine.executors import java.io._ +import java.net.InetAddress import java.util import java.util.concurrent.atomic.AtomicLong @@ -35,12 +36,13 @@ import com.webank.wedatasphere.linkis.scheduler.executer.{ErrorExecuteResponse, import com.webank.wedatasphere.linkis.storage.resultset.{ResultSetFactory, ResultSetWriter} import org.apache.commons.io.IOUtils import org.apache.commons.exec.CommandLine -import org.apache.commons.lang.StringUtils +import org.apache.commons.lang.{RandomStringUtils, StringUtils} import org.apache.spark.api.java.JavaSparkContext import org.apache.spark.rdd.RDD import org.apache.spark.sql.{DataFrame, SQLContext, SparkSession} import org.apache.spark.{SparkContext, SparkException} import py4j.GatewayServer +import py4j.GatewayServer.GatewayServerBuilder import scala.collection.JavaConversions._ import scala.collection.mutable.StringBuilder @@ -65,6 +67,21 @@ class SparkPythonExecutor(val sc: SparkContext, val sqlContext: SQLContext,sess private[executors] var engineExecutorContext: EngineExecutorContext = _ private val lineOutputStream = new RsOutputStream + private lazy val py4jToken: String = RandomStringUtils.randomAlphanumeric(256) + + private lazy val gwBuilder: GatewayServerBuilder = { + val builder = new GatewayServerBuilder() + .javaPort(0) + .callbackClient(0, InetAddress.getByName(GatewayServer.DEFAULT_ADDRESS)) + .connectTimeout(GatewayServer.DEFAULT_CONNECT_TIMEOUT) + .readTimeout(GatewayServer.DEFAULT_READ_TIMEOUT) + .customCommands(null) + + try builder.authToken(py4jToken) catch { + case err: Throwable => builder + } + } + val SUCCESS = "success" @throws(classOf[IOException]) override def open = {} @@ -96,7 +113,7 @@ class SparkPythonExecutor(val sc: SparkContext, val sqlContext: SQLContext,sess val pythonScriptPath = CommonVars("python.script.path", "python/mix_pyspark.py").getValue val port = EngineUtils.findAvailPort - gatewayServer = new GatewayServer(this, port) + gatewayServer = gwBuilder.entryPoint(this).javaPort(port).build() gatewayServer.start() info("Pyspark process file path is: " + getClass.getClassLoader.getResource(pythonScriptPath).toURI) @@ -119,6 +136,7 @@ class SparkPythonExecutor(val sc: SparkContext, val sqlContext: SQLContext,sess cmd.addArgument(createFakeShell(pythonScriptPath).getAbsolutePath, false) cmd.addArgument(port.toString, false) cmd.addArgument(EngineUtils.sparkSubmitVersion().replaceAll("\\.", ""), false) + cmd.addArgument(py4jToken, false) cmd.addArgument(pythonClasspath.toString(), false) cmd.addArgument(pyFiles, false) diff --git a/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/imexport/CsvRelation.scala b/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/imexport/CsvRelation.scala index 31046e869..6bd3daa02 100644 --- a/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/imexport/CsvRelation.scala +++ b/ujes/definedEngines/spark/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/imexport/CsvRelation.scala @@ -24,6 +24,7 @@ import java.util.Locale import com.webank.wedatasphere.linkis.common.utils.{Logging, Utils} import com.webank.wedatasphere.linkis.engine.imexport.util.ImExportUtils +import javax.xml.bind.DatatypeConverter import org.apache.hadoop.fs.Path import org.apache.hadoop.io.{IOUtils, LongWritable, Text} import org.apache.hadoop.mapred.TextInputFormat @@ -117,13 +118,33 @@ class CsvRelation(@transient private val source: Map[String,Any]) extends Serial case _: BooleanType => value.toBoolean case dt: DecimalType => val dataum = new BigDecimal(value.replaceAll(",", "")) Decimal(dataum, dt.precision, dt.scale) - case _: TimestampType => new Timestamp(Try(timestampFormat.parse(value).getTime).getOrElse(DateTimeUtils.stringToTime(value).getTime * 1000L)) - case _: DateType => new Date(Try(dateFormatP.parse(value).getTime).getOrElse(DateTimeUtils.stringToTime(value).getTime)) + case _: TimestampType => new Timestamp(Try(timestampFormat.parse(value).getTime).getOrElse(stringToTime(value).getTime * 1000L)) + case _: DateType => new Date(Try(dateFormatP.parse(value).getTime).getOrElse(stringToTime(value).getTime)) case _: StringType => value.replaceAll("\n|\t", " ") case t => throw new RuntimeException(s"Unsupported cast from $value to $t") } } + def stringToTime(s: String): java.util.Date = { + val indexOfGMT = s.indexOf("GMT") + if (indexOfGMT != -1) { + // ISO8601 with a weird time zone specifier (2000-01-01T00:00GMT+01:00) + val s0 = s.substring(0, indexOfGMT) + val s1 = s.substring(indexOfGMT + 3) + // Mapped to 2000-01-01T00:00+01:00 + stringToTime(s0 + s1) + } else if (!s.contains('T')) { + // JDBC escape string + if (s.contains(' ')) { + Timestamp.valueOf(s) + } else { + Date.valueOf(s) + } + } else { + DatatypeConverter.parseDateTime(s).getTime() + } + } + def saveDFToCsv(spark: SparkSession, df: DataFrame, path: String, hasHeader: Boolean = true ,isOverwrite: Boolean = false): Boolean = { val filesystemPath = new Path(path) spark.sparkContext.hadoopConfiguration.setBoolean("fs.hdfs.impl.disable.cache", true) -- Gitee From 5e6b1fd3333026675700cc0d7e0a42721785cbb4 Mon Sep 17 00:00:00 2001 From: xufei Date: Fri, 20 Nov 2020 08:39:16 +0800 Subject: [PATCH 039/148] bug fix --- .../spark/engine/src/main/resources/python/mix_pyspark.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ujes/definedEngines/spark/engine/src/main/resources/python/mix_pyspark.py b/ujes/definedEngines/spark/engine/src/main/resources/python/mix_pyspark.py index 63c44b2f3..56361443c 100644 --- a/ujes/definedEngines/spark/engine/src/main/resources/python/mix_pyspark.py +++ b/ujes/definedEngines/spark/engine/src/main/resources/python/mix_pyspark.py @@ -89,10 +89,10 @@ class SparkVersion(object): return self.version >= self.SPARK_1_3_0 try: - client = GatewayClient(port=int(sys.argv[1])) -except: client = GatewayClient(port=int(sys.argv[1]), gateway_parameters=GatewayParameters(port = int(sys.argv[1]), auto_convert = True, auth_token = sys.argv[3])) +except: + client = GatewayClient(port=int(sys.argv[1])) sparkVersion = SparkVersion(int(sys.argv[2])) -- Gitee From 556a95f69bca67fe10152fef23af86dfb251b72a Mon Sep 17 00:00:00 2001 From: "weijiang.lin" <31716550+linweijiang@users.noreply.github.com> Date: Wed, 16 Dec 2020 11:49:39 +0800 Subject: [PATCH 040/148] #489 fix loss of user cookie when login by sso #489 fix loss of user cookie when login by sso --- .../wedatasphere/linkis/gateway/security/SecurityFilter.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/SecurityFilter.scala b/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/SecurityFilter.scala index 04209acbe..0011fb8aa 100644 --- a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/SecurityFilter.scala +++ b/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/SecurityFilter.scala @@ -103,6 +103,7 @@ object SecurityFilter { } else if(GatewayConfiguration.ENABLE_SSO_LOGIN.getValue) { val user = SSOInterceptor.getSSOInterceptor.getUser(gatewayContext) if(StringUtils.isNotBlank(user)) { + GatewaySSOUtils.setLoginUser(gatewayContext, user) GatewaySSOUtils.setLoginUser(gatewayContext.getRequest, user) true } else if(isPassAuthRequest) { -- Gitee From da9d7400f978bc92534bd0bce548e5749a3888fe Mon Sep 17 00:00:00 2001 From: limeng <77954309@qq.com> Date: Thu, 17 Dec 2020 01:04:58 -0600 Subject: [PATCH 041/148] shell (#533) --- .../storage/script/ScriptFsWriter.scala | 4 +-- .../compaction/ShellScriptCompaction.scala | 25 +++++++++++++++++++ .../interceptor/impl/CommentInterceptor.scala | 1 + .../impl/CustomVariableUtils.scala | 4 +++ 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/ShellScriptCompaction.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/ScriptFsWriter.scala b/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/ScriptFsWriter.scala index 4df2ac527..9ad52a827 100644 --- a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/ScriptFsWriter.scala +++ b/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/ScriptFsWriter.scala @@ -20,7 +20,7 @@ import java.io.OutputStream import com.webank.wedatasphere.linkis.common.io.{FsPath, FsWriter, MetaData} import com.webank.wedatasphere.linkis.storage.LineRecord -import com.webank.wedatasphere.linkis.storage.script.compaction.{PYScriptCompaction, QLScriptCompaction, ScalaScriptCompaction} +import com.webank.wedatasphere.linkis.storage.script.compaction.{PYScriptCompaction, QLScriptCompaction, ScalaScriptCompaction, ShellScriptCompaction} import com.webank.wedatasphere.linkis.storage.script.parser.{PYScriptParser, QLScriptParser, ScalaScriptParser} import com.webank.wedatasphere.linkis.storage.script.writer.StorageScriptFsWriter @@ -42,7 +42,7 @@ object ParserFactory { } object Compaction { - def listCompactions(): Array[Compaction] = Array(PYScriptCompaction(),QLScriptCompaction(),ScalaScriptCompaction()) + def listCompactions(): Array[Compaction] = Array(PYScriptCompaction(),QLScriptCompaction(),ScalaScriptCompaction(),ShellScriptCompaction()) } trait Parser { diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/ShellScriptCompaction.scala b/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/ShellScriptCompaction.scala new file mode 100644 index 000000000..24e745037 --- /dev/null +++ b/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/ShellScriptCompaction.scala @@ -0,0 +1,25 @@ +package com.webank.wedatasphere.linkis.storage.script.compaction + +/** + * @Classname ShellScriptCompaction + * @Description TODO + * @Date 2020/12/17 9:11 + * @Created by limeng + */ +class ShellScriptCompaction private extends CommonScriptCompaction{ + override def prefixConf: String = "#conf@set" + + override def prefix: String = "#@set" + + override def belongTo(suffix: String): Boolean ={ + suffix match { + case "sh"=>true + case _=>false + } + } +} +object ShellScriptCompaction{ + val shellScriptCompaction:ShellScriptCompaction=new ShellScriptCompaction + + def apply(): CommonScriptCompaction = shellScriptCompaction +} diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CommentInterceptor.scala b/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CommentInterceptor.scala index 69f58fe53..4542862ba 100644 --- a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CommentInterceptor.scala +++ b/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CommentInterceptor.scala @@ -47,6 +47,7 @@ class CommentInterceptor extends EntranceInterceptor { case "sql" | "hql" | "psql" | "essql" => requestPersistTask.setExecutionCode(SQLCommentHelper.dealComment(requestPersistTask.getExecutionCode)) case "python" | "py" => requestPersistTask.setExecutionCode(PythonCommentHelper.dealComment(requestPersistTask.getExecutionCode)) case "scala" | "java" | "esjson" => requestPersistTask.setExecutionCode(ScalaCommentHelper.dealComment(requestPersistTask.getExecutionCode)) + case "sh" | "shell" => case _ => requestPersistTask.setExecutionCode(SQLCommentHelper.dealComment(requestPersistTask.getExecutionCode)) } requestPersistTask diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CustomVariableUtils.scala b/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CustomVariableUtils.scala index d65f729e0..41e01e5db 100644 --- a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CustomVariableUtils.scala +++ b/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CustomVariableUtils.scala @@ -52,6 +52,7 @@ object CustomVariableUtils extends Logging { val R_TYPE:String = "r" val RUN_DATE = "run_date" val TEAM:String = "team" + val SHELL_TYPE:String="shell" /** * date Format @@ -80,6 +81,7 @@ object CustomVariableUtils extends Logging { case "python" => codeType = PY_TYPE case "java" => codeType = JAVA_TYPE case "scala" | "esjson" => codeType = SCALA_TYPE + case "shell" | "sh" => codeType = SHELL_TYPE case _ => return (false, code) } @@ -360,6 +362,8 @@ object CustomVariableUtils extends Logging { case SCALA_TYPE => varString = """\s*//@set\s*.+\s*""" errString = """\s*//@.+""" case JAVA_TYPE => varString = """\s*!!@set\s*.+\s*""" + case SHELL_TYPE => varString = """\s*#@set\s*.+\s*""" + errString = """\s*#@""" } val customRegex = varString.r.unanchored -- Gitee From a864e5a7533de3142ec9313eb94276d9f3860e6b Mon Sep 17 00:00:00 2001 From: hanchenglin <770154811@qq.com> Date: Thu, 17 Dec 2020 17:45:19 +0800 Subject: [PATCH 042/148] modify name of linkis_udf_tree to varchar(200) --- db/linkis_ddl.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/linkis_ddl.sql b/db/linkis_ddl.sql index 206e5293d..d89710a0b 100644 --- a/db/linkis_ddl.sql +++ b/db/linkis_ddl.sql @@ -291,7 +291,7 @@ DROP TABLE IF EXISTS `linkis_udf_tree`; CREATE TABLE `linkis_udf_tree` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `parent` bigint(20) NOT NULL, - `name` varchar(100) DEFAULT NULL COMMENT 'Category name of the function. It would be displayed in the front-end', + `name` varchar(200) DEFAULT NULL COMMENT 'Category name of the function. It would be displayed in the front-end', `user_name` varchar(50) NOT NULL, `description` varchar(255) DEFAULT NULL, `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, -- Gitee From 14eee82a4c9b7d343e24fd2ffc2af46c1b504af6 Mon Sep 17 00:00:00 2001 From: AndyChen Date: Thu, 17 Dec 2020 18:09:40 +0800 Subject: [PATCH 043/148] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E9=9B=86=E6=88=90linkis=EF=BC=8CToken=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=96=B9=E5=BC=8F=EF=BC=8CToken=E6=A0=A1=E9=AA=8CBug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/token/TokenAuthentication.scala | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/token/TokenAuthentication.scala b/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/token/TokenAuthentication.scala index bed3e4820..6c2b135d8 100644 --- a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/token/TokenAuthentication.scala +++ b/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/token/TokenAuthentication.scala @@ -73,11 +73,19 @@ object TokenAuthentication extends Logging { SecurityFilter.filterResponse(gatewayContext, message) return false } - var token = gatewayContext.getRequest.getHeaders.get(TOKEN_KEY)(0) - var tokenUser = gatewayContext.getRequest.getHeaders.get(TOKEN_USER_KEY)(0) + var token = ""; + var tokenUser = ""; + val requestHeaders = gatewayContext.getRequest.getHeaders + if (requestHeaders.containsKey(TOKEN_KEY) && requestHeaders.containsKey(TOKEN_USER_KEY)) { + token = requestHeaders.get(TOKEN_KEY)(0) + tokenUser = requestHeaders.get(TOKEN_USER_KEY)(0) + } if(StringUtils.isBlank(token) || StringUtils.isBlank(tokenUser)) { - token = gatewayContext.getRequest.getCookies.get(TOKEN_KEY)(0).getValue - tokenUser = gatewayContext.getRequest.getCookies.get(TOKEN_USER_KEY)(0).getValue + val cookies = gatewayContext.getRequest.getCookies + if (cookies.containsKey(TOKEN_KEY) && cookies.containsKey(TOKEN_USER_KEY)) { + token = cookies.get(TOKEN_KEY)(0).getValue + tokenUser = cookies.get(TOKEN_USER_KEY)(0).getValue + } if(StringUtils.isBlank(token) || StringUtils.isBlank(tokenUser)) { val message = Message.noLogin(s"请在Header或Cookie中同时指定$TOKEN_KEY 和 $TOKEN_USER_KEY,以便完成token认证!") << gatewayContext.getRequest.getRequestURI SecurityFilter.filterResponse(gatewayContext, message) -- Gitee From 2068e1601fe02a2bb0a20b1afbfbfbb7b287612d Mon Sep 17 00:00:00 2001 From: Wang Zhen Date: Mon, 28 Dec 2020 20:54:47 +0800 Subject: [PATCH 044/148] add presto entrance config --- .../presto/entrance/src/main/resources/linkis.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ujes/definedEngines/presto/entrance/src/main/resources/linkis.properties b/ujes/definedEngines/presto/entrance/src/main/resources/linkis.properties index a25918e5c..cd796cc16 100644 --- a/ujes/definedEngines/presto/entrance/src/main/resources/linkis.properties +++ b/ujes/definedEngines/presto/entrance/src/main/resources/linkis.properties @@ -30,3 +30,10 @@ wds.linkis.entrance.config.logPath=file:///tmp/linkis/ wds.linkis.resultSet.store.path=file:///tmp/linkis wds.linkis.server.socket.mode=true + + +# presto entrance config +# wds.linkis.presto.url= +# wds.linkis.presto.catalog= +# wds.linkis.presto.resource.config= +# wds.linkis.presto.source= \ No newline at end of file -- Gitee From be44be44adead9db81c35f71ffd9a975520d56d1 Mon Sep 17 00:00:00 2001 From: Wang Zhen Date: Mon, 28 Dec 2020 20:56:49 +0800 Subject: [PATCH 045/148] fix compile --- assembly/src/main/assembly/assembly.xml | 22 +++++++++++ .../gateway-ujes-datasource-ruler/pom.xml | 6 +-- .../utils/PrestoResourceUtil.scala | 38 +++++++++---------- ujes/definedEngines/es/entrance/pom.xml | 11 +++--- ujes/definedEngines/presto/entrance/pom.xml | 11 +++--- 5 files changed, 56 insertions(+), 32 deletions(-) diff --git a/assembly/src/main/assembly/assembly.xml b/assembly/src/main/assembly/assembly.xml index ec4b92889..1c19030b6 100644 --- a/assembly/src/main/assembly/assembly.xml +++ b/assembly/src/main/assembly/assembly.xml @@ -196,6 +196,28 @@ --> + + + + ${project.parent.basedir}/ujes/definedEngines/es/entrance/target/ + + share/linkis/ujes/es + + *.zip + + + + + + + ${project.parent.basedir}/ujes/definedEngines/presto/entrance/target/ + + share/linkis/ujes/presto + + *.zip + + + diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/pom.xml b/gateway/plugins/gateway-ujes-datasource-ruler/pom.xml index 098a74a2e..b3db423fc 100644 --- a/gateway/plugins/gateway-ujes-datasource-ruler/pom.xml +++ b/gateway/plugins/gateway-ujes-datasource-ruler/pom.xml @@ -5,7 +5,7 @@ linkis com.webank.wedatasphere.linkis - 0.9.3 + 0.10.0 4.0.0 @@ -15,14 +15,14 @@ com.webank.wedatasphere.linkis linkis-gateway-ujes-support - ${linkis.version} + ${project.version} provided com.webank.wedatasphere.linkis linkis-mybatis - ${linkis.version} + ${project.version} diff --git a/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/PrestoResourceUtil.scala b/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/PrestoResourceUtil.scala index 3c7c64d86..7bb6f33b2 100644 --- a/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/PrestoResourceUtil.scala +++ b/resourceManager/resourcemanagerserver/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/PrestoResourceUtil.scala @@ -16,15 +16,15 @@ package com.webank.wedatasphere.linkis.resourcemanager.utils -import java.util.concurrent.TimeUnit - import com.webank.wedatasphere.linkis.common.conf.ByteType import com.webank.wedatasphere.linkis.resourcemanager.PrestoResource -import dispatch.{Http, as} +import org.apache.http.client.methods.HttpGet +import org.apache.http.impl.client.HttpClients +import org.apache.http.util.EntityUtils import org.json4s.JsonAST.{JInt, JString} +import org.json4s.jackson.JsonMethods.parse -import scala.concurrent.duration.Duration -import scala.concurrent.{Await, ExecutionContext} +import scala.concurrent.ExecutionContext /** * Created by yogafire on 2020/5/8 @@ -33,20 +33,20 @@ object PrestoResourceUtil { private implicit val executor = ExecutionContext.global - def getGroupInfo(groupName: String, prestoUrl: String): (PrestoResource, PrestoResource) = { - val url = dispatch.url(prestoUrl + "/v1/resourceGroupState/" + groupName.replaceAll("\\.", "/")) - - val future = Http(url > as.json4s.Json).map { resp => - val maxMemory: Long = new ByteType((resp \ "softMemoryLimit").asInstanceOf[JString].values).toLong - val maxInstances: Int = (resp \ "hardConcurrencyLimit").asInstanceOf[JInt].values.toInt + (resp \ "maxQueuedQueries").asInstanceOf[JInt].values.toInt - val maxResource = new PrestoResource(maxMemory, maxInstances, groupName, prestoUrl) + private val httpClient = HttpClients.createDefault() - val usedMemory: Long = new ByteType((resp \ "memoryUsage").asInstanceOf[JString].values).toLong - val usedInstances: Int = (resp \ "numRunningQueries").asInstanceOf[JInt].values.toInt + (resp \ "numQueuedQueries").asInstanceOf[JInt].values.toInt - val usedResource = new PrestoResource(usedMemory, usedInstances, groupName, prestoUrl) - (maxResource, usedResource) - } - - Await.result(future, Duration(10, TimeUnit.SECONDS)) + def getGroupInfo(groupName: String, prestoUrl: String): (PrestoResource, PrestoResource) = { + val url = prestoUrl + "/v1/resourceGroupState/" + groupName.replaceAll("\\.", "/") + val httpGet = new HttpGet(url) + val response = httpClient.execute(httpGet) + val resp = parse(EntityUtils.toString(response.getEntity())) + val maxMemory: Long = new ByteType((resp \ "softMemoryLimit").asInstanceOf[JString].values).toLong + val maxInstances: Int = (resp \ "hardConcurrencyLimit").asInstanceOf[JInt].values.toInt + (resp \ "maxQueuedQueries").asInstanceOf[JInt].values.toInt + val maxResource = new PrestoResource(maxMemory, maxInstances, groupName, prestoUrl) + + val usedMemory: Long = new ByteType((resp \ "memoryUsage").asInstanceOf[JString].values).toLong + val usedInstances: Int = (resp \ "numRunningQueries").asInstanceOf[JInt].values.toInt + (resp \ "numQueuedQueries").asInstanceOf[JInt].values.toInt + val usedResource = new PrestoResource(usedMemory, usedInstances, groupName, prestoUrl) + (maxResource, usedResource) } } \ No newline at end of file diff --git a/ujes/definedEngines/es/entrance/pom.xml b/ujes/definedEngines/es/entrance/pom.xml index 78521903e..7ac3e9833 100644 --- a/ujes/definedEngines/es/entrance/pom.xml +++ b/ujes/definedEngines/es/entrance/pom.xml @@ -5,7 +5,8 @@ linkis com.webank.wedatasphere.linkis - 0.9.3 + 0.10.0 + ../../../../pom.xml 4.0.0 @@ -19,27 +20,27 @@ com.webank.wedatasphere.linkis linkis-ujes-entrance - ${linkis.version} + ${project.version} com.webank.wedatasphere.linkis linkis-cloudRPC - ${linkis.version} + ${project.version} provided com.webank.wedatasphere.linkis linkis-storage - ${linkis.version} + ${project.version} provided com.webank.wedatasphere.linkis linkis-resourcemanager-client - ${linkis.version} + ${project.version} com.webank.wedatasphere.linkis diff --git a/ujes/definedEngines/presto/entrance/pom.xml b/ujes/definedEngines/presto/entrance/pom.xml index e8dc5df49..4f9acf6e4 100644 --- a/ujes/definedEngines/presto/entrance/pom.xml +++ b/ujes/definedEngines/presto/entrance/pom.xml @@ -5,7 +5,8 @@ linkis com.webank.wedatasphere.linkis - 0.9.3 + 0.10.0 + ../../../../pom.xml 4.0.0 @@ -25,24 +26,24 @@ com.webank.wedatasphere.linkis linkis-ujes-entrance - ${linkis.version} + ${project.version} com.webank.wedatasphere.linkis linkis-cloudRPC - ${linkis.version} + ${project.version} provided com.webank.wedatasphere.linkis linkis-storage - ${linkis.version} + ${project.version} provided com.webank.wedatasphere.linkis linkis-resourcemanager-client - ${linkis.version} + ${project.version} com.webank.wedatasphere.linkis -- Gitee From e2226c34ac34143d5245a4fe1778a798407d7117 Mon Sep 17 00:00:00 2001 From: Wang Zhen Date: Tue, 29 Dec 2020 10:06:49 +0800 Subject: [PATCH 046/148] change version 0.10.0 to 0.11.0 --- .gitignore | 2 + assembly/pom.xml | 4 +- assembly/public-module/pom.xml | 4 +- bml/bml-engine-hook/pom.xml | 4 +- bml/bmlclient/pom.xml | 4 +- bml/bmlcommon/pom.xml | 4 +- bml/bmlserver/pom.xml | 3 +- bml/bmlserver/pom_k8s.xml | 2 +- conf/config.sh | 2 +- contextservice/cs-cache/pom.xml | 2 +- contextservice/cs-client/pom.xml | 2 +- contextservice/cs-common/pom.xml | 2 +- contextservice/cs-highavailable/pom.xml | 2 +- contextservice/cs-listener/pom.xml | 2 +- contextservice/cs-persistence/pom.xml | 2 +- contextservice/cs-search/pom.xml | 2 +- contextservice/cs-server/pom.xml | 2 +- contextservice/cs-server/pom_k8s.xml | 2 +- contextservice/cs-ujes-client/pom.xml | 2 +- core/cloudModule/pom.xml | 4 +- core/cloudMybatis/pom.xml | 4 +- core/cloudProtocol/pom.xml | 4 +- core/cloudRPC/pom.xml | 4 +- core/common/pom.xml | 4 +- core/hadoop-common/pom.xml | 4 +- core/httpclient/pom.xml | 4 +- core/scheduler/pom.xml | 4 +- datasource/datasourcemanager/common/pom.xml | 2 +- datasource/datasourcemanager/server/pom.xml | 2 +- .../datasourcemanager/server/pom_k8s.xml | 2 +- datasource/metadatamanager/common/pom.xml | 4 +- datasource/metadatamanager/server/pom.xml | 2 +- datasource/metadatamanager/server/pom_k8s.xml | 2 +- .../service/elasticsearch/pom.xml | 2 +- .../service/elasticsearch/pom_k8s.xml | 2 +- .../metadatamanager/service/hive/pom.xml | 2 +- .../metadatamanager/service/hive/pom_k8s.xml | 2 +- .../metadatamanager/service/mysql/pom.xml | 4 +- .../metadatamanager/service/mysql/pom_k8s.xml | 2 +- eurekaServer/pom.xml | 4 +- extensions/spark-excel/pom.xml | 2 +- gateway/core/pom.xml | 4 +- gateway/gateway-httpclient-support/pom.xml | 4 +- gateway/gateway-ujes-support/pom.xml | 4 +- gateway/gateway-ujes-support/pom_k8s.xml | 2 +- .../gateway-ujes-datasource-ruler/pom.xml | 2 +- gateway/springcloudgateway/pom.xml | 4 +- k8s/build.sh | 46 +++++++++---------- k8s/linkis-bml-deployment.yaml | 2 +- k8s/linkis-cs-server-deployment.yaml | 2 +- k8s/linkis-dsm-server-deployment.yaml | 2 +- k8s/linkis-gateway-deployment.yaml | 2 +- k8s/linkis-mdm-server-deployment.yaml | 2 +- k8s/linkis-mdm-service-es-deployment.yaml | 2 +- k8s/linkis-mdm-service-hive-deployment.yaml | 2 +- k8s/linkis-mdm-service-mysql-deployment.yaml | 2 +- k8s/linkis-metadata-deployment.yaml | 2 +- k8s/linkis-publicservice-deployment.yaml | 2 +- k8s/linkis-resourcemanager-deployment.yaml | 2 +- ...is-ujes-hive-enginemanager-deployment.yaml | 2 +- k8s/linkis-ujes-hive-entrance-deployment.yaml | 2 +- k8s/linkis-ujes-jdbc-entrance-deployment.yaml | 2 +- ...linkis-ujes-mlsql-entrance-deployment.yaml | 2 +- ...jes-pipeline-enginemanager-deployment.yaml | 2 +- ...kis-ujes-pipeline-entrance-deployment.yaml | 2 +- ...-ujes-python-enginemanager-deployment.yaml | 2 +- ...inkis-ujes-python-entrance-deployment.yaml | 2 +- ...s-ujes-shell-enginemanager-deployment.yaml | 2 +- ...linkis-ujes-shell-entrance-deployment.yaml | 2 +- ...s-ujes-spark-enginemanager-deployment.yaml | 2 +- ...linkis-ujes-spark-entrance-deployment.yaml | 2 +- k8s/push.sh | 46 +++++++++---------- metadata/pom.xml | 4 +- metadata/pom_k8s.xml | 2 +- pom.xml | 8 ++-- publicService/application/pom.xml | 4 +- publicService/configuration/pom.xml | 4 +- publicService/jobhistory/pom.xml | 4 +- publicService/pom.xml | 2 +- publicService/pom_k8s.xml | 2 +- publicService/udf/pom.xml | 4 +- publicService/variable/pom.xml | 4 +- .../client/workspace-httpclient/pom.xml | 4 +- publicService/workspace/pom.xml | 4 +- resourceManager/resourcemanagerclient/pom.xml | 2 +- resourceManager/resourcemanagercommon/pom.xml | 2 +- resourceManager/resourcemanagerserver/pom.xml | 2 +- .../resourcemanagerserver/pom_k8s.xml | 2 +- storage/pesIO/io-engine/pom.xml | 2 +- storage/pesIO/io-enginemanager/pom.xml | 2 +- storage/pesIO/io-entrance/pom.xml | 2 +- storage/storage/pom.xml | 2 +- ujes/client/pom.xml | 4 +- ujes/definedEngines/es/entrance/pom.xml | 2 +- ujes/definedEngines/hive/engine/pom.xml | 4 +- .../definedEngines/hive/enginemanager/pom.xml | 4 +- .../hive/enginemanager/pom_k8s.xml | 2 +- ujes/definedEngines/hive/entrance/pom.xml | 4 +- ujes/definedEngines/hive/entrance/pom_k8s.xml | 2 +- ujes/definedEngines/jdbc/entrance/pom.xml | 4 +- ujes/definedEngines/jdbc/entrance/pom_k8s.xml | 2 +- ujes/definedEngines/mlsql/entrance/pom.xml | 4 +- .../definedEngines/mlsql/entrance/pom_k8s.xml | 2 +- ujes/definedEngines/pipeline/engine/pom.xml | 2 +- .../pipeline/enginemanager/pom.xml | 2 +- .../pipeline/enginemanager/pom_k8s.xml | 2 +- ujes/definedEngines/pipeline/entrance/pom.xml | 2 +- .../pipeline/entrance/pom_k8s.xml | 2 +- ujes/definedEngines/presto/entrance/pom.xml | 2 +- ujes/definedEngines/python/engine/pom.xml | 4 +- .../python/enginemanager/pom.xml | 4 +- .../python/enginemanager/pom_k8s.xml | 2 +- ujes/definedEngines/python/entrance/pom.xml | 4 +- .../python/entrance/pom_k8s.xml | 2 +- ujes/definedEngines/shell/engine/pom.xml | 4 +- .../shell/enginemanager/pom.xml | 4 +- .../shell/enginemanager/pom_k8s.xml | 2 +- ujes/definedEngines/shell/entrance/pom.xml | 4 +- .../definedEngines/shell/entrance/pom_k8s.xml | 2 +- ujes/definedEngines/spark/engine/pom.xml | 4 +- .../spark/enginemanager/pom.xml | 4 +- .../spark/enginemanager/pom_k8s.xml | 2 +- ujes/definedEngines/spark/entrance/pom.xml | 3 +- .../definedEngines/spark/entrance/pom_k8s.xml | 2 +- ujes/definedEngines/tispark/engine/pom.xml | 3 +- ujes/engine/pom.xml | 4 +- ujes/enginemanager/pom.xml | 4 +- ujes/entrance/pom.xml | 4 +- ujes/entranceclient/pom.xml | 4 +- ujes/jdbc/pom.xml | 4 +- userControl/pom.xml | 4 +- 131 files changed, 230 insertions(+), 225 deletions(-) diff --git a/.gitignore b/.gitignore index ff24fc55a..c8a07d74b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ .idea .DS_Store +target/ + assembly/target core/cloudModule/target/ diff --git a/assembly/pom.xml b/assembly/pom.xml index a78592c4f..3cda06265 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,8 +21,8 @@ com.webank.wedatasphere.linkis linkis - 0.10.0 - ../pom.xml + 0.11.0 + ../pom.xml 4.0.0 diff --git a/assembly/public-module/pom.xml b/assembly/public-module/pom.xml index ef16e28ee..6bc40c72c 100644 --- a/assembly/public-module/pom.xml +++ b/assembly/public-module/pom.xml @@ -18,8 +18,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml 4.0.0 diff --git a/bml/bml-engine-hook/pom.xml b/bml/bml-engine-hook/pom.xml index 0ecbb40b6..055942935 100644 --- a/bml/bml-engine-hook/pom.xml +++ b/bml/bml-engine-hook/pom.xml @@ -5,8 +5,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml 4.0.0 diff --git a/bml/bmlclient/pom.xml b/bml/bmlclient/pom.xml index 645b8e33e..ffe447048 100644 --- a/bml/bmlclient/pom.xml +++ b/bml/bmlclient/pom.xml @@ -5,8 +5,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml 4.0.0 diff --git a/bml/bmlcommon/pom.xml b/bml/bmlcommon/pom.xml index 090b92c8a..5810ec719 100644 --- a/bml/bmlcommon/pom.xml +++ b/bml/bmlcommon/pom.xml @@ -5,8 +5,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml 4.0.0 diff --git a/bml/bmlserver/pom.xml b/bml/bmlserver/pom.xml index bcfb9450e..3799c53af 100644 --- a/bml/bmlserver/pom.xml +++ b/bml/bmlserver/pom.xml @@ -5,7 +5,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 + ../../pom.xml 4.0.0 diff --git a/bml/bmlserver/pom_k8s.xml b/bml/bmlserver/pom_k8s.xml index 777106ab9..ec9e47855 100644 --- a/bml/bmlserver/pom_k8s.xml +++ b/bml/bmlserver/pom_k8s.xml @@ -5,7 +5,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../pom.xml 4.0.0 diff --git a/conf/config.sh b/conf/config.sh index 8f431b88f..d6f7ad0ed 100755 --- a/conf/config.sh +++ b/conf/config.sh @@ -132,4 +132,4 @@ MDM_PORT=9118 ## java application default jvm memory export SERVER_HEAP_SIZE="512M" -LINKIS_VERSION=0.10.0 +LINKIS_VERSION=0.11.0 diff --git a/contextservice/cs-cache/pom.xml b/contextservice/cs-cache/pom.xml index 06d48a507..1969444d9 100644 --- a/contextservice/cs-cache/pom.xml +++ b/contextservice/cs-cache/pom.xml @@ -18,7 +18,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../pom.xml 4.0.0 diff --git a/contextservice/cs-client/pom.xml b/contextservice/cs-client/pom.xml index 75c6e1e7b..820c8df60 100644 --- a/contextservice/cs-client/pom.xml +++ b/contextservice/cs-client/pom.xml @@ -18,7 +18,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../pom.xml 4.0.0 diff --git a/contextservice/cs-common/pom.xml b/contextservice/cs-common/pom.xml index 44983431c..ea1ff3931 100644 --- a/contextservice/cs-common/pom.xml +++ b/contextservice/cs-common/pom.xml @@ -18,7 +18,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../pom.xml 4.0.0 diff --git a/contextservice/cs-highavailable/pom.xml b/contextservice/cs-highavailable/pom.xml index e87c8a425..de1787627 100644 --- a/contextservice/cs-highavailable/pom.xml +++ b/contextservice/cs-highavailable/pom.xml @@ -18,7 +18,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../pom.xml 4.0.0 diff --git a/contextservice/cs-listener/pom.xml b/contextservice/cs-listener/pom.xml index e1cb123e2..1c5413d00 100644 --- a/contextservice/cs-listener/pom.xml +++ b/contextservice/cs-listener/pom.xml @@ -18,7 +18,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../pom.xml 4.0.0 diff --git a/contextservice/cs-persistence/pom.xml b/contextservice/cs-persistence/pom.xml index 1141ee2dc..b3a980dcd 100644 --- a/contextservice/cs-persistence/pom.xml +++ b/contextservice/cs-persistence/pom.xml @@ -18,7 +18,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../pom.xml 4.0.0 diff --git a/contextservice/cs-search/pom.xml b/contextservice/cs-search/pom.xml index 7b3c4a848..a30d66c54 100644 --- a/contextservice/cs-search/pom.xml +++ b/contextservice/cs-search/pom.xml @@ -18,7 +18,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../pom.xml 4.0.0 diff --git a/contextservice/cs-server/pom.xml b/contextservice/cs-server/pom.xml index d2c2b5815..3679595cf 100644 --- a/contextservice/cs-server/pom.xml +++ b/contextservice/cs-server/pom.xml @@ -18,7 +18,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../pom.xml 4.0.0 diff --git a/contextservice/cs-server/pom_k8s.xml b/contextservice/cs-server/pom_k8s.xml index 743fdf6ab..65491d939 100644 --- a/contextservice/cs-server/pom_k8s.xml +++ b/contextservice/cs-server/pom_k8s.xml @@ -18,7 +18,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../pom.xml 4.0.0 diff --git a/contextservice/cs-ujes-client/pom.xml b/contextservice/cs-ujes-client/pom.xml index d422492ca..fd8b60ecd 100644 --- a/contextservice/cs-ujes-client/pom.xml +++ b/contextservice/cs-ujes-client/pom.xml @@ -18,7 +18,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../pom.xml 4.0.0 diff --git a/core/cloudModule/pom.xml b/core/cloudModule/pom.xml index 698908fb0..b58aa2fbe 100644 --- a/core/cloudModule/pom.xml +++ b/core/cloudModule/pom.xml @@ -21,8 +21,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml 4.0.0 diff --git a/core/cloudMybatis/pom.xml b/core/cloudMybatis/pom.xml index b4eb65b27..c4dade413 100644 --- a/core/cloudMybatis/pom.xml +++ b/core/cloudMybatis/pom.xml @@ -21,8 +21,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml 4.0.0 jar diff --git a/core/cloudProtocol/pom.xml b/core/cloudProtocol/pom.xml index aa3f83a60..95b858787 100644 --- a/core/cloudProtocol/pom.xml +++ b/core/cloudProtocol/pom.xml @@ -21,8 +21,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml 4.0.0 diff --git a/core/cloudRPC/pom.xml b/core/cloudRPC/pom.xml index 61bc5e2ce..8a9a9c3d7 100644 --- a/core/cloudRPC/pom.xml +++ b/core/cloudRPC/pom.xml @@ -21,8 +21,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml 4.0.0 diff --git a/core/common/pom.xml b/core/common/pom.xml index 57a1c38a8..f44e1562e 100644 --- a/core/common/pom.xml +++ b/core/common/pom.xml @@ -21,8 +21,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml 4.0.0 diff --git a/core/hadoop-common/pom.xml b/core/hadoop-common/pom.xml index ff2897689..62a0c87e4 100644 --- a/core/hadoop-common/pom.xml +++ b/core/hadoop-common/pom.xml @@ -18,8 +18,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml 4.0.0 diff --git a/core/httpclient/pom.xml b/core/httpclient/pom.xml index eea76d854..12765893c 100644 --- a/core/httpclient/pom.xml +++ b/core/httpclient/pom.xml @@ -18,8 +18,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml 4.0.0 diff --git a/core/scheduler/pom.xml b/core/scheduler/pom.xml index fe3b7eaf0..8caf8941a 100644 --- a/core/scheduler/pom.xml +++ b/core/scheduler/pom.xml @@ -22,8 +22,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml linkis-scheduler diff --git a/datasource/datasourcemanager/common/pom.xml b/datasource/datasourcemanager/common/pom.xml index 8334f5e77..340baeb4c 100644 --- a/datasource/datasourcemanager/common/pom.xml +++ b/datasource/datasourcemanager/common/pom.xml @@ -18,7 +18,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../../pom.xml 4.0.0 diff --git a/datasource/datasourcemanager/server/pom.xml b/datasource/datasourcemanager/server/pom.xml index b7d8da87b..efdf6ed8f 100644 --- a/datasource/datasourcemanager/server/pom.xml +++ b/datasource/datasourcemanager/server/pom.xml @@ -18,7 +18,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../../pom.xml 4.0.0 diff --git a/datasource/datasourcemanager/server/pom_k8s.xml b/datasource/datasourcemanager/server/pom_k8s.xml index 9970a795d..2eefaa0a4 100644 --- a/datasource/datasourcemanager/server/pom_k8s.xml +++ b/datasource/datasourcemanager/server/pom_k8s.xml @@ -18,7 +18,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../../pom.xml 4.0.0 diff --git a/datasource/metadatamanager/common/pom.xml b/datasource/metadatamanager/common/pom.xml index 25a3d701f..c3b938141 100644 --- a/datasource/metadatamanager/common/pom.xml +++ b/datasource/metadatamanager/common/pom.xml @@ -18,8 +18,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../../pom.xml + 0.11.0 + ../../../pom.xml 4.0.0 diff --git a/datasource/metadatamanager/server/pom.xml b/datasource/metadatamanager/server/pom.xml index 1c35e9691..1aaa0b765 100644 --- a/datasource/metadatamanager/server/pom.xml +++ b/datasource/metadatamanager/server/pom.xml @@ -18,7 +18,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../../pom.xml 4.0.0 diff --git a/datasource/metadatamanager/server/pom_k8s.xml b/datasource/metadatamanager/server/pom_k8s.xml index d22cb129f..69f3f675f 100644 --- a/datasource/metadatamanager/server/pom_k8s.xml +++ b/datasource/metadatamanager/server/pom_k8s.xml @@ -18,7 +18,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../../pom.xml 4.0.0 diff --git a/datasource/metadatamanager/service/elasticsearch/pom.xml b/datasource/metadatamanager/service/elasticsearch/pom.xml index 7c7609aca..d710bf810 100644 --- a/datasource/metadatamanager/service/elasticsearch/pom.xml +++ b/datasource/metadatamanager/service/elasticsearch/pom.xml @@ -18,7 +18,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../../../pom.xml 4.0.0 diff --git a/datasource/metadatamanager/service/elasticsearch/pom_k8s.xml b/datasource/metadatamanager/service/elasticsearch/pom_k8s.xml index 322d66833..540fd2db4 100644 --- a/datasource/metadatamanager/service/elasticsearch/pom_k8s.xml +++ b/datasource/metadatamanager/service/elasticsearch/pom_k8s.xml @@ -18,7 +18,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../../../pom.xml 4.0.0 diff --git a/datasource/metadatamanager/service/hive/pom.xml b/datasource/metadatamanager/service/hive/pom.xml index 9fd641bc8..3c842514d 100644 --- a/datasource/metadatamanager/service/hive/pom.xml +++ b/datasource/metadatamanager/service/hive/pom.xml @@ -18,7 +18,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../../../pom.xml 4.0.0 diff --git a/datasource/metadatamanager/service/hive/pom_k8s.xml b/datasource/metadatamanager/service/hive/pom_k8s.xml index 90a094b54..cb3df7168 100644 --- a/datasource/metadatamanager/service/hive/pom_k8s.xml +++ b/datasource/metadatamanager/service/hive/pom_k8s.xml @@ -18,7 +18,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../../../pom.xml 4.0.0 diff --git a/datasource/metadatamanager/service/mysql/pom.xml b/datasource/metadatamanager/service/mysql/pom.xml index 86007121d..cbe8df0df 100644 --- a/datasource/metadatamanager/service/mysql/pom.xml +++ b/datasource/metadatamanager/service/mysql/pom.xml @@ -18,8 +18,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../../../pom.xml + 0.11.0 + ../../../../pom.xml 4.0.0 diff --git a/datasource/metadatamanager/service/mysql/pom_k8s.xml b/datasource/metadatamanager/service/mysql/pom_k8s.xml index d5839e311..e93710bfe 100644 --- a/datasource/metadatamanager/service/mysql/pom_k8s.xml +++ b/datasource/metadatamanager/service/mysql/pom_k8s.xml @@ -18,7 +18,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../../../pom.xml 4.0.0 diff --git a/eurekaServer/pom.xml b/eurekaServer/pom.xml index 2c1c1a01b..513b43a83 100644 --- a/eurekaServer/pom.xml +++ b/eurekaServer/pom.xml @@ -21,8 +21,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../pom.xml + 0.11.0 + ../pom.xml linkis-eureka-server diff --git a/extensions/spark-excel/pom.xml b/extensions/spark-excel/pom.xml index dbde02f21..dd2e4af8a 100644 --- a/extensions/spark-excel/pom.xml +++ b/extensions/spark-excel/pom.xml @@ -5,7 +5,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../pom.xml 4.0.0 diff --git a/gateway/core/pom.xml b/gateway/core/pom.xml index c424ba590..0bc8ed2bf 100644 --- a/gateway/core/pom.xml +++ b/gateway/core/pom.xml @@ -22,8 +22,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml linkis-gateway-core diff --git a/gateway/gateway-httpclient-support/pom.xml b/gateway/gateway-httpclient-support/pom.xml index e6afd8c6f..65f64e575 100644 --- a/gateway/gateway-httpclient-support/pom.xml +++ b/gateway/gateway-httpclient-support/pom.xml @@ -23,8 +23,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml linkis-gateway-httpclient-support diff --git a/gateway/gateway-ujes-support/pom.xml b/gateway/gateway-ujes-support/pom.xml index a20e20b89..f80ef6aa5 100644 --- a/gateway/gateway-ujes-support/pom.xml +++ b/gateway/gateway-ujes-support/pom.xml @@ -23,8 +23,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml linkis-gateway-ujes-support diff --git a/gateway/gateway-ujes-support/pom_k8s.xml b/gateway/gateway-ujes-support/pom_k8s.xml index 6e9aefa5f..e5379771b 100644 --- a/gateway/gateway-ujes-support/pom_k8s.xml +++ b/gateway/gateway-ujes-support/pom_k8s.xml @@ -23,7 +23,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../pom.xml diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/pom.xml b/gateway/plugins/gateway-ujes-datasource-ruler/pom.xml index b3db423fc..9d5cb864f 100644 --- a/gateway/plugins/gateway-ujes-datasource-ruler/pom.xml +++ b/gateway/plugins/gateway-ujes-datasource-ruler/pom.xml @@ -5,7 +5,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 4.0.0 diff --git a/gateway/springcloudgateway/pom.xml b/gateway/springcloudgateway/pom.xml index cf574e69b..e27c004f2 100644 --- a/gateway/springcloudgateway/pom.xml +++ b/gateway/springcloudgateway/pom.xml @@ -23,8 +23,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml linkis-gateway-springcloudgateway diff --git a/k8s/build.sh b/k8s/build.sh index abdf1857c..948ad27ef 100644 --- a/k8s/build.sh +++ b/k8s/build.sh @@ -2,42 +2,42 @@ # docker build -t $HARBOR_LINKIS/linkis:emr-base-spark2.4.4 -f emr-base/Dockerfile . -docker build -t $HARBOR_LINKIS/linkis:linkis-bml-0.10.0 -f bml/bmlserver/Dockerfile bml/bmlserver +docker build -t $HARBOR_LINKIS/linkis:linkis-bml-0.11.0 -f bml/bmlserver/Dockerfile bml/bmlserver -docker build -t $HARBOR_LINKIS/linkis:linkis-dsm-server-0.10.0 -f datasource/datasourcemanager/server/Dockerfile datasource/datasourcemanager/server +docker build -t $HARBOR_LINKIS/linkis:linkis-dsm-server-0.11.0 -f datasource/datasourcemanager/server/Dockerfile datasource/datasourcemanager/server -docker build -t $HARBOR_LINKIS/linkis:linkis-mdm-server-0.10.0 -f datasource/metadatamanager/server/Dockerfile datasource/metadatamanager/server -docker build -t $HARBOR_LINKIS/linkis:linkis-mdm-service-mysql-0.10.0 -f datasource/metadatamanager/service/mysql/Dockerfile datasource/metadatamanager/service/mysql -docker build -t $HARBOR_LINKIS/linkis:linkis-mdm-service-es-0.10.0 -f datasource/metadatamanager/service/elasticsearch/Dockerfile datasource/metadatamanager/service/elasticsearch -docker build -t $HARBOR_LINKIS/linkis:linkis-mdm-service-hive-0.10.0 -f datasource/metadatamanager/service/hive/Dockerfile datasource/metadatamanager/service/hive +docker build -t $HARBOR_LINKIS/linkis:linkis-mdm-server-0.11.0 -f datasource/metadatamanager/server/Dockerfile datasource/metadatamanager/server +docker build -t $HARBOR_LINKIS/linkis:linkis-mdm-service-mysql-0.11.0 -f datasource/metadatamanager/service/mysql/Dockerfile datasource/metadatamanager/service/mysql +docker build -t $HARBOR_LINKIS/linkis:linkis-mdm-service-es-0.11.0 -f datasource/metadatamanager/service/elasticsearch/Dockerfile datasource/metadatamanager/service/elasticsearch +docker build -t $HARBOR_LINKIS/linkis:linkis-mdm-service-hive-0.11.0 -f datasource/metadatamanager/service/hive/Dockerfile datasource/metadatamanager/service/hive -docker build -t $HARBOR_LINKIS/linkis:linkis-gateway-0.10.0 -f gateway/gateway-ujes-support/Dockerfile gateway/gateway-ujes-support +docker build -t $HARBOR_LINKIS/linkis:linkis-gateway-0.11.0 -f gateway/gateway-ujes-support/Dockerfile gateway/gateway-ujes-support -docker build -t $HARBOR_LINKIS/linkis:linkis-resourcemanager-0.10.0 -f resourceManager/resourcemanagerserver/Dockerfile resourceManager/resourcemanagerserver +docker build -t $HARBOR_LINKIS/linkis:linkis-resourcemanager-0.11.0 -f resourceManager/resourcemanagerserver/Dockerfile resourceManager/resourcemanagerserver -docker build -t $HARBOR_LINKIS/linkis:linkis-cs-server-0.10.0 -f contextservice/cs-server/Dockerfile contextservice/cs-server +docker build -t $HARBOR_LINKIS/linkis:linkis-cs-server-0.11.0 -f contextservice/cs-server/Dockerfile contextservice/cs-server -docker build -t $HARBOR_LINKIS/linkis:linkis-metadata-0.10.0 -f metadata/Dockerfile metadata +docker build -t $HARBOR_LINKIS/linkis:linkis-metadata-0.11.0 -f metadata/Dockerfile metadata -docker build -t $HARBOR_LINKIS/linkis:linkis-publicservice-0.10.0 -f publicService/Dockerfile publicService +docker build -t $HARBOR_LINKIS/linkis:linkis-publicservice-0.11.0 -f publicService/Dockerfile publicService -docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-spark-enginemanager-0.10.0 -f ujes/definedEngines/spark/enginemanager/Dockerfile ujes/definedEngines/spark/enginemanager -docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-spark-entrance-0.10.0 -f ujes/definedEngines/spark/entrance/Dockerfile ujes/definedEngines/spark/entrance +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-spark-enginemanager-0.11.0 -f ujes/definedEngines/spark/enginemanager/Dockerfile ujes/definedEngines/spark/enginemanager +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-spark-entrance-0.11.0 -f ujes/definedEngines/spark/entrance/Dockerfile ujes/definedEngines/spark/entrance -docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-hive-enginemanager-0.10.0 -f ujes/definedEngines/hive/enginemanager/Dockerfile ujes/definedEngines/hive/enginemanager -docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-hive-entrance-0.10.0 -f ujes/definedEngines/hive/entrance/Dockerfile ujes/definedEngines/hive/entrance +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-hive-enginemanager-0.11.0 -f ujes/definedEngines/hive/enginemanager/Dockerfile ujes/definedEngines/hive/enginemanager +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-hive-entrance-0.11.0 -f ujes/definedEngines/hive/entrance/Dockerfile ujes/definedEngines/hive/entrance -docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-python-enginemanager-0.10.0 -f ujes/definedEngines/python/enginemanager/Dockerfile ujes/definedEngines/python/enginemanager -docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-python-entrance-0.10.0 -f ujes/definedEngines/python/entrance/Dockerfile ujes/definedEngines/python/entrance +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-python-enginemanager-0.11.0 -f ujes/definedEngines/python/enginemanager/Dockerfile ujes/definedEngines/python/enginemanager +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-python-entrance-0.11.0 -f ujes/definedEngines/python/entrance/Dockerfile ujes/definedEngines/python/entrance -docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-pipeline-enginemanager-0.10.0 -f ujes/definedEngines/pipeline/enginemanager/Dockerfile ujes/definedEngines/pipeline/enginemanager -docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-pipeline-entrance-0.10.0 -f ujes/definedEngines/pipeline/entrance/Dockerfile ujes/definedEngines/pipeline/entrance +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-pipeline-enginemanager-0.11.0 -f ujes/definedEngines/pipeline/enginemanager/Dockerfile ujes/definedEngines/pipeline/enginemanager +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-pipeline-entrance-0.11.0 -f ujes/definedEngines/pipeline/entrance/Dockerfile ujes/definedEngines/pipeline/entrance -docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-jdbc-enginemanager-0.10.0 -f ujes/definedEngines/jdbc/entrance/Dockerfile ujes/definedEngines/jdbc/entrance +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-jdbc-enginemanager-0.11.0 -f ujes/definedEngines/jdbc/entrance/Dockerfile ujes/definedEngines/jdbc/entrance -docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-mlsql-entrance-0.10.0 -f ujes/definedEngines/mlsql/entrance/Dockerfile ujes/definedEngines/mlsql/entrance +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-mlsql-entrance-0.11.0 -f ujes/definedEngines/mlsql/entrance/Dockerfile ujes/definedEngines/mlsql/entrance -docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-shell-enginemanager-0.10.0 -f ujes/definedEngines/shell/entrance/Dockerfile ujes/definedEngines/shell/entrance -docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-shell-entrance-0.10.0 -f ujes/definedEngines/shell/enginemanager/Dockerfile ujes/definedEngines/shell/enginemanager +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-shell-enginemanager-0.11.0 -f ujes/definedEngines/shell/entrance/Dockerfile ujes/definedEngines/shell/entrance +docker build -t $HARBOR_LINKIS/linkis:linkis-ujes-shell-entrance-0.11.0 -f ujes/definedEngines/shell/enginemanager/Dockerfile ujes/definedEngines/shell/enginemanager diff --git a/k8s/linkis-bml-deployment.yaml b/k8s/linkis-bml-deployment.yaml index 3fe08553b..390ebd128 100644 --- a/k8s/linkis-bml-deployment.yaml +++ b/k8s/linkis-bml-deployment.yaml @@ -47,7 +47,7 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: linkis-bml - image: wedatasphere/linkis:linkis-bml-0.10.0 + image: wedatasphere/linkis:linkis-bml-0.11.0 lifecycle: preStop: exec: diff --git a/k8s/linkis-cs-server-deployment.yaml b/k8s/linkis-cs-server-deployment.yaml index 1b1eb80eb..1afcd5a1e 100644 --- a/k8s/linkis-cs-server-deployment.yaml +++ b/k8s/linkis-cs-server-deployment.yaml @@ -46,7 +46,7 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: linkis-cs-server - image: wedatasphere/linkis:linkis-cs-server-0.10.0 + image: wedatasphere/linkis:linkis-cs-server-0.11.0 lifecycle: preStop: exec: diff --git a/k8s/linkis-dsm-server-deployment.yaml b/k8s/linkis-dsm-server-deployment.yaml index e01377b1f..175c8af0f 100644 --- a/k8s/linkis-dsm-server-deployment.yaml +++ b/k8s/linkis-dsm-server-deployment.yaml @@ -45,7 +45,7 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: linkis-dsm-server - image: wedatasphere/linkis:linkis-dsm-server-0.10.0 + image: wedatasphere/linkis:linkis-dsm-server-0.11.0 lifecycle: preStop: exec: diff --git a/k8s/linkis-gateway-deployment.yaml b/k8s/linkis-gateway-deployment.yaml index 9d2690b5a..71acf981c 100644 --- a/k8s/linkis-gateway-deployment.yaml +++ b/k8s/linkis-gateway-deployment.yaml @@ -45,7 +45,7 @@ spec: containers: - name: linkis-gateway - image: wedatasphere/linkis:linkis-gateway-0.10.0 + image: wedatasphere/linkis:linkis-gateway-0.11.0 lifecycle: preStop: exec: diff --git a/k8s/linkis-mdm-server-deployment.yaml b/k8s/linkis-mdm-server-deployment.yaml index 202aee5e9..f6c3c5ed0 100644 --- a/k8s/linkis-mdm-server-deployment.yaml +++ b/k8s/linkis-mdm-server-deployment.yaml @@ -45,7 +45,7 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: linkis-mdm-server - image: wedatasphere/linkis:linkis-mdm-server-0.10.0 + image: wedatasphere/linkis:linkis-mdm-server-0.11.0 lifecycle: preStop: exec: diff --git a/k8s/linkis-mdm-service-es-deployment.yaml b/k8s/linkis-mdm-service-es-deployment.yaml index 01a91abea..26ce240c3 100644 --- a/k8s/linkis-mdm-service-es-deployment.yaml +++ b/k8s/linkis-mdm-service-es-deployment.yaml @@ -45,7 +45,7 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: linkis-mdm-service-es - image: wedatasphere/linkis:linkis-mdm-service-es-0.10.0 + image: wedatasphere/linkis:linkis-mdm-service-es-0.11.0 lifecycle: preStop: exec: diff --git a/k8s/linkis-mdm-service-hive-deployment.yaml b/k8s/linkis-mdm-service-hive-deployment.yaml index 05efdff2f..4ff8fdf7d 100644 --- a/k8s/linkis-mdm-service-hive-deployment.yaml +++ b/k8s/linkis-mdm-service-hive-deployment.yaml @@ -45,7 +45,7 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: linkis-mdm-service-hive - image: wedatasphere/linkis:linkis-mdm-service-hive-0.10.0 + image: wedatasphere/linkis:linkis-mdm-service-hive-0.11.0 lifecycle: preStop: exec: diff --git a/k8s/linkis-mdm-service-mysql-deployment.yaml b/k8s/linkis-mdm-service-mysql-deployment.yaml index a1a4778e2..34d4b9d9d 100644 --- a/k8s/linkis-mdm-service-mysql-deployment.yaml +++ b/k8s/linkis-mdm-service-mysql-deployment.yaml @@ -45,7 +45,7 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: linkis-mdm-service-mysql - image: wedatasphere/linkis:linkis-mdm-service-mysql-0.10.0 + image: wedatasphere/linkis:linkis-mdm-service-mysql-0.11.0 lifecycle: preStop: exec: diff --git a/k8s/linkis-metadata-deployment.yaml b/k8s/linkis-metadata-deployment.yaml index 203b5abde..8b896502d 100644 --- a/k8s/linkis-metadata-deployment.yaml +++ b/k8s/linkis-metadata-deployment.yaml @@ -45,7 +45,7 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: linkis-metadata - image: wedatasphere/linkis:linkis-metadata-0.10.0 + image: wedatasphere/linkis:linkis-metadata-0.11.0 lifecycle: preStop: exec: diff --git a/k8s/linkis-publicservice-deployment.yaml b/k8s/linkis-publicservice-deployment.yaml index a3865feea..5e2175ff4 100644 --- a/k8s/linkis-publicservice-deployment.yaml +++ b/k8s/linkis-publicservice-deployment.yaml @@ -44,7 +44,7 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: linkis-publicservice - image: wedatasphere/linkis:linkis-publicservice-0.10.0 + image: wedatasphere/linkis:linkis-publicservice-0.11.0 imagePullPolicy: Always lifecycle: preStop: diff --git a/k8s/linkis-resourcemanager-deployment.yaml b/k8s/linkis-resourcemanager-deployment.yaml index c229fdf02..f76116193 100644 --- a/k8s/linkis-resourcemanager-deployment.yaml +++ b/k8s/linkis-resourcemanager-deployment.yaml @@ -46,7 +46,7 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: linkis-resourcemanager - image: wedatasphere/linkis:linkis-resourcemanager-0.10.0 + image: wedatasphere/linkis:linkis-resourcemanager-0.11.0 lifecycle: preStop: exec: diff --git a/k8s/linkis-ujes-hive-enginemanager-deployment.yaml b/k8s/linkis-ujes-hive-enginemanager-deployment.yaml index fb748a69c..87f27cf7a 100644 --- a/k8s/linkis-ujes-hive-enginemanager-deployment.yaml +++ b/k8s/linkis-ujes-hive-enginemanager-deployment.yaml @@ -55,7 +55,7 @@ spec: - node1 containers: - name: linkis-ujes-hive-enginemanager - image: wedatasphere/linkis:linkis-ujes-hive-enginemanager-0.10.0 + image: wedatasphere/linkis:linkis-ujes-hive-enginemanager-0.11.0 lifecycle: preStop: exec: diff --git a/k8s/linkis-ujes-hive-entrance-deployment.yaml b/k8s/linkis-ujes-hive-entrance-deployment.yaml index ce30c4942..1af0d8fbf 100644 --- a/k8s/linkis-ujes-hive-entrance-deployment.yaml +++ b/k8s/linkis-ujes-hive-entrance-deployment.yaml @@ -54,7 +54,7 @@ spec: - node1 containers: - name: linkis-ujes-hive-entrance - image: wedatasphere/linkis:linkis-ujes-hive-entrance-0.10.0 + image: wedatasphere/linkis:linkis-ujes-hive-entrance-0.11.0 lifecycle: preStop: exec: diff --git a/k8s/linkis-ujes-jdbc-entrance-deployment.yaml b/k8s/linkis-ujes-jdbc-entrance-deployment.yaml index bbd832063..978e0e372 100644 --- a/k8s/linkis-ujes-jdbc-entrance-deployment.yaml +++ b/k8s/linkis-ujes-jdbc-entrance-deployment.yaml @@ -54,7 +54,7 @@ spec: - node3 containers: - name: linkis-ujes-jdbc-entrance - image: wedatasphere/linkis:linkis-ujes-jdbc-entrance-0.10.0 + image: wedatasphere/linkis:linkis-ujes-jdbc-entrance-0.11.0 lifecycle: preStop: exec: diff --git a/k8s/linkis-ujes-mlsql-entrance-deployment.yaml b/k8s/linkis-ujes-mlsql-entrance-deployment.yaml index a94f5a81e..f5fe63a70 100644 --- a/k8s/linkis-ujes-mlsql-entrance-deployment.yaml +++ b/k8s/linkis-ujes-mlsql-entrance-deployment.yaml @@ -54,7 +54,7 @@ spec: - node3 containers: - name: linkis-ujes-mlsql-entrance - image: wedatasphere/linkis:linkis-ujes-mlsql-entrance-0.10.0 + image: wedatasphere/linkis:linkis-ujes-mlsql-entrance-0.11.0 lifecycle: preStop: exec: diff --git a/k8s/linkis-ujes-pipeline-enginemanager-deployment.yaml b/k8s/linkis-ujes-pipeline-enginemanager-deployment.yaml index 71375c141..c2117d528 100644 --- a/k8s/linkis-ujes-pipeline-enginemanager-deployment.yaml +++ b/k8s/linkis-ujes-pipeline-enginemanager-deployment.yaml @@ -54,7 +54,7 @@ spec: - node3 containers: - name: linkis-ujes-mlsql-entrance - image: wedatasphere/linkis:linkis-ujes-pipeline-enginemanager-0.10.0 + image: wedatasphere/linkis:linkis-ujes-pipeline-enginemanager-0.11.0 lifecycle: preStop: exec: diff --git a/k8s/linkis-ujes-pipeline-entrance-deployment.yaml b/k8s/linkis-ujes-pipeline-entrance-deployment.yaml index 15fa3d815..9a57472b3 100644 --- a/k8s/linkis-ujes-pipeline-entrance-deployment.yaml +++ b/k8s/linkis-ujes-pipeline-entrance-deployment.yaml @@ -54,7 +54,7 @@ spec: - node3 containers: - name: linkis-ujes-pipeline-entrance - image: wedatasphere/linkis:linkis-ujes-pipeline-entrance-0.10.0 + image: wedatasphere/linkis:linkis-ujes-pipeline-entrance-0.11.0 lifecycle: preStop: exec: diff --git a/k8s/linkis-ujes-python-enginemanager-deployment.yaml b/k8s/linkis-ujes-python-enginemanager-deployment.yaml index 98b3f4c0d..055e84950 100644 --- a/k8s/linkis-ujes-python-enginemanager-deployment.yaml +++ b/k8s/linkis-ujes-python-enginemanager-deployment.yaml @@ -54,7 +54,7 @@ spec: - node3 containers: - name: linkis-ujes-python-enginemanager - image: wedatasphere/linkis:linkis-ujes-python-enginemanager-0.10.0 + image: wedatasphere/linkis:linkis-ujes-python-enginemanager-0.11.0 lifecycle: preStop: exec: diff --git a/k8s/linkis-ujes-python-entrance-deployment.yaml b/k8s/linkis-ujes-python-entrance-deployment.yaml index ac3d3ed3b..75ad9b186 100644 --- a/k8s/linkis-ujes-python-entrance-deployment.yaml +++ b/k8s/linkis-ujes-python-entrance-deployment.yaml @@ -54,7 +54,7 @@ spec: - node3 containers: - name: linkis-ujes-python-entrance - image: wedatasphere/linkis:linkis-ujes-python-entrance-0.10.0 + image: wedatasphere/linkis:linkis-ujes-python-entrance-0.11.0 lifecycle: preStop: exec: diff --git a/k8s/linkis-ujes-shell-enginemanager-deployment.yaml b/k8s/linkis-ujes-shell-enginemanager-deployment.yaml index 890c014ad..24c7d14ea 100644 --- a/k8s/linkis-ujes-shell-enginemanager-deployment.yaml +++ b/k8s/linkis-ujes-shell-enginemanager-deployment.yaml @@ -54,7 +54,7 @@ spec: - node2 containers: - name: linkis-ujes-shell-enginemanager - image: wedatasphere/linkis:linkis-ujes-shell-enginemanager-0.10.0 + image: wedatasphere/linkis:linkis-ujes-shell-enginemanager-0.11.0 lifecycle: preStop: exec: diff --git a/k8s/linkis-ujes-shell-entrance-deployment.yaml b/k8s/linkis-ujes-shell-entrance-deployment.yaml index fa4710cf0..54d39694f 100644 --- a/k8s/linkis-ujes-shell-entrance-deployment.yaml +++ b/k8s/linkis-ujes-shell-entrance-deployment.yaml @@ -54,7 +54,7 @@ spec: - node2 containers: - name: linkis-ujes-shell-entrance - image: wedatasphere/linkis:linkis-ujes-shell-entrance-0.10.0 + image: wedatasphere/linkis:linkis-ujes-shell-entrance-0.11.0 lifecycle: preStop: exec: diff --git a/k8s/linkis-ujes-spark-enginemanager-deployment.yaml b/k8s/linkis-ujes-spark-enginemanager-deployment.yaml index d5923b68c..2a22768ac 100644 --- a/k8s/linkis-ujes-spark-enginemanager-deployment.yaml +++ b/k8s/linkis-ujes-spark-enginemanager-deployment.yaml @@ -55,7 +55,7 @@ spec: - node2 containers: - name: linkis-ujes-spark-enginemanager - image: wedatasphere/linkis:linkis-ujes-spark-enginemanager-0.10.0 + image: wedatasphere/linkis:linkis-ujes-spark-enginemanager-0.11.0 lifecycle: preStop: exec: diff --git a/k8s/linkis-ujes-spark-entrance-deployment.yaml b/k8s/linkis-ujes-spark-entrance-deployment.yaml index b3c783ce6..61fafcd9b 100644 --- a/k8s/linkis-ujes-spark-entrance-deployment.yaml +++ b/k8s/linkis-ujes-spark-entrance-deployment.yaml @@ -54,7 +54,7 @@ spec: - node2 containers: - name: linkis-ujes-spark-entrance - image: wedatasphere/linkis:linkis-ujes-spark-entrance-0.10.0 + image: wedatasphere/linkis:linkis-ujes-spark-entrance-0.11.0 lifecycle: preStop: exec: diff --git a/k8s/push.sh b/k8s/push.sh index 49464f74a..8602f4545 100644 --- a/k8s/push.sh +++ b/k8s/push.sh @@ -1,41 +1,41 @@ #!/bin/bash -docker push $HARBOR_LINKIS/linkis:linkis-bml-0.10.0 +docker push $HARBOR_LINKIS/linkis:linkis-bml-0.11.0 -docker push $HARBOR_LINKIS/linkis:linkis-dsm-server-0.10.0 +docker push $HARBOR_LINKIS/linkis:linkis-dsm-server-0.11.0 -docker push $HARBOR_LINKIS/linkis:linkis-mdm-server-0.10.0 -docker push $HARBOR_LINKIS/linkis:linkis-mdm-service-mysql-0.10.0 -docker push $HARBOR_LINKIS/linkis:linkis-mdm-service-es-0.10.0 -docker push $HARBOR_LINKIS/linkis:linkis-mdm-service-hive-0.10.0 +docker push $HARBOR_LINKIS/linkis:linkis-mdm-server-0.11.0 +docker push $HARBOR_LINKIS/linkis:linkis-mdm-service-mysql-0.11.0 +docker push $HARBOR_LINKIS/linkis:linkis-mdm-service-es-0.11.0 +docker push $HARBOR_LINKIS/linkis:linkis-mdm-service-hive-0.11.0 -docker push $HARBOR_LINKIS/linkis:linkis-gateway-0.10.0 +docker push $HARBOR_LINKIS/linkis:linkis-gateway-0.11.0 -docker push $HARBOR_LINKIS/linkis:linkis-resourcemanager-0.10.0 +docker push $HARBOR_LINKIS/linkis:linkis-resourcemanager-0.11.0 -docker push $HARBOR_LINKIS/linkis:linkis-cs-server-0.10.0 +docker push $HARBOR_LINKIS/linkis:linkis-cs-server-0.11.0 -docker push $HARBOR_LINKIS/linkis:linkis-metadata-0.10.0 +docker push $HARBOR_LINKIS/linkis:linkis-metadata-0.11.0 -docker push $HARBOR_LINKIS/linkis:linkis-publicservice-0.10.0 +docker push $HARBOR_LINKIS/linkis:linkis-publicservice-0.11.0 -docker push $HARBOR_LINKIS/linkis:linkis-ujes-spark-enginemanager-0.10.0 -docker push $HARBOR_LINKIS/linkis:linkis-ujes-spark-entrance-0.10.0 +docker push $HARBOR_LINKIS/linkis:linkis-ujes-spark-enginemanager-0.11.0 +docker push $HARBOR_LINKIS/linkis:linkis-ujes-spark-entrance-0.11.0 -docker push $HARBOR_LINKIS/linkis:linkis-ujes-hive-enginemanager-0.10.0 -docker push $HARBOR_LINKIS/linkis:linkis-ujes-hive-entrance-0.10.0 +docker push $HARBOR_LINKIS/linkis:linkis-ujes-hive-enginemanager-0.11.0 +docker push $HARBOR_LINKIS/linkis:linkis-ujes-hive-entrance-0.11.0 -docker push $HARBOR_LINKIS/linkis:linkis-ujes-python-enginemanager-0.10.0 -docker push $HARBOR_LINKIS/linkis:linkis-ujes-python-entrance-0.10.0 +docker push $HARBOR_LINKIS/linkis:linkis-ujes-python-enginemanager-0.11.0 +docker push $HARBOR_LINKIS/linkis:linkis-ujes-python-entrance-0.11.0 -docker push $HARBOR_LINKIS/linkis:linkis-ujes-pipeline-enginemanager-0.10.0 -docker push $HARBOR_LINKIS/linkis:linkis-ujes-pipeline-entrance-0.10.0 +docker push $HARBOR_LINKIS/linkis:linkis-ujes-pipeline-enginemanager-0.11.0 +docker push $HARBOR_LINKIS/linkis:linkis-ujes-pipeline-entrance-0.11.0 -docker push $HARBOR_LINKIS/linkis:linkis-ujes-jdbc-enginemanager-0.10.0 +docker push $HARBOR_LINKIS/linkis:linkis-ujes-jdbc-enginemanager-0.11.0 -docker push $HARBOR_LINKIS/linkis:linkis-ujes-mlsql-entrance-0.10.0 +docker push $HARBOR_LINKIS/linkis:linkis-ujes-mlsql-entrance-0.11.0 -docker push $HARBOR_LINKIS/linkis:linkis-ujes-shell-enginemanager-0.10.0 -docker push $HARBOR_LINKIS/linkis:linkis-ujes-shell-entrance-0.10.0 +docker push $HARBOR_LINKIS/linkis:linkis-ujes-shell-enginemanager-0.11.0 +docker push $HARBOR_LINKIS/linkis:linkis-ujes-shell-entrance-0.11.0 diff --git a/metadata/pom.xml b/metadata/pom.xml index f04305eef..5937953af 100644 --- a/metadata/pom.xml +++ b/metadata/pom.xml @@ -21,8 +21,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../pom.xml + 0.11.0 + ../pom.xml 4.0.0 jar diff --git a/metadata/pom_k8s.xml b/metadata/pom_k8s.xml index 9af27571e..3c321cb9e 100644 --- a/metadata/pom_k8s.xml +++ b/metadata/pom_k8s.xml @@ -21,7 +21,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index a4ca1cccf..22a4d7ec9 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ com.webank.wedatasphere.linkis linkis - 0.10.0 + 0.11.0 pom Linkis Project Parent POM @@ -676,7 +676,7 @@ true - 0.10.0 + 0.11.0 4.1.17.Final 3.5.3 @@ -684,7 +684,7 @@ spark2.3 - 0.10.0 + 0.11.0 4.1.17.Final 3.2.11 @@ -692,7 +692,7 @@ spark2.2-2.0 - 0.10.0 + 0.11.0 4.0.47.Final 3.2.11 diff --git a/publicService/application/pom.xml b/publicService/application/pom.xml index d67b17f04..f7114a892 100644 --- a/publicService/application/pom.xml +++ b/publicService/application/pom.xml @@ -23,8 +23,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml linkis-application diff --git a/publicService/configuration/pom.xml b/publicService/configuration/pom.xml index 1bd34a3c5..c21e16048 100644 --- a/publicService/configuration/pom.xml +++ b/publicService/configuration/pom.xml @@ -23,8 +23,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml linkis-configuration diff --git a/publicService/jobhistory/pom.xml b/publicService/jobhistory/pom.xml index e7cb9e272..2a7578a3f 100644 --- a/publicService/jobhistory/pom.xml +++ b/publicService/jobhistory/pom.xml @@ -24,8 +24,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml linkis-jobhistory diff --git a/publicService/pom.xml b/publicService/pom.xml index b86598a2e..7ad3d116d 100644 --- a/publicService/pom.xml +++ b/publicService/pom.xml @@ -21,7 +21,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../pom.xml 4.0.0 diff --git a/publicService/pom_k8s.xml b/publicService/pom_k8s.xml index 77f20e26a..cc9bdc22e 100644 --- a/publicService/pom_k8s.xml +++ b/publicService/pom_k8s.xml @@ -21,7 +21,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 4.0.0 diff --git a/publicService/udf/pom.xml b/publicService/udf/pom.xml index 7426154fd..888e74cb8 100644 --- a/publicService/udf/pom.xml +++ b/publicService/udf/pom.xml @@ -21,8 +21,8 @@ com.webank.wedatasphere.linkis linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml 4.0.0 diff --git a/publicService/variable/pom.xml b/publicService/variable/pom.xml index 184e89792..30a2b5c4b 100644 --- a/publicService/variable/pom.xml +++ b/publicService/variable/pom.xml @@ -23,8 +23,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml linkis-variable diff --git a/publicService/workspace/client/workspace-httpclient/pom.xml b/publicService/workspace/client/workspace-httpclient/pom.xml index bd4b9267b..75c2e0eb6 100644 --- a/publicService/workspace/client/workspace-httpclient/pom.xml +++ b/publicService/workspace/client/workspace-httpclient/pom.xml @@ -7,8 +7,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../../../pom.xml + 0.11.0 + ../../../../pom.xml linkis-workspace-httpclient diff --git a/publicService/workspace/pom.xml b/publicService/workspace/pom.xml index ff57b5a17..bb071bde8 100644 --- a/publicService/workspace/pom.xml +++ b/publicService/workspace/pom.xml @@ -23,8 +23,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml linkis-workspace jar diff --git a/resourceManager/resourcemanagerclient/pom.xml b/resourceManager/resourcemanagerclient/pom.xml index cb3e59b62..fec76351c 100644 --- a/resourceManager/resourcemanagerclient/pom.xml +++ b/resourceManager/resourcemanagerclient/pom.xml @@ -20,7 +20,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.10.0 + 0.11.0 com.webank.wedatasphere.linkis linkis ../../pom.xml diff --git a/resourceManager/resourcemanagercommon/pom.xml b/resourceManager/resourcemanagercommon/pom.xml index 78384e3f4..bf5445240 100644 --- a/resourceManager/resourcemanagercommon/pom.xml +++ b/resourceManager/resourcemanagercommon/pom.xml @@ -21,7 +21,7 @@ 4.0.0 - 0.10.0 + 0.11.0 com.webank.wedatasphere.linkis linkis ../../pom.xml diff --git a/resourceManager/resourcemanagerserver/pom.xml b/resourceManager/resourcemanagerserver/pom.xml index fbee743a3..91f0f39dc 100644 --- a/resourceManager/resourcemanagerserver/pom.xml +++ b/resourceManager/resourcemanagerserver/pom.xml @@ -21,7 +21,7 @@ 4.0.0 - 0.10.0 + 0.11.0 com.webank.wedatasphere.linkis linkis ../../pom.xml diff --git a/resourceManager/resourcemanagerserver/pom_k8s.xml b/resourceManager/resourcemanagerserver/pom_k8s.xml index 397225b40..8160772c3 100644 --- a/resourceManager/resourcemanagerserver/pom_k8s.xml +++ b/resourceManager/resourcemanagerserver/pom_k8s.xml @@ -21,7 +21,7 @@ 4.0.0 - 0.10.0 + 0.11.0 com.webank.wedatasphere.linkis linkis ../../pom.xml diff --git a/storage/pesIO/io-engine/pom.xml b/storage/pesIO/io-engine/pom.xml index 6ced78586..0055ad905 100644 --- a/storage/pesIO/io-engine/pom.xml +++ b/storage/pesIO/io-engine/pom.xml @@ -21,7 +21,7 @@ 4.0.0 - 0.10.0 + 0.11.0 com.webank.wedatasphere.linkis linkis ../../../pom.xml diff --git a/storage/pesIO/io-enginemanager/pom.xml b/storage/pesIO/io-enginemanager/pom.xml index 473c40db6..ffce0f8fe 100644 --- a/storage/pesIO/io-enginemanager/pom.xml +++ b/storage/pesIO/io-enginemanager/pom.xml @@ -21,7 +21,7 @@ 4.0.0 - 0.10.0 + 0.11.0 com.webank.wedatasphere.linkis linkis ../../../pom.xml diff --git a/storage/pesIO/io-entrance/pom.xml b/storage/pesIO/io-entrance/pom.xml index 439901f15..a60893cf9 100644 --- a/storage/pesIO/io-entrance/pom.xml +++ b/storage/pesIO/io-entrance/pom.xml @@ -20,7 +20,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.10.0 + 0.11.0 com.webank.wedatasphere.linkis linkis ../../../pom.xml diff --git a/storage/storage/pom.xml b/storage/storage/pom.xml index 41c73a1bc..32abfca7f 100644 --- a/storage/storage/pom.xml +++ b/storage/storage/pom.xml @@ -21,7 +21,7 @@ 4.0.0 - 0.10.0 + 0.11.0 com.webank.wedatasphere.linkis linkis ../../pom.xml diff --git a/ujes/client/pom.xml b/ujes/client/pom.xml index 9cbae66f8..f047cd084 100644 --- a/ujes/client/pom.xml +++ b/ujes/client/pom.xml @@ -23,8 +23,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml linkis-ujes-client diff --git a/ujes/definedEngines/es/entrance/pom.xml b/ujes/definedEngines/es/entrance/pom.xml index 7ac3e9833..1f7d6399c 100644 --- a/ujes/definedEngines/es/entrance/pom.xml +++ b/ujes/definedEngines/es/entrance/pom.xml @@ -5,7 +5,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../../../pom.xml 4.0.0 diff --git a/ujes/definedEngines/hive/engine/pom.xml b/ujes/definedEngines/hive/engine/pom.xml index efb196b0a..d74fca5dd 100644 --- a/ujes/definedEngines/hive/engine/pom.xml +++ b/ujes/definedEngines/hive/engine/pom.xml @@ -21,8 +21,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../../../pom.xml + 0.11.0 + ../../../../pom.xml 4.0.0 diff --git a/ujes/definedEngines/hive/enginemanager/pom.xml b/ujes/definedEngines/hive/enginemanager/pom.xml index ebc596676..4ca1fa3ae 100644 --- a/ujes/definedEngines/hive/enginemanager/pom.xml +++ b/ujes/definedEngines/hive/enginemanager/pom.xml @@ -21,8 +21,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../../../pom.xml + 0.11.0 + ../../../../pom.xml 4.0.0 diff --git a/ujes/definedEngines/hive/enginemanager/pom_k8s.xml b/ujes/definedEngines/hive/enginemanager/pom_k8s.xml index f74b5377a..57b9054b6 100644 --- a/ujes/definedEngines/hive/enginemanager/pom_k8s.xml +++ b/ujes/definedEngines/hive/enginemanager/pom_k8s.xml @@ -21,7 +21,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../../../pom.xml 4.0.0 diff --git a/ujes/definedEngines/hive/entrance/pom.xml b/ujes/definedEngines/hive/entrance/pom.xml index 372311f92..2010a22c7 100644 --- a/ujes/definedEngines/hive/entrance/pom.xml +++ b/ujes/definedEngines/hive/entrance/pom.xml @@ -21,8 +21,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../../../pom.xml + 0.11.0 + ../../../../pom.xml 4.0.0 diff --git a/ujes/definedEngines/hive/entrance/pom_k8s.xml b/ujes/definedEngines/hive/entrance/pom_k8s.xml index 12ee8ddee..000ea0a8f 100644 --- a/ujes/definedEngines/hive/entrance/pom_k8s.xml +++ b/ujes/definedEngines/hive/entrance/pom_k8s.xml @@ -21,7 +21,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../../../pom.xml 4.0.0 diff --git a/ujes/definedEngines/jdbc/entrance/pom.xml b/ujes/definedEngines/jdbc/entrance/pom.xml index ccb37ffd6..9ff982466 100644 --- a/ujes/definedEngines/jdbc/entrance/pom.xml +++ b/ujes/definedEngines/jdbc/entrance/pom.xml @@ -22,8 +22,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../../../pom.xml + 0.11.0 + ../../../../pom.xml 4.0.0 diff --git a/ujes/definedEngines/jdbc/entrance/pom_k8s.xml b/ujes/definedEngines/jdbc/entrance/pom_k8s.xml index 84427df3b..bd807e453 100644 --- a/ujes/definedEngines/jdbc/entrance/pom_k8s.xml +++ b/ujes/definedEngines/jdbc/entrance/pom_k8s.xml @@ -22,7 +22,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../../../pom.xml 4.0.0 diff --git a/ujes/definedEngines/mlsql/entrance/pom.xml b/ujes/definedEngines/mlsql/entrance/pom.xml index 977deea89..80345edd2 100644 --- a/ujes/definedEngines/mlsql/entrance/pom.xml +++ b/ujes/definedEngines/mlsql/entrance/pom.xml @@ -5,8 +5,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../../../pom.xml + 0.11.0 + ../../../../pom.xml 4.0.0 diff --git a/ujes/definedEngines/mlsql/entrance/pom_k8s.xml b/ujes/definedEngines/mlsql/entrance/pom_k8s.xml index 0ae9cd8c0..b21bc8853 100644 --- a/ujes/definedEngines/mlsql/entrance/pom_k8s.xml +++ b/ujes/definedEngines/mlsql/entrance/pom_k8s.xml @@ -5,7 +5,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../../../pom.xml 4.0.0 diff --git a/ujes/definedEngines/pipeline/engine/pom.xml b/ujes/definedEngines/pipeline/engine/pom.xml index 51c7826c3..19e287fa1 100644 --- a/ujes/definedEngines/pipeline/engine/pom.xml +++ b/ujes/definedEngines/pipeline/engine/pom.xml @@ -21,7 +21,7 @@ 4.0.0 - 0.10.0 + 0.11.0 com.webank.wedatasphere.linkis linkis ../../../../pom.xml diff --git a/ujes/definedEngines/pipeline/enginemanager/pom.xml b/ujes/definedEngines/pipeline/enginemanager/pom.xml index 199292970..327bf1ac2 100644 --- a/ujes/definedEngines/pipeline/enginemanager/pom.xml +++ b/ujes/definedEngines/pipeline/enginemanager/pom.xml @@ -21,7 +21,7 @@ 4.0.0 - 0.10.0 + 0.11.0 com.webank.wedatasphere.linkis linkis ../../../../pom.xml diff --git a/ujes/definedEngines/pipeline/enginemanager/pom_k8s.xml b/ujes/definedEngines/pipeline/enginemanager/pom_k8s.xml index f5243f274..cf78e487b 100644 --- a/ujes/definedEngines/pipeline/enginemanager/pom_k8s.xml +++ b/ujes/definedEngines/pipeline/enginemanager/pom_k8s.xml @@ -21,7 +21,7 @@ 4.0.0 - 0.10.0 + 0.11.0 com.webank.wedatasphere.linkis linkis ../../../../pom.xml diff --git a/ujes/definedEngines/pipeline/entrance/pom.xml b/ujes/definedEngines/pipeline/entrance/pom.xml index d30dfe138..e9529e914 100644 --- a/ujes/definedEngines/pipeline/entrance/pom.xml +++ b/ujes/definedEngines/pipeline/entrance/pom.xml @@ -21,7 +21,7 @@ 4.0.0 - 0.10.0 + 0.11.0 com.webank.wedatasphere.linkis linkis ../../../../pom.xml diff --git a/ujes/definedEngines/pipeline/entrance/pom_k8s.xml b/ujes/definedEngines/pipeline/entrance/pom_k8s.xml index 940084219..086948f68 100644 --- a/ujes/definedEngines/pipeline/entrance/pom_k8s.xml +++ b/ujes/definedEngines/pipeline/entrance/pom_k8s.xml @@ -21,7 +21,7 @@ 4.0.0 - 0.10.0 + 0.11.0 com.webank.wedatasphere.linkis linkis ../../../../pom.xml diff --git a/ujes/definedEngines/presto/entrance/pom.xml b/ujes/definedEngines/presto/entrance/pom.xml index 4f9acf6e4..97351817e 100644 --- a/ujes/definedEngines/presto/entrance/pom.xml +++ b/ujes/definedEngines/presto/entrance/pom.xml @@ -5,7 +5,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../../../pom.xml 4.0.0 diff --git a/ujes/definedEngines/python/engine/pom.xml b/ujes/definedEngines/python/engine/pom.xml index 95ec0dc59..0a73863ee 100644 --- a/ujes/definedEngines/python/engine/pom.xml +++ b/ujes/definedEngines/python/engine/pom.xml @@ -23,8 +23,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../../../pom.xml + 0.11.0 + ../../../../pom.xml linkis-python-engine diff --git a/ujes/definedEngines/python/enginemanager/pom.xml b/ujes/definedEngines/python/enginemanager/pom.xml index 2e6e3d140..662d61838 100644 --- a/ujes/definedEngines/python/enginemanager/pom.xml +++ b/ujes/definedEngines/python/enginemanager/pom.xml @@ -23,8 +23,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../../../pom.xml + 0.11.0 + ../../../../pom.xml linkis-python-enginemanager diff --git a/ujes/definedEngines/python/enginemanager/pom_k8s.xml b/ujes/definedEngines/python/enginemanager/pom_k8s.xml index d0b25047b..38716de3b 100644 --- a/ujes/definedEngines/python/enginemanager/pom_k8s.xml +++ b/ujes/definedEngines/python/enginemanager/pom_k8s.xml @@ -23,7 +23,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../../../pom.xml diff --git a/ujes/definedEngines/python/entrance/pom.xml b/ujes/definedEngines/python/entrance/pom.xml index bd815e506..52a933d04 100644 --- a/ujes/definedEngines/python/entrance/pom.xml +++ b/ujes/definedEngines/python/entrance/pom.xml @@ -23,8 +23,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../../../pom.xml + 0.11.0 + ../../../../pom.xml linkis-python-entrance diff --git a/ujes/definedEngines/python/entrance/pom_k8s.xml b/ujes/definedEngines/python/entrance/pom_k8s.xml index 7bcc0dd48..ae6ced5f8 100644 --- a/ujes/definedEngines/python/entrance/pom_k8s.xml +++ b/ujes/definedEngines/python/entrance/pom_k8s.xml @@ -23,7 +23,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../../../pom.xml diff --git a/ujes/definedEngines/shell/engine/pom.xml b/ujes/definedEngines/shell/engine/pom.xml index 46e6ab840..4bd4a3b3c 100644 --- a/ujes/definedEngines/shell/engine/pom.xml +++ b/ujes/definedEngines/shell/engine/pom.xml @@ -21,8 +21,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../../../pom.xml + 0.11.0 + ../../../../pom.xml 4.0.0 diff --git a/ujes/definedEngines/shell/enginemanager/pom.xml b/ujes/definedEngines/shell/enginemanager/pom.xml index e9a0c7214..b6e970c94 100644 --- a/ujes/definedEngines/shell/enginemanager/pom.xml +++ b/ujes/definedEngines/shell/enginemanager/pom.xml @@ -21,8 +21,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../../../pom.xml + 0.11.0 + ../../../../pom.xml 4.0.0 diff --git a/ujes/definedEngines/shell/enginemanager/pom_k8s.xml b/ujes/definedEngines/shell/enginemanager/pom_k8s.xml index a0a1e7090..60e33c307 100644 --- a/ujes/definedEngines/shell/enginemanager/pom_k8s.xml +++ b/ujes/definedEngines/shell/enginemanager/pom_k8s.xml @@ -21,7 +21,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../../../pom.xml 4.0.0 diff --git a/ujes/definedEngines/shell/entrance/pom.xml b/ujes/definedEngines/shell/entrance/pom.xml index 6ab32d1d6..855c94501 100644 --- a/ujes/definedEngines/shell/entrance/pom.xml +++ b/ujes/definedEngines/shell/entrance/pom.xml @@ -21,8 +21,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../../../pom.xml + 0.11.0 + ../../../../pom.xml 4.0.0 diff --git a/ujes/definedEngines/shell/entrance/pom_k8s.xml b/ujes/definedEngines/shell/entrance/pom_k8s.xml index b99b0478b..c11c2545e 100644 --- a/ujes/definedEngines/shell/entrance/pom_k8s.xml +++ b/ujes/definedEngines/shell/entrance/pom_k8s.xml @@ -21,7 +21,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../../../pom.xml 4.0.0 diff --git a/ujes/definedEngines/spark/engine/pom.xml b/ujes/definedEngines/spark/engine/pom.xml index e4914e740..fe213e877 100644 --- a/ujes/definedEngines/spark/engine/pom.xml +++ b/ujes/definedEngines/spark/engine/pom.xml @@ -23,8 +23,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../../../pom.xml + 0.11.0 + ../../../../pom.xml linkis-ujes-spark-engine diff --git a/ujes/definedEngines/spark/enginemanager/pom.xml b/ujes/definedEngines/spark/enginemanager/pom.xml index f658d3c0b..3dcb62bc6 100644 --- a/ujes/definedEngines/spark/enginemanager/pom.xml +++ b/ujes/definedEngines/spark/enginemanager/pom.xml @@ -23,8 +23,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../../../pom.xml + 0.11.0 + ../../../../pom.xml linkis-ujes-spark-enginemanager diff --git a/ujes/definedEngines/spark/enginemanager/pom_k8s.xml b/ujes/definedEngines/spark/enginemanager/pom_k8s.xml index 4d343d50d..668695310 100644 --- a/ujes/definedEngines/spark/enginemanager/pom_k8s.xml +++ b/ujes/definedEngines/spark/enginemanager/pom_k8s.xml @@ -23,7 +23,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../../../pom.xml diff --git a/ujes/definedEngines/spark/entrance/pom.xml b/ujes/definedEngines/spark/entrance/pom.xml index 4a4a44a6d..44302e003 100644 --- a/ujes/definedEngines/spark/entrance/pom.xml +++ b/ujes/definedEngines/spark/entrance/pom.xml @@ -23,7 +23,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 + ../../../../pom.xml linkis-ujes-spark-entracne diff --git a/ujes/definedEngines/spark/entrance/pom_k8s.xml b/ujes/definedEngines/spark/entrance/pom_k8s.xml index 782f773fd..a161548f0 100644 --- a/ujes/definedEngines/spark/entrance/pom_k8s.xml +++ b/ujes/definedEngines/spark/entrance/pom_k8s.xml @@ -23,7 +23,7 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 ../../../../pom.xml diff --git a/ujes/definedEngines/tispark/engine/pom.xml b/ujes/definedEngines/tispark/engine/pom.xml index 9753a772c..4d38678f9 100644 --- a/ujes/definedEngines/tispark/engine/pom.xml +++ b/ujes/definedEngines/tispark/engine/pom.xml @@ -21,7 +21,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 + 0.11.0 + ../../../../pom.xml 4.0.0 diff --git a/ujes/engine/pom.xml b/ujes/engine/pom.xml index 59eebdd46..0a13994ba 100644 --- a/ujes/engine/pom.xml +++ b/ujes/engine/pom.xml @@ -23,8 +23,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml linkis-ujes-engine diff --git a/ujes/enginemanager/pom.xml b/ujes/enginemanager/pom.xml index 79b1c8e11..0133b9248 100644 --- a/ujes/enginemanager/pom.xml +++ b/ujes/enginemanager/pom.xml @@ -23,8 +23,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml linkis-ujes-enginemanager diff --git a/ujes/entrance/pom.xml b/ujes/entrance/pom.xml index 2181625c4..606b7b3f2 100644 --- a/ujes/entrance/pom.xml +++ b/ujes/entrance/pom.xml @@ -23,8 +23,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml linkis-ujes-entrance diff --git a/ujes/entranceclient/pom.xml b/ujes/entranceclient/pom.xml index 0c21d8ce2..c555346b9 100644 --- a/ujes/entranceclient/pom.xml +++ b/ujes/entranceclient/pom.xml @@ -23,8 +23,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml linkis-ujes-entranceclient diff --git a/ujes/jdbc/pom.xml b/ujes/jdbc/pom.xml index f2249c12a..f97ef8fde 100644 --- a/ujes/jdbc/pom.xml +++ b/ujes/jdbc/pom.xml @@ -20,8 +20,8 @@ linkis com.webank.wedatasphere.linkis - 0.10.0 - ../../pom.xml + 0.11.0 + ../../pom.xml linkis-ujes-jdbc diff --git a/userControl/pom.xml b/userControl/pom.xml index 503102315..b1de28389 100644 --- a/userControl/pom.xml +++ b/userControl/pom.xml @@ -21,8 +21,8 @@ com.webank.wedatasphere.linkis linkis - 0.10.0 - ../pom.xml + 0.11.0 + ../pom.xml 4.0.0 -- Gitee From 2d5ed5ad68d4b3cce6c70d4882b8f93bfec197ca Mon Sep 17 00:00:00 2001 From: zhangxhmuye <2504186239@qq.com> Date: Wed, 30 Dec 2020 10:55:26 +0800 Subject: [PATCH 047/148] modify appendStdout to appendTextResultSet --- .../linkis/engine/shell/executor/ShellEngineExecutor.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ujes/definedEngines/shell/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/shell/executor/ShellEngineExecutor.scala b/ujes/definedEngines/shell/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/shell/executor/ShellEngineExecutor.scala index 322c81bd3..0bf6259eb 100644 --- a/ujes/definedEngines/shell/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/shell/executor/ShellEngineExecutor.scala +++ b/ujes/definedEngines/shell/engine/src/main/scala/com/webank/wedatasphere/linkis/engine/shell/executor/ShellEngineExecutor.scala @@ -42,7 +42,7 @@ class ShellEngineExecutor(user:String) var line:String = null while({line = bufferedReader.readLine(); line != null}){ info(line) - engineExecutorContext.appendStdout(line) + engineExecutorContext.appendTextResultSet(line) } val errorLog = Stream.continually(errorsReader.readLine).takeWhile(_ != null).mkString("\n") val exitCode = process.waitFor() -- Gitee From 18eb8e02389c1a4871cff27a12b1e0ea5c73e69b Mon Sep 17 00:00:00 2001 From: Wang Zhen Date: Thu, 31 Dec 2020 12:45:33 +0800 Subject: [PATCH 048/148] fix AuthScope bug, fix OK statusCode and fix test case --- .../entrance/executor/esclient/EsClientFactory.scala | 9 +-------- .../entrance/executor/impl/EsEngineExecutorImpl.scala | 3 ++- .../linkis/entrance/execute/EsEntranceEngineTests.scala | 2 +- .../executor/esclient/EsClientFactoryTests.scala | 2 +- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactory.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactory.scala index 012d6b0c6..fa6b99205 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactory.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactory.scala @@ -117,14 +117,7 @@ object EsClientFactory { new EsClientImpl(datasourceName, client, sniffer) } - // default cluster - private val defaultCluster:Array[(String, Int)] = getCluster(ES_CLUSTER.getValue) - - private val credentialsProvider: CredentialsProvider = { - val credentialsProvider = new BasicCredentialsProvider() - setAuthScope(defaultCluster, ES_USERNAME.getValue, ES_PASSWORD.getValue) - credentialsProvider - } + private val credentialsProvider: CredentialsProvider = new BasicCredentialsProvider() private val defaultClient = { val cluster = ES_CLUSTER.getValue diff --git a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/EsEngineExecutorImpl.scala b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/EsEngineExecutorImpl.scala index afff36752..523796775 100644 --- a/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/EsEngineExecutorImpl.scala +++ b/ujes/definedEngines/es/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/executor/impl/EsEngineExecutorImpl.scala @@ -78,7 +78,8 @@ class EsEngineExecutorImpl(runType:String, client: EsClient, properties: JMap[St // convert response to executeResponse private def convertResponse(response: Response, storePath: String, alias: String): ExecuteResponse = Utils.tryCatch[ExecuteResponse]{ - if (response.getStatusLine.getStatusCode == 200) { + val statusCode = response.getStatusLine.getStatusCode + if (statusCode >= 200 && statusCode < 300) { val output = ResponseHandler.RESPONSE_HANDLER.handle(response, storePath, alias, this.user) AliasOutputExecuteResponse(alias, output) } else { diff --git a/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngineTests.scala b/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngineTests.scala index 1570b6e63..17efbf189 100644 --- a/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngineTests.scala +++ b/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/execute/EsEntranceEngineTests.scala @@ -38,7 +38,7 @@ class EsEntranceEngineTests { def init(): Unit = { options = new util.HashMap[String, String]() options.put("wds.linkis.es.cluster", "127.0.0.1:9200") - options.put("wds.linkis.es.datasource", "test") + options.put("wds.linkis.datasource", "test") options.put("runType", "esjson") diff --git a/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactoryTests.scala b/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactoryTests.scala index fe579f2ef..ea6968d77 100644 --- a/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactoryTests.scala +++ b/ujes/definedEngines/es/entrance/src/test/scala/com/webank/wedatasphere/linkis/entrance/executor/esclient/EsClientFactoryTests.scala @@ -33,7 +33,7 @@ class EsClientFactoryTests { val options: JMap[String, String] = new util.HashMap[String, String]() options.put("wds.linkis.es.cluster", "127.0.0.1:9200") - options.put("wds.linkis.es.datasource", "test") + options.put("wds.linkis.datasource", "test") @Test def test() = { -- Gitee From f236c6bc3ce63832e4dfce34b043a99aabb37f64 Mon Sep 17 00:00:00 2001 From: Wang Zhen Date: Thu, 7 Jan 2021 15:31:30 +0800 Subject: [PATCH 049/148] fix presto.session.query_max_total_memory default value --- db/linkis_dml.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/linkis_dml.sql b/db/linkis_dml.sql index 158946a07..4ffba935b 100644 --- a/db/linkis_dml.sql +++ b/db/linkis_dml.sql @@ -79,7 +79,7 @@ INSERT INTO `linkis_config_key` (`id`, `key`, `description`, `name`, `applicatio INSERT INTO `linkis_config_key` (`id`, `key`, `description`, `name`, `application_id`, `default_value`, `validate_type`, `validate_range`, `is_hidden`, `is_advanced`, `level`) VALUES (0, 'spark.tispark.tidb.user', NULL, NULL, @application_id, 'root', 'None', NULL, '0', '0', '1'); INSERT INTO `linkis_config_key` (`id`, `key`, `description`, `name`, `application_id`, `default_value`, `validate_type`, `validate_range`, `is_hidden`, `is_advanced`, `level`) VALUES (0, 'wds.linkis.instance', '范围:1-20,单位:个', 'presto引擎最大并发数', @application_id, '20', 'NumInterval', '[1,20]', '0', '0', '1'); -INSERT INTO `linkis_config_key` (`id`, `key`, `description`, `name`, `application_id`, `default_value`, `validate_type`, `validate_range`, `is_hidden`, `is_advanced`, `level`) VALUES (0, 'presto.session.query_max_total_memory', '取值范围:1-100,单位:GB/MB', 'presto单次任务最大使用内存', @application_id, '20G', 'Regex', '^([1-9]\\d{0,2}|1000)(GB|MB|gb|mb)$', '0', '0', '1'); +INSERT INTO `linkis_config_key` (`id`, `key`, `description`, `name`, `application_id`, `default_value`, `validate_type`, `validate_range`, `is_hidden`, `is_advanced`, `level`) VALUES (0, 'presto.session.query_max_total_memory', '取值范围:1-100,单位:GB/MB', 'presto单次任务最大使用内存', @application_id, '20GB', 'Regex', '^([1-9]\\d{0,2}|1000)(GB|MB|gb|mb)$', '0', '0', '1'); INSERT INTO `linkis_config_key` (`id`, `key`, `description`, `name`, `application_id`, `default_value`, `validate_type`, `validate_range`, `is_hidden`, `is_advanced`, `level`) VALUES (0, 'presto.session.query_max_run_time', '单位:s(秒)/m(分)', 'presto单次任务最大耗时', @application_id, '30m', 'Regex', '^([1-9]\\d{0,2}|1000)(m|s)$', '0', '0', '1'); #---------------------------------------全局设置------------------ -- Gitee From e5ed7a7fe04d9487060f4a3cc37f04b7e4654deb Mon Sep 17 00:00:00 2001 From: Wang Zhen Date: Thu, 7 Jan 2021 18:08:11 +0800 Subject: [PATCH 050/148] fix presto entrance dependency --- ujes/definedEngines/presto/entrance/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ujes/definedEngines/presto/entrance/pom.xml b/ujes/definedEngines/presto/entrance/pom.xml index 97351817e..e8eb08619 100644 --- a/ujes/definedEngines/presto/entrance/pom.xml +++ b/ujes/definedEngines/presto/entrance/pom.xml @@ -22,6 +22,12 @@ com.facebook.presto presto-resource-group-managers ${presto.version} + + + log-manager + com.facebook.airlift + + com.webank.wedatasphere.linkis -- Gitee From 237bc5df6e1fde8625a94d7d01bd5602304fad42 Mon Sep 17 00:00:00 2001 From: wForget <643348094@qq.com> Date: Thu, 7 Jan 2021 21:11:58 +0800 Subject: [PATCH 051/148] Modify the presto and es engine startup scripts --- ujes/definedEngines/es/entrance/bin/start-es-entrance.sh | 2 +- .../presto/entrance/bin/start-presto-entrance.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ujes/definedEngines/es/entrance/bin/start-es-entrance.sh b/ujes/definedEngines/es/entrance/bin/start-es-entrance.sh index 56cab6df0..80cc775a4 100644 --- a/ujes/definedEngines/es/entrance/bin/start-es-entrance.sh +++ b/ujes/definedEngines/es/entrance/bin/start-es-entrance.sh @@ -26,7 +26,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -nohup java $SERVER_JAVA_OPTS -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS 2>&1 > $SERVER_LOG_PATH/linkis.out & +nohup java $SERVER_JAVA_OPTS -cp ../module/lib/*:$HOME/conf:$HOME/lib/* $SERVER_CLASS 2>&1 > $SERVER_LOG_PATH/linkis.out & pid=$! if [[ -z "${pid}" ]]; then echo "server $SERVER_NAME start failed!" diff --git a/ujes/definedEngines/presto/entrance/bin/start-presto-entrance.sh b/ujes/definedEngines/presto/entrance/bin/start-presto-entrance.sh index f68ee8c7b..80cc775a4 100644 --- a/ujes/definedEngines/presto/entrance/bin/start-presto-entrance.sh +++ b/ujes/definedEngines/presto/entrance/bin/start-presto-entrance.sh @@ -10,7 +10,7 @@ export SERVER_CLASS=com.webank.wedatasphere.linkis.DataWorkCloudApplication if test -z "$SERVER_HEAP_SIZE" then - export SERVER_HEAP_SIZE="1G" + export SERVER_HEAP_SIZE="512M" fi if test -z "$SERVER_JAVA_OPTS" @@ -26,7 +26,7 @@ if [[ -f "${SERVER_PID}" ]]; then fi fi -nohup java $SERVER_JAVA_OPTS -cp $HOME/conf:$HOME/lib/* $SERVER_CLASS 2>&1 > $SERVER_LOG_PATH/linkis.out & +nohup java $SERVER_JAVA_OPTS -cp ../module/lib/*:$HOME/conf:$HOME/lib/* $SERVER_CLASS 2>&1 > $SERVER_LOG_PATH/linkis.out & pid=$! if [[ -z "${pid}" ]]; then echo "server $SERVER_NAME start failed!" -- Gitee From 912d6dfcac826d189aef2fd22b101fba3eba7184 Mon Sep 17 00:00:00 2001 From: Wang Zhen Date: Fri, 8 Jan 2021 10:26:41 +0800 Subject: [PATCH 052/148] exclude jsr311-api dependency --- core/cloudModule/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/cloudModule/pom.xml b/core/cloudModule/pom.xml index b58aa2fbe..be71d09e2 100644 --- a/core/cloudModule/pom.xml +++ b/core/cloudModule/pom.xml @@ -132,6 +132,10 @@ spring-cloud-starter-netflix-eureka-client 2.0.0.RELEASE + + jsr311-api + javax.ws.rs + jackson-databind com.fasterxml.jackson.core -- Gitee From 14c71d9aaf95da3a7bb36cd6cd8daf0e802d3af8 Mon Sep 17 00:00:00 2001 From: Wang Zhen Date: Thu, 14 Jan 2021 17:25:14 +0800 Subject: [PATCH 053/148] remove getValueAndRemove method from linkis-common --- .../linkis/common/conf/CommonVars.scala | 5 ---- .../process/SparkSubmitProcessBuilder.scala | 24 ++++++++++++------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/CommonVars.scala b/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/CommonVars.scala index 39a5b9a5b..b93932301 100644 --- a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/CommonVars.scala +++ b/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/CommonVars.scala @@ -28,11 +28,6 @@ case class CommonVars[T](key: String, defaultValue: T, value: T, description: St else BDPConfiguration.formatValue(defaultValue, Option(properties.get(key))).get } - def getValueAndRemove(properties: java.util.Map[String, String]): T = { - if(properties == null || !properties.containsKey(key) || properties.get(key) == null) getValue - else BDPConfiguration.formatValue(defaultValue, Option(properties.remove(key))).get - } - def getValue(properties: Map[String, String]): T = getValue(mapAsJavaMap(properties)) def acquireNew: T = BDPConfiguration.getOption(this).getOrElse(defaultValue) } diff --git a/ujes/definedEngines/spark/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/process/SparkSubmitProcessBuilder.scala b/ujes/definedEngines/spark/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/process/SparkSubmitProcessBuilder.scala index 608f09943..8f2ca5248 100644 --- a/ujes/definedEngines/spark/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/process/SparkSubmitProcessBuilder.scala +++ b/ujes/definedEngines/spark/enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/process/SparkSubmitProcessBuilder.scala @@ -20,14 +20,14 @@ package com.webank.wedatasphere.linkis.enginemanager.process import java.lang.ProcessBuilder.Redirect import java.util +import com.webank.wedatasphere.linkis.common.conf.CommonVars import com.webank.wedatasphere.linkis.common.utils.Logging import com.webank.wedatasphere.linkis.enginemanager.EngineResource import com.webank.wedatasphere.linkis.enginemanager.conf.EnvConfiguration._ -import com.webank.wedatasphere.linkis.enginemanager.configuration.SparkConfiguration import com.webank.wedatasphere.linkis.enginemanager.configuration.SparkConfiguration._ import com.webank.wedatasphere.linkis.enginemanager.configuration.SparkResourceConfiguration._ import com.webank.wedatasphere.linkis.enginemanager.impl.UserEngineResource -import com.webank.wedatasphere.linkis.enginemanager.process.SparkSubmitProcessBuilder.{AbsolutePath, Path, RelativePath} +import com.webank.wedatasphere.linkis.enginemanager.process.SparkSubmitProcessBuilder._ import com.webank.wedatasphere.linkis.protocol.engine.RequestEngine import com.webank.wedatasphere.linkis.resourcemanager.DriverAndYarnResource import org.apache.commons.lang.StringUtils @@ -134,20 +134,20 @@ class SparkSubmitProcessBuilder extends ProcessEngineBuilder with Logging { val darResource: DriverAndYarnResource = engineRequest.getResource.asInstanceOf[DriverAndYarnResource] val properties = new util.HashMap[String,String](request.properties) this.master("yarn") - this.deployMode(SPARK_DEPLOY_MODE.getValueAndRemove(properties)) + this.deployMode(getValueAndRemove(properties, SPARK_DEPLOY_MODE)) this.conf(SPARK_DRIVER_EXTRA_JAVA_OPTIONS.key, SPARK_DRIVER_EXTRA_JAVA_OPTIONS.getValue) this.name(properties.getOrDefault("appName", "linkis")) this.className(properties.getOrDefault("className", "com.webank.wedatasphere.linkis.engine.DataWorkCloudEngineApplication")) properties.getOrDefault("archives", "").toString.split(",").map(RelativePath).foreach(this.archive) this.driverCores(DWC_SPARK_DRIVER_CORES) - this.driverMemory(DWC_SPARK_DRIVER_MEMORY.getValueAndRemove(properties) + "G") - this.executorCores(DWC_SPARK_EXECUTOR_CORES.getValueAndRemove(properties)) - this.executorMemory(DWC_SPARK_EXECUTOR_MEMORY.getValueAndRemove(properties) + "G") - this.numExecutors(DWC_SPARK_EXECUTOR_INSTANCES.getValueAndRemove(properties)) + this.driverMemory(getValueAndRemove(properties, DWC_SPARK_DRIVER_MEMORY) + "G") + this.executorCores(getValueAndRemove(properties, DWC_SPARK_EXECUTOR_CORES)) + this.executorMemory(getValueAndRemove(properties, DWC_SPARK_EXECUTOR_MEMORY) + "G") + this.numExecutors(getValueAndRemove(properties, DWC_SPARK_EXECUTOR_INSTANCES)) properties.getOrDefault("files", "").split(",").map(RelativePath).foreach(file) properties.getOrDefault("jars", "").split(",").map(RelativePath).foreach(jar) - SPARK_APPLICATION_JARS.getValueAndRemove(properties).split(",").map(RelativePath).foreach(jar) - SPARK_EXTRA_JARS.getValueAndRemove(properties).split(",").map(RelativePath).foreach(jar) + getValueAndRemove(properties, SPARK_APPLICATION_JARS).split(",").map(RelativePath).foreach(jar) + getValueAndRemove(properties, SPARK_EXTRA_JARS).split(",").map(RelativePath).foreach(jar) proxyUser(properties.getOrDefault("proxyUser", "")) this.queue(darResource.yarnResource.queueName) @@ -392,4 +392,10 @@ object SparkSubmitProcessBuilder { override def isNotBlankPath(): Boolean = isNotBlankPath(path) } + def getValueAndRemove[T](properties: java.util.Map[String, String], commonVars: CommonVars[T]): T = { + val value = commonVars.getValue(properties) + properties.remove(commonVars.key) + value + } + } \ No newline at end of file -- Gitee From c205105d0ad9672252eaafa15bae71ea85d797e7 Mon Sep 17 00:00:00 2001 From: peacewong Date: Thu, 4 Feb 2021 11:51:49 +0800 Subject: [PATCH 054/148] Standardize the directory structure of linkis-commons --- .gitignore | 16 ++++++------ .../linkis-common}/pom.xml | 0 .../linkis/common/exception/DWCException.java | 0 .../common/exception/DWCRetryException.java | 0 .../common/exception/DWCRuntimeException.java | 0 .../exception/DwcCommonErrorException.java | 0 .../common/exception/ErrorException.java | 0 .../common/exception/ExceptionLevel.java | 0 .../common/exception/ExceptionManager.java | 0 .../common/exception/FatalException.java | 0 .../common/exception/WarnException.java | 0 .../wedatasphere/linkis/common/io/Fs.java | 0 .../wedatasphere/linkis/common/io/FsPath.java | 0 .../linkis/common/io/TestMain.java | 0 .../linkis/common/utils/ByteTimeUtils.java | 0 .../linkis/common/utils/DESUtil.java | 0 .../linkis/common/ServiceInstance.scala | 0 .../linkis/common/collection/LoopArray.scala | 0 .../linkis/common/conf/BDPConfiguration.scala | 0 .../linkis/common/conf/ByteType.scala | 0 .../linkis/common/conf/CommonVars.scala | 0 .../linkis/common/conf/Configuration.scala | 0 .../common/conf/DWCArgumentsParser.scala | 0 .../linkis/common/conf/TimeType.scala | 0 .../linkis/common/io/FsReader.scala | 0 .../linkis/common/io/FsWriter.scala | 0 .../linkis/common/io/MetaData.scala | 0 .../linkis/common/io/Record.scala | 0 .../io/resultset/ResultDeserializer.scala | 0 .../io/resultset/ResultSerializer.scala | 0 .../common/io/resultset/ResultSet.scala | 0 .../common/io/resultset/ResultSetReader.scala | 0 .../common/io/resultset/ResultSetWriter.scala | 0 .../linkis/common/listener/Event.scala | 0 .../common/listener/EventListener.scala | 0 .../common/listener/ListenerEventBus.scala | 0 .../listener/SingleThreadListenerBus.scala | 0 .../linkis/common/log/LogUtils.scala | 0 .../linkis/common/utils/ClassUtils.scala | 0 .../linkis/common/utils/FileService.scala | 0 .../linkis/common/utils/JavaLog.scala | 0 .../linkis/common/utils/LDAPUtils.scala | 0 .../linkis/common/utils/Logging.scala | 0 .../linkis/common/utils/OverloadUtils.scala | 0 .../linkis/common/utils/RSAUtils.scala | 0 .../linkis/common/utils/RefreshUtils.scala | 0 .../linkis/common/utils/RetryHandler.scala | 0 .../linkis/common/utils/ShutdownUtils.scala | 0 .../linkis/common/utils/Utils.scala | 0 .../linkis/common/utils/ZipUtils.scala | 0 .../linkis-hadoop-common}/pom.xml | 0 .../hadoop/common/conf/HadoopConf.scala | 0 .../hadoop/common/utils/HDFSUtils.scala | 0 .../linkis-httpclient}/pom.xml | 0 .../httpclient/AbstractHttpClient.scala | 0 .../linkis/httpclient/Client.scala | 0 .../linkis/httpclient/ResultListener.scala | 0 .../AbstractAuthenticationStrategy.scala | 0 .../authentication/Authentication.scala | 0 .../authentication/AuthenticationAction.scala | 0 .../AuthenticationStrategy.scala | 0 .../authentication/HttpAuthentication.scala | 0 .../httpclient/config/ClientConfig.scala | 0 .../config/ClientConfigBuilder.scala | 0 .../discovery/AbstractDiscovery.scala | 0 .../httpclient/discovery/Discovery.scala | 0 .../discovery/DiscoveryListener.scala | 0 .../discovery/HeartbeatAction.scala | 0 .../exception/DiscoveryException.scala | 0 .../exception/HttpClientResultException.scala | 0 .../exception/HttpMessageParseException.scala | 0 .../loadbalancer/AbstractLoadBalancer.scala | 0 .../DefaultLoadbalancerStrategy.scala | 0 .../loadbalancer/LoadBalancer.scala | 0 .../loadbalancer/LoadBalancerStrategy.scala | 0 .../linkis/httpclient/request/Action.scala | 0 .../httpclient/request/DownloadAction.scala | 0 .../linkis/httpclient/request/GetAction.scala | 0 .../httpclient/request/HttpAction.scala | 0 .../httpclient/request/POSTAction.scala | 0 .../httpclient/request/ServerUrlAction.scala | 0 .../httpclient/request/UploadAction.scala | 0 .../httpclient/request/UserAction.scala | 0 .../httpclient/request/UserPwdAction.scala | 0 .../httpclient/response/HttpResult.scala | 0 .../httpclient/response/ListResult.scala | 0 .../linkis/httpclient/response/Result.scala | 0 .../linkis-module}/pom.xml | 2 +- .../src/main/assembly/distribution.xml | 0 .../linkis/DataWorkCloudApplication.java | 0 .../server/restful/RestfulApplication.java | 0 .../linkis/server/utils/AopTargetUtils.java | 0 .../src/main/resources/mybatis-config.xml | 0 .../linkis/server/BDPJettyServerHelper.scala | 0 .../wedatasphere/linkis/server/Message.scala | 0 .../DataWorkCloudCustomExcludeFilter.scala | 0 .../server/conf/ServerConfiguration.scala | 0 .../server/exception/BDPServerException.scala | 0 .../FetchMapCacheFailedException.scala | 0 .../IllegalUserTicketException.scala | 0 .../exception/LoginExpireException.scala | 0 .../NoApplicationExistsException.scala | 0 .../server/exception/NonLoginException.scala | 0 .../wedatasphere/linkis/server/package.scala | 0 .../server/restful/RestfulCatchAOP.scala | 0 .../linkis/server/security/SSOUtils.scala | 0 .../server/security/SecurityFilter.scala | 0 .../server/socket/ControllerServer.scala | 0 .../linkis/server/socket/ServerSocket.scala | 0 .../linkis/server/socket/SocketListener.scala | 0 .../socket/controller/ServerEvent.scala | 0 .../controller/ServerEventService.scala | 0 .../controller/ServerListenerEventBus.scala | 0 .../linkis-mybatis}/pom.xml | 0 .../linkis/mybatis/DataSourceConfig.java | 0 .../mybatis/MyBatisMapperScannerConfig.java | 0 .../mybatis/MybatisConfigurationFactory.java | 0 .../mybatis/conf/MybatisConfiguration.java | 0 .../linkis-protocol}/pom.xml | 0 .../protocol/constants/TaskConstant.java | 0 .../linkis/protocol/query/QueryProtocol.java | 0 .../protocol/query/RequestInsertTask.java | 0 .../protocol/query/RequestPersistTask.java | 0 .../protocol/query/RequestQueryTask.java | 0 .../protocol/query/RequestReadAllTask.java | 0 .../protocol/query/RequestUpdateTask.java | 0 .../protocol/query/ResponsePersist.java | 0 .../protocol/query/cache/CacheNotFound.java | 0 .../protocol/query/cache/CacheTaskResult.java | 0 .../query/cache/FailedToDeleteCache.java | 0 .../query/cache/RequestDeleteCache.java | 0 .../query/cache/RequestReadCache.java | 0 .../query/cache/ResponseDeleteCache.java | 0 .../query/cache/ResponseReadCache.java | 0 .../query/cache/SuccessDeletedCache.java | 0 .../protocol/usercontrol/RequestLogin.java | 0 .../protocol/usercontrol/RequestRegister.java | 0 .../protocol/usercontrol/ResponseLogin.java | 0 .../usercontrol/ResponseRegister.java | 0 .../usercontrol/UserControlLoginProtocol.java | 0 .../UserControlRegtisterProtocol.java | 0 .../linkis/protocol/BroadcastProtocol.scala | 0 .../linkis/protocol/CacheableProtocol.scala | 0 .../linkis/protocol/IRCommonProtocol.scala | 0 .../linkis/protocol/IRProtocol.scala | 0 .../protocol/IRServiceGroupProtocol.scala | 0 .../linkis/protocol/InstanceProtocol.scala | 0 .../linkis/protocol/Protocol.scala | 0 .../linkis/protocol/RetryableProtocol.scala | 0 .../protocol/SingleInstanceProtocol.scala | 0 .../config/RequestQueryGlobalConfig.scala | 0 .../protocol/config/ResponseQueryConfig.scala | 0 .../protocol/engine/EngineCallback.scala | 0 .../linkis/protocol/engine/EngineState.scala | 0 .../protocol/engine/RequestEngineStatus.scala | 0 .../protocol/engine/RequestNewEngine.scala | 0 .../linkis/protocol/engine/RequestTask.scala | 0 .../engine/RequestUserEngineKill.scala | 0 .../protocol/engine/ResponseNewEngine.scala | 0 .../protocol/engine/ResponseTaskExecute.scala | 0 .../linkis/protocol/mdq/MDQProtocol.scala | 0 .../linkis/protocol/task/Task.scala | 0 .../linkis/protocol/utils/ProtocolUtils.scala | 0 .../linkis/protocol/utils/TaskUtils.scala | 0 .../protocol/utils/ZuulEntranceUtils.scala | 0 .../variable/RequestQueryGlobalVariable.scala | 0 .../variable/ResponseQueryVariable.scala | 0 .../linkis-rpc}/pom.xml | 2 +- .../linkis/rpc/AsynRPCMessageBus.scala | 0 .../linkis/rpc/BaseRPCSender.scala | 0 .../linkis/rpc/BroadcastListener.scala | 0 .../wedatasphere/linkis/rpc/RPCMapCache.scala | 0 .../linkis/rpc/RPCReceiveRemote.scala | 0 .../linkis/rpc/RPCReceiveRestful.scala | 0 .../linkis/rpc/RPCSpringBeanCache.scala | 0 .../wedatasphere/linkis/rpc/Receiver.scala | 0 .../linkis/rpc/ReceiverChooser.scala | 0 .../linkis/rpc/ReceiverSenderBuilder.scala | 0 .../wedatasphere/linkis/rpc/Sender.scala | 0 .../linkis/rpc/conf/RPCConfiguration.scala | 0 .../rpc/conf/RPCSpringConfiguration.scala | 0 .../rpc/exception/DWCRPCRetryException.scala | 0 .../rpc/exception/DWCURIException.scala | 0 .../exception/NoInstanceExistsException.scala | 0 .../exception/RPCInitFailedException.scala | 0 .../InstanceAliasConverter.scala | 0 .../instancealias/InstanceAliasManager.scala | 0 .../impl/DefaultInstanceAliasConverter.scala | 0 .../impl/InstanceAliasManagerImpl.scala | 0 .../rpc/interceptor/RPCInterceptor.scala | 0 .../rpc/interceptor/RPCInterceptorChain.scala | 0 .../interceptor/RPCInterceptorExchange.scala | 0 .../rpc/interceptor/RPCLoadBalancer.scala | 0 .../rpc/interceptor/RPCServerLoader.scala | 0 .../common/BroadcastRPCInterceptor.scala | 0 .../common/BroadcastSenderBuilder.scala | 0 .../common/CacheableRPCInterceptor.scala | 0 .../common/CommonRPCInterceptor.scala | 0 .../common/InstanceRPCLoadBalancer.scala | 0 .../common/RetryableRPCInterceptor.scala | 0 .../SingleInstanceRPCLoadBalancer.scala | 0 .../FeignClientRequestInterceptor.scala | 0 .../SpringCloudFeignConfigurationCache.scala | 0 .../rpc/sender/SpringMVCRPCSender.scala | 0 .../linkis/rpc/sender/UnionSender.scala | 0 .../eureka/EurekaClientRefreshUtils.scala | 0 .../sender/eureka/EurekaRPCServerLoader.scala | 0 .../transform/JavaCollectionSerializer.scala | 0 .../linkis/rpc/transform/RPCConsumer.scala | 0 .../linkis/rpc/transform/RPCFormats.scala | 0 .../linkis/rpc/transform/RPCProduct.scala | 0 .../linkis/rpc/utils/RPCUtils.scala | 0 .../linkis/rpc/RPCFormatsTest.scala | 0 .../linkis-scheduler}/pom.xml | 0 .../linkis/scheduler/AbstractScheduler.scala | 0 .../linkis/scheduler/Scheduler.scala | 0 .../linkis/scheduler/SchedulerContext.scala | 0 .../linkis/scheduler/event/LogEvent.scala | 0 .../scheduler/event/ScheduleEvent.scala | 0 .../event/SchedulerEventListener.scala | 0 .../exception/DWCJobRetryException.scala | 0 .../exception/SchedulerErrorException.scala | 0 .../WaitForNextAskExecutorException.scala | 0 .../scheduler/executer/AbstractExecutor.scala | 0 .../executer/ConcurrentTaskInfoSupport.scala | 0 .../ConcurrentTaskOperateSupport.scala | 0 .../scheduler/executer/ExecuteRequest.scala | 0 .../scheduler/executer/ExecuteResponse.scala | 0 .../linkis/scheduler/executer/Executor.scala | 0 .../scheduler/executer/ExecutorInfo.scala | 0 .../scheduler/executer/ExecutorManager.scala | 0 .../executer/SingleTaskInfoSupport.scala | 0 .../executer/SingleTaskOperateSupport.scala | 0 .../linkis/scheduler/future/BDPFuture.scala | 0 .../scheduler/future/BDPFutureTask.scala | 0 .../scheduler/listener/ConsumerListener.scala | 0 .../scheduler/listener/ExecutorListener.scala | 0 .../scheduler/listener/JobListener.scala | 0 .../scheduler/listener/LogListener.scala | 0 .../scheduler/listener/ProgressListener.scala | 0 .../listener/SchedulerListener.scala | 0 .../scheduler/queue/AbstractGroup.scala | 0 .../linkis/scheduler/queue/ConsumeQueue.scala | 0 .../linkis/scheduler/queue/Consumer.scala | 0 .../scheduler/queue/ConsumerManager.scala | 0 .../linkis/scheduler/queue/Group.scala | 0 .../linkis/scheduler/queue/GroupFactory.scala | 0 .../linkis/scheduler/queue/Job.scala | 0 .../linkis/scheduler/queue/JobInfo.scala | 0 .../linkis/scheduler/queue/LockJob.scala | 0 .../scheduler/queue/LoopArrayQueue.scala | 0 .../scheduler/queue/SchedulerEvent.scala | 0 .../scheduler/queue/SchedulerEventState.scala | 0 .../linkis/scheduler/queue/UserJob.scala | 0 .../queue/fifoqueue/FIFOConsumerManager.scala | 0 .../scheduler/queue/fifoqueue/FIFOGroup.scala | 0 .../queue/fifoqueue/FIFOGroupFactory.scala | 0 .../queue/fifoqueue/FIFOScheduler.scala | 0 .../fifoqueue/FIFOSchedulerContextImpl.scala | 0 .../queue/fifoqueue/FIFOUserConsumer.scala | 0 .../ParallelConsumerManager.scala | 0 .../queue/parallelqueue/ParallelGroup.scala | 0 .../parallelqueue/ParallelGroupFactory.scala | 0 .../parallelqueue/ParallelScheduler.scala | 0 .../ParallelSchedulerContextImpl.scala | 0 linkis-commons/pom.xml | 26 +++++++++++++++++++ pom.xml | 9 +------ 267 files changed, 37 insertions(+), 18 deletions(-) rename {core/common => linkis-commons/linkis-common}/pom.xml (100%) rename {core/common => linkis-commons/linkis-common}/src/main/java/com/webank/wedatasphere/linkis/common/exception/DWCException.java (100%) rename {core/common => linkis-commons/linkis-common}/src/main/java/com/webank/wedatasphere/linkis/common/exception/DWCRetryException.java (100%) rename {core/common => linkis-commons/linkis-common}/src/main/java/com/webank/wedatasphere/linkis/common/exception/DWCRuntimeException.java (100%) rename {core/common => linkis-commons/linkis-common}/src/main/java/com/webank/wedatasphere/linkis/common/exception/DwcCommonErrorException.java (100%) rename {core/common => linkis-commons/linkis-common}/src/main/java/com/webank/wedatasphere/linkis/common/exception/ErrorException.java (100%) rename {core/common => linkis-commons/linkis-common}/src/main/java/com/webank/wedatasphere/linkis/common/exception/ExceptionLevel.java (100%) rename {core/common => linkis-commons/linkis-common}/src/main/java/com/webank/wedatasphere/linkis/common/exception/ExceptionManager.java (100%) rename {core/common => linkis-commons/linkis-common}/src/main/java/com/webank/wedatasphere/linkis/common/exception/FatalException.java (100%) rename {core/common => linkis-commons/linkis-common}/src/main/java/com/webank/wedatasphere/linkis/common/exception/WarnException.java (100%) rename {core/common => linkis-commons/linkis-common}/src/main/java/com/webank/wedatasphere/linkis/common/io/Fs.java (100%) rename {core/common => linkis-commons/linkis-common}/src/main/java/com/webank/wedatasphere/linkis/common/io/FsPath.java (100%) rename {core/common => linkis-commons/linkis-common}/src/main/java/com/webank/wedatasphere/linkis/common/io/TestMain.java (100%) rename {core/common => linkis-commons/linkis-common}/src/main/java/com/webank/wedatasphere/linkis/common/utils/ByteTimeUtils.java (100%) rename {core/common => linkis-commons/linkis-common}/src/main/java/com/webank/wedatasphere/linkis/common/utils/DESUtil.java (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/ServiceInstance.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/collection/LoopArray.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/conf/BDPConfiguration.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/conf/ByteType.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/conf/CommonVars.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/conf/Configuration.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/conf/DWCArgumentsParser.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/conf/TimeType.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/io/FsReader.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/io/FsWriter.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/io/MetaData.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/io/Record.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultDeserializer.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultSerializer.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultSet.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultSetReader.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultSetWriter.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/listener/Event.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/listener/EventListener.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/listener/ListenerEventBus.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/listener/SingleThreadListenerBus.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/log/LogUtils.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/utils/ClassUtils.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/utils/FileService.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/utils/JavaLog.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/utils/LDAPUtils.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/utils/Logging.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/utils/OverloadUtils.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/utils/RSAUtils.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/utils/RefreshUtils.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/utils/RetryHandler.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/utils/ShutdownUtils.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/utils/Utils.scala (100%) rename {core/common => linkis-commons/linkis-common}/src/main/scala/com/webank/wedatasphere/linkis/common/utils/ZipUtils.scala (100%) rename {core/hadoop-common => linkis-commons/linkis-hadoop-common}/pom.xml (100%) rename {core/hadoop-common => linkis-commons/linkis-hadoop-common}/src/main/scala/com/webank/wedatasphere/linkis/hadoop/common/conf/HadoopConf.scala (100%) rename {core/hadoop-common => linkis-commons/linkis-hadoop-common}/src/main/scala/com/webank/wedatasphere/linkis/hadoop/common/utils/HDFSUtils.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/pom.xml (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/AbstractHttpClient.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/Client.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/ResultListener.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/AbstractAuthenticationStrategy.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/Authentication.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/AuthenticationAction.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/AuthenticationStrategy.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/HttpAuthentication.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/config/ClientConfig.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/config/ClientConfigBuilder.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/discovery/AbstractDiscovery.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/discovery/Discovery.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/discovery/DiscoveryListener.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/discovery/HeartbeatAction.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/exception/DiscoveryException.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/exception/HttpClientResultException.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/exception/HttpMessageParseException.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/loadbalancer/AbstractLoadBalancer.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/loadbalancer/DefaultLoadbalancerStrategy.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/loadbalancer/LoadBalancer.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/loadbalancer/LoadBalancerStrategy.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/Action.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/DownloadAction.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/GetAction.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/HttpAction.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/POSTAction.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/ServerUrlAction.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/UploadAction.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/UserAction.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/UserPwdAction.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/response/HttpResult.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/response/ListResult.scala (100%) rename {core/httpclient => linkis-commons/linkis-httpclient}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/response/Result.scala (100%) rename {core/cloudModule => linkis-commons/linkis-module}/pom.xml (99%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/assembly/distribution.xml (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/java/com/webank/wedatasphere/linkis/DataWorkCloudApplication.java (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/java/com/webank/wedatasphere/linkis/server/restful/RestfulApplication.java (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/java/com/webank/wedatasphere/linkis/server/utils/AopTargetUtils.java (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/resources/mybatis-config.xml (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/scala/com/webank/wedatasphere/linkis/server/BDPJettyServerHelper.scala (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/scala/com/webank/wedatasphere/linkis/server/Message.scala (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/scala/com/webank/wedatasphere/linkis/server/conf/DataWorkCloudCustomExcludeFilter.scala (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/scala/com/webank/wedatasphere/linkis/server/conf/ServerConfiguration.scala (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/scala/com/webank/wedatasphere/linkis/server/exception/BDPServerException.scala (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/scala/com/webank/wedatasphere/linkis/server/exception/FetchMapCacheFailedException.scala (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/scala/com/webank/wedatasphere/linkis/server/exception/IllegalUserTicketException.scala (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/scala/com/webank/wedatasphere/linkis/server/exception/LoginExpireException.scala (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/scala/com/webank/wedatasphere/linkis/server/exception/NoApplicationExistsException.scala (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/scala/com/webank/wedatasphere/linkis/server/exception/NonLoginException.scala (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/scala/com/webank/wedatasphere/linkis/server/package.scala (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/scala/com/webank/wedatasphere/linkis/server/restful/RestfulCatchAOP.scala (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/scala/com/webank/wedatasphere/linkis/server/security/SSOUtils.scala (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/scala/com/webank/wedatasphere/linkis/server/security/SecurityFilter.scala (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/scala/com/webank/wedatasphere/linkis/server/socket/ControllerServer.scala (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/scala/com/webank/wedatasphere/linkis/server/socket/ServerSocket.scala (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/scala/com/webank/wedatasphere/linkis/server/socket/SocketListener.scala (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/scala/com/webank/wedatasphere/linkis/server/socket/controller/ServerEvent.scala (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/scala/com/webank/wedatasphere/linkis/server/socket/controller/ServerEventService.scala (100%) rename {core/cloudModule => linkis-commons/linkis-module}/src/main/scala/com/webank/wedatasphere/linkis/server/socket/controller/ServerListenerEventBus.scala (100%) rename {core/cloudMybatis => linkis-commons/linkis-mybatis}/pom.xml (100%) rename {core/cloudMybatis => linkis-commons/linkis-mybatis}/src/main/java/com/webank/wedatasphere/linkis/mybatis/DataSourceConfig.java (100%) rename {core/cloudMybatis => linkis-commons/linkis-mybatis}/src/main/java/com/webank/wedatasphere/linkis/mybatis/MyBatisMapperScannerConfig.java (100%) rename {core/cloudMybatis => linkis-commons/linkis-mybatis}/src/main/java/com/webank/wedatasphere/linkis/mybatis/MybatisConfigurationFactory.java (100%) rename {core/cloudMybatis => linkis-commons/linkis-mybatis}/src/main/java/com/webank/wedatasphere/linkis/mybatis/conf/MybatisConfiguration.java (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/pom.xml (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/java/com/webank/wedatasphere/linkis/protocol/constants/TaskConstant.java (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/java/com/webank/wedatasphere/linkis/protocol/query/QueryProtocol.java (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestInsertTask.java (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestPersistTask.java (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestQueryTask.java (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestReadAllTask.java (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestUpdateTask.java (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/java/com/webank/wedatasphere/linkis/protocol/query/ResponsePersist.java (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/CacheNotFound.java (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/CacheTaskResult.java (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/FailedToDeleteCache.java (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/RequestDeleteCache.java (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/RequestReadCache.java (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/ResponseDeleteCache.java (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/ResponseReadCache.java (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/SuccessDeletedCache.java (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/RequestLogin.java (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/RequestRegister.java (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/ResponseLogin.java (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/ResponseRegister.java (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/UserControlLoginProtocol.java (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/UserControlRegtisterProtocol.java (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/BroadcastProtocol.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/CacheableProtocol.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/IRCommonProtocol.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/IRProtocol.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/IRServiceGroupProtocol.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/InstanceProtocol.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/Protocol.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/RetryableProtocol.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/SingleInstanceProtocol.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/config/RequestQueryGlobalConfig.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/config/ResponseQueryConfig.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/EngineCallback.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/EngineState.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/RequestEngineStatus.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/RequestNewEngine.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/RequestTask.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/RequestUserEngineKill.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/ResponseNewEngine.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/ResponseTaskExecute.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/mdq/MDQProtocol.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/task/Task.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/utils/ProtocolUtils.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/utils/TaskUtils.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/utils/ZuulEntranceUtils.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/variable/RequestQueryGlobalVariable.scala (100%) rename {core/cloudProtocol => linkis-commons/linkis-protocol}/src/main/scala/com/webank/wedatasphere/linkis/protocol/variable/ResponseQueryVariable.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/pom.xml (99%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/AsynRPCMessageBus.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/BaseRPCSender.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/BroadcastListener.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/RPCMapCache.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/RPCReceiveRemote.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/RPCReceiveRestful.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/RPCSpringBeanCache.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/Receiver.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/ReceiverChooser.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/ReceiverSenderBuilder.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/Sender.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/conf/RPCConfiguration.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/conf/RPCSpringConfiguration.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/exception/DWCRPCRetryException.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/exception/DWCURIException.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/exception/NoInstanceExistsException.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/exception/RPCInitFailedException.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/instancealias/InstanceAliasConverter.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/instancealias/InstanceAliasManager.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/instancealias/impl/DefaultInstanceAliasConverter.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/instancealias/impl/InstanceAliasManagerImpl.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCInterceptor.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCInterceptorChain.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCInterceptorExchange.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCLoadBalancer.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCServerLoader.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/BroadcastRPCInterceptor.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/BroadcastSenderBuilder.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/CacheableRPCInterceptor.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/CommonRPCInterceptor.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/InstanceRPCLoadBalancer.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/RetryableRPCInterceptor.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/SingleInstanceRPCLoadBalancer.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/FeignClientRequestInterceptor.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/SpringCloudFeignConfigurationCache.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/SpringMVCRPCSender.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/UnionSender.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/eureka/EurekaClientRefreshUtils.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/eureka/EurekaRPCServerLoader.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/transform/JavaCollectionSerializer.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/transform/RPCConsumer.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/transform/RPCFormats.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/transform/RPCProduct.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/main/scala/com/webank/wedatasphere/linkis/rpc/utils/RPCUtils.scala (100%) rename {core/cloudRPC => linkis-commons/linkis-rpc}/src/test/scala/com/webank/wedatasphere/linkis/rpc/RPCFormatsTest.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/pom.xml (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/AbstractScheduler.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/Scheduler.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/SchedulerContext.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/event/LogEvent.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/event/ScheduleEvent.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/event/SchedulerEventListener.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/exception/DWCJobRetryException.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/exception/SchedulerErrorException.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/exception/WaitForNextAskExecutorException.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/AbstractExecutor.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ConcurrentTaskInfoSupport.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ConcurrentTaskOperateSupport.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ExecuteRequest.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ExecuteResponse.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/Executor.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ExecutorInfo.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ExecutorManager.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/SingleTaskInfoSupport.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/SingleTaskOperateSupport.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/future/BDPFuture.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/future/BDPFutureTask.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/ConsumerListener.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/ExecutorListener.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/JobListener.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/LogListener.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/ProgressListener.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/SchedulerListener.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/AbstractGroup.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/ConsumeQueue.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/Consumer.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/ConsumerManager.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/Group.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/GroupFactory.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/Job.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/JobInfo.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/LockJob.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/LoopArrayQueue.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/SchedulerEvent.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/SchedulerEventState.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/UserJob.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOConsumerManager.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOGroup.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOGroupFactory.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOScheduler.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOSchedulerContextImpl.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOUserConsumer.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelConsumerManager.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelGroup.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelGroupFactory.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelScheduler.scala (100%) rename {core/scheduler => linkis-commons/linkis-scheduler}/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelSchedulerContextImpl.scala (100%) create mode 100644 linkis-commons/pom.xml diff --git a/.gitignore b/.gitignore index c8a07d74b..f90db9d13 100644 --- a/.gitignore +++ b/.gitignore @@ -6,13 +6,13 @@ target/ assembly/target -core/cloudModule/target/ -core/cloudMybatis/target/ -core/cloudProtocol/target/ -core/cloudRPC/target/ -core/common/target/ -core/httpclient/target/ -core/scheduler/target/ +linkis-commons/linkis-module/target/ +linkis-commons/linkis-mybatis/target/ +linkis-commons/linkis-protocol/target/ +linkis-commons/linkis-rpc/target/ +linkis-commons/linkis-common/target/ +linkis-commons/linkis-httpclient/target/ +linkis-commons/linkis-scheduler/target/ eurekaServer/target/ gateway/core/target/ gateway/gateway-httpclient-support/target/ @@ -78,7 +78,7 @@ bml/bml-engine-hook/target/ bml/bmlclient/target/ bml/bmlcommon/target/ bml/bmlserver/target/ -core/hadoop-common/target/ +linkis-commons/linkis-hadoop-common/target/ publicService/workspace/client/workspace-httpclient/target/ userControl/target/ diff --git a/core/common/pom.xml b/linkis-commons/linkis-common/pom.xml similarity index 100% rename from core/common/pom.xml rename to linkis-commons/linkis-common/pom.xml diff --git a/core/common/src/main/java/com/webank/wedatasphere/linkis/common/exception/DWCException.java b/linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/exception/DWCException.java similarity index 100% rename from core/common/src/main/java/com/webank/wedatasphere/linkis/common/exception/DWCException.java rename to linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/exception/DWCException.java diff --git a/core/common/src/main/java/com/webank/wedatasphere/linkis/common/exception/DWCRetryException.java b/linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/exception/DWCRetryException.java similarity index 100% rename from core/common/src/main/java/com/webank/wedatasphere/linkis/common/exception/DWCRetryException.java rename to linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/exception/DWCRetryException.java diff --git a/core/common/src/main/java/com/webank/wedatasphere/linkis/common/exception/DWCRuntimeException.java b/linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/exception/DWCRuntimeException.java similarity index 100% rename from core/common/src/main/java/com/webank/wedatasphere/linkis/common/exception/DWCRuntimeException.java rename to linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/exception/DWCRuntimeException.java diff --git a/core/common/src/main/java/com/webank/wedatasphere/linkis/common/exception/DwcCommonErrorException.java b/linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/exception/DwcCommonErrorException.java similarity index 100% rename from core/common/src/main/java/com/webank/wedatasphere/linkis/common/exception/DwcCommonErrorException.java rename to linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/exception/DwcCommonErrorException.java diff --git a/core/common/src/main/java/com/webank/wedatasphere/linkis/common/exception/ErrorException.java b/linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/exception/ErrorException.java similarity index 100% rename from core/common/src/main/java/com/webank/wedatasphere/linkis/common/exception/ErrorException.java rename to linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/exception/ErrorException.java diff --git a/core/common/src/main/java/com/webank/wedatasphere/linkis/common/exception/ExceptionLevel.java b/linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/exception/ExceptionLevel.java similarity index 100% rename from core/common/src/main/java/com/webank/wedatasphere/linkis/common/exception/ExceptionLevel.java rename to linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/exception/ExceptionLevel.java diff --git a/core/common/src/main/java/com/webank/wedatasphere/linkis/common/exception/ExceptionManager.java b/linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/exception/ExceptionManager.java similarity index 100% rename from core/common/src/main/java/com/webank/wedatasphere/linkis/common/exception/ExceptionManager.java rename to linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/exception/ExceptionManager.java diff --git a/core/common/src/main/java/com/webank/wedatasphere/linkis/common/exception/FatalException.java b/linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/exception/FatalException.java similarity index 100% rename from core/common/src/main/java/com/webank/wedatasphere/linkis/common/exception/FatalException.java rename to linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/exception/FatalException.java diff --git a/core/common/src/main/java/com/webank/wedatasphere/linkis/common/exception/WarnException.java b/linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/exception/WarnException.java similarity index 100% rename from core/common/src/main/java/com/webank/wedatasphere/linkis/common/exception/WarnException.java rename to linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/exception/WarnException.java diff --git a/core/common/src/main/java/com/webank/wedatasphere/linkis/common/io/Fs.java b/linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/io/Fs.java similarity index 100% rename from core/common/src/main/java/com/webank/wedatasphere/linkis/common/io/Fs.java rename to linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/io/Fs.java diff --git a/core/common/src/main/java/com/webank/wedatasphere/linkis/common/io/FsPath.java b/linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/io/FsPath.java similarity index 100% rename from core/common/src/main/java/com/webank/wedatasphere/linkis/common/io/FsPath.java rename to linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/io/FsPath.java diff --git a/core/common/src/main/java/com/webank/wedatasphere/linkis/common/io/TestMain.java b/linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/io/TestMain.java similarity index 100% rename from core/common/src/main/java/com/webank/wedatasphere/linkis/common/io/TestMain.java rename to linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/io/TestMain.java diff --git a/core/common/src/main/java/com/webank/wedatasphere/linkis/common/utils/ByteTimeUtils.java b/linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/utils/ByteTimeUtils.java similarity index 100% rename from core/common/src/main/java/com/webank/wedatasphere/linkis/common/utils/ByteTimeUtils.java rename to linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/utils/ByteTimeUtils.java diff --git a/core/common/src/main/java/com/webank/wedatasphere/linkis/common/utils/DESUtil.java b/linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/utils/DESUtil.java similarity index 100% rename from core/common/src/main/java/com/webank/wedatasphere/linkis/common/utils/DESUtil.java rename to linkis-commons/linkis-common/src/main/java/com/webank/wedatasphere/linkis/common/utils/DESUtil.java diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/ServiceInstance.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/ServiceInstance.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/ServiceInstance.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/ServiceInstance.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/collection/LoopArray.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/collection/LoopArray.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/collection/LoopArray.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/collection/LoopArray.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/BDPConfiguration.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/BDPConfiguration.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/BDPConfiguration.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/BDPConfiguration.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/ByteType.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/ByteType.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/ByteType.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/ByteType.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/CommonVars.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/CommonVars.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/CommonVars.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/CommonVars.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/Configuration.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/Configuration.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/Configuration.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/Configuration.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/DWCArgumentsParser.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/DWCArgumentsParser.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/DWCArgumentsParser.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/DWCArgumentsParser.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/TimeType.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/TimeType.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/TimeType.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/conf/TimeType.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/io/FsReader.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/io/FsReader.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/io/FsReader.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/io/FsReader.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/io/FsWriter.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/io/FsWriter.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/io/FsWriter.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/io/FsWriter.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/io/MetaData.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/io/MetaData.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/io/MetaData.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/io/MetaData.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/io/Record.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/io/Record.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/io/Record.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/io/Record.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultDeserializer.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultDeserializer.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultDeserializer.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultDeserializer.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultSerializer.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultSerializer.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultSerializer.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultSerializer.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultSet.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultSet.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultSet.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultSet.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultSetReader.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultSetReader.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultSetReader.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultSetReader.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultSetWriter.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultSetWriter.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultSetWriter.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/io/resultset/ResultSetWriter.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/listener/Event.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/listener/Event.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/listener/Event.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/listener/Event.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/listener/EventListener.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/listener/EventListener.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/listener/EventListener.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/listener/EventListener.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/listener/ListenerEventBus.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/listener/ListenerEventBus.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/listener/ListenerEventBus.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/listener/ListenerEventBus.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/listener/SingleThreadListenerBus.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/listener/SingleThreadListenerBus.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/listener/SingleThreadListenerBus.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/listener/SingleThreadListenerBus.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/log/LogUtils.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/log/LogUtils.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/log/LogUtils.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/log/LogUtils.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/ClassUtils.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/ClassUtils.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/ClassUtils.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/ClassUtils.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/FileService.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/FileService.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/FileService.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/FileService.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/JavaLog.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/JavaLog.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/JavaLog.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/JavaLog.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/LDAPUtils.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/LDAPUtils.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/LDAPUtils.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/LDAPUtils.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/Logging.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/Logging.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/Logging.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/Logging.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/OverloadUtils.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/OverloadUtils.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/OverloadUtils.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/OverloadUtils.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/RSAUtils.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/RSAUtils.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/RSAUtils.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/RSAUtils.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/RefreshUtils.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/RefreshUtils.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/RefreshUtils.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/RefreshUtils.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/RetryHandler.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/RetryHandler.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/RetryHandler.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/RetryHandler.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/ShutdownUtils.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/ShutdownUtils.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/ShutdownUtils.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/ShutdownUtils.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/Utils.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/Utils.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/Utils.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/Utils.scala diff --git a/core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/ZipUtils.scala b/linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/ZipUtils.scala similarity index 100% rename from core/common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/ZipUtils.scala rename to linkis-commons/linkis-common/src/main/scala/com/webank/wedatasphere/linkis/common/utils/ZipUtils.scala diff --git a/core/hadoop-common/pom.xml b/linkis-commons/linkis-hadoop-common/pom.xml similarity index 100% rename from core/hadoop-common/pom.xml rename to linkis-commons/linkis-hadoop-common/pom.xml diff --git a/core/hadoop-common/src/main/scala/com/webank/wedatasphere/linkis/hadoop/common/conf/HadoopConf.scala b/linkis-commons/linkis-hadoop-common/src/main/scala/com/webank/wedatasphere/linkis/hadoop/common/conf/HadoopConf.scala similarity index 100% rename from core/hadoop-common/src/main/scala/com/webank/wedatasphere/linkis/hadoop/common/conf/HadoopConf.scala rename to linkis-commons/linkis-hadoop-common/src/main/scala/com/webank/wedatasphere/linkis/hadoop/common/conf/HadoopConf.scala diff --git a/core/hadoop-common/src/main/scala/com/webank/wedatasphere/linkis/hadoop/common/utils/HDFSUtils.scala b/linkis-commons/linkis-hadoop-common/src/main/scala/com/webank/wedatasphere/linkis/hadoop/common/utils/HDFSUtils.scala similarity index 100% rename from core/hadoop-common/src/main/scala/com/webank/wedatasphere/linkis/hadoop/common/utils/HDFSUtils.scala rename to linkis-commons/linkis-hadoop-common/src/main/scala/com/webank/wedatasphere/linkis/hadoop/common/utils/HDFSUtils.scala diff --git a/core/httpclient/pom.xml b/linkis-commons/linkis-httpclient/pom.xml similarity index 100% rename from core/httpclient/pom.xml rename to linkis-commons/linkis-httpclient/pom.xml diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/AbstractHttpClient.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/AbstractHttpClient.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/AbstractHttpClient.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/AbstractHttpClient.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/Client.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/Client.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/Client.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/Client.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/ResultListener.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/ResultListener.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/ResultListener.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/ResultListener.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/AbstractAuthenticationStrategy.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/AbstractAuthenticationStrategy.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/AbstractAuthenticationStrategy.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/AbstractAuthenticationStrategy.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/Authentication.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/Authentication.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/Authentication.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/Authentication.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/AuthenticationAction.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/AuthenticationAction.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/AuthenticationAction.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/AuthenticationAction.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/AuthenticationStrategy.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/AuthenticationStrategy.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/AuthenticationStrategy.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/AuthenticationStrategy.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/HttpAuthentication.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/HttpAuthentication.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/HttpAuthentication.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/authentication/HttpAuthentication.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/config/ClientConfig.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/config/ClientConfig.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/config/ClientConfig.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/config/ClientConfig.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/config/ClientConfigBuilder.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/config/ClientConfigBuilder.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/config/ClientConfigBuilder.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/config/ClientConfigBuilder.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/discovery/AbstractDiscovery.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/discovery/AbstractDiscovery.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/discovery/AbstractDiscovery.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/discovery/AbstractDiscovery.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/discovery/Discovery.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/discovery/Discovery.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/discovery/Discovery.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/discovery/Discovery.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/discovery/DiscoveryListener.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/discovery/DiscoveryListener.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/discovery/DiscoveryListener.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/discovery/DiscoveryListener.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/discovery/HeartbeatAction.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/discovery/HeartbeatAction.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/discovery/HeartbeatAction.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/discovery/HeartbeatAction.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/exception/DiscoveryException.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/exception/DiscoveryException.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/exception/DiscoveryException.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/exception/DiscoveryException.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/exception/HttpClientResultException.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/exception/HttpClientResultException.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/exception/HttpClientResultException.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/exception/HttpClientResultException.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/exception/HttpMessageParseException.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/exception/HttpMessageParseException.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/exception/HttpMessageParseException.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/exception/HttpMessageParseException.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/loadbalancer/AbstractLoadBalancer.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/loadbalancer/AbstractLoadBalancer.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/loadbalancer/AbstractLoadBalancer.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/loadbalancer/AbstractLoadBalancer.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/loadbalancer/DefaultLoadbalancerStrategy.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/loadbalancer/DefaultLoadbalancerStrategy.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/loadbalancer/DefaultLoadbalancerStrategy.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/loadbalancer/DefaultLoadbalancerStrategy.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/loadbalancer/LoadBalancer.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/loadbalancer/LoadBalancer.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/loadbalancer/LoadBalancer.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/loadbalancer/LoadBalancer.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/loadbalancer/LoadBalancerStrategy.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/loadbalancer/LoadBalancerStrategy.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/loadbalancer/LoadBalancerStrategy.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/loadbalancer/LoadBalancerStrategy.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/Action.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/Action.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/Action.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/Action.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/DownloadAction.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/DownloadAction.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/DownloadAction.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/DownloadAction.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/GetAction.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/GetAction.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/GetAction.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/GetAction.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/HttpAction.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/HttpAction.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/HttpAction.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/HttpAction.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/POSTAction.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/POSTAction.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/POSTAction.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/POSTAction.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/ServerUrlAction.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/ServerUrlAction.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/ServerUrlAction.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/ServerUrlAction.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/UploadAction.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/UploadAction.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/UploadAction.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/UploadAction.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/UserAction.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/UserAction.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/UserAction.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/UserAction.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/UserPwdAction.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/UserPwdAction.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/UserPwdAction.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/request/UserPwdAction.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/response/HttpResult.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/response/HttpResult.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/response/HttpResult.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/response/HttpResult.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/response/ListResult.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/response/ListResult.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/response/ListResult.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/response/ListResult.scala diff --git a/core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/response/Result.scala b/linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/response/Result.scala similarity index 100% rename from core/httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/response/Result.scala rename to linkis-commons/linkis-httpclient/src/main/scala/com/webank/wedatasphere/linkis/httpclient/response/Result.scala diff --git a/core/cloudModule/pom.xml b/linkis-commons/linkis-module/pom.xml similarity index 99% rename from core/cloudModule/pom.xml rename to linkis-commons/linkis-module/pom.xml index be71d09e2..e38dcc7f9 100644 --- a/core/cloudModule/pom.xml +++ b/linkis-commons/linkis-module/pom.xml @@ -544,7 +544,7 @@ - ${basedir}/src/main/resources + src/main/resources ${project.artifactId}-${project.version} diff --git a/core/cloudModule/src/main/assembly/distribution.xml b/linkis-commons/linkis-module/src/main/assembly/distribution.xml similarity index 100% rename from core/cloudModule/src/main/assembly/distribution.xml rename to linkis-commons/linkis-module/src/main/assembly/distribution.xml diff --git a/core/cloudModule/src/main/java/com/webank/wedatasphere/linkis/DataWorkCloudApplication.java b/linkis-commons/linkis-module/src/main/java/com/webank/wedatasphere/linkis/DataWorkCloudApplication.java similarity index 100% rename from core/cloudModule/src/main/java/com/webank/wedatasphere/linkis/DataWorkCloudApplication.java rename to linkis-commons/linkis-module/src/main/java/com/webank/wedatasphere/linkis/DataWorkCloudApplication.java diff --git a/core/cloudModule/src/main/java/com/webank/wedatasphere/linkis/server/restful/RestfulApplication.java b/linkis-commons/linkis-module/src/main/java/com/webank/wedatasphere/linkis/server/restful/RestfulApplication.java similarity index 100% rename from core/cloudModule/src/main/java/com/webank/wedatasphere/linkis/server/restful/RestfulApplication.java rename to linkis-commons/linkis-module/src/main/java/com/webank/wedatasphere/linkis/server/restful/RestfulApplication.java diff --git a/core/cloudModule/src/main/java/com/webank/wedatasphere/linkis/server/utils/AopTargetUtils.java b/linkis-commons/linkis-module/src/main/java/com/webank/wedatasphere/linkis/server/utils/AopTargetUtils.java similarity index 100% rename from core/cloudModule/src/main/java/com/webank/wedatasphere/linkis/server/utils/AopTargetUtils.java rename to linkis-commons/linkis-module/src/main/java/com/webank/wedatasphere/linkis/server/utils/AopTargetUtils.java diff --git a/core/cloudModule/src/main/resources/mybatis-config.xml b/linkis-commons/linkis-module/src/main/resources/mybatis-config.xml similarity index 100% rename from core/cloudModule/src/main/resources/mybatis-config.xml rename to linkis-commons/linkis-module/src/main/resources/mybatis-config.xml diff --git a/core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/BDPJettyServerHelper.scala b/linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/BDPJettyServerHelper.scala similarity index 100% rename from core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/BDPJettyServerHelper.scala rename to linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/BDPJettyServerHelper.scala diff --git a/core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/Message.scala b/linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/Message.scala similarity index 100% rename from core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/Message.scala rename to linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/Message.scala diff --git a/core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/conf/DataWorkCloudCustomExcludeFilter.scala b/linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/conf/DataWorkCloudCustomExcludeFilter.scala similarity index 100% rename from core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/conf/DataWorkCloudCustomExcludeFilter.scala rename to linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/conf/DataWorkCloudCustomExcludeFilter.scala diff --git a/core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/conf/ServerConfiguration.scala b/linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/conf/ServerConfiguration.scala similarity index 100% rename from core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/conf/ServerConfiguration.scala rename to linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/conf/ServerConfiguration.scala diff --git a/core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/exception/BDPServerException.scala b/linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/exception/BDPServerException.scala similarity index 100% rename from core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/exception/BDPServerException.scala rename to linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/exception/BDPServerException.scala diff --git a/core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/exception/FetchMapCacheFailedException.scala b/linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/exception/FetchMapCacheFailedException.scala similarity index 100% rename from core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/exception/FetchMapCacheFailedException.scala rename to linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/exception/FetchMapCacheFailedException.scala diff --git a/core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/exception/IllegalUserTicketException.scala b/linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/exception/IllegalUserTicketException.scala similarity index 100% rename from core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/exception/IllegalUserTicketException.scala rename to linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/exception/IllegalUserTicketException.scala diff --git a/core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/exception/LoginExpireException.scala b/linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/exception/LoginExpireException.scala similarity index 100% rename from core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/exception/LoginExpireException.scala rename to linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/exception/LoginExpireException.scala diff --git a/core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/exception/NoApplicationExistsException.scala b/linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/exception/NoApplicationExistsException.scala similarity index 100% rename from core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/exception/NoApplicationExistsException.scala rename to linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/exception/NoApplicationExistsException.scala diff --git a/core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/exception/NonLoginException.scala b/linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/exception/NonLoginException.scala similarity index 100% rename from core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/exception/NonLoginException.scala rename to linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/exception/NonLoginException.scala diff --git a/core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/package.scala b/linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/package.scala similarity index 100% rename from core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/package.scala rename to linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/package.scala diff --git a/core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/restful/RestfulCatchAOP.scala b/linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/restful/RestfulCatchAOP.scala similarity index 100% rename from core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/restful/RestfulCatchAOP.scala rename to linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/restful/RestfulCatchAOP.scala diff --git a/core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/security/SSOUtils.scala b/linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/security/SSOUtils.scala similarity index 100% rename from core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/security/SSOUtils.scala rename to linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/security/SSOUtils.scala diff --git a/core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/security/SecurityFilter.scala b/linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/security/SecurityFilter.scala similarity index 100% rename from core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/security/SecurityFilter.scala rename to linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/security/SecurityFilter.scala diff --git a/core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/socket/ControllerServer.scala b/linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/socket/ControllerServer.scala similarity index 100% rename from core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/socket/ControllerServer.scala rename to linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/socket/ControllerServer.scala diff --git a/core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/socket/ServerSocket.scala b/linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/socket/ServerSocket.scala similarity index 100% rename from core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/socket/ServerSocket.scala rename to linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/socket/ServerSocket.scala diff --git a/core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/socket/SocketListener.scala b/linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/socket/SocketListener.scala similarity index 100% rename from core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/socket/SocketListener.scala rename to linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/socket/SocketListener.scala diff --git a/core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/socket/controller/ServerEvent.scala b/linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/socket/controller/ServerEvent.scala similarity index 100% rename from core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/socket/controller/ServerEvent.scala rename to linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/socket/controller/ServerEvent.scala diff --git a/core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/socket/controller/ServerEventService.scala b/linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/socket/controller/ServerEventService.scala similarity index 100% rename from core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/socket/controller/ServerEventService.scala rename to linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/socket/controller/ServerEventService.scala diff --git a/core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/socket/controller/ServerListenerEventBus.scala b/linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/socket/controller/ServerListenerEventBus.scala similarity index 100% rename from core/cloudModule/src/main/scala/com/webank/wedatasphere/linkis/server/socket/controller/ServerListenerEventBus.scala rename to linkis-commons/linkis-module/src/main/scala/com/webank/wedatasphere/linkis/server/socket/controller/ServerListenerEventBus.scala diff --git a/core/cloudMybatis/pom.xml b/linkis-commons/linkis-mybatis/pom.xml similarity index 100% rename from core/cloudMybatis/pom.xml rename to linkis-commons/linkis-mybatis/pom.xml diff --git a/core/cloudMybatis/src/main/java/com/webank/wedatasphere/linkis/mybatis/DataSourceConfig.java b/linkis-commons/linkis-mybatis/src/main/java/com/webank/wedatasphere/linkis/mybatis/DataSourceConfig.java similarity index 100% rename from core/cloudMybatis/src/main/java/com/webank/wedatasphere/linkis/mybatis/DataSourceConfig.java rename to linkis-commons/linkis-mybatis/src/main/java/com/webank/wedatasphere/linkis/mybatis/DataSourceConfig.java diff --git a/core/cloudMybatis/src/main/java/com/webank/wedatasphere/linkis/mybatis/MyBatisMapperScannerConfig.java b/linkis-commons/linkis-mybatis/src/main/java/com/webank/wedatasphere/linkis/mybatis/MyBatisMapperScannerConfig.java similarity index 100% rename from core/cloudMybatis/src/main/java/com/webank/wedatasphere/linkis/mybatis/MyBatisMapperScannerConfig.java rename to linkis-commons/linkis-mybatis/src/main/java/com/webank/wedatasphere/linkis/mybatis/MyBatisMapperScannerConfig.java diff --git a/core/cloudMybatis/src/main/java/com/webank/wedatasphere/linkis/mybatis/MybatisConfigurationFactory.java b/linkis-commons/linkis-mybatis/src/main/java/com/webank/wedatasphere/linkis/mybatis/MybatisConfigurationFactory.java similarity index 100% rename from core/cloudMybatis/src/main/java/com/webank/wedatasphere/linkis/mybatis/MybatisConfigurationFactory.java rename to linkis-commons/linkis-mybatis/src/main/java/com/webank/wedatasphere/linkis/mybatis/MybatisConfigurationFactory.java diff --git a/core/cloudMybatis/src/main/java/com/webank/wedatasphere/linkis/mybatis/conf/MybatisConfiguration.java b/linkis-commons/linkis-mybatis/src/main/java/com/webank/wedatasphere/linkis/mybatis/conf/MybatisConfiguration.java similarity index 100% rename from core/cloudMybatis/src/main/java/com/webank/wedatasphere/linkis/mybatis/conf/MybatisConfiguration.java rename to linkis-commons/linkis-mybatis/src/main/java/com/webank/wedatasphere/linkis/mybatis/conf/MybatisConfiguration.java diff --git a/core/cloudProtocol/pom.xml b/linkis-commons/linkis-protocol/pom.xml similarity index 100% rename from core/cloudProtocol/pom.xml rename to linkis-commons/linkis-protocol/pom.xml diff --git a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/constants/TaskConstant.java b/linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/constants/TaskConstant.java similarity index 100% rename from core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/constants/TaskConstant.java rename to linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/constants/TaskConstant.java diff --git a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/QueryProtocol.java b/linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/QueryProtocol.java similarity index 100% rename from core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/QueryProtocol.java rename to linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/QueryProtocol.java diff --git a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestInsertTask.java b/linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestInsertTask.java similarity index 100% rename from core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestInsertTask.java rename to linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestInsertTask.java diff --git a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestPersistTask.java b/linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestPersistTask.java similarity index 100% rename from core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestPersistTask.java rename to linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestPersistTask.java diff --git a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestQueryTask.java b/linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestQueryTask.java similarity index 100% rename from core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestQueryTask.java rename to linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestQueryTask.java diff --git a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestReadAllTask.java b/linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestReadAllTask.java similarity index 100% rename from core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestReadAllTask.java rename to linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestReadAllTask.java diff --git a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestUpdateTask.java b/linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestUpdateTask.java similarity index 100% rename from core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestUpdateTask.java rename to linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/RequestUpdateTask.java diff --git a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/ResponsePersist.java b/linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/ResponsePersist.java similarity index 100% rename from core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/ResponsePersist.java rename to linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/ResponsePersist.java diff --git a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/CacheNotFound.java b/linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/CacheNotFound.java similarity index 100% rename from core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/CacheNotFound.java rename to linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/CacheNotFound.java diff --git a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/CacheTaskResult.java b/linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/CacheTaskResult.java similarity index 100% rename from core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/CacheTaskResult.java rename to linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/CacheTaskResult.java diff --git a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/FailedToDeleteCache.java b/linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/FailedToDeleteCache.java similarity index 100% rename from core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/FailedToDeleteCache.java rename to linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/FailedToDeleteCache.java diff --git a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/RequestDeleteCache.java b/linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/RequestDeleteCache.java similarity index 100% rename from core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/RequestDeleteCache.java rename to linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/RequestDeleteCache.java diff --git a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/RequestReadCache.java b/linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/RequestReadCache.java similarity index 100% rename from core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/RequestReadCache.java rename to linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/RequestReadCache.java diff --git a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/ResponseDeleteCache.java b/linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/ResponseDeleteCache.java similarity index 100% rename from core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/ResponseDeleteCache.java rename to linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/ResponseDeleteCache.java diff --git a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/ResponseReadCache.java b/linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/ResponseReadCache.java similarity index 100% rename from core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/ResponseReadCache.java rename to linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/ResponseReadCache.java diff --git a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/SuccessDeletedCache.java b/linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/SuccessDeletedCache.java similarity index 100% rename from core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/SuccessDeletedCache.java rename to linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/query/cache/SuccessDeletedCache.java diff --git a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/RequestLogin.java b/linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/RequestLogin.java similarity index 100% rename from core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/RequestLogin.java rename to linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/RequestLogin.java diff --git a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/RequestRegister.java b/linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/RequestRegister.java similarity index 100% rename from core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/RequestRegister.java rename to linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/RequestRegister.java diff --git a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/ResponseLogin.java b/linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/ResponseLogin.java similarity index 100% rename from core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/ResponseLogin.java rename to linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/ResponseLogin.java diff --git a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/ResponseRegister.java b/linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/ResponseRegister.java similarity index 100% rename from core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/ResponseRegister.java rename to linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/ResponseRegister.java diff --git a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/UserControlLoginProtocol.java b/linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/UserControlLoginProtocol.java similarity index 100% rename from core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/UserControlLoginProtocol.java rename to linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/UserControlLoginProtocol.java diff --git a/core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/UserControlRegtisterProtocol.java b/linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/UserControlRegtisterProtocol.java similarity index 100% rename from core/cloudProtocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/UserControlRegtisterProtocol.java rename to linkis-commons/linkis-protocol/src/main/java/com/webank/wedatasphere/linkis/protocol/usercontrol/UserControlRegtisterProtocol.java diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/BroadcastProtocol.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/BroadcastProtocol.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/BroadcastProtocol.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/BroadcastProtocol.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/CacheableProtocol.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/CacheableProtocol.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/CacheableProtocol.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/CacheableProtocol.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/IRCommonProtocol.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/IRCommonProtocol.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/IRCommonProtocol.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/IRCommonProtocol.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/IRProtocol.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/IRProtocol.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/IRProtocol.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/IRProtocol.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/IRServiceGroupProtocol.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/IRServiceGroupProtocol.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/IRServiceGroupProtocol.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/IRServiceGroupProtocol.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/InstanceProtocol.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/InstanceProtocol.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/InstanceProtocol.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/InstanceProtocol.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/Protocol.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/Protocol.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/Protocol.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/Protocol.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/RetryableProtocol.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/RetryableProtocol.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/RetryableProtocol.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/RetryableProtocol.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/SingleInstanceProtocol.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/SingleInstanceProtocol.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/SingleInstanceProtocol.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/SingleInstanceProtocol.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/config/RequestQueryGlobalConfig.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/config/RequestQueryGlobalConfig.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/config/RequestQueryGlobalConfig.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/config/RequestQueryGlobalConfig.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/config/ResponseQueryConfig.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/config/ResponseQueryConfig.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/config/ResponseQueryConfig.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/config/ResponseQueryConfig.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/EngineCallback.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/EngineCallback.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/EngineCallback.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/EngineCallback.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/EngineState.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/EngineState.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/EngineState.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/EngineState.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/RequestEngineStatus.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/RequestEngineStatus.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/RequestEngineStatus.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/RequestEngineStatus.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/RequestNewEngine.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/RequestNewEngine.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/RequestNewEngine.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/RequestNewEngine.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/RequestTask.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/RequestTask.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/RequestTask.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/RequestTask.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/RequestUserEngineKill.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/RequestUserEngineKill.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/RequestUserEngineKill.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/RequestUserEngineKill.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/ResponseNewEngine.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/ResponseNewEngine.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/ResponseNewEngine.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/ResponseNewEngine.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/ResponseTaskExecute.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/ResponseTaskExecute.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/ResponseTaskExecute.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/engine/ResponseTaskExecute.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/mdq/MDQProtocol.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/mdq/MDQProtocol.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/mdq/MDQProtocol.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/mdq/MDQProtocol.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/task/Task.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/task/Task.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/task/Task.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/task/Task.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/utils/ProtocolUtils.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/utils/ProtocolUtils.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/utils/ProtocolUtils.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/utils/ProtocolUtils.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/utils/TaskUtils.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/utils/TaskUtils.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/utils/TaskUtils.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/utils/TaskUtils.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/utils/ZuulEntranceUtils.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/utils/ZuulEntranceUtils.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/utils/ZuulEntranceUtils.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/utils/ZuulEntranceUtils.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/variable/RequestQueryGlobalVariable.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/variable/RequestQueryGlobalVariable.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/variable/RequestQueryGlobalVariable.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/variable/RequestQueryGlobalVariable.scala diff --git a/core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/variable/ResponseQueryVariable.scala b/linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/variable/ResponseQueryVariable.scala similarity index 100% rename from core/cloudProtocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/variable/ResponseQueryVariable.scala rename to linkis-commons/linkis-protocol/src/main/scala/com/webank/wedatasphere/linkis/protocol/variable/ResponseQueryVariable.scala diff --git a/core/cloudRPC/pom.xml b/linkis-commons/linkis-rpc/pom.xml similarity index 99% rename from core/cloudRPC/pom.xml rename to linkis-commons/linkis-rpc/pom.xml index 8a9a9c3d7..76ffa223b 100644 --- a/core/cloudRPC/pom.xml +++ b/linkis-commons/linkis-rpc/pom.xml @@ -26,7 +26,7 @@ 4.0.0 - linkis-cloudRPC + linkis-rpc diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/AsynRPCMessageBus.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/AsynRPCMessageBus.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/AsynRPCMessageBus.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/AsynRPCMessageBus.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/BaseRPCSender.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/BaseRPCSender.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/BaseRPCSender.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/BaseRPCSender.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/BroadcastListener.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/BroadcastListener.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/BroadcastListener.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/BroadcastListener.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/RPCMapCache.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/RPCMapCache.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/RPCMapCache.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/RPCMapCache.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/RPCReceiveRemote.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/RPCReceiveRemote.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/RPCReceiveRemote.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/RPCReceiveRemote.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/RPCReceiveRestful.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/RPCReceiveRestful.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/RPCReceiveRestful.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/RPCReceiveRestful.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/RPCSpringBeanCache.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/RPCSpringBeanCache.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/RPCSpringBeanCache.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/RPCSpringBeanCache.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/Receiver.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/Receiver.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/Receiver.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/Receiver.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/ReceiverChooser.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/ReceiverChooser.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/ReceiverChooser.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/ReceiverChooser.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/ReceiverSenderBuilder.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/ReceiverSenderBuilder.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/ReceiverSenderBuilder.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/ReceiverSenderBuilder.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/Sender.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/Sender.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/Sender.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/Sender.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/conf/RPCConfiguration.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/conf/RPCConfiguration.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/conf/RPCConfiguration.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/conf/RPCConfiguration.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/conf/RPCSpringConfiguration.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/conf/RPCSpringConfiguration.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/conf/RPCSpringConfiguration.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/conf/RPCSpringConfiguration.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/exception/DWCRPCRetryException.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/exception/DWCRPCRetryException.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/exception/DWCRPCRetryException.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/exception/DWCRPCRetryException.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/exception/DWCURIException.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/exception/DWCURIException.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/exception/DWCURIException.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/exception/DWCURIException.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/exception/NoInstanceExistsException.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/exception/NoInstanceExistsException.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/exception/NoInstanceExistsException.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/exception/NoInstanceExistsException.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/exception/RPCInitFailedException.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/exception/RPCInitFailedException.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/exception/RPCInitFailedException.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/exception/RPCInitFailedException.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/instancealias/InstanceAliasConverter.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/instancealias/InstanceAliasConverter.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/instancealias/InstanceAliasConverter.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/instancealias/InstanceAliasConverter.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/instancealias/InstanceAliasManager.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/instancealias/InstanceAliasManager.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/instancealias/InstanceAliasManager.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/instancealias/InstanceAliasManager.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/instancealias/impl/DefaultInstanceAliasConverter.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/instancealias/impl/DefaultInstanceAliasConverter.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/instancealias/impl/DefaultInstanceAliasConverter.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/instancealias/impl/DefaultInstanceAliasConverter.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/instancealias/impl/InstanceAliasManagerImpl.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/instancealias/impl/InstanceAliasManagerImpl.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/instancealias/impl/InstanceAliasManagerImpl.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/instancealias/impl/InstanceAliasManagerImpl.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCInterceptor.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCInterceptor.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCInterceptor.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCInterceptor.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCInterceptorChain.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCInterceptorChain.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCInterceptorChain.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCInterceptorChain.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCInterceptorExchange.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCInterceptorExchange.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCInterceptorExchange.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCInterceptorExchange.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCLoadBalancer.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCLoadBalancer.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCLoadBalancer.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCLoadBalancer.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCServerLoader.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCServerLoader.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCServerLoader.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/RPCServerLoader.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/BroadcastRPCInterceptor.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/BroadcastRPCInterceptor.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/BroadcastRPCInterceptor.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/BroadcastRPCInterceptor.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/BroadcastSenderBuilder.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/BroadcastSenderBuilder.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/BroadcastSenderBuilder.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/BroadcastSenderBuilder.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/CacheableRPCInterceptor.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/CacheableRPCInterceptor.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/CacheableRPCInterceptor.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/CacheableRPCInterceptor.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/CommonRPCInterceptor.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/CommonRPCInterceptor.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/CommonRPCInterceptor.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/CommonRPCInterceptor.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/InstanceRPCLoadBalancer.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/InstanceRPCLoadBalancer.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/InstanceRPCLoadBalancer.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/InstanceRPCLoadBalancer.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/RetryableRPCInterceptor.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/RetryableRPCInterceptor.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/RetryableRPCInterceptor.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/RetryableRPCInterceptor.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/SingleInstanceRPCLoadBalancer.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/SingleInstanceRPCLoadBalancer.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/SingleInstanceRPCLoadBalancer.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/common/SingleInstanceRPCLoadBalancer.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/FeignClientRequestInterceptor.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/FeignClientRequestInterceptor.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/FeignClientRequestInterceptor.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/FeignClientRequestInterceptor.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/SpringCloudFeignConfigurationCache.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/SpringCloudFeignConfigurationCache.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/SpringCloudFeignConfigurationCache.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/SpringCloudFeignConfigurationCache.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/SpringMVCRPCSender.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/SpringMVCRPCSender.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/SpringMVCRPCSender.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/SpringMVCRPCSender.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/UnionSender.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/UnionSender.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/UnionSender.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/UnionSender.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/eureka/EurekaClientRefreshUtils.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/eureka/EurekaClientRefreshUtils.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/eureka/EurekaClientRefreshUtils.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/eureka/EurekaClientRefreshUtils.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/eureka/EurekaRPCServerLoader.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/eureka/EurekaRPCServerLoader.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/eureka/EurekaRPCServerLoader.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/sender/eureka/EurekaRPCServerLoader.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/transform/JavaCollectionSerializer.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/transform/JavaCollectionSerializer.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/transform/JavaCollectionSerializer.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/transform/JavaCollectionSerializer.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/transform/RPCConsumer.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/transform/RPCConsumer.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/transform/RPCConsumer.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/transform/RPCConsumer.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/transform/RPCFormats.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/transform/RPCFormats.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/transform/RPCFormats.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/transform/RPCFormats.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/transform/RPCProduct.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/transform/RPCProduct.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/transform/RPCProduct.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/transform/RPCProduct.scala diff --git a/core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/utils/RPCUtils.scala b/linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/utils/RPCUtils.scala similarity index 100% rename from core/cloudRPC/src/main/scala/com/webank/wedatasphere/linkis/rpc/utils/RPCUtils.scala rename to linkis-commons/linkis-rpc/src/main/scala/com/webank/wedatasphere/linkis/rpc/utils/RPCUtils.scala diff --git a/core/cloudRPC/src/test/scala/com/webank/wedatasphere/linkis/rpc/RPCFormatsTest.scala b/linkis-commons/linkis-rpc/src/test/scala/com/webank/wedatasphere/linkis/rpc/RPCFormatsTest.scala similarity index 100% rename from core/cloudRPC/src/test/scala/com/webank/wedatasphere/linkis/rpc/RPCFormatsTest.scala rename to linkis-commons/linkis-rpc/src/test/scala/com/webank/wedatasphere/linkis/rpc/RPCFormatsTest.scala diff --git a/core/scheduler/pom.xml b/linkis-commons/linkis-scheduler/pom.xml similarity index 100% rename from core/scheduler/pom.xml rename to linkis-commons/linkis-scheduler/pom.xml diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/AbstractScheduler.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/AbstractScheduler.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/AbstractScheduler.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/AbstractScheduler.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/Scheduler.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/Scheduler.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/Scheduler.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/Scheduler.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/SchedulerContext.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/SchedulerContext.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/SchedulerContext.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/SchedulerContext.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/event/LogEvent.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/event/LogEvent.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/event/LogEvent.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/event/LogEvent.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/event/ScheduleEvent.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/event/ScheduleEvent.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/event/ScheduleEvent.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/event/ScheduleEvent.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/event/SchedulerEventListener.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/event/SchedulerEventListener.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/event/SchedulerEventListener.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/event/SchedulerEventListener.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/exception/DWCJobRetryException.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/exception/DWCJobRetryException.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/exception/DWCJobRetryException.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/exception/DWCJobRetryException.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/exception/SchedulerErrorException.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/exception/SchedulerErrorException.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/exception/SchedulerErrorException.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/exception/SchedulerErrorException.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/exception/WaitForNextAskExecutorException.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/exception/WaitForNextAskExecutorException.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/exception/WaitForNextAskExecutorException.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/exception/WaitForNextAskExecutorException.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/AbstractExecutor.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/AbstractExecutor.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/AbstractExecutor.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/AbstractExecutor.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ConcurrentTaskInfoSupport.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ConcurrentTaskInfoSupport.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ConcurrentTaskInfoSupport.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ConcurrentTaskInfoSupport.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ConcurrentTaskOperateSupport.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ConcurrentTaskOperateSupport.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ConcurrentTaskOperateSupport.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ConcurrentTaskOperateSupport.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ExecuteRequest.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ExecuteRequest.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ExecuteRequest.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ExecuteRequest.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ExecuteResponse.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ExecuteResponse.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ExecuteResponse.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ExecuteResponse.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/Executor.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/Executor.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/Executor.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/Executor.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ExecutorInfo.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ExecutorInfo.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ExecutorInfo.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ExecutorInfo.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ExecutorManager.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ExecutorManager.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ExecutorManager.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/ExecutorManager.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/SingleTaskInfoSupport.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/SingleTaskInfoSupport.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/SingleTaskInfoSupport.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/SingleTaskInfoSupport.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/SingleTaskOperateSupport.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/SingleTaskOperateSupport.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/SingleTaskOperateSupport.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/executer/SingleTaskOperateSupport.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/future/BDPFuture.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/future/BDPFuture.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/future/BDPFuture.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/future/BDPFuture.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/future/BDPFutureTask.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/future/BDPFutureTask.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/future/BDPFutureTask.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/future/BDPFutureTask.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/ConsumerListener.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/ConsumerListener.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/ConsumerListener.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/ConsumerListener.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/ExecutorListener.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/ExecutorListener.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/ExecutorListener.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/ExecutorListener.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/JobListener.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/JobListener.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/JobListener.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/JobListener.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/LogListener.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/LogListener.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/LogListener.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/LogListener.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/ProgressListener.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/ProgressListener.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/ProgressListener.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/ProgressListener.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/SchedulerListener.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/SchedulerListener.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/SchedulerListener.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/listener/SchedulerListener.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/AbstractGroup.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/AbstractGroup.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/AbstractGroup.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/AbstractGroup.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/ConsumeQueue.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/ConsumeQueue.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/ConsumeQueue.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/ConsumeQueue.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/Consumer.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/Consumer.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/Consumer.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/Consumer.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/ConsumerManager.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/ConsumerManager.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/ConsumerManager.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/ConsumerManager.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/Group.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/Group.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/Group.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/Group.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/GroupFactory.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/GroupFactory.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/GroupFactory.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/GroupFactory.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/Job.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/Job.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/Job.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/Job.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/JobInfo.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/JobInfo.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/JobInfo.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/JobInfo.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/LockJob.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/LockJob.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/LockJob.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/LockJob.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/LoopArrayQueue.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/LoopArrayQueue.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/LoopArrayQueue.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/LoopArrayQueue.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/SchedulerEvent.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/SchedulerEvent.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/SchedulerEvent.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/SchedulerEvent.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/SchedulerEventState.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/SchedulerEventState.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/SchedulerEventState.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/SchedulerEventState.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/UserJob.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/UserJob.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/UserJob.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/UserJob.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOConsumerManager.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOConsumerManager.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOConsumerManager.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOConsumerManager.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOGroup.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOGroup.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOGroup.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOGroup.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOGroupFactory.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOGroupFactory.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOGroupFactory.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOGroupFactory.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOScheduler.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOScheduler.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOScheduler.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOScheduler.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOSchedulerContextImpl.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOSchedulerContextImpl.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOSchedulerContextImpl.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOSchedulerContextImpl.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOUserConsumer.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOUserConsumer.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOUserConsumer.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/fifoqueue/FIFOUserConsumer.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelConsumerManager.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelConsumerManager.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelConsumerManager.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelConsumerManager.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelGroup.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelGroup.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelGroup.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelGroup.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelGroupFactory.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelGroupFactory.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelGroupFactory.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelGroupFactory.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelScheduler.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelScheduler.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelScheduler.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelScheduler.scala diff --git a/core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelSchedulerContextImpl.scala b/linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelSchedulerContextImpl.scala similarity index 100% rename from core/scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelSchedulerContextImpl.scala rename to linkis-commons/linkis-scheduler/src/main/scala/com/webank/wedatasphere/linkis/scheduler/queue/parallelqueue/ParallelSchedulerContextImpl.scala diff --git a/linkis-commons/pom.xml b/linkis-commons/pom.xml new file mode 100644 index 000000000..6828c3044 --- /dev/null +++ b/linkis-commons/pom.xml @@ -0,0 +1,26 @@ + + + + linkis + com.webank.wedatasphere.linkis + dev-1.0.0 + + 4.0.0 + + linkis-commons + pom + + linkis-common + linkis-hadoop-common + linkis-httpclient + linkis-protocol + linkis-scheduler + linkis-module + linkis-mybatis + linkis-rpc + linkis-message-scheduler + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 22a4d7ec9..43d44c95d 100644 --- a/pom.xml +++ b/pom.xml @@ -57,14 +57,7 @@ - core/common - core/cloudProtocol - core/scheduler - core/cloudModule - core/cloudRPC - core/cloudMybatis - core/hadoop-common - core/httpclient + linkis-commons storage/storage bml/bmlcommon bml/bmlclient -- Gitee From 4df430e900de3c883de1685858ceca196bed9dfc Mon Sep 17 00:00:00 2001 From: peacewong Date: Thu, 4 Feb 2021 14:51:26 +0800 Subject: [PATCH 055/148] Standardize the directory structure of linkis-spring-cloud-services --- .gitignore | 10 +++---- linkis-commons/pom.xml | 5 ++-- .../linkis-eureka}/bin/start-eureka.sh | 0 .../linkis-eureka}/bin/stop-eureka.sh | 0 .../linkis-eureka}/pom.xml | 6 ++--- .../src/main/assembly/distribution.xml | 0 .../eureka/SpringCloudEurekaApplication.java | 0 .../src/main/resources/application-eureka.yml | 0 .../src/main/resources/log4j.properties | 0 .../src/main/resources/log4j2.xml | 0 .../linkis-gateway-core}/pom.xml | 2 +- .../gateway/config/GatewayConfiguration.scala | 0 .../config/GatewaySpringConfiguration.scala | 0 .../exception/GatewayErrorException.scala | 0 .../exception/TooManyServiceException.scala | 0 .../linkis/gateway/http/GatewayContext.scala | 0 .../gateway/http/GatewayHttpRequest.scala | 0 .../gateway/http/GatewayHttpResponse.scala | 0 .../linkis/gateway/http/GatewayRoute.scala | 0 .../linkis/gateway/parser/GatewayParser.scala | 0 .../linkis/gateway/route/GatewayRouter.scala | 0 .../gateway/security/GatewaySSOUtils.scala | 0 .../gateway/security/LDAPUserRestful.scala | 0 .../gateway/security/ProxyUserUtils.scala | 0 .../gateway/security/SecurityFilter.scala | 0 .../gateway/security/SecurityHook.scala | 0 .../linkis/gateway/security/UserRestful.scala | 0 .../gateway/security/sso/SSOInterceptor.scala | 0 .../security/token/TokenAuthentication.scala | 0 .../interceptor/ServiceInstanceUtils.scala | 0 .../server/security/ServerSSOUtils.scala | 0 .../pom.xml | 2 +- .../dws/annotation/DWSHttpMessageResult.java | 0 .../linkis/httpclient/dws/DWSHttpClient.scala | 0 .../StaticAuthenticationStrategy.scala | 0 .../TokenAuthenticationStrategy.scala | 0 .../dws/config/DWSClientConfig.scala | 0 .../dws/config/DWSClientConfigBuilder.scala | 0 .../dws/discovery/DWSGatewayDiscovery.scala | 0 .../AuthenticationFailedException.scala | 0 .../exception/UnknownVersionException.scala | 0 .../AbstractAuthenticationAction.scala | 0 .../dws/request/DWSHeartbeatAction.scala | 0 .../dws/request/DWSHttpAction.scala | 0 .../httpclient/dws/request/RestType.scala | 0 .../response/DWSAuthenticationResult.scala | 0 .../dws/response/DWSHeartbeatResult.scala | 0 .../dws/response/DWSHttpMessageFactory.scala | 0 .../httpclient/dws/response/DWSResult.scala | 0 .../linkis-gateway-server-support}/Dockerfile | 0 .../bin/start-gateway.sh | 0 .../bin/startup.sh | 0 .../bin/stop-gateway.sh | 0 .../bin/stop.sh | 0 .../dockerinfo/image-id | 0 .../dockerinfo/image-name | 0 .../dockerinfo/repository | 0 .../dockerinfo/tag | 0 .../linkis-gateway-server-support}/pom.xml | 10 +++---- .../pom_k8s.xml | 8 +++--- .../src/main/assembly/distribution.xml | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/linkis.properties | 0 .../src/main/resources/log4j.properties | 0 .../src/main/resources/log4j2.xml | 0 .../src/main/resources/token.properties | 0 .../EntranceExecutionGatewayParser.scala | 0 .../parser/EntranceRequestGatewayParser.scala | 0 .../ujes/route/EntranceGatewayRouter.scala | 0 .../route/EntranceGatewayRouterRuler.scala | 0 .../ujes/route/HaContextGatewayRouter.scala | 0 .../contextservice/ContextIdParserImpl.scala | 0 .../linkis-spring-cloud-gateway}/pom.xml | 4 +-- .../http/GatewayAuthorizationFilter.java | 0 .../http/SpringCloudHttpUtils.java | 0 .../SpringCloudGatewayWebsocketFilter.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/linkis.properties | 0 .../src/main/resources/log4j2.xml | 0 .../src/main/resources/token.properties | 0 .../SpringCloudGatewayConfiguration.scala | 0 .../http/SpringCloudGatewayHttpRequest.scala | 0 .../http/SpringCloudGatewayHttpResponse.scala | 0 ...ingCloudGatewayWebSocketSecurityHook.scala | 0 .../SpringCloudGatewayWebsocketUtils.scala | 0 .../WebsocketGatewayHttpResponse.scala | 0 .../websocket/WebsocketGatewaySession.scala | 0 .../linkis-gateway-datasource-ruler}/pom.xml | 0 .../datasource/cache/DatasourceMapCache.java | 0 .../datasource/dao/DatasourceMapMapper.java | 0 .../dao/impl/datasourceMapMapper.xml | 0 .../datasource/entity/DatasourceMap.java | 0 .../service/DatasourceMapService.java | 0 .../impl/DatasourceMapServiceImpl.java | 0 .../DatasourceGatewayRouterRuler.scala | 0 .../linkis-service-gateway/pom.xml | 26 +++++++++++++++++++ linkis-spring-cloud-services/pom.xml | 24 +++++++++++++++++ 97 files changed, 74 insertions(+), 23 deletions(-) rename {eurekaServer => linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka}/bin/start-eureka.sh (100%) mode change 100755 => 100644 rename {eurekaServer => linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka}/bin/stop-eureka.sh (100%) mode change 100755 => 100644 rename {eurekaServer => linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka}/pom.xml (95%) rename {eurekaServer => linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka}/src/main/assembly/distribution.xml (100%) rename {eurekaServer => linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka}/src/main/java/com/webank/wedatasphere/linkis/eureka/SpringCloudEurekaApplication.java (100%) rename {eurekaServer => linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka}/src/main/resources/application-eureka.yml (100%) rename {eurekaServer => linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka}/src/main/resources/log4j.properties (100%) rename {eurekaServer => linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka}/src/main/resources/log4j2.xml (100%) rename {gateway/core => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core}/pom.xml (98%) rename {gateway/core => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core}/src/main/scala/com/webank/wedatasphere/linkis/gateway/config/GatewayConfiguration.scala (100%) rename {gateway/core => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core}/src/main/scala/com/webank/wedatasphere/linkis/gateway/config/GatewaySpringConfiguration.scala (100%) rename {gateway/core => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core}/src/main/scala/com/webank/wedatasphere/linkis/gateway/exception/GatewayErrorException.scala (100%) rename {gateway/core => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core}/src/main/scala/com/webank/wedatasphere/linkis/gateway/exception/TooManyServiceException.scala (100%) rename {gateway/core => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core}/src/main/scala/com/webank/wedatasphere/linkis/gateway/http/GatewayContext.scala (100%) rename {gateway/core => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core}/src/main/scala/com/webank/wedatasphere/linkis/gateway/http/GatewayHttpRequest.scala (100%) rename {gateway/core => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core}/src/main/scala/com/webank/wedatasphere/linkis/gateway/http/GatewayHttpResponse.scala (100%) rename {gateway/core => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core}/src/main/scala/com/webank/wedatasphere/linkis/gateway/http/GatewayRoute.scala (100%) rename {gateway/core => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core}/src/main/scala/com/webank/wedatasphere/linkis/gateway/parser/GatewayParser.scala (100%) rename {gateway/core => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core}/src/main/scala/com/webank/wedatasphere/linkis/gateway/route/GatewayRouter.scala (100%) rename {gateway/core => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core}/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/GatewaySSOUtils.scala (100%) rename {gateway/core => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core}/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/LDAPUserRestful.scala (100%) rename {gateway/core => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core}/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/ProxyUserUtils.scala (100%) rename {gateway/core => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core}/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/SecurityFilter.scala (100%) rename {gateway/core => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core}/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/SecurityHook.scala (100%) rename {gateway/core => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core}/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/UserRestful.scala (100%) rename {gateway/core => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core}/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/sso/SSOInterceptor.scala (100%) rename {gateway/core => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core}/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/token/TokenAuthentication.scala (100%) rename {gateway/core => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core}/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/ServiceInstanceUtils.scala (100%) rename {gateway/core => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core}/src/main/scala/com/webank/wedatasphere/linkis/server/security/ServerSSOUtils.scala (100%) rename {gateway/gateway-httpclient-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support}/pom.xml (98%) rename {gateway/gateway-httpclient-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support}/src/main/java/com/webank/wedatasphere/linkis/httpclient/dws/annotation/DWSHttpMessageResult.java (100%) rename {gateway/gateway-httpclient-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/DWSHttpClient.scala (100%) rename {gateway/gateway-httpclient-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/authentication/StaticAuthenticationStrategy.scala (100%) rename {gateway/gateway-httpclient-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/authentication/TokenAuthenticationStrategy.scala (100%) rename {gateway/gateway-httpclient-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/config/DWSClientConfig.scala (100%) rename {gateway/gateway-httpclient-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/config/DWSClientConfigBuilder.scala (100%) rename {gateway/gateway-httpclient-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/discovery/DWSGatewayDiscovery.scala (100%) rename {gateway/gateway-httpclient-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/exception/AuthenticationFailedException.scala (100%) rename {gateway/gateway-httpclient-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/exception/UnknownVersionException.scala (100%) rename {gateway/gateway-httpclient-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/request/AbstractAuthenticationAction.scala (100%) rename {gateway/gateway-httpclient-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/request/DWSHeartbeatAction.scala (100%) rename {gateway/gateway-httpclient-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/request/DWSHttpAction.scala (100%) rename {gateway/gateway-httpclient-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/request/RestType.scala (100%) rename {gateway/gateway-httpclient-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/response/DWSAuthenticationResult.scala (100%) rename {gateway/gateway-httpclient-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/response/DWSHeartbeatResult.scala (100%) rename {gateway/gateway-httpclient-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/response/DWSHttpMessageFactory.scala (100%) rename {gateway/gateway-httpclient-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support}/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/response/DWSResult.scala (100%) rename {gateway/gateway-ujes-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support}/Dockerfile (100%) rename {gateway/gateway-ujes-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support}/bin/start-gateway.sh (100%) mode change 100755 => 100644 rename {gateway/gateway-ujes-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support}/bin/startup.sh (100%) mode change 100755 => 100644 rename {gateway/gateway-ujes-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support}/bin/stop-gateway.sh (100%) mode change 100755 => 100644 rename {gateway/gateway-ujes-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support}/bin/stop.sh (100%) mode change 100755 => 100644 rename {gateway/gateway-ujes-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support}/dockerinfo/image-id (100%) rename {gateway/gateway-ujes-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support}/dockerinfo/image-name (100%) rename {gateway/gateway-ujes-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support}/dockerinfo/repository (100%) rename {gateway/gateway-ujes-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support}/dockerinfo/tag (100%) rename {gateway/gateway-ujes-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support}/pom.xml (90%) rename {gateway/gateway-ujes-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support}/pom_k8s.xml (94%) rename {gateway/gateway-ujes-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support}/src/main/assembly/distribution.xml (100%) rename {gateway/gateway-ujes-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support}/src/main/resources/application.yml (100%) rename {gateway/gateway-ujes-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support}/src/main/resources/linkis.properties (100%) rename {gateway/gateway-ujes-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support}/src/main/resources/log4j.properties (100%) rename {gateway/gateway-ujes-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support}/src/main/resources/log4j2.xml (100%) rename {gateway/gateway-ujes-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support}/src/main/resources/token.properties (100%) rename {gateway/gateway-ujes-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support}/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/parser/EntranceExecutionGatewayParser.scala (100%) rename {gateway/gateway-ujes-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support}/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/parser/EntranceRequestGatewayParser.scala (100%) rename {gateway/gateway-ujes-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support}/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/EntranceGatewayRouter.scala (100%) rename {gateway/gateway-ujes-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support}/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/EntranceGatewayRouterRuler.scala (100%) rename {gateway/gateway-ujes-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support}/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/HaContextGatewayRouter.scala (100%) rename {gateway/gateway-ujes-support => linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support}/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/contextservice/ContextIdParserImpl.scala (100%) rename {gateway/springcloudgateway => linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway}/pom.xml (96%) rename {gateway/springcloudgateway => linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway}/src/main/java/com/webank/wedatasphere/linkis/gateway/springcloud/http/GatewayAuthorizationFilter.java (100%) rename {gateway/springcloudgateway => linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway}/src/main/java/com/webank/wedatasphere/linkis/gateway/springcloud/http/SpringCloudHttpUtils.java (100%) rename {gateway/springcloudgateway => linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway}/src/main/java/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/SpringCloudGatewayWebsocketFilter.java (100%) rename {gateway/springcloudgateway => linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway}/src/main/resources/application.yml (100%) rename {gateway/springcloudgateway => linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway}/src/main/resources/linkis.properties (100%) rename {gateway/springcloudgateway => linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway}/src/main/resources/log4j2.xml (100%) rename {gateway/springcloudgateway => linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway}/src/main/resources/token.properties (100%) rename {gateway/springcloudgateway => linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway}/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/SpringCloudGatewayConfiguration.scala (100%) rename {gateway/springcloudgateway => linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway}/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/http/SpringCloudGatewayHttpRequest.scala (100%) rename {gateway/springcloudgateway => linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway}/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/http/SpringCloudGatewayHttpResponse.scala (100%) rename {gateway/springcloudgateway => linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway}/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/SpringCloudGatewayWebSocketSecurityHook.scala (100%) rename {gateway/springcloudgateway => linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway}/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/SpringCloudGatewayWebsocketUtils.scala (100%) rename {gateway/springcloudgateway => linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway}/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/WebsocketGatewayHttpResponse.scala (100%) rename {gateway/springcloudgateway => linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway}/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/WebsocketGatewaySession.scala (100%) rename {gateway/plugins/gateway-ujes-datasource-ruler => linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler}/pom.xml (100%) rename {gateway/plugins/gateway-ujes-datasource-ruler => linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler}/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/cache/DatasourceMapCache.java (100%) rename {gateway/plugins/gateway-ujes-datasource-ruler => linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler}/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/dao/DatasourceMapMapper.java (100%) rename {gateway/plugins/gateway-ujes-datasource-ruler => linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler}/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/dao/impl/datasourceMapMapper.xml (100%) rename {gateway/plugins/gateway-ujes-datasource-ruler => linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler}/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/entity/DatasourceMap.java (100%) rename {gateway/plugins/gateway-ujes-datasource-ruler => linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler}/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/DatasourceMapService.java (100%) rename {gateway/plugins/gateway-ujes-datasource-ruler => linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler}/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/impl/DatasourceMapServiceImpl.java (100%) rename {gateway/plugins/gateway-ujes-datasource-ruler => linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler}/src/main/scala/com/webank/wedatasphere/linkis/gateway/ruler/datasource/DatasourceGatewayRouterRuler.scala (100%) create mode 100644 linkis-spring-cloud-services/linkis-service-gateway/pom.xml create mode 100644 linkis-spring-cloud-services/pom.xml diff --git a/.gitignore b/.gitignore index f90db9d13..1dea16f9f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,11 +13,11 @@ linkis-commons/linkis-rpc/target/ linkis-commons/linkis-common/target/ linkis-commons/linkis-httpclient/target/ linkis-commons/linkis-scheduler/target/ -eurekaServer/target/ -gateway/core/target/ -gateway/gateway-httpclient-support/target/ -gateway/gateway-ujes-support/target/ -gateway/springcloudgateway/target/ +linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/target/ +linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/target/ +linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/target/ +linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/target/ +linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/target/ metadata/target/ diff --git a/linkis-commons/pom.xml b/linkis-commons/pom.xml index 6828c3044..396b03785 100644 --- a/linkis-commons/pom.xml +++ b/linkis-commons/pom.xml @@ -5,8 +5,10 @@ linkis com.webank.wedatasphere.linkis - dev-1.0.0 + 0.11.0 + ../pom.xml + 4.0.0 linkis-commons @@ -20,7 +22,6 @@ linkis-module linkis-mybatis linkis-rpc - linkis-message-scheduler \ No newline at end of file diff --git a/eurekaServer/bin/start-eureka.sh b/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/bin/start-eureka.sh old mode 100755 new mode 100644 similarity index 100% rename from eurekaServer/bin/start-eureka.sh rename to linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/bin/start-eureka.sh diff --git a/eurekaServer/bin/stop-eureka.sh b/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/bin/stop-eureka.sh old mode 100755 new mode 100644 similarity index 100% rename from eurekaServer/bin/stop-eureka.sh rename to linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/bin/stop-eureka.sh diff --git a/eurekaServer/pom.xml b/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/pom.xml similarity index 95% rename from eurekaServer/pom.xml rename to linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/pom.xml index 513b43a83..3a9946082 100644 --- a/eurekaServer/pom.xml +++ b/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/pom.xml @@ -22,10 +22,10 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../pom.xml + ../../../pom.xml - linkis-eureka-server + linkis-eureka 4.0.0 jar @@ -99,7 +99,7 @@ - ${basedir}/src/main/resources + src/main/resources ${project.artifactId}-${project.version} diff --git a/eurekaServer/src/main/assembly/distribution.xml b/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/src/main/assembly/distribution.xml similarity index 100% rename from eurekaServer/src/main/assembly/distribution.xml rename to linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/src/main/assembly/distribution.xml diff --git a/eurekaServer/src/main/java/com/webank/wedatasphere/linkis/eureka/SpringCloudEurekaApplication.java b/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/src/main/java/com/webank/wedatasphere/linkis/eureka/SpringCloudEurekaApplication.java similarity index 100% rename from eurekaServer/src/main/java/com/webank/wedatasphere/linkis/eureka/SpringCloudEurekaApplication.java rename to linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/src/main/java/com/webank/wedatasphere/linkis/eureka/SpringCloudEurekaApplication.java diff --git a/eurekaServer/src/main/resources/application-eureka.yml b/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/src/main/resources/application-eureka.yml similarity index 100% rename from eurekaServer/src/main/resources/application-eureka.yml rename to linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/src/main/resources/application-eureka.yml diff --git a/eurekaServer/src/main/resources/log4j.properties b/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/src/main/resources/log4j.properties similarity index 100% rename from eurekaServer/src/main/resources/log4j.properties rename to linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/src/main/resources/log4j.properties diff --git a/eurekaServer/src/main/resources/log4j2.xml b/linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/src/main/resources/log4j2.xml similarity index 100% rename from eurekaServer/src/main/resources/log4j2.xml rename to linkis-spring-cloud-services/linkis-service-discovery/linkis-eureka/src/main/resources/log4j2.xml diff --git a/gateway/core/pom.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/pom.xml similarity index 98% rename from gateway/core/pom.xml rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/pom.xml index 0bc8ed2bf..c9529940b 100644 --- a/gateway/core/pom.xml +++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/pom.xml @@ -23,7 +23,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml linkis-gateway-core diff --git a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/config/GatewayConfiguration.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/config/GatewayConfiguration.scala similarity index 100% rename from gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/config/GatewayConfiguration.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/config/GatewayConfiguration.scala diff --git a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/config/GatewaySpringConfiguration.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/config/GatewaySpringConfiguration.scala similarity index 100% rename from gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/config/GatewaySpringConfiguration.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/config/GatewaySpringConfiguration.scala diff --git a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/exception/GatewayErrorException.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/exception/GatewayErrorException.scala similarity index 100% rename from gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/exception/GatewayErrorException.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/exception/GatewayErrorException.scala diff --git a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/exception/TooManyServiceException.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/exception/TooManyServiceException.scala similarity index 100% rename from gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/exception/TooManyServiceException.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/exception/TooManyServiceException.scala diff --git a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/http/GatewayContext.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/http/GatewayContext.scala similarity index 100% rename from gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/http/GatewayContext.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/http/GatewayContext.scala diff --git a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/http/GatewayHttpRequest.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/http/GatewayHttpRequest.scala similarity index 100% rename from gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/http/GatewayHttpRequest.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/http/GatewayHttpRequest.scala diff --git a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/http/GatewayHttpResponse.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/http/GatewayHttpResponse.scala similarity index 100% rename from gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/http/GatewayHttpResponse.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/http/GatewayHttpResponse.scala diff --git a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/http/GatewayRoute.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/http/GatewayRoute.scala similarity index 100% rename from gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/http/GatewayRoute.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/http/GatewayRoute.scala diff --git a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/parser/GatewayParser.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/parser/GatewayParser.scala similarity index 100% rename from gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/parser/GatewayParser.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/parser/GatewayParser.scala diff --git a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/route/GatewayRouter.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/route/GatewayRouter.scala similarity index 100% rename from gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/route/GatewayRouter.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/route/GatewayRouter.scala diff --git a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/GatewaySSOUtils.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/GatewaySSOUtils.scala similarity index 100% rename from gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/GatewaySSOUtils.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/GatewaySSOUtils.scala diff --git a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/LDAPUserRestful.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/LDAPUserRestful.scala similarity index 100% rename from gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/LDAPUserRestful.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/LDAPUserRestful.scala diff --git a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/ProxyUserUtils.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/ProxyUserUtils.scala similarity index 100% rename from gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/ProxyUserUtils.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/ProxyUserUtils.scala diff --git a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/SecurityFilter.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/SecurityFilter.scala similarity index 100% rename from gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/SecurityFilter.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/SecurityFilter.scala diff --git a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/SecurityHook.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/SecurityHook.scala similarity index 100% rename from gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/SecurityHook.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/SecurityHook.scala diff --git a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/UserRestful.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/UserRestful.scala similarity index 100% rename from gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/UserRestful.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/UserRestful.scala diff --git a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/sso/SSOInterceptor.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/sso/SSOInterceptor.scala similarity index 100% rename from gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/sso/SSOInterceptor.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/sso/SSOInterceptor.scala diff --git a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/token/TokenAuthentication.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/token/TokenAuthentication.scala similarity index 100% rename from gateway/core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/token/TokenAuthentication.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/gateway/security/token/TokenAuthentication.scala diff --git a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/ServiceInstanceUtils.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/ServiceInstanceUtils.scala similarity index 100% rename from gateway/core/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/ServiceInstanceUtils.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/rpc/interceptor/ServiceInstanceUtils.scala diff --git a/gateway/core/src/main/scala/com/webank/wedatasphere/linkis/server/security/ServerSSOUtils.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/server/security/ServerSSOUtils.scala similarity index 100% rename from gateway/core/src/main/scala/com/webank/wedatasphere/linkis/server/security/ServerSSOUtils.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/com/webank/wedatasphere/linkis/server/security/ServerSSOUtils.scala diff --git a/gateway/gateway-httpclient-support/pom.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/pom.xml similarity index 98% rename from gateway/gateway-httpclient-support/pom.xml rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/pom.xml index 65f64e575..4bdaf87fe 100644 --- a/gateway/gateway-httpclient-support/pom.xml +++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/pom.xml @@ -24,7 +24,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml linkis-gateway-httpclient-support diff --git a/gateway/gateway-httpclient-support/src/main/java/com/webank/wedatasphere/linkis/httpclient/dws/annotation/DWSHttpMessageResult.java b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/java/com/webank/wedatasphere/linkis/httpclient/dws/annotation/DWSHttpMessageResult.java similarity index 100% rename from gateway/gateway-httpclient-support/src/main/java/com/webank/wedatasphere/linkis/httpclient/dws/annotation/DWSHttpMessageResult.java rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/java/com/webank/wedatasphere/linkis/httpclient/dws/annotation/DWSHttpMessageResult.java diff --git a/gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/DWSHttpClient.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/DWSHttpClient.scala similarity index 100% rename from gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/DWSHttpClient.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/DWSHttpClient.scala diff --git a/gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/authentication/StaticAuthenticationStrategy.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/authentication/StaticAuthenticationStrategy.scala similarity index 100% rename from gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/authentication/StaticAuthenticationStrategy.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/authentication/StaticAuthenticationStrategy.scala diff --git a/gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/authentication/TokenAuthenticationStrategy.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/authentication/TokenAuthenticationStrategy.scala similarity index 100% rename from gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/authentication/TokenAuthenticationStrategy.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/authentication/TokenAuthenticationStrategy.scala diff --git a/gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/config/DWSClientConfig.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/config/DWSClientConfig.scala similarity index 100% rename from gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/config/DWSClientConfig.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/config/DWSClientConfig.scala diff --git a/gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/config/DWSClientConfigBuilder.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/config/DWSClientConfigBuilder.scala similarity index 100% rename from gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/config/DWSClientConfigBuilder.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/config/DWSClientConfigBuilder.scala diff --git a/gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/discovery/DWSGatewayDiscovery.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/discovery/DWSGatewayDiscovery.scala similarity index 100% rename from gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/discovery/DWSGatewayDiscovery.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/discovery/DWSGatewayDiscovery.scala diff --git a/gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/exception/AuthenticationFailedException.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/exception/AuthenticationFailedException.scala similarity index 100% rename from gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/exception/AuthenticationFailedException.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/exception/AuthenticationFailedException.scala diff --git a/gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/exception/UnknownVersionException.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/exception/UnknownVersionException.scala similarity index 100% rename from gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/exception/UnknownVersionException.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/exception/UnknownVersionException.scala diff --git a/gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/request/AbstractAuthenticationAction.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/request/AbstractAuthenticationAction.scala similarity index 100% rename from gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/request/AbstractAuthenticationAction.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/request/AbstractAuthenticationAction.scala diff --git a/gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/request/DWSHeartbeatAction.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/request/DWSHeartbeatAction.scala similarity index 100% rename from gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/request/DWSHeartbeatAction.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/request/DWSHeartbeatAction.scala diff --git a/gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/request/DWSHttpAction.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/request/DWSHttpAction.scala similarity index 100% rename from gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/request/DWSHttpAction.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/request/DWSHttpAction.scala diff --git a/gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/request/RestType.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/request/RestType.scala similarity index 100% rename from gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/request/RestType.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/request/RestType.scala diff --git a/gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/response/DWSAuthenticationResult.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/response/DWSAuthenticationResult.scala similarity index 100% rename from gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/response/DWSAuthenticationResult.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/response/DWSAuthenticationResult.scala diff --git a/gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/response/DWSHeartbeatResult.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/response/DWSHeartbeatResult.scala similarity index 100% rename from gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/response/DWSHeartbeatResult.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/response/DWSHeartbeatResult.scala diff --git a/gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/response/DWSHttpMessageFactory.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/response/DWSHttpMessageFactory.scala similarity index 100% rename from gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/response/DWSHttpMessageFactory.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/response/DWSHttpMessageFactory.scala diff --git a/gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/response/DWSResult.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/response/DWSResult.scala similarity index 100% rename from gateway/gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/response/DWSResult.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-httpclient-support/src/main/scala/com/webank/wedatasphere/linkis/httpclient/dws/response/DWSResult.scala diff --git a/gateway/gateway-ujes-support/Dockerfile b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/Dockerfile similarity index 100% rename from gateway/gateway-ujes-support/Dockerfile rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/Dockerfile diff --git a/gateway/gateway-ujes-support/bin/start-gateway.sh b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/bin/start-gateway.sh old mode 100755 new mode 100644 similarity index 100% rename from gateway/gateway-ujes-support/bin/start-gateway.sh rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/bin/start-gateway.sh diff --git a/gateway/gateway-ujes-support/bin/startup.sh b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/bin/startup.sh old mode 100755 new mode 100644 similarity index 100% rename from gateway/gateway-ujes-support/bin/startup.sh rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/bin/startup.sh diff --git a/gateway/gateway-ujes-support/bin/stop-gateway.sh b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/bin/stop-gateway.sh old mode 100755 new mode 100644 similarity index 100% rename from gateway/gateway-ujes-support/bin/stop-gateway.sh rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/bin/stop-gateway.sh diff --git a/gateway/gateway-ujes-support/bin/stop.sh b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/bin/stop.sh old mode 100755 new mode 100644 similarity index 100% rename from gateway/gateway-ujes-support/bin/stop.sh rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/bin/stop.sh diff --git a/gateway/gateway-ujes-support/dockerinfo/image-id b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/dockerinfo/image-id similarity index 100% rename from gateway/gateway-ujes-support/dockerinfo/image-id rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/dockerinfo/image-id diff --git a/gateway/gateway-ujes-support/dockerinfo/image-name b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/dockerinfo/image-name similarity index 100% rename from gateway/gateway-ujes-support/dockerinfo/image-name rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/dockerinfo/image-name diff --git a/gateway/gateway-ujes-support/dockerinfo/repository b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/dockerinfo/repository similarity index 100% rename from gateway/gateway-ujes-support/dockerinfo/repository rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/dockerinfo/repository diff --git a/gateway/gateway-ujes-support/dockerinfo/tag b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/dockerinfo/tag similarity index 100% rename from gateway/gateway-ujes-support/dockerinfo/tag rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/dockerinfo/tag diff --git a/gateway/gateway-ujes-support/pom.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml similarity index 90% rename from gateway/gateway-ujes-support/pom.xml rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml index f80ef6aa5..2282647f6 100644 --- a/gateway/gateway-ujes-support/pom.xml +++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml @@ -24,10 +24,10 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml - linkis-gateway-ujes-support + linkis-gateway-server-support @@ -85,7 +85,7 @@ - ../gateway-ujes-support/src/main/assembly/distribution.xml + src/main/assembly/distribution.xml @@ -96,14 +96,14 @@ false false - ../gateway-ujes-support/src/main/assembly/distribution.xml + src/main/assembly/distribution.xml - ${basedir}/src/main/resources + src/main/resources ${project.artifactId}-${project.version} diff --git a/gateway/gateway-ujes-support/pom_k8s.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom_k8s.xml similarity index 94% rename from gateway/gateway-ujes-support/pom_k8s.xml rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom_k8s.xml index e5379771b..f76fb5f47 100644 --- a/gateway/gateway-ujes-support/pom_k8s.xml +++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom_k8s.xml @@ -24,10 +24,10 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml - linkis-gateway-ujes-support + linkis-gateway-server-support @@ -105,7 +105,7 @@ - ../gateway-ujes-support/src/main/assembly/distribution.xml + src/main/assembly/distribution.xml @@ -116,7 +116,7 @@ false false - ../gateway-ujes-support/src/main/assembly/distribution.xml + src/main/assembly/distribution.xml diff --git a/gateway/gateway-ujes-support/src/main/assembly/distribution.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/assembly/distribution.xml similarity index 100% rename from gateway/gateway-ujes-support/src/main/assembly/distribution.xml rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/assembly/distribution.xml diff --git a/gateway/gateway-ujes-support/src/main/resources/application.yml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/resources/application.yml similarity index 100% rename from gateway/gateway-ujes-support/src/main/resources/application.yml rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/resources/application.yml diff --git a/gateway/gateway-ujes-support/src/main/resources/linkis.properties b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/resources/linkis.properties similarity index 100% rename from gateway/gateway-ujes-support/src/main/resources/linkis.properties rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/resources/linkis.properties diff --git a/gateway/gateway-ujes-support/src/main/resources/log4j.properties b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/resources/log4j.properties similarity index 100% rename from gateway/gateway-ujes-support/src/main/resources/log4j.properties rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/resources/log4j.properties diff --git a/gateway/gateway-ujes-support/src/main/resources/log4j2.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/resources/log4j2.xml similarity index 100% rename from gateway/gateway-ujes-support/src/main/resources/log4j2.xml rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/resources/log4j2.xml diff --git a/gateway/gateway-ujes-support/src/main/resources/token.properties b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/resources/token.properties similarity index 100% rename from gateway/gateway-ujes-support/src/main/resources/token.properties rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/resources/token.properties diff --git a/gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/parser/EntranceExecutionGatewayParser.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/parser/EntranceExecutionGatewayParser.scala similarity index 100% rename from gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/parser/EntranceExecutionGatewayParser.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/parser/EntranceExecutionGatewayParser.scala diff --git a/gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/parser/EntranceRequestGatewayParser.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/parser/EntranceRequestGatewayParser.scala similarity index 100% rename from gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/parser/EntranceRequestGatewayParser.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/parser/EntranceRequestGatewayParser.scala diff --git a/gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/EntranceGatewayRouter.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/EntranceGatewayRouter.scala similarity index 100% rename from gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/EntranceGatewayRouter.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/EntranceGatewayRouter.scala diff --git a/gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/EntranceGatewayRouterRuler.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/EntranceGatewayRouterRuler.scala similarity index 100% rename from gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/EntranceGatewayRouterRuler.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/EntranceGatewayRouterRuler.scala diff --git a/gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/HaContextGatewayRouter.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/HaContextGatewayRouter.scala similarity index 100% rename from gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/HaContextGatewayRouter.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/HaContextGatewayRouter.scala diff --git a/gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/contextservice/ContextIdParserImpl.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/contextservice/ContextIdParserImpl.scala similarity index 100% rename from gateway/gateway-ujes-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/contextservice/ContextIdParserImpl.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/src/main/scala/com/webank/wedatasphere/linkis/gateway/ujes/route/contextservice/ContextIdParserImpl.scala diff --git a/gateway/springcloudgateway/pom.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml similarity index 96% rename from gateway/springcloudgateway/pom.xml rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml index e27c004f2..a8d96f7a9 100644 --- a/gateway/springcloudgateway/pom.xml +++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/pom.xml @@ -24,7 +24,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml linkis-gateway-springcloudgateway @@ -88,7 +88,7 @@ - ${basedir}/src/main/resources + src/main/resources ${project.artifactId}-${project.version} diff --git a/gateway/springcloudgateway/src/main/java/com/webank/wedatasphere/linkis/gateway/springcloud/http/GatewayAuthorizationFilter.java b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/java/com/webank/wedatasphere/linkis/gateway/springcloud/http/GatewayAuthorizationFilter.java similarity index 100% rename from gateway/springcloudgateway/src/main/java/com/webank/wedatasphere/linkis/gateway/springcloud/http/GatewayAuthorizationFilter.java rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/java/com/webank/wedatasphere/linkis/gateway/springcloud/http/GatewayAuthorizationFilter.java diff --git a/gateway/springcloudgateway/src/main/java/com/webank/wedatasphere/linkis/gateway/springcloud/http/SpringCloudHttpUtils.java b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/java/com/webank/wedatasphere/linkis/gateway/springcloud/http/SpringCloudHttpUtils.java similarity index 100% rename from gateway/springcloudgateway/src/main/java/com/webank/wedatasphere/linkis/gateway/springcloud/http/SpringCloudHttpUtils.java rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/java/com/webank/wedatasphere/linkis/gateway/springcloud/http/SpringCloudHttpUtils.java diff --git a/gateway/springcloudgateway/src/main/java/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/SpringCloudGatewayWebsocketFilter.java b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/java/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/SpringCloudGatewayWebsocketFilter.java similarity index 100% rename from gateway/springcloudgateway/src/main/java/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/SpringCloudGatewayWebsocketFilter.java rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/java/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/SpringCloudGatewayWebsocketFilter.java diff --git a/gateway/springcloudgateway/src/main/resources/application.yml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/resources/application.yml similarity index 100% rename from gateway/springcloudgateway/src/main/resources/application.yml rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/resources/application.yml diff --git a/gateway/springcloudgateway/src/main/resources/linkis.properties b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/resources/linkis.properties similarity index 100% rename from gateway/springcloudgateway/src/main/resources/linkis.properties rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/resources/linkis.properties diff --git a/gateway/springcloudgateway/src/main/resources/log4j2.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/resources/log4j2.xml similarity index 100% rename from gateway/springcloudgateway/src/main/resources/log4j2.xml rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/resources/log4j2.xml diff --git a/gateway/springcloudgateway/src/main/resources/token.properties b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/resources/token.properties similarity index 100% rename from gateway/springcloudgateway/src/main/resources/token.properties rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/resources/token.properties diff --git a/gateway/springcloudgateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/SpringCloudGatewayConfiguration.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/SpringCloudGatewayConfiguration.scala similarity index 100% rename from gateway/springcloudgateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/SpringCloudGatewayConfiguration.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/SpringCloudGatewayConfiguration.scala diff --git a/gateway/springcloudgateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/http/SpringCloudGatewayHttpRequest.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/http/SpringCloudGatewayHttpRequest.scala similarity index 100% rename from gateway/springcloudgateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/http/SpringCloudGatewayHttpRequest.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/http/SpringCloudGatewayHttpRequest.scala diff --git a/gateway/springcloudgateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/http/SpringCloudGatewayHttpResponse.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/http/SpringCloudGatewayHttpResponse.scala similarity index 100% rename from gateway/springcloudgateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/http/SpringCloudGatewayHttpResponse.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/http/SpringCloudGatewayHttpResponse.scala diff --git a/gateway/springcloudgateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/SpringCloudGatewayWebSocketSecurityHook.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/SpringCloudGatewayWebSocketSecurityHook.scala similarity index 100% rename from gateway/springcloudgateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/SpringCloudGatewayWebSocketSecurityHook.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/SpringCloudGatewayWebSocketSecurityHook.scala diff --git a/gateway/springcloudgateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/SpringCloudGatewayWebsocketUtils.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/SpringCloudGatewayWebsocketUtils.scala similarity index 100% rename from gateway/springcloudgateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/SpringCloudGatewayWebsocketUtils.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/SpringCloudGatewayWebsocketUtils.scala diff --git a/gateway/springcloudgateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/WebsocketGatewayHttpResponse.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/WebsocketGatewayHttpResponse.scala similarity index 100% rename from gateway/springcloudgateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/WebsocketGatewayHttpResponse.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/WebsocketGatewayHttpResponse.scala diff --git a/gateway/springcloudgateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/WebsocketGatewaySession.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/WebsocketGatewaySession.scala similarity index 100% rename from gateway/springcloudgateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/WebsocketGatewaySession.scala rename to linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/src/main/scala/com/webank/wedatasphere/linkis/gateway/springcloud/websocket/WebsocketGatewaySession.scala diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/pom.xml b/linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler/pom.xml similarity index 100% rename from gateway/plugins/gateway-ujes-datasource-ruler/pom.xml rename to linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler/pom.xml diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/cache/DatasourceMapCache.java b/linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/cache/DatasourceMapCache.java similarity index 100% rename from gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/cache/DatasourceMapCache.java rename to linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/cache/DatasourceMapCache.java diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/dao/DatasourceMapMapper.java b/linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/dao/DatasourceMapMapper.java similarity index 100% rename from gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/dao/DatasourceMapMapper.java rename to linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/dao/DatasourceMapMapper.java diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/dao/impl/datasourceMapMapper.xml b/linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/dao/impl/datasourceMapMapper.xml similarity index 100% rename from gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/dao/impl/datasourceMapMapper.xml rename to linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/dao/impl/datasourceMapMapper.xml diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/entity/DatasourceMap.java b/linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/entity/DatasourceMap.java similarity index 100% rename from gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/entity/DatasourceMap.java rename to linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/entity/DatasourceMap.java diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/DatasourceMapService.java b/linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/DatasourceMapService.java similarity index 100% rename from gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/DatasourceMapService.java rename to linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/DatasourceMapService.java diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/impl/DatasourceMapServiceImpl.java b/linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/impl/DatasourceMapServiceImpl.java similarity index 100% rename from gateway/plugins/gateway-ujes-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/impl/DatasourceMapServiceImpl.java rename to linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler/src/main/java/com/webank/wedatasphere/linkis/gateway/ruler/datasource/service/impl/DatasourceMapServiceImpl.java diff --git a/gateway/plugins/gateway-ujes-datasource-ruler/src/main/scala/com/webank/wedatasphere/linkis/gateway/ruler/datasource/DatasourceGatewayRouterRuler.scala b/linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler/src/main/scala/com/webank/wedatasphere/linkis/gateway/ruler/datasource/DatasourceGatewayRouterRuler.scala similarity index 100% rename from gateway/plugins/gateway-ujes-datasource-ruler/src/main/scala/com/webank/wedatasphere/linkis/gateway/ruler/datasource/DatasourceGatewayRouterRuler.scala rename to linkis-spring-cloud-services/linkis-service-gateway/plugins/linkis-gateway-datasource-ruler/src/main/scala/com/webank/wedatasphere/linkis/gateway/ruler/datasource/DatasourceGatewayRouterRuler.scala diff --git a/linkis-spring-cloud-services/linkis-service-gateway/pom.xml b/linkis-spring-cloud-services/linkis-service-gateway/pom.xml new file mode 100644 index 000000000..ed7d8dc5f --- /dev/null +++ b/linkis-spring-cloud-services/linkis-service-gateway/pom.xml @@ -0,0 +1,26 @@ + + + + linkis + com.webank.wedatasphere.linkis + dev-1.0.0 + ../../pom.xml + + 4.0.0 + + linkis-gateway + + pom + + + linkis-gateway-core + linkis-gateway-httpclient-support + linkis-spring-cloud-gateway + linkis-gateway-server-support + + + + + \ No newline at end of file diff --git a/linkis-spring-cloud-services/pom.xml b/linkis-spring-cloud-services/pom.xml new file mode 100644 index 000000000..161a62203 --- /dev/null +++ b/linkis-spring-cloud-services/pom.xml @@ -0,0 +1,24 @@ + + + + linkis + com.webank.wedatasphere.linkis + 0.11.0 + ../pom.xml + + 4.0.0 + + linkis-spring-cloud-services + + pom + + + + linkis-service-discovery/linkis-eureka + linkis-service-gateway + + + + \ No newline at end of file -- Gitee From 1d5de2c46b663c7857a981484a3912bb62362cff Mon Sep 17 00:00:00 2001 From: peacewong Date: Thu, 4 Feb 2021 14:53:57 +0800 Subject: [PATCH 056/148] Standardize the directory structure of linkis-extensions --- {extensions => linkis-extensions}/spark-excel/pom.xml | 0 .../scala/com/webank/wedatasphere/spark/excel/DefaultSource.scala | 0 .../com/webank/wedatasphere/spark/excel/DefaultSource15.scala | 0 .../com/webank/wedatasphere/spark/excel/ExcelFileSaver.scala | 0 .../scala/com/webank/wedatasphere/spark/excel/ExcelRelation.scala | 0 .../scala/com/webank/wedatasphere/spark/excel/InferSchema.scala | 0 .../main/scala/com/webank/wedatasphere/spark/excel/package.scala | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename {extensions => linkis-extensions}/spark-excel/pom.xml (100%) rename {extensions => linkis-extensions}/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/DefaultSource.scala (100%) rename {extensions => linkis-extensions}/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/DefaultSource15.scala (100%) rename {extensions => linkis-extensions}/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/ExcelFileSaver.scala (100%) rename {extensions => linkis-extensions}/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/ExcelRelation.scala (100%) rename {extensions => linkis-extensions}/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/InferSchema.scala (100%) rename {extensions => linkis-extensions}/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/package.scala (100%) diff --git a/extensions/spark-excel/pom.xml b/linkis-extensions/spark-excel/pom.xml similarity index 100% rename from extensions/spark-excel/pom.xml rename to linkis-extensions/spark-excel/pom.xml diff --git a/extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/DefaultSource.scala b/linkis-extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/DefaultSource.scala similarity index 100% rename from extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/DefaultSource.scala rename to linkis-extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/DefaultSource.scala diff --git a/extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/DefaultSource15.scala b/linkis-extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/DefaultSource15.scala similarity index 100% rename from extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/DefaultSource15.scala rename to linkis-extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/DefaultSource15.scala diff --git a/extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/ExcelFileSaver.scala b/linkis-extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/ExcelFileSaver.scala similarity index 100% rename from extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/ExcelFileSaver.scala rename to linkis-extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/ExcelFileSaver.scala diff --git a/extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/ExcelRelation.scala b/linkis-extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/ExcelRelation.scala similarity index 100% rename from extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/ExcelRelation.scala rename to linkis-extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/ExcelRelation.scala diff --git a/extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/InferSchema.scala b/linkis-extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/InferSchema.scala similarity index 100% rename from extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/InferSchema.scala rename to linkis-extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/InferSchema.scala diff --git a/extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/package.scala b/linkis-extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/package.scala similarity index 100% rename from extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/package.scala rename to linkis-extensions/spark-excel/src/main/scala/com/webank/wedatasphere/spark/excel/package.scala -- Gitee From bdba083e573701a2af325ef8c9444dfbc0bbf5e8 Mon Sep 17 00:00:00 2001 From: peacewong Date: Thu, 4 Feb 2021 15:04:15 +0800 Subject: [PATCH 057/148] Standardize the directory structure of linkis-computation-governance --- .gitignore | 4 +-- .../linkis-computation-client}/pom.xml | 2 +- .../src/main/resources/log4j.properties | 0 .../linkis/ujes/client/UJESClient.scala | 0 .../linkis/ujes/client/UJESClientImpl.scala | 0 .../UJESClientBuilderException.scala | 0 .../ujes/client/request/JobExecIdAction.scala | 0 .../client/request/JobExecuteAction.scala | 0 .../ujes/client/request/JobInfoAction.scala | 0 .../ujes/client/request/JobLogAction.scala | 0 .../ujes/client/request/ResultSetAction.scala | 0 .../client/request/ResultSetListAction.scala | 0 .../ujes/client/request/UJESJobAction.scala | 0 .../ujes/client/request/UserAction.scala | 0 .../client/response/JobExecuteResult.scala | 0 .../ujes/client/response/JobInfoResult.scala | 0 .../ujes/client/response/JobKillResult.scala | 0 .../ujes/client/response/JobLogResult.scala | 0 .../ujes/client/response/JobPauseResult.scala | 0 .../client/response/JobProgressResult.scala | 0 .../client/response/JobStatusResult.scala | 0 .../client/response/ResultSetListResult.scala | 0 .../client/response/ResultSetResult.scala | 0 .../ujes/client/response/UJESJobResult.scala | 0 .../ujes/client/utils/UJESClientUtils.scala | 0 .../ujes/client/UJESClientImplTest.scala | 0 .../ujes/client/UJESClientImplTestJ.java | 0 .../linkis-entrance-client}/pom.xml | 2 +- .../execute/EntranceReceiverUtils.java | 0 .../ClientEngineBuilderBeanAnnotation.java | 0 .../ClientEngineRequesterBeanAnnotation.java | 0 .../ClientEngineSelectorBeanAnnotation.java | 0 .../ClientEntranceParserBeanAnnotation.java | 0 .../ClientGroupFactoryBeanAnnotation.java | 0 .../ClientInterceptorsBeanAnnotation.java | 0 .../DefaultEntranceClientBeanAnnotation.java | 0 .../conf/ClientSpringConfiguration.java | 0 .../EngineApplicationNameFactory.scala | 0 .../entranceclient/EntranceClient.scala | 0 .../entranceclient/EntranceClientImpl.scala | 0 .../conf/ClientConfiguration.scala | 0 ...ClientForEntranceSpringConfiguration.scala | 0 .../conf/MultiEntranceCondition.scala | 0 .../context/ClientEntranceParser.scala | 0 .../context/ClientLogManager.scala | 0 .../context/ClientPersistenceEngine.scala | 0 .../context/ClientPersistenceManager.scala | 0 .../entranceclient/context/ClientTask.scala | 0 .../exception/ClientErrorException.scala | 0 .../AbstractClientEngineSelector.scala | 0 .../execute/ClientEngineBuilder.scala | 0 .../execute/ClientEngineManager.scala | 0 .../execute/ClientEngineRequester.scala | 0 .../ClientEntranceExecutorManager.scala | 0 .../entranceclient/execute/ClientJob.scala | 0 .../scheduler/ClientGroupFactory.scala | 0 .../ClientNewEngineBroadcastListener.scala | 0 .../linkis/rpc/ClientReceiverChooser.scala | 0 ...EngineStatusChangedBroadcastListener.scala | 0 .../linkis-entrance}/pom.xml | 4 +-- .../BackGroundServiceBeanAnnotation.java | 0 .../ConsumerManagerBeanAnnotation.java | 0 .../EngineBuilderBeanAnnotation.java | 0 .../EngineManagerBeanAnnotation.java | 0 .../EngineRequesterBeanAnnotation.java | 0 .../EngineSelectorBeanAnnotation.java | 0 .../EntranceContextBeanAnnotation.java | 0 ...EntranceExecutorManagerBeanAnnotation.java | 0 .../EntranceInterceptorBeanAnnotation.java | 0 .../EntranceListenerBusBeanAnnotation.java | 0 .../EntranceParserBeanAnnotation.java | 0 .../EntranceServerBeanAnnotation.java | 0 .../ErrorCodeListenerBeanAnnotation.java | 0 .../ErrorCodeManagerBeanAnnotation.java | 0 .../GroupFactoryBeanAnnotation.java | 0 .../annotation/LogManagerBeanAnnotation.java | 0 ...EngineBroadcastListenerBeanAnnotation.java | 0 .../PersistenceEngineBeanAnnotation.java | 0 .../PersistenceManagerBeanAnnotation.java | 0 .../ReceiverChooserBeanAnnotation.java | 0 ...hangedBroadcastListenerBeanAnnotation.java | 0 .../ResultSetEngineBeanAnnotation.java | 0 .../annotation/SchedulerBeanAnnotation.java | 0 .../SchedulerContextBeanAnnotation.java | 0 .../conf/EntranceSpringConfiguration.java | 0 .../context/DefaultEntranceContext.java | 0 .../entrance/exception/EntranceErrorCode.java | 0 .../EntranceIllegalParamException.java | 0 .../exception/EntranceRPCException.java | 0 .../exception/QueryFailedException.java | 0 .../entrance/job/EntranceExecutionJob.java | 0 .../parser/AbstractEntranceParser.java | 0 .../linkis/entrance/parser/ParserUtils.java | 0 .../AbstractPersistenceEngine.java | 0 .../persistence/QueryPersistenceEngine.java | 0 .../persistence/QueryPersistenceManager.java | 0 .../entrance/restful/EntranceRestfulApi.java | 0 .../server/DefaultEntranceServer.java | 0 .../linkis/entrance/utils/RPCUtils.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/log4j2-spring.xml | 0 .../linkis/entrance/EntranceContext.scala | 0 .../linkis/entrance/EntranceParser.scala | 0 .../linkis/entrance/EntranceServer.scala | 0 .../entrance/EntranceWebSocketService.scala | 0 .../AbstractBackGroundService.scala | 0 .../background/BackGroundService.scala | 0 .../GlobalConfigurationKeyValueCache.scala | 0 .../entrance/conf/EntranceConfiguration.scala | 0 .../linkis/entrance/cs/CSEntranceHelper.scala | 0 .../linkis/entrance/event/EntranceEvent.scala | 0 .../event/EntranceEventListener.scala | 0 .../event/EntranceEventListenerBus.scala | 0 .../exception/CacheNotReadyException.scala | 0 .../exception/EntranceCastFailException.scala | 0 .../exception/EntranceErrorException.scala | 0 .../exception/JobHistoryFailedException.scala | 0 .../exception/LogReadFailedException.scala | 0 .../exception/SubmitFailedException.scala | 0 .../exception/TuningErrorException.scala | 0 .../execute/ConcurrentEntranceEngine.scala | 0 .../entrance/execute/EngineBuilder.scala | 0 .../entrance/execute/EngineLockListener.scala | 0 .../entrance/execute/EngineManager.scala | 0 .../entrance/execute/EngineRequester.scala | 0 .../entrance/execute/EngineSelector.scala | 0 .../execute/EntranceBroadcastListener.scala | 0 .../entrance/execute/EntranceEngine.scala | 0 .../execute/EntranceExecutorManager.scala | 0 .../execute/EntranceExecutorRuler.scala | 0 .../linkis/entrance/execute/EntranceJob.scala | 0 .../entrance/execute/EntranceReceiver.scala | 0 .../execute/EntranceReceiverChooser.scala | 0 .../execute/ExecuteRequestInterceptor.scala | 0 .../execute/JobLockExecuteRequest.scala | 0 .../execute/SingleEntranceEngine.scala | 0 .../execute/impl/AbstractEngineBuilder.scala | 0 .../impl/ConcurrentEngineSelector.scala | 0 .../execute/impl/EngineManagerImpl.scala | 0 .../execute/impl/EngineRequesterImpl.scala | 0 .../impl/EntranceExecutorManagerImpl.scala | 0 .../execute/impl/SingleEngineSelector.scala | 0 .../interceptor/EntranceInterceptor.scala | 0 .../interceptor/RuntypeInterceptor.scala | 0 .../exception/CodeCheckException.scala | 0 .../exception/LimitCheckException.scala | 0 .../exception/LogPathCreateException.scala | 0 .../exception/PythonCodeCheckException.scala | 0 .../exception/VarSubstitutionException.scala | 0 .../impl/CSEntranceInterceptor.scala | 0 .../interceptor/impl/CommentInterceptor.scala | 0 .../impl/CustomVariableUtils.scala | 0 .../impl/DBInfoCompleteInterceptor.scala | 0 .../entrance/interceptor/impl/Explain.scala | 0 .../impl/LogPathCreateInterceptor.scala | 0 .../impl/PythonCodeCheckInterceptor.scala | 0 .../impl/SQLCodeCheckInterceptor.scala | 0 .../impl/SQLLimitEntranceInterceptor.scala | 0 .../impl/ScalaCodeInterceptor.scala | 0 .../impl/SparkCodeCheckInterceptor.scala | 0 .../impl/StorePathEntranceInterceptor.scala | 0 .../impl/VarSubstitutionInterceptor.scala | 0 .../linkis/entrance/log/Cache.scala | 0 .../linkis/entrance/log/CacheLogManager.scala | 0 .../linkis/entrance/log/CacheLogReader.scala | 0 .../linkis/entrance/log/CacheLogWriter.scala | 0 .../linkis/entrance/log/ErrorCode.scala | 0 .../entrance/log/ErrorCodeListener.scala | 0 .../entrance/log/ErrorCodeManager.scala | 0 .../linkis/entrance/log/LogFilter.scala | 0 .../linkis/entrance/log/LogHandler.scala | 0 .../linkis/entrance/log/LogManager.scala | 0 .../linkis/entrance/log/LogReader.scala | 0 .../linkis/entrance/log/LogWriter.scala | 0 .../linkis/entrance/log/LoopArray.scala | 0 .../log/WebSocketCacheLogReader.scala | 0 .../entrance/log/WebSocketLogWriter.scala | 0 .../parser/CommonEntranceParser.scala | 0 .../persistence/EntranceResultSetEngine.scala | 0 .../persistence/HaPersistenceTask.scala | 0 .../persistence/JobCompletedListener.scala | 0 .../persistence/PersistenceEngine.scala | 0 .../persistence/PersistenceManager.scala | 0 .../persistence/ResultSetEngine.scala | 0 .../persistence/ResultSetListener.scala | 0 .../restful/EntranceRestfulRemote.scala | 0 .../scheduler/EntranceGroupFactory.scala | 0 .../scheduler/EntranceSchedulerContext.scala | 0 .../entrance/utils/JobHistoryHelper.scala | 0 .../linkis-jdbc-driver}/pom.xml | 2 +- .../linkis/ujes/jdbc/UJESSQLDriver.java | 0 .../linkis/ujes/jdbc/UJESSQLErrorCode.java | 0 .../META-INF/services/java.sql.Driver | 0 .../linkis/ujes/jdbc/UJESClientFactory.scala | 0 .../linkis/ujes/jdbc/UJESSQLConnection.scala | 0 .../ujes/jdbc/UJESSQLDatabaseMetaData.scala | 0 .../linkis/ujes/jdbc/UJESSQLDriverMain.scala | 0 .../linkis/ujes/jdbc/UJESSQLException.scala | 0 .../ujes/jdbc/UJESSQLPreparedStatement.scala | 0 .../linkis/ujes/jdbc/UJESSQLResultSet.scala | 0 .../ujes/jdbc/UJESSQLResultSetMetaData.scala | 0 .../linkis/ujes/jdbc/UJESSQLStatement.scala | 0 .../linkis/ujes/jdbc/UJESSQLTypeParser.scala | 0 .../linkis/ujes/jdbc/CreateConnection.java | 0 .../linkis/ujes/jdbc/JDBCSpiTest.java | 0 .../linkis/ujes/jdbc/JDBCTest.java | 0 .../jdbc/UJESSQLDatabaseMetaDataTest.java | 0 .../jdbc/UJESSQLPreparedStatementTest.java | 0 .../ujes/jdbc/UJESSQLResultSetTest.java | 0 .../ujes/jdbc/UJESSQLStatementTest.java | 0 linkis-computation-governance/pom.xml | 27 +++++++++++++++++++ .../linkis-service-gateway/pom.xml | 2 +- 212 files changed, 35 insertions(+), 8 deletions(-) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/pom.xml (98%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/main/resources/log4j.properties (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/UJESClient.scala (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/UJESClientImpl.scala (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/exception/UJESClientBuilderException.scala (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/JobExecIdAction.scala (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/JobExecuteAction.scala (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/JobInfoAction.scala (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/JobLogAction.scala (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/ResultSetAction.scala (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/ResultSetListAction.scala (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/UJESJobAction.scala (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/UserAction.scala (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobExecuteResult.scala (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobInfoResult.scala (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobKillResult.scala (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobLogResult.scala (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobPauseResult.scala (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobProgressResult.scala (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobStatusResult.scala (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/ResultSetListResult.scala (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/ResultSetResult.scala (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/UJESJobResult.scala (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/utils/UJESClientUtils.scala (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/test/java/com/webank/bdp/dataworkcloud/ujes/client/UJESClientImplTest.scala (100%) rename {ujes/client => linkis-computation-governance/linkis-computation-client}/src/test/java/com/webank/bdp/dataworkcloud/ujes/client/UJESClientImplTestJ.java (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/pom.xml (97%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/java/com/webank/wedatasphere/linkis/entrance/execute/EntranceReceiverUtils.java (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientEngineBuilderBeanAnnotation.java (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientEngineRequesterBeanAnnotation.java (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientEngineSelectorBeanAnnotation.java (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientEntranceParserBeanAnnotation.java (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientGroupFactoryBeanAnnotation.java (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientInterceptorsBeanAnnotation.java (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/DefaultEntranceClientBeanAnnotation.java (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/java/com/webank/wedatasphere/linkis/entranceclient/conf/ClientSpringConfiguration.java (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/EngineApplicationNameFactory.scala (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/EntranceClient.scala (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/EntranceClientImpl.scala (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/conf/ClientConfiguration.scala (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/conf/ClientForEntranceSpringConfiguration.scala (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/conf/MultiEntranceCondition.scala (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientEntranceParser.scala (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientLogManager.scala (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientPersistenceEngine.scala (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientPersistenceManager.scala (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientTask.scala (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/exception/ClientErrorException.scala (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/AbstractClientEngineSelector.scala (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientEngineBuilder.scala (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientEngineManager.scala (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientEngineRequester.scala (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientEntranceExecutorManager.scala (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientJob.scala (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/scheduler/ClientGroupFactory.scala (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/scala/com/webank/wedatasphere/linkis/rpc/ClientNewEngineBroadcastListener.scala (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/scala/com/webank/wedatasphere/linkis/rpc/ClientReceiverChooser.scala (100%) rename {ujes/entranceclient => linkis-computation-governance/linkis-entrance-client}/src/main/scala/com/webank/wedatasphere/linkis/rpc/ClientResponseEngineStatusChangedBroadcastListener.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/pom.xml (96%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/BackGroundServiceBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ConsumerManagerBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EngineBuilderBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EngineManagerBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EngineRequesterBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EngineSelectorBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceContextBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceExecutorManagerBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceInterceptorBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceListenerBusBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceParserBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceServerBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ErrorCodeListenerBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ErrorCodeManagerBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/GroupFactoryBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/LogManagerBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/NewEngineBroadcastListenerBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/PersistenceEngineBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/PersistenceManagerBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ReceiverChooserBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ResponseEngineStatusChangedBroadcastListenerBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ResultSetEngineBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/SchedulerBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/SchedulerContextBeanAnnotation.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/conf/EntranceSpringConfiguration.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/context/DefaultEntranceContext.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/exception/EntranceErrorCode.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/exception/EntranceIllegalParamException.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/exception/EntranceRPCException.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/exception/QueryFailedException.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/job/EntranceExecutionJob.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/parser/AbstractEntranceParser.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/parser/ParserUtils.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/persistence/AbstractPersistenceEngine.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/persistence/QueryPersistenceEngine.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/persistence/QueryPersistenceManager.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/restful/EntranceRestfulApi.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/server/DefaultEntranceServer.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/java/com/webank/wedatasphere/linkis/entrance/utils/RPCUtils.java (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/resources/application.yml (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/resources/log4j2-spring.xml (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/EntranceContext.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/EntranceParser.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/EntranceServer.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/EntranceWebSocketService.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/background/AbstractBackGroundService.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/background/BackGroundService.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/cache/GlobalConfigurationKeyValueCache.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EntranceConfiguration.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/cs/CSEntranceHelper.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/event/EntranceEvent.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/event/EntranceEventListener.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/event/EntranceEventListenerBus.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/CacheNotReadyException.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EntranceCastFailException.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EntranceErrorException.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/JobHistoryFailedException.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/LogReadFailedException.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/SubmitFailedException.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/TuningErrorException.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/ConcurrentEntranceEngine.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineBuilder.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineLockListener.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineManager.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineRequester.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineSelector.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceBroadcastListener.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceEngine.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceExecutorManager.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceExecutorRuler.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceJob.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceReceiver.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceReceiverChooser.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/ExecuteRequestInterceptor.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/JobLockExecuteRequest.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/SingleEntranceEngine.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/AbstractEngineBuilder.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/ConcurrentEngineSelector.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/EngineManagerImpl.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/EngineRequesterImpl.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/EntranceExecutorManagerImpl.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/SingleEngineSelector.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/EntranceInterceptor.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/RuntypeInterceptor.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/CodeCheckException.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/LimitCheckException.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/LogPathCreateException.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/PythonCodeCheckException.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/VarSubstitutionException.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CSEntranceInterceptor.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CommentInterceptor.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CustomVariableUtils.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/DBInfoCompleteInterceptor.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/Explain.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/LogPathCreateInterceptor.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/PythonCodeCheckInterceptor.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/SQLCodeCheckInterceptor.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/SQLLimitEntranceInterceptor.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/ScalaCodeInterceptor.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/SparkCodeCheckInterceptor.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/StorePathEntranceInterceptor.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/VarSubstitutionInterceptor.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/Cache.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/CacheLogManager.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/CacheLogReader.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/CacheLogWriter.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/ErrorCode.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/ErrorCodeListener.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/ErrorCodeManager.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogFilter.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogHandler.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogManager.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogReader.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogWriter.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LoopArray.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/WebSocketCacheLogReader.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/WebSocketLogWriter.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/parser/CommonEntranceParser.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/EntranceResultSetEngine.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/HaPersistenceTask.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/JobCompletedListener.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/PersistenceEngine.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/PersistenceManager.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/ResultSetEngine.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/ResultSetListener.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/restful/EntranceRestfulRemote.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/scheduler/EntranceGroupFactory.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/scheduler/EntranceSchedulerContext.scala (100%) rename {ujes/entrance => linkis-computation-governance/linkis-entrance}/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/JobHistoryHelper.scala (100%) rename {ujes/jdbc => linkis-computation-governance/linkis-jdbc-driver}/pom.xml (98%) rename {ujes/jdbc => linkis-computation-governance/linkis-jdbc-driver}/src/main/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLDriver.java (100%) rename {ujes/jdbc => linkis-computation-governance/linkis-jdbc-driver}/src/main/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLErrorCode.java (100%) rename {ujes/jdbc => linkis-computation-governance/linkis-jdbc-driver}/src/main/resources/META-INF/services/java.sql.Driver (100%) rename {ujes/jdbc => linkis-computation-governance/linkis-jdbc-driver}/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESClientFactory.scala (100%) rename {ujes/jdbc => linkis-computation-governance/linkis-jdbc-driver}/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLConnection.scala (100%) rename {ujes/jdbc => linkis-computation-governance/linkis-jdbc-driver}/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLDatabaseMetaData.scala (100%) rename {ujes/jdbc => linkis-computation-governance/linkis-jdbc-driver}/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLDriverMain.scala (100%) rename {ujes/jdbc => linkis-computation-governance/linkis-jdbc-driver}/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLException.scala (100%) rename {ujes/jdbc => linkis-computation-governance/linkis-jdbc-driver}/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLPreparedStatement.scala (100%) rename {ujes/jdbc => linkis-computation-governance/linkis-jdbc-driver}/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLResultSet.scala (100%) rename {ujes/jdbc => linkis-computation-governance/linkis-jdbc-driver}/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLResultSetMetaData.scala (100%) rename {ujes/jdbc => linkis-computation-governance/linkis-jdbc-driver}/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLStatement.scala (100%) rename {ujes/jdbc => linkis-computation-governance/linkis-jdbc-driver}/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLTypeParser.scala (100%) rename {ujes/jdbc => linkis-computation-governance/linkis-jdbc-driver}/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/CreateConnection.java (100%) rename {ujes/jdbc => linkis-computation-governance/linkis-jdbc-driver}/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/JDBCSpiTest.java (100%) rename {ujes/jdbc => linkis-computation-governance/linkis-jdbc-driver}/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/JDBCTest.java (100%) rename {ujes/jdbc => linkis-computation-governance/linkis-jdbc-driver}/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLDatabaseMetaDataTest.java (100%) rename {ujes/jdbc => linkis-computation-governance/linkis-jdbc-driver}/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLPreparedStatementTest.java (100%) rename {ujes/jdbc => linkis-computation-governance/linkis-jdbc-driver}/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLResultSetTest.java (100%) rename {ujes/jdbc => linkis-computation-governance/linkis-jdbc-driver}/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLStatementTest.java (100%) create mode 100644 linkis-computation-governance/pom.xml diff --git a/.gitignore b/.gitignore index 1dea16f9f..3a0dc5ae8 100644 --- a/.gitignore +++ b/.gitignore @@ -53,7 +53,7 @@ datasource/metadatamanager/service/mysql/target -ujes/client/target/ +linkis-computation-governance/linkis-computation-client/target/ ujes/definedEngines/hive/engine/target/ ujes/definedEngines/hive/enginemanager/target/ ujes/definedEngines/hive/entrance/target/ @@ -70,7 +70,7 @@ ujes/definedEngines/spark/entrance/target/ ujes/definedEngines/presto/entrance/target/ ujes/engine/target/ ujes/enginemanager/target/ -ujes/entrance/target/ +linkis-computation-governance/linkis-entrance/target/ ujes/definedEngines/mlsql/entrance/target/ assembly/public-module/target/ diff --git a/ujes/client/pom.xml b/linkis-computation-governance/linkis-computation-client/pom.xml similarity index 98% rename from ujes/client/pom.xml rename to linkis-computation-governance/linkis-computation-client/pom.xml index f047cd084..d4712d846 100644 --- a/ujes/client/pom.xml +++ b/linkis-computation-governance/linkis-computation-client/pom.xml @@ -27,7 +27,7 @@ ../../pom.xml - linkis-ujes-client + linkis-computation-client diff --git a/ujes/client/src/main/resources/log4j.properties b/linkis-computation-governance/linkis-computation-client/src/main/resources/log4j.properties similarity index 100% rename from ujes/client/src/main/resources/log4j.properties rename to linkis-computation-governance/linkis-computation-client/src/main/resources/log4j.properties diff --git a/ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/UJESClient.scala b/linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/UJESClient.scala similarity index 100% rename from ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/UJESClient.scala rename to linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/UJESClient.scala diff --git a/ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/UJESClientImpl.scala b/linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/UJESClientImpl.scala similarity index 100% rename from ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/UJESClientImpl.scala rename to linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/UJESClientImpl.scala diff --git a/ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/exception/UJESClientBuilderException.scala b/linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/exception/UJESClientBuilderException.scala similarity index 100% rename from ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/exception/UJESClientBuilderException.scala rename to linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/exception/UJESClientBuilderException.scala diff --git a/ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/JobExecIdAction.scala b/linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/JobExecIdAction.scala similarity index 100% rename from ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/JobExecIdAction.scala rename to linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/JobExecIdAction.scala diff --git a/ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/JobExecuteAction.scala b/linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/JobExecuteAction.scala similarity index 100% rename from ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/JobExecuteAction.scala rename to linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/JobExecuteAction.scala diff --git a/ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/JobInfoAction.scala b/linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/JobInfoAction.scala similarity index 100% rename from ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/JobInfoAction.scala rename to linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/JobInfoAction.scala diff --git a/ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/JobLogAction.scala b/linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/JobLogAction.scala similarity index 100% rename from ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/JobLogAction.scala rename to linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/JobLogAction.scala diff --git a/ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/ResultSetAction.scala b/linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/ResultSetAction.scala similarity index 100% rename from ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/ResultSetAction.scala rename to linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/ResultSetAction.scala diff --git a/ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/ResultSetListAction.scala b/linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/ResultSetListAction.scala similarity index 100% rename from ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/ResultSetListAction.scala rename to linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/ResultSetListAction.scala diff --git a/ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/UJESJobAction.scala b/linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/UJESJobAction.scala similarity index 100% rename from ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/UJESJobAction.scala rename to linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/UJESJobAction.scala diff --git a/ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/UserAction.scala b/linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/UserAction.scala similarity index 100% rename from ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/UserAction.scala rename to linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/request/UserAction.scala diff --git a/ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobExecuteResult.scala b/linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobExecuteResult.scala similarity index 100% rename from ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobExecuteResult.scala rename to linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobExecuteResult.scala diff --git a/ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobInfoResult.scala b/linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobInfoResult.scala similarity index 100% rename from ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobInfoResult.scala rename to linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobInfoResult.scala diff --git a/ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobKillResult.scala b/linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobKillResult.scala similarity index 100% rename from ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobKillResult.scala rename to linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobKillResult.scala diff --git a/ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobLogResult.scala b/linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobLogResult.scala similarity index 100% rename from ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobLogResult.scala rename to linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobLogResult.scala diff --git a/ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobPauseResult.scala b/linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobPauseResult.scala similarity index 100% rename from ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobPauseResult.scala rename to linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobPauseResult.scala diff --git a/ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobProgressResult.scala b/linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobProgressResult.scala similarity index 100% rename from ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobProgressResult.scala rename to linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobProgressResult.scala diff --git a/ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobStatusResult.scala b/linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobStatusResult.scala similarity index 100% rename from ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobStatusResult.scala rename to linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/JobStatusResult.scala diff --git a/ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/ResultSetListResult.scala b/linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/ResultSetListResult.scala similarity index 100% rename from ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/ResultSetListResult.scala rename to linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/ResultSetListResult.scala diff --git a/ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/ResultSetResult.scala b/linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/ResultSetResult.scala similarity index 100% rename from ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/ResultSetResult.scala rename to linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/ResultSetResult.scala diff --git a/ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/UJESJobResult.scala b/linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/UJESJobResult.scala similarity index 100% rename from ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/UJESJobResult.scala rename to linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/response/UJESJobResult.scala diff --git a/ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/utils/UJESClientUtils.scala b/linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/utils/UJESClientUtils.scala similarity index 100% rename from ujes/client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/utils/UJESClientUtils.scala rename to linkis-computation-governance/linkis-computation-client/src/main/scala/com/webank/wedatasphere/linkis/ujes/client/utils/UJESClientUtils.scala diff --git a/ujes/client/src/test/java/com/webank/bdp/dataworkcloud/ujes/client/UJESClientImplTest.scala b/linkis-computation-governance/linkis-computation-client/src/test/java/com/webank/bdp/dataworkcloud/ujes/client/UJESClientImplTest.scala similarity index 100% rename from ujes/client/src/test/java/com/webank/bdp/dataworkcloud/ujes/client/UJESClientImplTest.scala rename to linkis-computation-governance/linkis-computation-client/src/test/java/com/webank/bdp/dataworkcloud/ujes/client/UJESClientImplTest.scala diff --git a/ujes/client/src/test/java/com/webank/bdp/dataworkcloud/ujes/client/UJESClientImplTestJ.java b/linkis-computation-governance/linkis-computation-client/src/test/java/com/webank/bdp/dataworkcloud/ujes/client/UJESClientImplTestJ.java similarity index 100% rename from ujes/client/src/test/java/com/webank/bdp/dataworkcloud/ujes/client/UJESClientImplTestJ.java rename to linkis-computation-governance/linkis-computation-client/src/test/java/com/webank/bdp/dataworkcloud/ujes/client/UJESClientImplTestJ.java diff --git a/ujes/entranceclient/pom.xml b/linkis-computation-governance/linkis-entrance-client/pom.xml similarity index 97% rename from ujes/entranceclient/pom.xml rename to linkis-computation-governance/linkis-entrance-client/pom.xml index c555346b9..1470b3449 100644 --- a/ujes/entranceclient/pom.xml +++ b/linkis-computation-governance/linkis-entrance-client/pom.xml @@ -27,7 +27,7 @@ ../../pom.xml - linkis-ujes-entranceclient + linkis-entranceclient diff --git a/ujes/entranceclient/src/main/java/com/webank/wedatasphere/linkis/entrance/execute/EntranceReceiverUtils.java b/linkis-computation-governance/linkis-entrance-client/src/main/java/com/webank/wedatasphere/linkis/entrance/execute/EntranceReceiverUtils.java similarity index 100% rename from ujes/entranceclient/src/main/java/com/webank/wedatasphere/linkis/entrance/execute/EntranceReceiverUtils.java rename to linkis-computation-governance/linkis-entrance-client/src/main/java/com/webank/wedatasphere/linkis/entrance/execute/EntranceReceiverUtils.java diff --git a/ujes/entranceclient/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientEngineBuilderBeanAnnotation.java b/linkis-computation-governance/linkis-entrance-client/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientEngineBuilderBeanAnnotation.java similarity index 100% rename from ujes/entranceclient/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientEngineBuilderBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance-client/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientEngineBuilderBeanAnnotation.java diff --git a/ujes/entranceclient/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientEngineRequesterBeanAnnotation.java b/linkis-computation-governance/linkis-entrance-client/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientEngineRequesterBeanAnnotation.java similarity index 100% rename from ujes/entranceclient/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientEngineRequesterBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance-client/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientEngineRequesterBeanAnnotation.java diff --git a/ujes/entranceclient/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientEngineSelectorBeanAnnotation.java b/linkis-computation-governance/linkis-entrance-client/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientEngineSelectorBeanAnnotation.java similarity index 100% rename from ujes/entranceclient/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientEngineSelectorBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance-client/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientEngineSelectorBeanAnnotation.java diff --git a/ujes/entranceclient/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientEntranceParserBeanAnnotation.java b/linkis-computation-governance/linkis-entrance-client/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientEntranceParserBeanAnnotation.java similarity index 100% rename from ujes/entranceclient/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientEntranceParserBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance-client/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientEntranceParserBeanAnnotation.java diff --git a/ujes/entranceclient/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientGroupFactoryBeanAnnotation.java b/linkis-computation-governance/linkis-entrance-client/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientGroupFactoryBeanAnnotation.java similarity index 100% rename from ujes/entranceclient/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientGroupFactoryBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance-client/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientGroupFactoryBeanAnnotation.java diff --git a/ujes/entranceclient/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientInterceptorsBeanAnnotation.java b/linkis-computation-governance/linkis-entrance-client/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientInterceptorsBeanAnnotation.java similarity index 100% rename from ujes/entranceclient/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientInterceptorsBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance-client/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/ClientInterceptorsBeanAnnotation.java diff --git a/ujes/entranceclient/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/DefaultEntranceClientBeanAnnotation.java b/linkis-computation-governance/linkis-entrance-client/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/DefaultEntranceClientBeanAnnotation.java similarity index 100% rename from ujes/entranceclient/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/DefaultEntranceClientBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance-client/src/main/java/com/webank/wedatasphere/linkis/entranceclient/annotation/DefaultEntranceClientBeanAnnotation.java diff --git a/ujes/entranceclient/src/main/java/com/webank/wedatasphere/linkis/entranceclient/conf/ClientSpringConfiguration.java b/linkis-computation-governance/linkis-entrance-client/src/main/java/com/webank/wedatasphere/linkis/entranceclient/conf/ClientSpringConfiguration.java similarity index 100% rename from ujes/entranceclient/src/main/java/com/webank/wedatasphere/linkis/entranceclient/conf/ClientSpringConfiguration.java rename to linkis-computation-governance/linkis-entrance-client/src/main/java/com/webank/wedatasphere/linkis/entranceclient/conf/ClientSpringConfiguration.java diff --git a/ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/EngineApplicationNameFactory.scala b/linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/EngineApplicationNameFactory.scala similarity index 100% rename from ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/EngineApplicationNameFactory.scala rename to linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/EngineApplicationNameFactory.scala diff --git a/ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/EntranceClient.scala b/linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/EntranceClient.scala similarity index 100% rename from ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/EntranceClient.scala rename to linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/EntranceClient.scala diff --git a/ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/EntranceClientImpl.scala b/linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/EntranceClientImpl.scala similarity index 100% rename from ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/EntranceClientImpl.scala rename to linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/EntranceClientImpl.scala diff --git a/ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/conf/ClientConfiguration.scala b/linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/conf/ClientConfiguration.scala similarity index 100% rename from ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/conf/ClientConfiguration.scala rename to linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/conf/ClientConfiguration.scala diff --git a/ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/conf/ClientForEntranceSpringConfiguration.scala b/linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/conf/ClientForEntranceSpringConfiguration.scala similarity index 100% rename from ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/conf/ClientForEntranceSpringConfiguration.scala rename to linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/conf/ClientForEntranceSpringConfiguration.scala diff --git a/ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/conf/MultiEntranceCondition.scala b/linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/conf/MultiEntranceCondition.scala similarity index 100% rename from ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/conf/MultiEntranceCondition.scala rename to linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/conf/MultiEntranceCondition.scala diff --git a/ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientEntranceParser.scala b/linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientEntranceParser.scala similarity index 100% rename from ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientEntranceParser.scala rename to linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientEntranceParser.scala diff --git a/ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientLogManager.scala b/linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientLogManager.scala similarity index 100% rename from ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientLogManager.scala rename to linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientLogManager.scala diff --git a/ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientPersistenceEngine.scala b/linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientPersistenceEngine.scala similarity index 100% rename from ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientPersistenceEngine.scala rename to linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientPersistenceEngine.scala diff --git a/ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientPersistenceManager.scala b/linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientPersistenceManager.scala similarity index 100% rename from ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientPersistenceManager.scala rename to linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientPersistenceManager.scala diff --git a/ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientTask.scala b/linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientTask.scala similarity index 100% rename from ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientTask.scala rename to linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/context/ClientTask.scala diff --git a/ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/exception/ClientErrorException.scala b/linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/exception/ClientErrorException.scala similarity index 100% rename from ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/exception/ClientErrorException.scala rename to linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/exception/ClientErrorException.scala diff --git a/ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/AbstractClientEngineSelector.scala b/linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/AbstractClientEngineSelector.scala similarity index 100% rename from ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/AbstractClientEngineSelector.scala rename to linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/AbstractClientEngineSelector.scala diff --git a/ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientEngineBuilder.scala b/linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientEngineBuilder.scala similarity index 100% rename from ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientEngineBuilder.scala rename to linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientEngineBuilder.scala diff --git a/ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientEngineManager.scala b/linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientEngineManager.scala similarity index 100% rename from ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientEngineManager.scala rename to linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientEngineManager.scala diff --git a/ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientEngineRequester.scala b/linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientEngineRequester.scala similarity index 100% rename from ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientEngineRequester.scala rename to linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientEngineRequester.scala diff --git a/ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientEntranceExecutorManager.scala b/linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientEntranceExecutorManager.scala similarity index 100% rename from ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientEntranceExecutorManager.scala rename to linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientEntranceExecutorManager.scala diff --git a/ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientJob.scala b/linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientJob.scala similarity index 100% rename from ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientJob.scala rename to linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/execute/ClientJob.scala diff --git a/ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/scheduler/ClientGroupFactory.scala b/linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/scheduler/ClientGroupFactory.scala similarity index 100% rename from ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/scheduler/ClientGroupFactory.scala rename to linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/entranceclient/scheduler/ClientGroupFactory.scala diff --git a/ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/rpc/ClientNewEngineBroadcastListener.scala b/linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/rpc/ClientNewEngineBroadcastListener.scala similarity index 100% rename from ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/rpc/ClientNewEngineBroadcastListener.scala rename to linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/rpc/ClientNewEngineBroadcastListener.scala diff --git a/ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/rpc/ClientReceiverChooser.scala b/linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/rpc/ClientReceiverChooser.scala similarity index 100% rename from ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/rpc/ClientReceiverChooser.scala rename to linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/rpc/ClientReceiverChooser.scala diff --git a/ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/rpc/ClientResponseEngineStatusChangedBroadcastListener.scala b/linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/rpc/ClientResponseEngineStatusChangedBroadcastListener.scala similarity index 100% rename from ujes/entranceclient/src/main/scala/com/webank/wedatasphere/linkis/rpc/ClientResponseEngineStatusChangedBroadcastListener.scala rename to linkis-computation-governance/linkis-entrance-client/src/main/scala/com/webank/wedatasphere/linkis/rpc/ClientResponseEngineStatusChangedBroadcastListener.scala diff --git a/ujes/entrance/pom.xml b/linkis-computation-governance/linkis-entrance/pom.xml similarity index 96% rename from ujes/entrance/pom.xml rename to linkis-computation-governance/linkis-entrance/pom.xml index 606b7b3f2..56ccf82d6 100644 --- a/ujes/entrance/pom.xml +++ b/linkis-computation-governance/linkis-entrance/pom.xml @@ -26,7 +26,7 @@ 0.11.0 ../../pom.xml - linkis-ujes-entrance + linkis-entrance @@ -97,7 +97,7 @@ - ${basedir}/src/main/resources + src/main/resources ${project.artifactId}-${project.version} diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/BackGroundServiceBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/BackGroundServiceBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/BackGroundServiceBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/BackGroundServiceBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ConsumerManagerBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ConsumerManagerBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ConsumerManagerBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ConsumerManagerBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EngineBuilderBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EngineBuilderBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EngineBuilderBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EngineBuilderBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EngineManagerBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EngineManagerBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EngineManagerBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EngineManagerBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EngineRequesterBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EngineRequesterBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EngineRequesterBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EngineRequesterBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EngineSelectorBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EngineSelectorBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EngineSelectorBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EngineSelectorBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceContextBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceContextBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceContextBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceContextBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceExecutorManagerBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceExecutorManagerBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceExecutorManagerBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceExecutorManagerBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceInterceptorBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceInterceptorBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceInterceptorBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceInterceptorBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceListenerBusBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceListenerBusBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceListenerBusBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceListenerBusBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceParserBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceParserBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceParserBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceParserBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceServerBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceServerBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceServerBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/EntranceServerBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ErrorCodeListenerBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ErrorCodeListenerBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ErrorCodeListenerBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ErrorCodeListenerBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ErrorCodeManagerBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ErrorCodeManagerBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ErrorCodeManagerBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ErrorCodeManagerBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/GroupFactoryBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/GroupFactoryBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/GroupFactoryBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/GroupFactoryBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/LogManagerBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/LogManagerBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/LogManagerBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/LogManagerBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/NewEngineBroadcastListenerBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/NewEngineBroadcastListenerBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/NewEngineBroadcastListenerBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/NewEngineBroadcastListenerBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/PersistenceEngineBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/PersistenceEngineBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/PersistenceEngineBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/PersistenceEngineBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/PersistenceManagerBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/PersistenceManagerBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/PersistenceManagerBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/PersistenceManagerBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ReceiverChooserBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ReceiverChooserBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ReceiverChooserBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ReceiverChooserBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ResponseEngineStatusChangedBroadcastListenerBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ResponseEngineStatusChangedBroadcastListenerBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ResponseEngineStatusChangedBroadcastListenerBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ResponseEngineStatusChangedBroadcastListenerBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ResultSetEngineBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ResultSetEngineBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ResultSetEngineBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/ResultSetEngineBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/SchedulerBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/SchedulerBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/SchedulerBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/SchedulerBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/SchedulerContextBeanAnnotation.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/SchedulerContextBeanAnnotation.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/SchedulerContextBeanAnnotation.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/annotation/SchedulerContextBeanAnnotation.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/conf/EntranceSpringConfiguration.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/conf/EntranceSpringConfiguration.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/conf/EntranceSpringConfiguration.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/conf/EntranceSpringConfiguration.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/context/DefaultEntranceContext.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/context/DefaultEntranceContext.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/context/DefaultEntranceContext.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/context/DefaultEntranceContext.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/exception/EntranceErrorCode.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/exception/EntranceErrorCode.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/exception/EntranceErrorCode.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/exception/EntranceErrorCode.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/exception/EntranceIllegalParamException.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/exception/EntranceIllegalParamException.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/exception/EntranceIllegalParamException.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/exception/EntranceIllegalParamException.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/exception/EntranceRPCException.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/exception/EntranceRPCException.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/exception/EntranceRPCException.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/exception/EntranceRPCException.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/exception/QueryFailedException.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/exception/QueryFailedException.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/exception/QueryFailedException.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/exception/QueryFailedException.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/job/EntranceExecutionJob.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/job/EntranceExecutionJob.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/job/EntranceExecutionJob.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/job/EntranceExecutionJob.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/parser/AbstractEntranceParser.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/parser/AbstractEntranceParser.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/parser/AbstractEntranceParser.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/parser/AbstractEntranceParser.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/parser/ParserUtils.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/parser/ParserUtils.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/parser/ParserUtils.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/parser/ParserUtils.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/persistence/AbstractPersistenceEngine.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/persistence/AbstractPersistenceEngine.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/persistence/AbstractPersistenceEngine.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/persistence/AbstractPersistenceEngine.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/persistence/QueryPersistenceEngine.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/persistence/QueryPersistenceEngine.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/persistence/QueryPersistenceEngine.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/persistence/QueryPersistenceEngine.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/persistence/QueryPersistenceManager.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/persistence/QueryPersistenceManager.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/persistence/QueryPersistenceManager.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/persistence/QueryPersistenceManager.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/restful/EntranceRestfulApi.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/restful/EntranceRestfulApi.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/restful/EntranceRestfulApi.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/restful/EntranceRestfulApi.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/server/DefaultEntranceServer.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/server/DefaultEntranceServer.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/server/DefaultEntranceServer.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/server/DefaultEntranceServer.java diff --git a/ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/utils/RPCUtils.java b/linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/utils/RPCUtils.java similarity index 100% rename from ujes/entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/utils/RPCUtils.java rename to linkis-computation-governance/linkis-entrance/src/main/java/com/webank/wedatasphere/linkis/entrance/utils/RPCUtils.java diff --git a/ujes/entrance/src/main/resources/application.yml b/linkis-computation-governance/linkis-entrance/src/main/resources/application.yml similarity index 100% rename from ujes/entrance/src/main/resources/application.yml rename to linkis-computation-governance/linkis-entrance/src/main/resources/application.yml diff --git a/ujes/entrance/src/main/resources/log4j2-spring.xml b/linkis-computation-governance/linkis-entrance/src/main/resources/log4j2-spring.xml similarity index 100% rename from ujes/entrance/src/main/resources/log4j2-spring.xml rename to linkis-computation-governance/linkis-entrance/src/main/resources/log4j2-spring.xml diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/EntranceContext.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/EntranceContext.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/EntranceContext.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/EntranceContext.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/EntranceParser.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/EntranceParser.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/EntranceParser.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/EntranceParser.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/EntranceServer.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/EntranceServer.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/EntranceServer.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/EntranceServer.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/EntranceWebSocketService.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/EntranceWebSocketService.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/EntranceWebSocketService.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/EntranceWebSocketService.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/background/AbstractBackGroundService.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/background/AbstractBackGroundService.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/background/AbstractBackGroundService.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/background/AbstractBackGroundService.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/background/BackGroundService.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/background/BackGroundService.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/background/BackGroundService.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/background/BackGroundService.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/cache/GlobalConfigurationKeyValueCache.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/cache/GlobalConfigurationKeyValueCache.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/cache/GlobalConfigurationKeyValueCache.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/cache/GlobalConfigurationKeyValueCache.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EntranceConfiguration.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EntranceConfiguration.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EntranceConfiguration.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/conf/EntranceConfiguration.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/cs/CSEntranceHelper.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/cs/CSEntranceHelper.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/cs/CSEntranceHelper.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/cs/CSEntranceHelper.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/event/EntranceEvent.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/event/EntranceEvent.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/event/EntranceEvent.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/event/EntranceEvent.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/event/EntranceEventListener.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/event/EntranceEventListener.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/event/EntranceEventListener.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/event/EntranceEventListener.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/event/EntranceEventListenerBus.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/event/EntranceEventListenerBus.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/event/EntranceEventListenerBus.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/event/EntranceEventListenerBus.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/CacheNotReadyException.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/CacheNotReadyException.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/CacheNotReadyException.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/CacheNotReadyException.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EntranceCastFailException.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EntranceCastFailException.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EntranceCastFailException.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EntranceCastFailException.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EntranceErrorException.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EntranceErrorException.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EntranceErrorException.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/EntranceErrorException.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/JobHistoryFailedException.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/JobHistoryFailedException.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/JobHistoryFailedException.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/JobHistoryFailedException.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/LogReadFailedException.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/LogReadFailedException.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/LogReadFailedException.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/LogReadFailedException.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/SubmitFailedException.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/SubmitFailedException.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/SubmitFailedException.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/SubmitFailedException.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/TuningErrorException.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/TuningErrorException.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/TuningErrorException.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/exception/TuningErrorException.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/ConcurrentEntranceEngine.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/ConcurrentEntranceEngine.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/ConcurrentEntranceEngine.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/ConcurrentEntranceEngine.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineBuilder.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineBuilder.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineBuilder.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineBuilder.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineLockListener.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineLockListener.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineLockListener.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineLockListener.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineManager.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineManager.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineManager.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineManager.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineRequester.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineRequester.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineRequester.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineRequester.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineSelector.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineSelector.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineSelector.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EngineSelector.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceBroadcastListener.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceBroadcastListener.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceBroadcastListener.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceBroadcastListener.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceEngine.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceEngine.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceEngine.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceEngine.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceExecutorManager.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceExecutorManager.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceExecutorManager.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceExecutorManager.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceExecutorRuler.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceExecutorRuler.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceExecutorRuler.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceExecutorRuler.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceJob.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceJob.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceJob.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceJob.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceReceiver.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceReceiver.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceReceiver.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceReceiver.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceReceiverChooser.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceReceiverChooser.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceReceiverChooser.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/EntranceReceiverChooser.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/ExecuteRequestInterceptor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/ExecuteRequestInterceptor.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/ExecuteRequestInterceptor.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/ExecuteRequestInterceptor.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/JobLockExecuteRequest.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/JobLockExecuteRequest.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/JobLockExecuteRequest.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/JobLockExecuteRequest.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/SingleEntranceEngine.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/SingleEntranceEngine.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/SingleEntranceEngine.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/SingleEntranceEngine.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/AbstractEngineBuilder.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/AbstractEngineBuilder.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/AbstractEngineBuilder.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/AbstractEngineBuilder.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/ConcurrentEngineSelector.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/ConcurrentEngineSelector.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/ConcurrentEngineSelector.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/ConcurrentEngineSelector.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/EngineManagerImpl.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/EngineManagerImpl.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/EngineManagerImpl.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/EngineManagerImpl.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/EngineRequesterImpl.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/EngineRequesterImpl.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/EngineRequesterImpl.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/EngineRequesterImpl.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/EntranceExecutorManagerImpl.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/EntranceExecutorManagerImpl.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/EntranceExecutorManagerImpl.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/EntranceExecutorManagerImpl.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/SingleEngineSelector.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/SingleEngineSelector.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/SingleEngineSelector.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/execute/impl/SingleEngineSelector.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/EntranceInterceptor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/EntranceInterceptor.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/EntranceInterceptor.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/EntranceInterceptor.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/RuntypeInterceptor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/RuntypeInterceptor.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/RuntypeInterceptor.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/RuntypeInterceptor.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/CodeCheckException.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/CodeCheckException.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/CodeCheckException.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/CodeCheckException.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/LimitCheckException.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/LimitCheckException.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/LimitCheckException.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/LimitCheckException.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/LogPathCreateException.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/LogPathCreateException.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/LogPathCreateException.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/LogPathCreateException.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/PythonCodeCheckException.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/PythonCodeCheckException.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/PythonCodeCheckException.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/PythonCodeCheckException.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/VarSubstitutionException.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/VarSubstitutionException.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/VarSubstitutionException.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/exception/VarSubstitutionException.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CSEntranceInterceptor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CSEntranceInterceptor.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CSEntranceInterceptor.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CSEntranceInterceptor.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CommentInterceptor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CommentInterceptor.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CommentInterceptor.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CommentInterceptor.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CustomVariableUtils.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CustomVariableUtils.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CustomVariableUtils.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/CustomVariableUtils.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/DBInfoCompleteInterceptor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/DBInfoCompleteInterceptor.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/DBInfoCompleteInterceptor.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/DBInfoCompleteInterceptor.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/Explain.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/Explain.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/Explain.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/Explain.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/LogPathCreateInterceptor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/LogPathCreateInterceptor.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/LogPathCreateInterceptor.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/LogPathCreateInterceptor.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/PythonCodeCheckInterceptor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/PythonCodeCheckInterceptor.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/PythonCodeCheckInterceptor.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/PythonCodeCheckInterceptor.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/SQLCodeCheckInterceptor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/SQLCodeCheckInterceptor.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/SQLCodeCheckInterceptor.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/SQLCodeCheckInterceptor.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/SQLLimitEntranceInterceptor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/SQLLimitEntranceInterceptor.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/SQLLimitEntranceInterceptor.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/SQLLimitEntranceInterceptor.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/ScalaCodeInterceptor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/ScalaCodeInterceptor.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/ScalaCodeInterceptor.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/ScalaCodeInterceptor.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/SparkCodeCheckInterceptor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/SparkCodeCheckInterceptor.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/SparkCodeCheckInterceptor.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/SparkCodeCheckInterceptor.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/StorePathEntranceInterceptor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/StorePathEntranceInterceptor.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/StorePathEntranceInterceptor.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/StorePathEntranceInterceptor.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/VarSubstitutionInterceptor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/VarSubstitutionInterceptor.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/VarSubstitutionInterceptor.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/interceptor/impl/VarSubstitutionInterceptor.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/Cache.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/Cache.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/Cache.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/Cache.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/CacheLogManager.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/CacheLogManager.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/CacheLogManager.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/CacheLogManager.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/CacheLogReader.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/CacheLogReader.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/CacheLogReader.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/CacheLogReader.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/CacheLogWriter.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/CacheLogWriter.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/CacheLogWriter.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/CacheLogWriter.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/ErrorCode.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/ErrorCode.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/ErrorCode.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/ErrorCode.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/ErrorCodeListener.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/ErrorCodeListener.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/ErrorCodeListener.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/ErrorCodeListener.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/ErrorCodeManager.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/ErrorCodeManager.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/ErrorCodeManager.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/ErrorCodeManager.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogFilter.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogFilter.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogFilter.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogFilter.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogHandler.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogHandler.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogHandler.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogHandler.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogManager.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogManager.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogManager.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogManager.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogReader.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogReader.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogReader.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogReader.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogWriter.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogWriter.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogWriter.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LogWriter.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LoopArray.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LoopArray.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LoopArray.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/LoopArray.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/WebSocketCacheLogReader.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/WebSocketCacheLogReader.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/WebSocketCacheLogReader.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/WebSocketCacheLogReader.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/WebSocketLogWriter.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/WebSocketLogWriter.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/WebSocketLogWriter.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/log/WebSocketLogWriter.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/parser/CommonEntranceParser.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/parser/CommonEntranceParser.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/parser/CommonEntranceParser.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/parser/CommonEntranceParser.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/EntranceResultSetEngine.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/EntranceResultSetEngine.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/EntranceResultSetEngine.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/EntranceResultSetEngine.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/HaPersistenceTask.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/HaPersistenceTask.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/HaPersistenceTask.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/HaPersistenceTask.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/JobCompletedListener.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/JobCompletedListener.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/JobCompletedListener.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/JobCompletedListener.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/PersistenceEngine.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/PersistenceEngine.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/PersistenceEngine.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/PersistenceEngine.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/PersistenceManager.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/PersistenceManager.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/PersistenceManager.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/PersistenceManager.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/ResultSetEngine.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/ResultSetEngine.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/ResultSetEngine.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/ResultSetEngine.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/ResultSetListener.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/ResultSetListener.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/ResultSetListener.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/persistence/ResultSetListener.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/restful/EntranceRestfulRemote.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/restful/EntranceRestfulRemote.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/restful/EntranceRestfulRemote.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/restful/EntranceRestfulRemote.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/scheduler/EntranceGroupFactory.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/scheduler/EntranceGroupFactory.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/scheduler/EntranceGroupFactory.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/scheduler/EntranceGroupFactory.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/scheduler/EntranceSchedulerContext.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/scheduler/EntranceSchedulerContext.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/scheduler/EntranceSchedulerContext.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/scheduler/EntranceSchedulerContext.scala diff --git a/ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/JobHistoryHelper.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/JobHistoryHelper.scala similarity index 100% rename from ujes/entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/JobHistoryHelper.scala rename to linkis-computation-governance/linkis-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/utils/JobHistoryHelper.scala diff --git a/ujes/jdbc/pom.xml b/linkis-computation-governance/linkis-jdbc-driver/pom.xml similarity index 98% rename from ujes/jdbc/pom.xml rename to linkis-computation-governance/linkis-jdbc-driver/pom.xml index f97ef8fde..3e3be8b25 100644 --- a/ujes/jdbc/pom.xml +++ b/linkis-computation-governance/linkis-jdbc-driver/pom.xml @@ -23,7 +23,7 @@ 0.11.0 ../../pom.xml - linkis-ujes-jdbc + linkis-jdbc-driver diff --git a/ujes/jdbc/src/main/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLDriver.java b/linkis-computation-governance/linkis-jdbc-driver/src/main/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLDriver.java similarity index 100% rename from ujes/jdbc/src/main/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLDriver.java rename to linkis-computation-governance/linkis-jdbc-driver/src/main/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLDriver.java diff --git a/ujes/jdbc/src/main/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLErrorCode.java b/linkis-computation-governance/linkis-jdbc-driver/src/main/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLErrorCode.java similarity index 100% rename from ujes/jdbc/src/main/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLErrorCode.java rename to linkis-computation-governance/linkis-jdbc-driver/src/main/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLErrorCode.java diff --git a/ujes/jdbc/src/main/resources/META-INF/services/java.sql.Driver b/linkis-computation-governance/linkis-jdbc-driver/src/main/resources/META-INF/services/java.sql.Driver similarity index 100% rename from ujes/jdbc/src/main/resources/META-INF/services/java.sql.Driver rename to linkis-computation-governance/linkis-jdbc-driver/src/main/resources/META-INF/services/java.sql.Driver diff --git a/ujes/jdbc/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESClientFactory.scala b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESClientFactory.scala similarity index 100% rename from ujes/jdbc/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESClientFactory.scala rename to linkis-computation-governance/linkis-jdbc-driver/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESClientFactory.scala diff --git a/ujes/jdbc/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLConnection.scala b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLConnection.scala similarity index 100% rename from ujes/jdbc/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLConnection.scala rename to linkis-computation-governance/linkis-jdbc-driver/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLConnection.scala diff --git a/ujes/jdbc/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLDatabaseMetaData.scala b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLDatabaseMetaData.scala similarity index 100% rename from ujes/jdbc/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLDatabaseMetaData.scala rename to linkis-computation-governance/linkis-jdbc-driver/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLDatabaseMetaData.scala diff --git a/ujes/jdbc/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLDriverMain.scala b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLDriverMain.scala similarity index 100% rename from ujes/jdbc/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLDriverMain.scala rename to linkis-computation-governance/linkis-jdbc-driver/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLDriverMain.scala diff --git a/ujes/jdbc/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLException.scala b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLException.scala similarity index 100% rename from ujes/jdbc/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLException.scala rename to linkis-computation-governance/linkis-jdbc-driver/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLException.scala diff --git a/ujes/jdbc/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLPreparedStatement.scala b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLPreparedStatement.scala similarity index 100% rename from ujes/jdbc/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLPreparedStatement.scala rename to linkis-computation-governance/linkis-jdbc-driver/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLPreparedStatement.scala diff --git a/ujes/jdbc/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLResultSet.scala b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLResultSet.scala similarity index 100% rename from ujes/jdbc/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLResultSet.scala rename to linkis-computation-governance/linkis-jdbc-driver/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLResultSet.scala diff --git a/ujes/jdbc/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLResultSetMetaData.scala b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLResultSetMetaData.scala similarity index 100% rename from ujes/jdbc/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLResultSetMetaData.scala rename to linkis-computation-governance/linkis-jdbc-driver/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLResultSetMetaData.scala diff --git a/ujes/jdbc/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLStatement.scala b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLStatement.scala similarity index 100% rename from ujes/jdbc/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLStatement.scala rename to linkis-computation-governance/linkis-jdbc-driver/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLStatement.scala diff --git a/ujes/jdbc/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLTypeParser.scala b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLTypeParser.scala similarity index 100% rename from ujes/jdbc/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLTypeParser.scala rename to linkis-computation-governance/linkis-jdbc-driver/src/main/scala/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLTypeParser.scala diff --git a/ujes/jdbc/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/CreateConnection.java b/linkis-computation-governance/linkis-jdbc-driver/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/CreateConnection.java similarity index 100% rename from ujes/jdbc/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/CreateConnection.java rename to linkis-computation-governance/linkis-jdbc-driver/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/CreateConnection.java diff --git a/ujes/jdbc/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/JDBCSpiTest.java b/linkis-computation-governance/linkis-jdbc-driver/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/JDBCSpiTest.java similarity index 100% rename from ujes/jdbc/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/JDBCSpiTest.java rename to linkis-computation-governance/linkis-jdbc-driver/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/JDBCSpiTest.java diff --git a/ujes/jdbc/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/JDBCTest.java b/linkis-computation-governance/linkis-jdbc-driver/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/JDBCTest.java similarity index 100% rename from ujes/jdbc/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/JDBCTest.java rename to linkis-computation-governance/linkis-jdbc-driver/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/JDBCTest.java diff --git a/ujes/jdbc/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLDatabaseMetaDataTest.java b/linkis-computation-governance/linkis-jdbc-driver/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLDatabaseMetaDataTest.java similarity index 100% rename from ujes/jdbc/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLDatabaseMetaDataTest.java rename to linkis-computation-governance/linkis-jdbc-driver/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLDatabaseMetaDataTest.java diff --git a/ujes/jdbc/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLPreparedStatementTest.java b/linkis-computation-governance/linkis-jdbc-driver/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLPreparedStatementTest.java similarity index 100% rename from ujes/jdbc/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLPreparedStatementTest.java rename to linkis-computation-governance/linkis-jdbc-driver/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLPreparedStatementTest.java diff --git a/ujes/jdbc/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLResultSetTest.java b/linkis-computation-governance/linkis-jdbc-driver/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLResultSetTest.java similarity index 100% rename from ujes/jdbc/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLResultSetTest.java rename to linkis-computation-governance/linkis-jdbc-driver/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLResultSetTest.java diff --git a/ujes/jdbc/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLStatementTest.java b/linkis-computation-governance/linkis-jdbc-driver/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLStatementTest.java similarity index 100% rename from ujes/jdbc/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLStatementTest.java rename to linkis-computation-governance/linkis-jdbc-driver/src/test/java/com/webank/wedatasphere/linkis/ujes/jdbc/UJESSQLStatementTest.java diff --git a/linkis-computation-governance/pom.xml b/linkis-computation-governance/pom.xml new file mode 100644 index 000000000..b1717f7b8 --- /dev/null +++ b/linkis-computation-governance/pom.xml @@ -0,0 +1,27 @@ + + + + linkis + com.webank.wedatasphere.linkis + 0.11.0 + ../pom.xml + + 4.0.0 + + linkis-computation-governance + + pom + + + + linkis-entrance + linkis-entrance-client + linkis-computation-client + + + + + + \ No newline at end of file diff --git a/linkis-spring-cloud-services/linkis-service-gateway/pom.xml b/linkis-spring-cloud-services/linkis-service-gateway/pom.xml index ed7d8dc5f..d39c2f257 100644 --- a/linkis-spring-cloud-services/linkis-service-gateway/pom.xml +++ b/linkis-spring-cloud-services/linkis-service-gateway/pom.xml @@ -5,7 +5,7 @@ linkis com.webank.wedatasphere.linkis - dev-1.0.0 + dev-0.11.0 ../../pom.xml 4.0.0 -- Gitee From 3084cf23e39780d2848d058fa00d9b6cfa226bd7 Mon Sep 17 00:00:00 2001 From: peacewong Date: Thu, 4 Feb 2021 15:43:52 +0800 Subject: [PATCH 058/148] Standardize the directory structure of linkis-storage --- .gitignore | 2 +- .../linkis-io}/io-engine/pom.xml | 0 .../engine/io/utils/ReflectionUtils.java | 0 .../linkis/engine/io/IOEngineExecutor.scala | 0 .../engine/io/IOEngineExecutorFactory.scala | 0 .../linkis/engine/io/domain/FSInfo.scala | 0 .../engine/io/service/FsProxyService.scala | 0 .../io/utils/IOEngineConfiguration.scala | 0 .../linkis/engine/io/utils/IOHelp.scala | 0 .../bin/start-ioEngineManager.sh | 0 .../bin/stop-ioEngineManager.sh | 0 .../linkis-io}/io-enginemanager/pom.xml | 0 .../io/IODefaultEngineCreator.scala | 0 .../enginemanager/io/IOEngineHook.scala | 0 .../io/IOEngineManagerConfiguration.scala | 0 .../enginemanager/io/IOErrorException.scala | 0 .../io/IOManagerSpringConfiguration.scala | 0 .../linkis-io}/io-entrance/pom.xml | 0 .../linkis/io/utils/JobUtils.java | 0 .../linkis/entrance/io/DefaultIOClient.scala | 0 .../linkis/entrance/io/IOEngineBuilder.scala | 0 .../entrance/io/IOEngineRequester.scala | 0 .../linkis/entrance/io/IOEntranceJob.scala | 0 .../linkis/entrance/io/IOEntranceParser.scala | 0 .../linkis/entrance/io/IOGroupFactory.scala | 0 {storage/storage => linkis-storage}/pom.xml | 2 +- .../storage/domain/FsPathListWithError.java | 0 .../storage/excel/ExcelStorageReader.java | 0 .../linkis/storage/excel/XlsUtils.java | 0 .../linkis/storage/excel/XlsxUtils.java | 0 .../exception/FSNotInitException.scala | 0 .../exception/StorageErrorException.java | 0 .../exception/StorageFatalException.java | 0 .../exception/StorageWarnException.java | 0 .../linkis/storage/factory/BuildFactory.java | 0 .../factory/impl/BuildHDFSFileSystem.java | 0 .../factory/impl/BuildLocalFileSystem.java | 0 .../linkis/storage/fs/FileSystem.java | 0 .../storage/fs/impl/HDFSFileSystem.java | 0 .../storage/fs/impl/LocalFileSystem.java | 0 .../pipeline/DefaultPipelineFactory.java | 0 .../storage/pipeline/PipelineReader.java | 0 .../storage/pipeline/PipelineWriter.java | 0 .../src/main/resources/test01.dolphin | 0 .../src/main/resources/test02.dolphin | 0 .../src/main/resources/test03.dolphin | 0 .../linkis/storage/LineMetaData.scala | 0 .../linkis/storage/LineRecord.scala | 0 .../linkis/storage/csv/CSVFsReader.scala | 0 .../linkis/storage/csv/CSVFsWriter.scala | 0 .../linkis/storage/csv/StorageCSVReader.scala | 0 .../linkis/storage/csv/StorageCSVWriter.scala | 0 .../linkis/storage/domain/DataType.scala | 0 .../linkis/storage/domain/Dolphin.scala | 0 .../linkis/storage/domain/MethodEntity.scala | 0 .../linkis/storage/excel/ExcelFsReader.scala | 0 .../linkis/storage/excel/ExcelFsWriter.scala | 0 .../storage/excel/StorageExcelReader.scala | 0 .../storage/excel/StorageExcelWriter.scala | 0 .../linkis/storage/io/IOClient.scala | 0 .../resultset/DefaultResultSetFactory.scala | 0 .../storage/resultset/ResultMetaData.scala | 0 .../storage/resultset/ResultRecord.scala | 0 .../storage/resultset/ResultSetFactory.scala | 0 .../storage/resultset/StorageResultSet.scala | 0 .../resultset/StorageResultSetReader.scala | 0 .../resultset/StorageResultSetWriter.scala | 0 .../resultset/html/HtmlResultSet.scala | 0 .../storage/resultset/io/IOMetaData.scala | 0 .../storage/resultset/io/IORecord.scala | 0 .../resultset/io/IOResultDeserializer.scala | 0 .../resultset/io/IOResultSerializer.scala | 0 .../storage/resultset/io/IOResultSet.scala | 0 .../resultset/picture/PictureResultSet.scala | 0 .../resultset/table/TableMetaData.scala | 0 .../storage/resultset/table/TableRecord.scala | 0 .../table/TableResultDeserializer.scala | 0 .../table/TableResultSerializer.scala | 0 .../resultset/table/TableResultSet.scala | 0 .../resultset/txt/TextResultSerializer.scala | 0 .../storage/resultset/txt/TextResultSet.scala | 0 .../storage/script/ScriptFsReader.scala | 0 .../storage/script/VariableParser.scala | 0 .../compaction/CommonScriptCompaction.scala | 0 .../compaction/PYScriptCompaction.scala | 0 .../compaction/QLScriptCompaction.scala | 0 .../compaction/ScalaScriptCompaction.scala | 0 .../compaction/ShellScriptCompaction.scala | 0 .../script/parser/CommonScriptParser.scala | 0 .../script/parser/PYScriptParser.scala | 0 .../script/parser/QLScriptParser.scala | 0 .../script/reader/StorageScriptFsReader.scala | 0 .../script/writer/StorageScriptFsWriter.scala | 0 .../storage/source/AbstractFileSource.scala | 0 .../linkis/storage/source/FileSource.scala | 0 .../storage/source/ResultsetFileSource.scala | 0 .../storage/source/TextFileSource.scala | 0 .../storage/utils/FileSystemUtils.scala | 0 .../storage/utils/StorageConfiguration.scala | 0 .../linkis/storage/utils/StorageHelper.scala | 0 .../linkis/storage/utils/StorageUtils.scala | 0 .../linkis/storage/FSFactory.scala | 79 ---- .../linkis/storage/excel/ExcelXlsReader.java | 371 ------------------ .../storage/io/IOMethodInterceptor.scala | 325 --------------- .../storage/resultset/ResultSetReader.scala | 74 ---- .../storage/resultset/ResultSetWriter.scala | 63 --- .../txt/TextResultDeserializer.scala | 34 -- .../storage/script/ScriptFsWriter.scala | 85 ---- .../script/parser/ScalaScriptParser.scala | 40 -- 109 files changed, 2 insertions(+), 1073 deletions(-) rename {storage/pesIO => linkis-extensions/linkis-io}/io-engine/pom.xml (100%) rename {storage/pesIO => linkis-extensions/linkis-io}/io-engine/src/main/java/com/webank/wedatasphere/linkis/engine/io/utils/ReflectionUtils.java (100%) rename {storage/pesIO => linkis-extensions/linkis-io}/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/IOEngineExecutor.scala (100%) rename {storage/pesIO => linkis-extensions/linkis-io}/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/IOEngineExecutorFactory.scala (100%) rename {storage/pesIO => linkis-extensions/linkis-io}/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/domain/FSInfo.scala (100%) rename {storage/pesIO => linkis-extensions/linkis-io}/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/service/FsProxyService.scala (100%) rename {storage/pesIO => linkis-extensions/linkis-io}/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/utils/IOEngineConfiguration.scala (100%) rename {storage/pesIO => linkis-extensions/linkis-io}/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/utils/IOHelp.scala (100%) rename {storage/pesIO => linkis-extensions/linkis-io}/io-enginemanager/bin/start-ioEngineManager.sh (100%) mode change 100755 => 100644 rename {storage/pesIO => linkis-extensions/linkis-io}/io-enginemanager/bin/stop-ioEngineManager.sh (100%) mode change 100755 => 100644 rename {storage/pesIO => linkis-extensions/linkis-io}/io-enginemanager/pom.xml (100%) rename {storage/pesIO => linkis-extensions/linkis-io}/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IODefaultEngineCreator.scala (100%) rename {storage/pesIO => linkis-extensions/linkis-io}/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IOEngineHook.scala (100%) rename {storage/pesIO => linkis-extensions/linkis-io}/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IOEngineManagerConfiguration.scala (100%) rename {storage/pesIO => linkis-extensions/linkis-io}/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IOErrorException.scala (100%) rename {storage/pesIO => linkis-extensions/linkis-io}/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IOManagerSpringConfiguration.scala (100%) rename {storage/pesIO => linkis-extensions/linkis-io}/io-entrance/pom.xml (100%) rename {storage/pesIO => linkis-extensions/linkis-io}/io-entrance/src/main/java/com/webank/wedatasphere/linkis/io/utils/JobUtils.java (100%) rename {storage/pesIO => linkis-extensions/linkis-io}/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/DefaultIOClient.scala (100%) rename {storage/pesIO => linkis-extensions/linkis-io}/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOEngineBuilder.scala (100%) rename {storage/pesIO => linkis-extensions/linkis-io}/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOEngineRequester.scala (100%) rename {storage/pesIO => linkis-extensions/linkis-io}/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOEntranceJob.scala (100%) rename {storage/pesIO => linkis-extensions/linkis-io}/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOEntranceParser.scala (100%) rename {storage/pesIO => linkis-extensions/linkis-io}/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOGroupFactory.scala (100%) rename {storage/storage => linkis-storage}/pom.xml (98%) rename {storage/storage => linkis-storage}/src/main/java/com/webank/wedatasphere/linkis/storage/domain/FsPathListWithError.java (100%) rename {storage/storage => linkis-storage}/src/main/java/com/webank/wedatasphere/linkis/storage/excel/ExcelStorageReader.java (100%) rename {storage/storage => linkis-storage}/src/main/java/com/webank/wedatasphere/linkis/storage/excel/XlsUtils.java (100%) rename {storage/storage => linkis-storage}/src/main/java/com/webank/wedatasphere/linkis/storage/excel/XlsxUtils.java (100%) rename {storage/storage => linkis-storage}/src/main/java/com/webank/wedatasphere/linkis/storage/exception/FSNotInitException.scala (100%) rename {storage/storage => linkis-storage}/src/main/java/com/webank/wedatasphere/linkis/storage/exception/StorageErrorException.java (100%) rename {storage/storage => linkis-storage}/src/main/java/com/webank/wedatasphere/linkis/storage/exception/StorageFatalException.java (100%) rename {storage/storage => linkis-storage}/src/main/java/com/webank/wedatasphere/linkis/storage/exception/StorageWarnException.java (100%) rename {storage/storage => linkis-storage}/src/main/java/com/webank/wedatasphere/linkis/storage/factory/BuildFactory.java (100%) rename {storage/storage => linkis-storage}/src/main/java/com/webank/wedatasphere/linkis/storage/factory/impl/BuildHDFSFileSystem.java (100%) rename {storage/storage => linkis-storage}/src/main/java/com/webank/wedatasphere/linkis/storage/factory/impl/BuildLocalFileSystem.java (100%) rename {storage/storage => linkis-storage}/src/main/java/com/webank/wedatasphere/linkis/storage/fs/FileSystem.java (100%) rename {storage/storage => linkis-storage}/src/main/java/com/webank/wedatasphere/linkis/storage/fs/impl/HDFSFileSystem.java (100%) rename {storage/storage => linkis-storage}/src/main/java/com/webank/wedatasphere/linkis/storage/fs/impl/LocalFileSystem.java (100%) rename {storage/storage => linkis-storage}/src/main/java/com/webank/wedatasphere/linkis/storage/pipeline/DefaultPipelineFactory.java (100%) rename {storage/storage => linkis-storage}/src/main/java/com/webank/wedatasphere/linkis/storage/pipeline/PipelineReader.java (100%) rename {storage/storage => linkis-storage}/src/main/java/com/webank/wedatasphere/linkis/storage/pipeline/PipelineWriter.java (100%) rename {storage/storage => linkis-storage}/src/main/resources/test01.dolphin (100%) rename {storage/storage => linkis-storage}/src/main/resources/test02.dolphin (100%) rename {storage/storage => linkis-storage}/src/main/resources/test03.dolphin (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/LineMetaData.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/LineRecord.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/csv/CSVFsReader.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/csv/CSVFsWriter.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/csv/StorageCSVReader.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/csv/StorageCSVWriter.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/domain/DataType.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/domain/Dolphin.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/domain/MethodEntity.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/ExcelFsReader.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/ExcelFsWriter.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/StorageExcelReader.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/StorageExcelWriter.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/io/IOClient.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/DefaultResultSetFactory.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/ResultMetaData.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/ResultRecord.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/ResultSetFactory.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/StorageResultSet.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/StorageResultSetReader.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/StorageResultSetWriter.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/html/HtmlResultSet.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IOMetaData.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IORecord.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IOResultDeserializer.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IOResultSerializer.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IOResultSet.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/picture/PictureResultSet.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableMetaData.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableRecord.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableResultDeserializer.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableResultSerializer.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableResultSet.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/txt/TextResultSerializer.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/txt/TextResultSet.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/script/ScriptFsReader.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/script/VariableParser.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/CommonScriptCompaction.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/PYScriptCompaction.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/QLScriptCompaction.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/ScalaScriptCompaction.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/ShellScriptCompaction.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/script/parser/CommonScriptParser.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/script/parser/PYScriptParser.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/script/parser/QLScriptParser.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/script/reader/StorageScriptFsReader.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/script/writer/StorageScriptFsWriter.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/source/AbstractFileSource.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/source/FileSource.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/source/ResultsetFileSource.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/source/TextFileSource.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/utils/FileSystemUtils.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/utils/StorageConfiguration.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/utils/StorageHelper.scala (100%) rename {storage/storage => linkis-storage}/src/main/scala/com/webank/wedatasphere/linkis/storage/utils/StorageUtils.scala (100%) delete mode 100644 storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/FSFactory.scala delete mode 100644 storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/ExcelXlsReader.java delete mode 100644 storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/io/IOMethodInterceptor.scala delete mode 100644 storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/ResultSetReader.scala delete mode 100644 storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/ResultSetWriter.scala delete mode 100644 storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/txt/TextResultDeserializer.scala delete mode 100644 storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/ScriptFsWriter.scala delete mode 100644 storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/parser/ScalaScriptParser.scala diff --git a/.gitignore b/.gitignore index 3a0dc5ae8..b0cfe8f54 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,7 @@ publicService/workspace/target/ resourceManager/resourcemanagerclient/target/ resourceManager/resourcemanagercommon/target/ resourceManager/resourcemanagerserver/target/ -storage/storage/target/ +linkis-storage/target/ contextservice/cs-cache/target contextservice/cs-client/target diff --git a/storage/pesIO/io-engine/pom.xml b/linkis-extensions/linkis-io/io-engine/pom.xml similarity index 100% rename from storage/pesIO/io-engine/pom.xml rename to linkis-extensions/linkis-io/io-engine/pom.xml diff --git a/storage/pesIO/io-engine/src/main/java/com/webank/wedatasphere/linkis/engine/io/utils/ReflectionUtils.java b/linkis-extensions/linkis-io/io-engine/src/main/java/com/webank/wedatasphere/linkis/engine/io/utils/ReflectionUtils.java similarity index 100% rename from storage/pesIO/io-engine/src/main/java/com/webank/wedatasphere/linkis/engine/io/utils/ReflectionUtils.java rename to linkis-extensions/linkis-io/io-engine/src/main/java/com/webank/wedatasphere/linkis/engine/io/utils/ReflectionUtils.java diff --git a/storage/pesIO/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/IOEngineExecutor.scala b/linkis-extensions/linkis-io/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/IOEngineExecutor.scala similarity index 100% rename from storage/pesIO/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/IOEngineExecutor.scala rename to linkis-extensions/linkis-io/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/IOEngineExecutor.scala diff --git a/storage/pesIO/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/IOEngineExecutorFactory.scala b/linkis-extensions/linkis-io/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/IOEngineExecutorFactory.scala similarity index 100% rename from storage/pesIO/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/IOEngineExecutorFactory.scala rename to linkis-extensions/linkis-io/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/IOEngineExecutorFactory.scala diff --git a/storage/pesIO/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/domain/FSInfo.scala b/linkis-extensions/linkis-io/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/domain/FSInfo.scala similarity index 100% rename from storage/pesIO/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/domain/FSInfo.scala rename to linkis-extensions/linkis-io/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/domain/FSInfo.scala diff --git a/storage/pesIO/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/service/FsProxyService.scala b/linkis-extensions/linkis-io/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/service/FsProxyService.scala similarity index 100% rename from storage/pesIO/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/service/FsProxyService.scala rename to linkis-extensions/linkis-io/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/service/FsProxyService.scala diff --git a/storage/pesIO/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/utils/IOEngineConfiguration.scala b/linkis-extensions/linkis-io/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/utils/IOEngineConfiguration.scala similarity index 100% rename from storage/pesIO/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/utils/IOEngineConfiguration.scala rename to linkis-extensions/linkis-io/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/utils/IOEngineConfiguration.scala diff --git a/storage/pesIO/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/utils/IOHelp.scala b/linkis-extensions/linkis-io/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/utils/IOHelp.scala similarity index 100% rename from storage/pesIO/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/utils/IOHelp.scala rename to linkis-extensions/linkis-io/io-engine/src/main/scala/com/webank/wedatasphere/linkis/engine/io/utils/IOHelp.scala diff --git a/storage/pesIO/io-enginemanager/bin/start-ioEngineManager.sh b/linkis-extensions/linkis-io/io-enginemanager/bin/start-ioEngineManager.sh old mode 100755 new mode 100644 similarity index 100% rename from storage/pesIO/io-enginemanager/bin/start-ioEngineManager.sh rename to linkis-extensions/linkis-io/io-enginemanager/bin/start-ioEngineManager.sh diff --git a/storage/pesIO/io-enginemanager/bin/stop-ioEngineManager.sh b/linkis-extensions/linkis-io/io-enginemanager/bin/stop-ioEngineManager.sh old mode 100755 new mode 100644 similarity index 100% rename from storage/pesIO/io-enginemanager/bin/stop-ioEngineManager.sh rename to linkis-extensions/linkis-io/io-enginemanager/bin/stop-ioEngineManager.sh diff --git a/storage/pesIO/io-enginemanager/pom.xml b/linkis-extensions/linkis-io/io-enginemanager/pom.xml similarity index 100% rename from storage/pesIO/io-enginemanager/pom.xml rename to linkis-extensions/linkis-io/io-enginemanager/pom.xml diff --git a/storage/pesIO/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IODefaultEngineCreator.scala b/linkis-extensions/linkis-io/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IODefaultEngineCreator.scala similarity index 100% rename from storage/pesIO/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IODefaultEngineCreator.scala rename to linkis-extensions/linkis-io/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IODefaultEngineCreator.scala diff --git a/storage/pesIO/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IOEngineHook.scala b/linkis-extensions/linkis-io/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IOEngineHook.scala similarity index 100% rename from storage/pesIO/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IOEngineHook.scala rename to linkis-extensions/linkis-io/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IOEngineHook.scala diff --git a/storage/pesIO/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IOEngineManagerConfiguration.scala b/linkis-extensions/linkis-io/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IOEngineManagerConfiguration.scala similarity index 100% rename from storage/pesIO/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IOEngineManagerConfiguration.scala rename to linkis-extensions/linkis-io/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IOEngineManagerConfiguration.scala diff --git a/storage/pesIO/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IOErrorException.scala b/linkis-extensions/linkis-io/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IOErrorException.scala similarity index 100% rename from storage/pesIO/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IOErrorException.scala rename to linkis-extensions/linkis-io/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IOErrorException.scala diff --git a/storage/pesIO/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IOManagerSpringConfiguration.scala b/linkis-extensions/linkis-io/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IOManagerSpringConfiguration.scala similarity index 100% rename from storage/pesIO/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IOManagerSpringConfiguration.scala rename to linkis-extensions/linkis-io/io-enginemanager/src/main/scala/com/webank/wedatasphere/linkis/enginemanager/io/IOManagerSpringConfiguration.scala diff --git a/storage/pesIO/io-entrance/pom.xml b/linkis-extensions/linkis-io/io-entrance/pom.xml similarity index 100% rename from storage/pesIO/io-entrance/pom.xml rename to linkis-extensions/linkis-io/io-entrance/pom.xml diff --git a/storage/pesIO/io-entrance/src/main/java/com/webank/wedatasphere/linkis/io/utils/JobUtils.java b/linkis-extensions/linkis-io/io-entrance/src/main/java/com/webank/wedatasphere/linkis/io/utils/JobUtils.java similarity index 100% rename from storage/pesIO/io-entrance/src/main/java/com/webank/wedatasphere/linkis/io/utils/JobUtils.java rename to linkis-extensions/linkis-io/io-entrance/src/main/java/com/webank/wedatasphere/linkis/io/utils/JobUtils.java diff --git a/storage/pesIO/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/DefaultIOClient.scala b/linkis-extensions/linkis-io/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/DefaultIOClient.scala similarity index 100% rename from storage/pesIO/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/DefaultIOClient.scala rename to linkis-extensions/linkis-io/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/DefaultIOClient.scala diff --git a/storage/pesIO/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOEngineBuilder.scala b/linkis-extensions/linkis-io/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOEngineBuilder.scala similarity index 100% rename from storage/pesIO/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOEngineBuilder.scala rename to linkis-extensions/linkis-io/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOEngineBuilder.scala diff --git a/storage/pesIO/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOEngineRequester.scala b/linkis-extensions/linkis-io/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOEngineRequester.scala similarity index 100% rename from storage/pesIO/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOEngineRequester.scala rename to linkis-extensions/linkis-io/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOEngineRequester.scala diff --git a/storage/pesIO/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOEntranceJob.scala b/linkis-extensions/linkis-io/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOEntranceJob.scala similarity index 100% rename from storage/pesIO/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOEntranceJob.scala rename to linkis-extensions/linkis-io/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOEntranceJob.scala diff --git a/storage/pesIO/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOEntranceParser.scala b/linkis-extensions/linkis-io/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOEntranceParser.scala similarity index 100% rename from storage/pesIO/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOEntranceParser.scala rename to linkis-extensions/linkis-io/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOEntranceParser.scala diff --git a/storage/pesIO/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOGroupFactory.scala b/linkis-extensions/linkis-io/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOGroupFactory.scala similarity index 100% rename from storage/pesIO/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOGroupFactory.scala rename to linkis-extensions/linkis-io/io-entrance/src/main/scala/com/webank/wedatasphere/linkis/entrance/io/IOGroupFactory.scala diff --git a/storage/storage/pom.xml b/linkis-storage/pom.xml similarity index 98% rename from storage/storage/pom.xml rename to linkis-storage/pom.xml index 32abfca7f..adccfba62 100644 --- a/storage/storage/pom.xml +++ b/linkis-storage/pom.xml @@ -24,7 +24,7 @@ 0.11.0 com.webank.wedatasphere.linkis linkis - ../../pom.xml + ../pom.xml diff --git a/storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/domain/FsPathListWithError.java b/linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/domain/FsPathListWithError.java similarity index 100% rename from storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/domain/FsPathListWithError.java rename to linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/domain/FsPathListWithError.java diff --git a/storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/excel/ExcelStorageReader.java b/linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/excel/ExcelStorageReader.java similarity index 100% rename from storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/excel/ExcelStorageReader.java rename to linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/excel/ExcelStorageReader.java diff --git a/storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/excel/XlsUtils.java b/linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/excel/XlsUtils.java similarity index 100% rename from storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/excel/XlsUtils.java rename to linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/excel/XlsUtils.java diff --git a/storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/excel/XlsxUtils.java b/linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/excel/XlsxUtils.java similarity index 100% rename from storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/excel/XlsxUtils.java rename to linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/excel/XlsxUtils.java diff --git a/storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/exception/FSNotInitException.scala b/linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/exception/FSNotInitException.scala similarity index 100% rename from storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/exception/FSNotInitException.scala rename to linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/exception/FSNotInitException.scala diff --git a/storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/exception/StorageErrorException.java b/linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/exception/StorageErrorException.java similarity index 100% rename from storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/exception/StorageErrorException.java rename to linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/exception/StorageErrorException.java diff --git a/storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/exception/StorageFatalException.java b/linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/exception/StorageFatalException.java similarity index 100% rename from storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/exception/StorageFatalException.java rename to linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/exception/StorageFatalException.java diff --git a/storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/exception/StorageWarnException.java b/linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/exception/StorageWarnException.java similarity index 100% rename from storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/exception/StorageWarnException.java rename to linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/exception/StorageWarnException.java diff --git a/storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/factory/BuildFactory.java b/linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/factory/BuildFactory.java similarity index 100% rename from storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/factory/BuildFactory.java rename to linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/factory/BuildFactory.java diff --git a/storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/factory/impl/BuildHDFSFileSystem.java b/linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/factory/impl/BuildHDFSFileSystem.java similarity index 100% rename from storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/factory/impl/BuildHDFSFileSystem.java rename to linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/factory/impl/BuildHDFSFileSystem.java diff --git a/storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/factory/impl/BuildLocalFileSystem.java b/linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/factory/impl/BuildLocalFileSystem.java similarity index 100% rename from storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/factory/impl/BuildLocalFileSystem.java rename to linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/factory/impl/BuildLocalFileSystem.java diff --git a/storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/fs/FileSystem.java b/linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/fs/FileSystem.java similarity index 100% rename from storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/fs/FileSystem.java rename to linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/fs/FileSystem.java diff --git a/storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/fs/impl/HDFSFileSystem.java b/linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/fs/impl/HDFSFileSystem.java similarity index 100% rename from storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/fs/impl/HDFSFileSystem.java rename to linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/fs/impl/HDFSFileSystem.java diff --git a/storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/fs/impl/LocalFileSystem.java b/linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/fs/impl/LocalFileSystem.java similarity index 100% rename from storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/fs/impl/LocalFileSystem.java rename to linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/fs/impl/LocalFileSystem.java diff --git a/storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/pipeline/DefaultPipelineFactory.java b/linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/pipeline/DefaultPipelineFactory.java similarity index 100% rename from storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/pipeline/DefaultPipelineFactory.java rename to linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/pipeline/DefaultPipelineFactory.java diff --git a/storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/pipeline/PipelineReader.java b/linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/pipeline/PipelineReader.java similarity index 100% rename from storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/pipeline/PipelineReader.java rename to linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/pipeline/PipelineReader.java diff --git a/storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/pipeline/PipelineWriter.java b/linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/pipeline/PipelineWriter.java similarity index 100% rename from storage/storage/src/main/java/com/webank/wedatasphere/linkis/storage/pipeline/PipelineWriter.java rename to linkis-storage/src/main/java/com/webank/wedatasphere/linkis/storage/pipeline/PipelineWriter.java diff --git a/storage/storage/src/main/resources/test01.dolphin b/linkis-storage/src/main/resources/test01.dolphin similarity index 100% rename from storage/storage/src/main/resources/test01.dolphin rename to linkis-storage/src/main/resources/test01.dolphin diff --git a/storage/storage/src/main/resources/test02.dolphin b/linkis-storage/src/main/resources/test02.dolphin similarity index 100% rename from storage/storage/src/main/resources/test02.dolphin rename to linkis-storage/src/main/resources/test02.dolphin diff --git a/storage/storage/src/main/resources/test03.dolphin b/linkis-storage/src/main/resources/test03.dolphin similarity index 100% rename from storage/storage/src/main/resources/test03.dolphin rename to linkis-storage/src/main/resources/test03.dolphin diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/LineMetaData.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/LineMetaData.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/LineMetaData.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/LineMetaData.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/LineRecord.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/LineRecord.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/LineRecord.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/LineRecord.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/csv/CSVFsReader.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/csv/CSVFsReader.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/csv/CSVFsReader.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/csv/CSVFsReader.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/csv/CSVFsWriter.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/csv/CSVFsWriter.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/csv/CSVFsWriter.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/csv/CSVFsWriter.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/csv/StorageCSVReader.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/csv/StorageCSVReader.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/csv/StorageCSVReader.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/csv/StorageCSVReader.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/csv/StorageCSVWriter.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/csv/StorageCSVWriter.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/csv/StorageCSVWriter.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/csv/StorageCSVWriter.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/domain/DataType.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/domain/DataType.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/domain/DataType.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/domain/DataType.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/domain/Dolphin.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/domain/Dolphin.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/domain/Dolphin.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/domain/Dolphin.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/domain/MethodEntity.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/domain/MethodEntity.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/domain/MethodEntity.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/domain/MethodEntity.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/ExcelFsReader.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/ExcelFsReader.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/ExcelFsReader.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/ExcelFsReader.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/ExcelFsWriter.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/ExcelFsWriter.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/ExcelFsWriter.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/ExcelFsWriter.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/StorageExcelReader.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/StorageExcelReader.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/StorageExcelReader.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/StorageExcelReader.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/StorageExcelWriter.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/StorageExcelWriter.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/StorageExcelWriter.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/StorageExcelWriter.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/io/IOClient.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/io/IOClient.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/io/IOClient.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/io/IOClient.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/DefaultResultSetFactory.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/DefaultResultSetFactory.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/DefaultResultSetFactory.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/DefaultResultSetFactory.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/ResultMetaData.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/ResultMetaData.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/ResultMetaData.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/ResultMetaData.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/ResultRecord.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/ResultRecord.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/ResultRecord.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/ResultRecord.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/ResultSetFactory.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/ResultSetFactory.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/ResultSetFactory.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/ResultSetFactory.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/StorageResultSet.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/StorageResultSet.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/StorageResultSet.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/StorageResultSet.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/StorageResultSetReader.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/StorageResultSetReader.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/StorageResultSetReader.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/StorageResultSetReader.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/StorageResultSetWriter.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/StorageResultSetWriter.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/StorageResultSetWriter.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/StorageResultSetWriter.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/html/HtmlResultSet.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/html/HtmlResultSet.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/html/HtmlResultSet.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/html/HtmlResultSet.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IOMetaData.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IOMetaData.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IOMetaData.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IOMetaData.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IORecord.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IORecord.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IORecord.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IORecord.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IOResultDeserializer.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IOResultDeserializer.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IOResultDeserializer.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IOResultDeserializer.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IOResultSerializer.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IOResultSerializer.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IOResultSerializer.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IOResultSerializer.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IOResultSet.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IOResultSet.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IOResultSet.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/io/IOResultSet.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/picture/PictureResultSet.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/picture/PictureResultSet.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/picture/PictureResultSet.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/picture/PictureResultSet.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableMetaData.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableMetaData.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableMetaData.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableMetaData.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableRecord.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableRecord.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableRecord.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableRecord.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableResultDeserializer.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableResultDeserializer.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableResultDeserializer.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableResultDeserializer.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableResultSerializer.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableResultSerializer.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableResultSerializer.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableResultSerializer.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableResultSet.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableResultSet.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableResultSet.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/table/TableResultSet.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/txt/TextResultSerializer.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/txt/TextResultSerializer.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/txt/TextResultSerializer.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/txt/TextResultSerializer.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/txt/TextResultSet.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/txt/TextResultSet.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/txt/TextResultSet.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/txt/TextResultSet.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/ScriptFsReader.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/ScriptFsReader.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/ScriptFsReader.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/ScriptFsReader.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/VariableParser.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/VariableParser.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/VariableParser.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/VariableParser.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/CommonScriptCompaction.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/CommonScriptCompaction.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/CommonScriptCompaction.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/CommonScriptCompaction.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/PYScriptCompaction.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/PYScriptCompaction.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/PYScriptCompaction.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/PYScriptCompaction.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/QLScriptCompaction.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/QLScriptCompaction.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/QLScriptCompaction.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/QLScriptCompaction.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/ScalaScriptCompaction.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/ScalaScriptCompaction.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/ScalaScriptCompaction.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/ScalaScriptCompaction.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/ShellScriptCompaction.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/ShellScriptCompaction.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/ShellScriptCompaction.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/compaction/ShellScriptCompaction.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/parser/CommonScriptParser.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/parser/CommonScriptParser.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/parser/CommonScriptParser.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/parser/CommonScriptParser.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/parser/PYScriptParser.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/parser/PYScriptParser.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/parser/PYScriptParser.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/parser/PYScriptParser.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/parser/QLScriptParser.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/parser/QLScriptParser.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/parser/QLScriptParser.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/parser/QLScriptParser.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/reader/StorageScriptFsReader.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/reader/StorageScriptFsReader.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/reader/StorageScriptFsReader.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/reader/StorageScriptFsReader.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/writer/StorageScriptFsWriter.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/writer/StorageScriptFsWriter.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/writer/StorageScriptFsWriter.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/writer/StorageScriptFsWriter.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/source/AbstractFileSource.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/source/AbstractFileSource.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/source/AbstractFileSource.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/source/AbstractFileSource.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/source/FileSource.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/source/FileSource.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/source/FileSource.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/source/FileSource.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/source/ResultsetFileSource.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/source/ResultsetFileSource.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/source/ResultsetFileSource.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/source/ResultsetFileSource.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/source/TextFileSource.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/source/TextFileSource.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/source/TextFileSource.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/source/TextFileSource.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/utils/FileSystemUtils.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/utils/FileSystemUtils.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/utils/FileSystemUtils.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/utils/FileSystemUtils.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/utils/StorageConfiguration.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/utils/StorageConfiguration.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/utils/StorageConfiguration.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/utils/StorageConfiguration.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/utils/StorageHelper.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/utils/StorageHelper.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/utils/StorageHelper.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/utils/StorageHelper.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/utils/StorageUtils.scala b/linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/utils/StorageUtils.scala similarity index 100% rename from storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/utils/StorageUtils.scala rename to linkis-storage/src/main/scala/com/webank/wedatasphere/linkis/storage/utils/StorageUtils.scala diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/FSFactory.scala b/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/FSFactory.scala deleted file mode 100644 index 6b7aa39bf..000000000 --- a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/FSFactory.scala +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright 2019 WeBank - * - * Licensed 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 com.webank.wedatasphere.linkis.storage - -import com.webank.wedatasphere.linkis.common.io.{Fs, FsPath} -import com.webank.wedatasphere.linkis.common.utils.Logging -import com.webank.wedatasphere.linkis.storage.exception.StorageFatalException -import com.webank.wedatasphere.linkis.storage.factory.BuildFactory -import com.webank.wedatasphere.linkis.storage.utils.{StorageConfiguration, StorageUtils} - -/** - * Created by johnnwang on 10/17/18. - */ -object FSFactory extends Logging{ - - private val buildClasses: Map[String, BuildFactory] = StorageUtils.loadClass[BuildFactory](StorageConfiguration.STORAGE_BUILD_FS_CLASSES.getValue, t => t.fsName()) - - def getBuildFactory(fsName: String): BuildFactory = { - if(! buildClasses.contains(fsName)) throw new StorageFatalException(50000, s"Unsupported file system type(不支持的文件系统类型):$fsName" ) - buildClasses(fsName) - } - - - def getFs(fsType: String, proxyUser:String): Fs = { - val user = StorageUtils.getJvmUser - getBuildFactory(fsType).getFs(user, proxyUser) - } - - def getFs(fsType: String): Fs = { - val user = StorageUtils.getJvmUser - getBuildFactory(fsType).getFs(user, user) - } - - /** - * 1. If this machine has shared storage, the file:// type FS obtained here is the FS of the process user. -  * 2, if this machine does not have shared storage, then the file:// type FS obtained is the proxy to the Remote (shared storage machine root) FS -  * 3. If it is HDFS, it returns the FS of the process user. - * 1、如果这台机器装有共享存储则这里获得的file://类型的FS为该进程用户的FS - * 2、如果这台机器没有共享存储则获得的file://类型的FS为代理到Remote(共享存储机器root)的FS - * 3、如果是HDFS则返回的就是该进程用户的FS - * @param fsPath - * @return - */ - def getFs(fsPath: FsPath): Fs = { - getFs(fsPath.getFsType()) - } - - /** - * 1. If the process user is passed and the proxy user and the process user are consistent, the file:// type FS is the FS of the process user (the shared storage exists) -  * 2, if the process user is passed and the proxy user and the process user are consistent and there is no shared storage, the file:// type FS is the proxy to the remote (shared storage machine root) FS -  * 3. If the passed proxy user and process user are consistent, the hdfs type is the FS of the process user. -  * 4. If the proxy user and the process user are inconsistent, the hdfs type is the FS after the proxy. - * 1、如果传了进程用户且代理用户和进程用户一致则file://类型的FS为该进程用户的FS(存在共享存储) - * 2、如果传了进程用户且代理用户和进程用户一致且没有共享存储则file://类型的FS为代理到Remote(共享存储机器root)的FS - * 3、如果传了的代理用户和进程用户一致则hdfs类型为该进程用户的FS - * 4、如果传了代理用户和进程用户不一致则hdfs类型为代理后的FS - * @param fsPath - * @param proxyUser - * @return - */ - def getFsByProxyUser(fsPath: FsPath, proxyUser:String): Fs = { - getFs(fsPath.getFsType(), proxyUser) - } - -} diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/ExcelXlsReader.java b/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/ExcelXlsReader.java deleted file mode 100644 index 7051ab26f..000000000 --- a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/excel/ExcelXlsReader.java +++ /dev/null @@ -1,371 +0,0 @@ -/* - * Copyright 2019 WeBank - * - * Licensed 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 com.webank.wedatasphere.linkis.storage.excel; - -import org.apache.poi.hssf.eventusermodel.EventWorkbookBuilder.SheetRecordCollectingListener; -import org.apache.poi.hssf.eventusermodel.*; -import org.apache.poi.hssf.eventusermodel.dummyrecord.LastCellOfRowDummyRecord; -import org.apache.poi.hssf.eventusermodel.dummyrecord.MissingCellDummyRecord; -import org.apache.poi.hssf.model.HSSFFormulaParser; -import org.apache.poi.hssf.record.*; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.poifs.filesystem.POIFSFileSystem; - -import java.io.*; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - - -/** - * Created by johnnwang on 7/10/18. - */ -public class ExcelXlsReader implements HSSFListener { - private int minColumns = -1; - - private POIFSFileSystem fs; - - private InputStream inputStream; - - private int lastRowNumber; - - private int lastColumnNumber; - - /** - * Should we output the formula, or the value it has? - */ - private boolean outputFormulaValues = true; - - /** - * For parsing Formulas - */ - private SheetRecordCollectingListener workbookBuildingListener; - - // excel2003Workbook(工作薄) - private HSSFWorkbook stubWorkbook; - - // Records we pick up as we process - private SSTRecord sstRecord; - - private FormatTrackingHSSFListener formatListener; - - // Table index(表索引) - private int sheetIndex = -1; - - private BoundSheetRecord[] orderedBSRs; - - @SuppressWarnings("unchecked") - private ArrayList boundSheetRecords = new ArrayList(); - - // For handling formulas with string results - private int nextRow; - - private int nextColumn; - - private boolean outputNextStringRecord; - - // Current line(当前行) - private int curRow = 0; - - // a container that stores row records(存储行记录的容器) - private List rowlist = new ArrayList(); - - - @SuppressWarnings("unused") - private String sheetName; - - private IExcelRowDeal excelRowDeal; - - - public void init(IExcelRowDeal excelRowDeal, InputStream inputStream) { - this.excelRowDeal = excelRowDeal; - this.inputStream = inputStream; - } - - - /** - * Traverse all the sheets under excel - * 遍历excel下所有的sheet - * @throws IOException - */ - public void process() throws IOException { - this.fs = new POIFSFileSystem(this.inputStream); - MissingRecordAwareHSSFListener listener = new MissingRecordAwareHSSFListener(this); - formatListener = new FormatTrackingHSSFListener(listener); - HSSFEventFactory factory = new HSSFEventFactory(); - HSSFRequest request = new HSSFRequest(); - if (outputFormulaValues) { - request.addListenerForAllRecords(formatListener); - } else { - workbookBuildingListener = new SheetRecordCollectingListener(formatListener); - request.addListenerForAllRecords(workbookBuildingListener); - } - factory.processWorkbookEvents(request, fs); - } - - /** - * HSSFListener listener method, processing Record - * HSSFListener 监听方法,处理 Record - */ - @SuppressWarnings("unchecked") - public void processRecord(Record record) { - int thisRow = -1; - int thisColumn = -1; - String thisStr = null; - String value = null; - switch (record.getSid()) { - case BoundSheetRecord.sid: - boundSheetRecords.add(record); - break; - case BOFRecord.sid: - BOFRecord br = (BOFRecord) record; - if (br.getType() == BOFRecord.TYPE_WORKSHEET) { - // Create a child workbook if needed(如果有需要,则建立子工作薄) - if (workbookBuildingListener != null && stubWorkbook == null) { - stubWorkbook = workbookBuildingListener.getStubHSSFWorkbook(); - } - - sheetIndex++; - if (orderedBSRs == null) { - orderedBSRs = BoundSheetRecord.orderByBofPosition(boundSheetRecords); - } - sheetName = orderedBSRs[sheetIndex].getSheetname(); - } - break; - - case SSTRecord.sid: - sstRecord = (SSTRecord) record; - break; - - case BlankRecord.sid: - BlankRecord brec = (BlankRecord) record; - thisRow = brec.getRow(); - thisColumn = brec.getColumn(); - thisStr = ""; - rowlist.add(thisColumn, thisStr); - break; - case BoolErrRecord.sid: // Cell is boolean(单元格为布尔类型) - BoolErrRecord berec = (BoolErrRecord) record; - thisRow = berec.getRow(); - thisColumn = berec.getColumn(); - thisStr = berec.getBooleanValue() + ""; - rowlist.add(thisColumn, thisStr); - break; - - case FormulaRecord.sid: // Cell is a formula type(单元格为公式类型) - FormulaRecord frec = (FormulaRecord) record; - thisRow = frec.getRow(); - thisColumn = frec.getColumn(); - if (outputFormulaValues) { - if (Double.isNaN(frec.getValue())) { - // Formula result is a string - // This is stored in the next record - outputNextStringRecord = true; - nextRow = frec.getRow(); - nextColumn = frec.getColumn(); - } else { - thisStr = formatListener.formatNumberDateCell(frec); - } - } else { - thisStr = '"' + HSSFFormulaParser.toFormulaString(stubWorkbook, frec.getParsedExpression()) + '"'; - } - rowlist.add(thisColumn, thisStr); - break; - case StringRecord.sid:// a string of formulas in a cell(单元格中公式的字符串) - if (outputNextStringRecord) { - // String for formula - StringRecord srec = (StringRecord) record; - thisStr = srec.getString(); - thisRow = nextRow; - thisColumn = nextColumn; - outputNextStringRecord = false; - } - break; - case LabelRecord.sid: - LabelRecord lrec = (LabelRecord) record; - curRow = thisRow = lrec.getRow(); - thisColumn = lrec.getColumn(); - value = lrec.getValue().trim(); - value = value.equals("") ? " " : value; - this.rowlist.add(thisColumn, value); - break; - case LabelSSTRecord.sid: // Cell is a string type(单元格为字符串类型) - LabelSSTRecord lsrec = (LabelSSTRecord) record; - curRow = thisRow = lsrec.getRow(); - thisColumn = lsrec.getColumn(); - if (sstRecord == null) { - rowlist.add(thisColumn, " "); - } else { - value = sstRecord.getString(lsrec.getSSTIndex()).toString().trim(); - value = value.equals("") ? " " : value; - rowlist.add(thisColumn, value); - } - break; - case NumberRecord.sid: // Cell is a numeric type(单元格为数字类型) - NumberRecord numrec = (NumberRecord) record; - curRow = thisRow = numrec.getRow(); - thisColumn = numrec.getColumn(); - value = formatListener.formatNumberDateCell(numrec).trim(); - value = value.equals("") ? "0" : value; - // Add column values to the container(向容器加入列值) - rowlist.add(thisColumn, value); - break; - default: - break; - } - - // Encountered a new line of operations(遇到新行的操作)( - if (thisRow != -1 && thisRow != lastRowNumber) { - lastColumnNumber = -1; - } - - // Null operation(空值的操作) - if (record instanceof MissingCellDummyRecord) { - MissingCellDummyRecord mc = (MissingCellDummyRecord) record; - curRow = thisRow = mc.getRow(); - thisColumn = mc.getColumn(); - rowlist.add(thisColumn, " "); - } - - // Update row and column values(更新行和列的值) - if (thisRow > -1) - lastRowNumber = thisRow; - if (thisColumn > -1) - lastColumnNumber = thisColumn; - - // End of line operation(行结束时的操作) - if (record instanceof LastCellOfRowDummyRecord) { - if (minColumns > 0) { - // Column value is re-empted(列值重新置空) - if (lastColumnNumber == -1) { - lastColumnNumber = 0; - } - } - lastColumnNumber = -1; - - // At the end of each line, the dealRow() method(每行结束时, dealRow() 方法) - excelRowDeal.dealRow(orderedBSRs, sheetIndex, curRow, rowlist); - // Empty container(清空容器) - rowlist.clear(); - } - } - - public void close() { - try { - if (fs != null) - fs.close(); - if (inputStream != null) - inputStream.close(); - } catch (Exception e) { - - } - } - - public static void main(String[] args) { - - } -} - -class ExcelAnalysisException extends RuntimeException { - public ExcelAnalysisException() { - } - - public ExcelAnalysisException(String message) { - super(message); - } - - public ExcelAnalysisException(String message, Throwable cause) { - super(message, cause); - } - - public ExcelAnalysisException(Throwable cause) { - super(cause); - } -} - -interface IExcelRowDeal { - void dealRow(BoundSheetRecord[] orderedBSRs, int sheetIndex, int curRow, List rowlist); -} - - -class FirstRowDeal implements IExcelRowDeal { - - private List sheetNames = new ArrayList<>(); - private List row; - - public List getSheetNames() { - return sheetNames; - } - - public void setSheetNames(List sheetNames) { - this.sheetNames = sheetNames; - } - - public List getRow() { - return row; - } - - public void setRow(List row) { - this.row = row; - } - - public void dealRow(BoundSheetRecord[] orderedBSRs, int sheetIndex, int curRow, List rowlist) { - for (BoundSheetRecord record : orderedBSRs) { - sheetNames.add(record.getSheetname()); - } - row = rowlist; - throw new ExcelAnalysisException("Finished to deal first row"); - } - -} - -class RowToCsvDeal implements IExcelRowDeal { - - private Map params; - private List sheetNames; - private OutputStream outputStream; - private Boolean hasHeader; - private Boolean fisrtRow = true; - public void init(Boolean hasHeader, List sheetNames, OutputStream outputStream) { - this.hasHeader = hasHeader; - this.sheetNames = sheetNames; - this.outputStream = outputStream; - } - - public void dealRow(BoundSheetRecord[] orderedBSRs, int sheetIndex, int curRow, List rowlist) { - String sheetName = orderedBSRs[sheetIndex].getSheetname(); - if (sheetNames == null || sheetNames.isEmpty() || sheetNames.contains(sheetName)) { - if (! (curRow == 0 && hasHeader)) { - try { - if(fisrtRow){ - fisrtRow = false; - } else{ - outputStream.write("\n".getBytes()); - } - int len = rowlist.size(); - for (int i = 0; i < len; i ++) { - outputStream.write(rowlist.get(i).replaceAll("\n|\t", " ").getBytes("utf-8")); - if(i < len -1) - outputStream.write("\t".getBytes()); - } - } catch (IOException e) { - throw new RuntimeException(e); - } - } - } - } -} \ No newline at end of file diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/io/IOMethodInterceptor.scala b/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/io/IOMethodInterceptor.scala deleted file mode 100644 index 4e49e6dad..000000000 --- a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/io/IOMethodInterceptor.scala +++ /dev/null @@ -1,325 +0,0 @@ -/* - * Copyright 2019 WeBank - * - * Licensed 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 com.webank.wedatasphere.linkis.storage.io - -import java.io.{IOException, InputStream, OutputStream} -import java.lang.reflect.Method -import java.net.{InetAddress, UnknownHostException} - -import com.google.gson.reflect.TypeToken -import com.webank.wedatasphere.linkis.common.io.FsPath -import com.webank.wedatasphere.linkis.common.utils.{Logging, Utils} -import com.webank.wedatasphere.linkis.storage.domain.{FsPathListWithError, MethodEntity, MethodEntitySerializer} -import com.webank.wedatasphere.linkis.storage.exception.{FSNotInitException, StorageErrorException} -import com.webank.wedatasphere.linkis.storage.resultset.io.{IOMetaData, IORecord} -import com.webank.wedatasphere.linkis.storage.resultset.{ResultSetFactory, ResultSetReader, ResultSetWriter} -import com.webank.wedatasphere.linkis.storage.utils.{StorageConfiguration, StorageUtils} -import net.sf.cglib.proxy.{MethodInterceptor, MethodProxy} -import org.apache.commons.lang.StringUtils - -import scala.collection.mutable -import scala.collection.JavaConversions._ - -/** - * io代理时的代理类 - * Created by johnnwang on 2018/11/2. - */ -class IOMethodInterceptor(fsType: String) extends MethodInterceptor with Logging { - - val ioClient: IOClient = IOClient.getIOClient() - - private val properties: mutable.HashMap[String, String] = mutable.HashMap[String, String]() - - private var inited = false - - private var closed = false - - private var id: Long = -1L - - private val iOEngineExecutorMaxFreeTime = StorageConfiguration.IO_FS_EXPIRE_TIME.getValue - private val fetchSize = StorageConfiguration.IO_PROXY_READ_FETCH_SIZE.getValue.toLong - private val cacheSize = StorageConfiguration.IO_PROXY_WRITE_CACHE_SIZE.getValue.toLong.toInt - - private var lastAccessTime = System.currentTimeMillis() - private val executeParams = new java.util.HashMap[String, Any]() - - def getProxyUser: String = StorageConfiguration.PROXY_USER.getValue(properties) - - def getCreatorUser: String = StorageUtils.getJvmUser - - def getLocalIP: String = { - var ip = Utils.tryQuietly(InetAddress.getLocalHost.getHostAddress) - if (ip.contains("/")) ip = ip.split("/")(0) - ip - } - - /** - * Call io-client to execute the corresponding method, except init. - * 调用io-client执行相应的方法,除了init都走该方法 - * @param methodName - * @param params - * @return - */ - def executeMethod(methodName: String, params: Array[AnyRef]): String = { - val res = Utils.tryCatch(ioClient.execute(getProxyUser, - MethodEntity(id, fsType, getCreatorUser, getProxyUser, getLocalIP, methodName, params), executeParams)) { - t: Throwable => - if (t.isInstanceOf[FSNotInitException]) { - info(s"The Fs of user:$getProxyUser need re-init:") - initFS() - executeMethod(methodName, params) - } else throw t - } - if(methodName == "exists"){ - info(s"For user($getProxyUser) execute exists,get res is :$res") - } - res - } - - - def initFS(methodName: String = "init"): Unit = { - if (!properties.contains(StorageConfiguration.PROXY_USER.key)) throw new StorageErrorException(52002, "no user set, we cannot get the permission information.") - if(executeParams.containsKey(StorageUtils.FIXED_INSTANCE)) executeParams.remove(StorageUtils.FIXED_INSTANCE) - val msg = ioClient.executeWithEngine(getProxyUser, MethodEntity(id, fsType, getCreatorUser, getProxyUser, getLocalIP, methodName, Array(properties.toMap)), executeParams) //executeMethod(methodName, Array(properties.toMap)) - id = Utils.tryCatch(StorageUtils.deserializerResultToString(msg(0)).toLong) { t:Throwable => - info(s"Failed to init fs:msg0:(${msg(0)},msg1:${msg(1)}") - throw t - } - if (id != -1) inited = true else throw new StorageErrorException(52002, s"Failed to init FS for user:$getProxyUser ") - executeParams.put(StorageUtils.FIXED_INSTANCE, msg(1)) - } - - - def beforeOperation(): Unit = { - if (closed) throw new StorageErrorException(52002, s"$fsType storage($id) has been closed, IO operation was illegal.") - if (System.currentTimeMillis() - lastAccessTime >= iOEngineExecutorMaxFreeTime) synchronized { - if (System.currentTimeMillis() - lastAccessTime >= iOEngineExecutorMaxFreeTime) { - initFS() - info(s"since the $fsType storage($id) is free for too long time, re-inited it in beforeOperation") - } - } - lastAccessTime = System.currentTimeMillis() - } - - override def intercept(o: scala.Any, method: Method, args: Array[AnyRef], methodProxy: MethodProxy): AnyRef = { - if (closed && method.getName != "close") throw new StorageErrorException(52002, s"$fsType storage has been closed.") - if (System.currentTimeMillis() - lastAccessTime >= iOEngineExecutorMaxFreeTime) synchronized { - method.getName match { - case "init" => - case "close" => closed = true; return Unit - case "storageName" => return fsType - case "setUser" => properties += StorageConfiguration.PROXY_USER.key -> args(0).asInstanceOf[String]; return Unit - case _ => if (inited) { - initFS() - info(s"since the $fsType storage($id) is free for too long time, re-inited it.") - } - } - } - lastAccessTime = System.currentTimeMillis() - method.getName match { - case "init" => - val user = if (properties.contains(StorageConfiguration.PROXY_USER.key)) StorageConfiguration.PROXY_USER.getValue(properties.toMap) else null - if (args.length > 0 && args(0).isInstanceOf[java.util.Map[String, String]]) { - properties ++= args(0).asInstanceOf[java.util.Map[String, String]] - } - if (StringUtils.isNotEmpty(user)) properties += StorageConfiguration.PROXY_USER.key -> user - initFS() - warn(s"For user($user)inited a $fsType storage($id) .") - Unit - case "fsName" => fsType - case "setUser" => properties += StorageConfiguration.PROXY_USER.key -> args(0).asInstanceOf[String]; Unit - case "read" => - if (!inited) throw new IllegalAccessException("storage has not been inited.") - new IOInputStream(args) - case "write" => - if (!inited) throw new IllegalAccessException("storage has not been inited.") - new IOOutputStream(args) - case "renameTo" => - if (!inited || args.length < 2) throw new IllegalAccessException("storage has not been inited.") - val params = args.map(MethodEntitySerializer.serializerJavaObject(_)).map(_.asInstanceOf[AnyRef]) - executeMethod(method.getName, params) - new java.lang.Boolean(true) - case "list" => - if (!inited || args.length < 1) throw new IllegalAccessException("storage has not been inited.") - val params = Array(MethodEntitySerializer.serializerJavaObject(args(0))).map(_.asInstanceOf[AnyRef]) - val msg = executeMethod(method.getName, params) - MethodEntitySerializer.deserializerToJavaObject[java.util.List[FsPath]](StorageUtils.deserializerResultToString(msg), new TypeToken[java.util.List[FsPath]]() {}.getType) - case "listPathWithError" => - if (!inited || args.length < 1) throw new IllegalAccessException("storage has not been inited.") - val params = Array(MethodEntitySerializer.serializerJavaObject(args(0))).map(_.asInstanceOf[AnyRef]) - val msg = executeMethod(method.getName, params) - MethodEntitySerializer.deserializerToJavaObject[FsPathListWithError](StorageUtils.deserializerResultToString(msg), new TypeToken[FsPathListWithError]() {}.getType) - case "toString" => - this.toString - case "finalize" => - info("no support method") - Unit - case _ => - if (!inited) throw new IllegalAccessException("storage has not been inited.") - if (method.getName == "close") closed = true - val returnType = method.getReturnType - if (args.length > 0) args(0) = MethodEntitySerializer.serializerJavaObject(args(0)) - val msg = executeMethod(method.getName, args) - if (returnType == Void.TYPE) return Unit - val result = MethodEntitySerializer.deserializerToJavaObject(StorageUtils.deserializerResultToString(msg), returnType) - result.asInstanceOf[AnyRef] - } - - } - - class IOInputStream(args: Array[AnyRef]) extends InputStream { - private var fetched: Array[Byte] = _ - private var index = 0 - private var position = 0l - private var markPosition = 0L - private var readable = true - private var canContinueFetch = true - - private def fetch: Unit = { - if (!canContinueFetch) { - readable = false - fetched = null - return - } - fetched = null - beforeOperation() - val params = Array(MethodEntitySerializer.serializerJavaObject(args(0)), position, fetchSize).map(_.asInstanceOf[AnyRef]) - val fetchedMsg = executeMethod("read", params) - if (StringUtils.isNotEmpty(fetchedMsg)) { - val resultSet = ResultSetFactory.getInstance.getResultSetByType(ResultSetFactory.IO_TYPE) - val reader = ResultSetReader.getResultSetReader(resultSet, fetchedMsg) - val metaData = reader.getMetaData.asInstanceOf[IOMetaData] - while (reader.hasNext) { - fetched = reader.getRecord.asInstanceOf[IORecord].value - } - if (metaData.len == -1 || metaData.len < fetchSize) canContinueFetch = false - index = 0 - position += fetched.length - } else readable = false - } - - override def read(): Int = synchronized { - if (!readable) return -1 - if (fetched == null || index == fetched.length) { - fetch - } - if (fetched == null || fetched.length == 0) return -1 - val v = fetched(index) - index += 1 - v & 0xff - } - - override def available(): Int = { - if (!readable) return 0 - if (!canContinueFetch) - return fetched.length - index - beforeOperation() - val params = Array(MethodEntitySerializer.serializerJavaObject(args(0)), position).map(_.asInstanceOf[AnyRef]) - val available = if (fetched != null) fetched.length - index else 0 - val msg = StorageUtils.deserializerResultToString( - executeMethod("available", params) - ) - val len = if (StringUtils.isEmpty(msg)) { - 0 - } else { - Utils.tryAndError(msg.toInt) - } - available + len - } - - override def skip(n: Long): Long = synchronized { - if (!readable) return 0 - var left = n - var _available = 0 - if (fetched != null) { - _available = fetched.length - index - if (_available > left) { - index += left.toInt - return left - } else if (_available == left) { - fetched = null - return left - } else { - left -= _available - fetched = null - } - } - val skipped = _available - _available = available() - if (_available <= left) { - position += _available - canContinueFetch = false - skipped + _available - } else { - position += left - fetch - n - } - } - - override def reset(): Unit = { - index = 0 - position = markPosition - fetched = null - readable = true - canContinueFetch = true - markPosition = 0 - } - - override def mark(readLimit: Int): Unit = { - markPosition = readLimit - } - } - - class IOOutputStream(args: Array[AnyRef]) extends OutputStream { - private val cached = new Array[Byte](cacheSize) - private var index = 0 - private var firstWrite = true - - override def write(b: Int): Unit = cached synchronized { - if (index >= cacheSize) write - cached(index) = b.toByte - index += 1 - } - - private def write = { - beforeOperation() - val overwrite = if (!args(1).toString.toBoolean) false else if (firstWrite) { - firstWrite = false - true - } else false - val resultSet = ResultSetFactory.getInstance.getResultSetByType(ResultSetFactory.IO_TYPE) - val writer = ResultSetWriter.getResultSetWriter(resultSet, Long.MaxValue, null) - writer.addMetaData(new IOMetaData(0, index)) - writer.addRecord(new IORecord(cached.slice(0, index))) - val params: Array[AnyRef] = Array(MethodEntitySerializer.serializerJavaObject(args(0)), overwrite.asInstanceOf[AnyRef], writer.toString()) - val msg = executeMethod("write", params) - if (msg == IOClient.SUCCESS) { - index = 0 - } else throw new IOException(msg) - } - - override def flush(): Unit = cached synchronized { - if (index > 0) { - write - } - } - - override def close(): Unit = flush() - } - -} \ No newline at end of file diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/ResultSetReader.scala b/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/ResultSetReader.scala deleted file mode 100644 index 8aa6afcc4..000000000 --- a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/ResultSetReader.scala +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright 2019 WeBank - * - * Licensed 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 com.webank.wedatasphere.linkis.storage.resultset - -import java.io.InputStream - -import com.webank.wedatasphere.linkis.common.io.resultset.{ResultSet, ResultSetReader} -import com.webank.wedatasphere.linkis.common.io.{FsPath, MetaData, Record} -import com.webank.wedatasphere.linkis.storage.FSFactory -import com.webank.wedatasphere.linkis.storage.exception.StorageErrorException -import com.webank.wedatasphere.linkis.storage.resultset.table.{TableMetaData, TableRecord, TableResultSet} - -/** - * Created by johnnwang on 10/18/18. - */ -object ResultSetReader { - - def getResultSetReader[K <: MetaData, V <: Record](resultSet: ResultSet[K, V], inputStream: InputStream): ResultSetReader[K, V] = { - new StorageResultSetReader[K, V](resultSet, inputStream) - } - - def getResultSetReader[K <: MetaData, V <: Record](resultSet: ResultSet[K, V], value: String): ResultSetReader[K, V] = { - new StorageResultSetReader[K, V](resultSet, value) - } - - def getResultSetReader(res: String):ResultSetReader[_ <: MetaData, _ <: Record]= { - val rsFactory = ResultSetFactory.getInstance - if (rsFactory.isResultSet(res)) { - val resultSet = rsFactory.getResultSet(res) - ResultSetReader.getResultSetReader(resultSet, res) - }else { - val resPath = new FsPath(res) - val resultSet = rsFactory.getResultSetByPath(resPath) - val fs = FSFactory.getFs(resPath) - fs.init(null) - ResultSetReader.getResultSetReader(resultSet, fs.read(resPath)) - } - } - - def getTableResultReader(res: String):ResultSetReader[TableMetaData,TableRecord] = { - val rsFactory = ResultSetFactory.getInstance - if (rsFactory.isResultSet(res)) { - val resultSet = rsFactory.getResultSet(res) - if (ResultSetFactory.TABLE_TYPE != resultSet.resultSetType()) { - throw new StorageErrorException(52002, "Result sets that are not tables are not supported(不支持不是表格的结果集)") - } - ResultSetReader.getResultSetReader(resultSet.asInstanceOf[TableResultSet], res) - }else { - val resPath = new FsPath(res) - val resultSet = rsFactory.getResultSetByPath(resPath) - if (ResultSetFactory.TABLE_TYPE != resultSet.resultSetType()) { - throw new StorageErrorException(52002, "Result sets that are not tables are not supported(不支持不是表格的结果集)") - } - val fs = FSFactory.getFs(resPath) - fs.init(null) - ResultSetReader.getResultSetReader(resultSet.asInstanceOf[TableResultSet], fs.read(resPath)) - } - } - -} diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/ResultSetWriter.scala b/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/ResultSetWriter.scala deleted file mode 100644 index bfd6e2d00..000000000 --- a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/ResultSetWriter.scala +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 2019 WeBank - * - * Licensed 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 com.webank.wedatasphere.linkis.storage.resultset - -import com.webank.wedatasphere.linkis.common.io.resultset.{ResultSet, ResultSetWriter} -import com.webank.wedatasphere.linkis.common.io.{FsPath, MetaData, Record} - -import scala.collection.mutable.ArrayBuffer - -/** - * Created by johnnwang on 10/18/18. - */ -object ResultSetWriter { - def getResultSetWriter[K <: MetaData, V <: Record](resultSet: ResultSet[K,V], maxCacheSize: Long, storePath: FsPath):ResultSetWriter[K, V] = - new StorageResultSetWriter[K, V](resultSet, maxCacheSize, storePath) - - def getResultSetWriter[K <: MetaData, V <: Record](resultSet: ResultSet[K,V], maxCacheSize: Long, storePath: FsPath, proxyUser:String):ResultSetWriter[K, V] ={ - val writer = new StorageResultSetWriter[K, V](resultSet, maxCacheSize, storePath) - writer.setProxyUser(proxyUser) - writer - } - - - def getRecordByWriter(writer: ResultSetWriter[_ <:MetaData,_ <:Record],limit:Long): Array[Record] ={ - val res = writer.toString - getRecordByRes(res,limit) - } - - def getRecordByRes(res: String,limit:Long): Array[Record] ={ - val reader = ResultSetReader.getResultSetReader(res) - var count = 0 - val records = new ArrayBuffer[Record]() - reader.getMetaData - while (reader.hasNext && count < limit){ - records += reader.getRecord - count = count + 1 - } - records.toArray - } - - def getLastRecordByRes(res: String):Record = { - val reader = ResultSetReader.getResultSetReader(res) - reader.getMetaData - while (reader.hasNext ){ - reader.getRecord - } - reader.getRecord - } -} diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/txt/TextResultDeserializer.scala b/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/txt/TextResultDeserializer.scala deleted file mode 100644 index 63b2114ac..000000000 --- a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/resultset/txt/TextResultDeserializer.scala +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2019 WeBank - * - * Licensed 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 com.webank.wedatasphere.linkis.storage.resultset.txt - -import com.webank.wedatasphere.linkis.common.io.resultset.ResultDeserializer -import com.webank.wedatasphere.linkis.storage.domain.Dolphin -import com.webank.wedatasphere.linkis.storage.{LineMetaData, LineRecord} - -/** - * Created by johnnwang on 10/20/18. - */ -class TextResultDeserializer extends ResultDeserializer[LineMetaData, LineRecord]{ - override def createMetaData(bytes: Array[Byte]): LineMetaData = { - new LineMetaData(Dolphin.getString(bytes, 0, bytes.length)) - } - - override def createRecord(bytes: Array[Byte]): LineRecord = { - new LineRecord(Dolphin.getString(bytes, 0, bytes.length)) - } -} diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/ScriptFsWriter.scala b/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/ScriptFsWriter.scala deleted file mode 100644 index f53fbfb65..000000000 --- a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/ScriptFsWriter.scala +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright 2019 WeBank - * - * Licensed 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 com.webank.wedatasphere.linkis.storage.script - -import java.io.{InputStream, OutputStream} - -import com.webank.wedatasphere.linkis.common.io.{FsPath, FsWriter, MetaData} -import com.webank.wedatasphere.linkis.storage.LineRecord -import com.webank.wedatasphere.linkis.storage.script.compaction.{PYScriptCompaction, QLScriptCompaction, ScalaScriptCompaction, ShellScriptCompaction} -import com.webank.wedatasphere.linkis.storage.script.parser.{PYScriptParser, QLScriptParser, ScalaScriptParser} -import com.webank.wedatasphere.linkis.storage.script.writer.StorageScriptFsWriter - -abstract class ScriptFsWriter extends FsWriter { - - val path: FsPath - val charset: String - - def getInputStream(): InputStream - -} - -object ScriptFsWriter { - def getScriptFsWriter(path: FsPath, charset: String, outputStream: OutputStream = null): ScriptFsWriter = - new StorageScriptFsWriter(path, charset, outputStream) -} - - -object ParserFactory { - def listParsers(): Array[Parser] = Array(PYScriptParser(), QLScriptParser(), ScalaScriptParser()) -} - -object Compaction { - def listCompactions(): Array[Compaction] = Array(PYScriptCompaction(),QLScriptCompaction(),ScalaScriptCompaction(),ShellScriptCompaction()) -} - -trait Parser { - def prefixConf: String - - def prefix: String - - def belongTo(suffix: String): Boolean - - def parse(line: String): Variable -} - -trait Compaction { - - def prefixConf: String - - def prefix: String - - def belongTo(suffix: String): Boolean - - def compact(variable: Variable): String -} - -class ScriptMetaData(var variables: Array[Variable]) extends MetaData { - override def cloneMeta(): MetaData = new ScriptMetaData(variables) - - def getMetaData = variables - - def setMetaData(variables: Array[Variable]) = { - this.variables = variables - } -} - -class ScriptRecord(line: String) extends LineRecord(line) - -//definition variable; specialConfiguration ;runConfiguration; startUpConfiguration; -case class Variable(sortParent: String, sort: String, key: String, value: String) - diff --git a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/parser/ScalaScriptParser.scala b/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/parser/ScalaScriptParser.scala deleted file mode 100644 index 766537a0e..000000000 --- a/storage/storage/src/main/scala/com/webank/wedatasphere/linkis/storage/script/parser/ScalaScriptParser.scala +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2019 WeBank - * - * Licensed 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 com.webank.wedatasphere.linkis.storage.script.parser - -/** - * Created by johnnwang on 2018/11/7. - */ -class ScalaScriptParser private extends CommonScriptParser { - //todo To be determined(待定) - override def prefix: String = "//@set" - - override def belongTo(suffix: String): Boolean = { - suffix match { - case "scala" => true - case _ => false - } - } - - override def prefixConf: String = "//conf@set" -} - -object ScalaScriptParser { - val otherScriptParser: ScalaScriptParser = new ScalaScriptParser - - def apply(): CommonScriptParser = otherScriptParser -} -- Gitee From a01c86080e393150d38ffa5ba197672c1361924b Mon Sep 17 00:00:00 2001 From: peacewong Date: Thu, 4 Feb 2021 15:45:47 +0800 Subject: [PATCH 059/148] Standardize the directory structure of linkis-user-control --- .gitignore | 2 +- {userControl => linkis-user-control}/bin/start-usercontrol.sh | 0 {userControl => linkis-user-control}/bin/stop-usercontrol.sh | 0 {userControl => linkis-user-control}/conf/application.yml | 0 {userControl => linkis-user-control}/conf/linkis.properties | 0 {userControl => linkis-user-control}/conf/log4j.properties | 0 {userControl => linkis-user-control}/conf/log4j2.xml | 0 {userControl => linkis-user-control}/pom.xml | 4 ++-- .../src/main/assembly/distribution.xml | 0 .../linkis/usercontrol/receiver/UserControlReceiver.scala | 0 .../usercontrol/receiver/UserControlReceiverChooser.scala | 0 .../linkis/usercontrol/service/UserControlService.scala | 0 12 files changed, 3 insertions(+), 3 deletions(-) rename {userControl => linkis-user-control}/bin/start-usercontrol.sh (100%) mode change 100755 => 100644 rename {userControl => linkis-user-control}/bin/stop-usercontrol.sh (100%) mode change 100755 => 100644 rename {userControl => linkis-user-control}/conf/application.yml (100%) rename {userControl => linkis-user-control}/conf/linkis.properties (100%) rename {userControl => linkis-user-control}/conf/log4j.properties (100%) rename {userControl => linkis-user-control}/conf/log4j2.xml (100%) rename {userControl => linkis-user-control}/pom.xml (98%) rename {userControl => linkis-user-control}/src/main/assembly/distribution.xml (100%) rename {userControl => linkis-user-control}/src/main/scala/com/webank/wedatasphere/linkis/usercontrol/receiver/UserControlReceiver.scala (100%) rename {userControl => linkis-user-control}/src/main/scala/com/webank/wedatasphere/linkis/usercontrol/receiver/UserControlReceiverChooser.scala (100%) rename {userControl => linkis-user-control}/src/main/scala/com/webank/wedatasphere/linkis/usercontrol/service/UserControlService.scala (100%) diff --git a/.gitignore b/.gitignore index b0cfe8f54..39589cd1c 100644 --- a/.gitignore +++ b/.gitignore @@ -80,6 +80,6 @@ bml/bmlcommon/target/ bml/bmlserver/target/ linkis-commons/linkis-hadoop-common/target/ publicService/workspace/client/workspace-httpclient/target/ -userControl/target/ +linkis-user-control/target/ diff --git a/userControl/bin/start-usercontrol.sh b/linkis-user-control/bin/start-usercontrol.sh old mode 100755 new mode 100644 similarity index 100% rename from userControl/bin/start-usercontrol.sh rename to linkis-user-control/bin/start-usercontrol.sh diff --git a/userControl/bin/stop-usercontrol.sh b/linkis-user-control/bin/stop-usercontrol.sh old mode 100755 new mode 100644 similarity index 100% rename from userControl/bin/stop-usercontrol.sh rename to linkis-user-control/bin/stop-usercontrol.sh diff --git a/userControl/conf/application.yml b/linkis-user-control/conf/application.yml similarity index 100% rename from userControl/conf/application.yml rename to linkis-user-control/conf/application.yml diff --git a/userControl/conf/linkis.properties b/linkis-user-control/conf/linkis.properties similarity index 100% rename from userControl/conf/linkis.properties rename to linkis-user-control/conf/linkis.properties diff --git a/userControl/conf/log4j.properties b/linkis-user-control/conf/log4j.properties similarity index 100% rename from userControl/conf/log4j.properties rename to linkis-user-control/conf/log4j.properties diff --git a/userControl/conf/log4j2.xml b/linkis-user-control/conf/log4j2.xml similarity index 100% rename from userControl/conf/log4j2.xml rename to linkis-user-control/conf/log4j2.xml diff --git a/userControl/pom.xml b/linkis-user-control/pom.xml similarity index 98% rename from userControl/pom.xml rename to linkis-user-control/pom.xml index b1de28389..345693b1a 100644 --- a/userControl/pom.xml +++ b/linkis-user-control/pom.xml @@ -27,8 +27,8 @@ 4.0.0 jar - linkis-usercontrol - linkis-usercontrol + + linkis-user-control UTF-8 diff --git a/userControl/src/main/assembly/distribution.xml b/linkis-user-control/src/main/assembly/distribution.xml similarity index 100% rename from userControl/src/main/assembly/distribution.xml rename to linkis-user-control/src/main/assembly/distribution.xml diff --git a/userControl/src/main/scala/com/webank/wedatasphere/linkis/usercontrol/receiver/UserControlReceiver.scala b/linkis-user-control/src/main/scala/com/webank/wedatasphere/linkis/usercontrol/receiver/UserControlReceiver.scala similarity index 100% rename from userControl/src/main/scala/com/webank/wedatasphere/linkis/usercontrol/receiver/UserControlReceiver.scala rename to linkis-user-control/src/main/scala/com/webank/wedatasphere/linkis/usercontrol/receiver/UserControlReceiver.scala diff --git a/userControl/src/main/scala/com/webank/wedatasphere/linkis/usercontrol/receiver/UserControlReceiverChooser.scala b/linkis-user-control/src/main/scala/com/webank/wedatasphere/linkis/usercontrol/receiver/UserControlReceiverChooser.scala similarity index 100% rename from userControl/src/main/scala/com/webank/wedatasphere/linkis/usercontrol/receiver/UserControlReceiverChooser.scala rename to linkis-user-control/src/main/scala/com/webank/wedatasphere/linkis/usercontrol/receiver/UserControlReceiverChooser.scala diff --git a/userControl/src/main/scala/com/webank/wedatasphere/linkis/usercontrol/service/UserControlService.scala b/linkis-user-control/src/main/scala/com/webank/wedatasphere/linkis/usercontrol/service/UserControlService.scala similarity index 100% rename from userControl/src/main/scala/com/webank/wedatasphere/linkis/usercontrol/service/UserControlService.scala rename to linkis-user-control/src/main/scala/com/webank/wedatasphere/linkis/usercontrol/service/UserControlService.scala -- Gitee From fa3cddb03d0bfd9dfcf38a2164195f9c00878216 Mon Sep 17 00:00:00 2001 From: peacewong Date: Thu, 4 Feb 2021 17:06:40 +0800 Subject: [PATCH 060/148] Standardize the directory structure of linkis-public-enhancements --- .gitignore | 58 +++++++++---------- .../linkis-bml/linkis-bml-client}/pom.xml | 4 +- .../linkis/bml/client/AbstractBmlClient.java | 0 .../linkis/bml/client/BmlClient.java | 0 .../linkis/bml/client/BmlClientFactory.java | 0 .../bml/client/impl/HttpBmlClient.scala | 0 .../bml/common/POSTActionFailException.scala | 0 .../linkis/bml/conf/BmlConfiguration.scala | 0 .../linkis/bml/http/HttpConf.scala | 0 .../linkis/bml/request/BmlPOSTAction.scala | 0 .../linkis/bml/response/BmlResult.scala | 0 .../linkis-bml/linkis-bml-common}/pom.xml | 4 +- .../linkis/bml/model/AbstractAuditable.java | 0 .../linkis/bml/protocol/BmlProtocol.scala | 0 .../linkis-bml-engine-hook}/pom.xml | 4 +- .../linkis/bml/conf/BmlHookConf.scala | 0 .../exception/BmlHookDownloadException.scala | 0 .../bml/hook/BmlEnginePreExecuteHook.scala | 0 .../linkis/bml/hook/BmlResourceParser.scala | 0 .../linkis/bml/utils/BmlHookUtils.scala | 0 .../linkis-bml/linkis-bml-server}/Dockerfile | 0 .../linkis-bml-server}/bin/start-bml.sh | 0 .../linkis-bml-server}/bin/startup.sh | 0 .../linkis-bml-server}/bin/stop-bml.sh | 0 .../linkis-bml/linkis-bml-server}/bin/stop.sh | 0 .../linkis-bml-server}/conf/application.yml | 0 .../linkis-bml-server}/conf/linkis.properties | 0 .../linkis-bml-server}/conf/log4j2.xml | 0 .../linkis-bml/linkis-bml-server}/pom.xml | 4 +- .../linkis-bml/linkis-bml-server}/pom_k8s.xml | 4 +- .../src/main/assembly/distribution.xml | 0 .../linkis/bml/Entity/DownloadModel.java | 0 .../linkis/bml/Entity/Resource.java | 0 .../linkis/bml/Entity/ResourceTask.java | 0 .../linkis/bml/Entity/ResourceVersion.java | 0 .../linkis/bml/Entity/Version.java | 0 .../linkis/bml/common/Constant.java | 0 .../linkis/bml/common/ExecutorManager.java | 0 .../linkis/bml/common/HdfsResourceHelper.java | 0 .../linkis/bml/common/OperationEnum.java | 0 .../linkis/bml/common/ResourceHelper.java | 0 .../bml/common/ResourceHelperFactory.java | 0 .../linkis/bml/common/ScheduledTask.java | 0 .../linkis/bml/dao/DownloadDao.java | 0 .../linkis/bml/dao/ResourceDao.java | 0 .../wedatasphere/linkis/bml/dao/TaskDao.java | 0 .../linkis/bml/dao/VersionDao.java | 0 .../linkis/bml/dao/impl/DownloadMapper.xml | 0 .../linkis/bml/dao/impl/ResourceMapper.xml | 0 .../linkis/bml/dao/impl/TaskMapper.xml | 0 .../linkis/bml/dao/impl/VersionMapper.xml | 0 .../linkis/bml/restful/BmlRestfulApi.java | 0 .../linkis/bml/restful/RestfulUtils.java | 0 .../linkis/bml/service/BmlService.java | 0 .../linkis/bml/service/DownloadService.java | 0 .../linkis/bml/service/ResourceService.java | 0 .../linkis/bml/service/TaskService.java | 0 .../linkis/bml/service/VersionService.java | 0 .../bml/service/impl/BmlServiceImpl.java | 0 .../bml/service/impl/DownloadServiceImpl.java | 0 .../bml/service/impl/ResourceServiceImpl.java | 0 .../bml/service/impl/TaskServiceImpl.java | 0 .../bml/service/impl/VersionServiceImpl.java | 0 .../linkis/bml/threading/Scheduler.java | 0 .../linkis/bml/threading/Task.java | 0 .../linkis/bml/threading/TaskState.java | 0 .../linkis/bml/util/HttpRequestHelper.java | 0 .../linkis/bml/util/MD5Utils.java | 0 .../linkis/bml/vo/ResourceBasicVO.java | 0 .../linkis/bml/vo/ResourceVO.java | 0 .../linkis/bml/vo/ResourceVersionsVO.java | 0 .../bml/common/BmlAuthorityException.scala | 0 .../common/BmlPermissionDeniedException.scala | 0 .../bml/common/BmlQueryFailException.scala | 0 .../common/BmlResourceExpiredException.scala | 0 .../common/BmlServerParaErrorException.scala | 0 .../bml/conf/BmlServerConfiguration.scala | 0 .../bml/protocol/BmlServerProtocol.scala | 0 .../linkis/bml/rpc/BmlReceiver.scala | 0 linkis-public-enhancements/linkis-bml/pom.xml | 26 +++++++++ .../linkis-cs-cache}/pom.xml | 2 +- .../cs/contextcache/ContextCacheService.java | 0 .../DefaultContextCacheService.java | 0 .../cs/contextcache/cache/ContextCache.java | 0 .../cache/DefaultContextCache.java | 0 .../cache/csid/ContextIDValue.java | 0 .../cache/csid/ContextIDValueGenerator.java | 0 .../impl/ContextIDValueGeneratorImpl.java | 0 .../cache/csid/impl/ContextIDValueImpl.java | 0 .../cache/cskey/ContextKeyValueContext.java | 0 .../cache/cskey/ContextValueMapSet.java | 0 .../cskey/impl/ContextValueMapSetImpl.java | 0 .../impl/DefaultContextKeyValueContext.java | 0 .../cache/guava/ContextIDCacheLoader.java | 0 .../cache/guava/ContextIDRemoveListener.java | 0 .../cs/contextcache/cleaner/AUTOCleaner.java | 0 .../contextcache/conf/ContextCacheConf.java | 0 .../index/ContextInvertedIndex.java | 0 .../index/ContextInvertedIndexSet.java | 0 .../index/ContextInvertedIndexSetImpl.java | 0 .../index/DefaultContextInvertedIndex.java | 0 .../metric/ClassIntrospector.java | 0 .../metric/ContextCacheMetric.java | 0 .../contextcache/metric/ContextIDMetric.java | 0 .../metric/DefaultContextCacheMetric.java | 0 .../metric/DefaultContextIDMetric.java | 0 .../cs/contextcache/metric/Metrtic.java | 0 .../cs/contextcache/metric/ObjectInfo.java | 0 .../cs/contextcache/metric/SizeEstimator.java | 0 .../parser/ContextKeyValueParser.java | 0 .../parser/DefaultContextKeyValueParser.java | 0 .../contextcache/utils/ContextCacheUtils.java | 0 .../contextcache/test/csid/TestContextID.java | 0 .../test/keyword/TestContextKey.java | 0 .../test/keyword/TestContextKeyValue.java | 0 .../keyword/TestContextKeyValueParser.java | 0 .../test/keyword/TestContextValue.java | 0 .../test/service/TestContextCacheService.java | 0 .../src/test/resources/linkis.properties | 0 .../src/test/resources/log4j.properties | 0 .../src/test/resources/log4j2.xml | 0 .../linkis-cs-client}/pom.xml | 2 +- .../cs/client/AbstractContextClient.java | 0 .../linkis/cs/client/Context.java | 0 .../linkis/cs/client/ContextClient.java | 0 .../linkis/cs/client/LinkisContext.java | 0 .../cs/client/LinkisWorkFlowContext.java | 0 .../client/builder/ContextClientConfig.java | 0 .../client/builder/ContextClientFactory.java | 0 .../builder/HttpContextClientConfig.java | 0 .../builder/RPCHttpContextClientConfig.java | 0 .../client/http/ContextPostActionBuilder.java | 0 .../cs/client/http/HttpContextClient.java | 0 .../cs/client/http/HttpHeartBeater.java | 0 .../client/listener/ContextClientEvent.java | 0 .../listener/ContextClientListener.java | 0 .../listener/ContextClientListenerBus.java | 0 .../ContextClientListenerManager.java | 0 .../cs/client/listener/ContextIDListener.java | 0 .../client/listener/ContextKeyListener.java | 0 .../client/listener/ContextUpdateEvent.java | 0 .../cs/client/listener/HeartBeater.java | 0 .../cs/client/service/CSMetaDataService.java | 0 .../cs/client/service/CSNodeService.java | 0 .../cs/client/service/CSNodeServiceImpl.java | 0 .../cs/client/service/CSResourceService.java | 0 .../client/service/CSResultDataService.java | 0 .../service/CSResultDataServiceImpl.java | 0 .../cs/client/service/CSTableService.java | 0 .../cs/client/service/CSVariableService.java | 0 .../cs/client/service/CSWorkService.java | 0 .../cs/client/service/CSWorkServiceImpl.java | 0 .../client/service/DefaultSearchService.java | 0 .../client/service/LinkisJobDataService.java | 0 .../service/LinkisJobDataServiceImpl.java | 0 .../cs/client/service/MetaDataService.java | 0 .../cs/client/service/ResourceService.java | 0 .../cs/client/service/SearchService.java | 0 .../cs/client/service/TableService.java | 0 .../cs/client/service/VariableService.java | 0 .../cs/client/utils/ContextServiceUtils.java | 0 .../cs/client/utils/ExceptionHelper.java | 0 .../cs/client/utils/SerializeHelper.java | 0 .../exception/ProtocolNotMatchException.scala | 0 .../linkis/cs/client/http/ContextAction.scala | 0 .../linkis/cs/client/http/ContextResult.scala | 0 .../cs/client/utils/ContextClientConf.scala | 0 .../cs/client/utils/ContextClientUtils.scala | 0 .../client/utils/ContextServerHttpConf.scala | 0 .../linkis-cs-common}/pom.xml | 2 +- .../cs/common/annotation/KeywordMethod.java | 0 .../cs/common/entity/data/CSResultData.java | 0 .../linkis/cs/common/entity/data/Data.java | 0 .../linkis/cs/common/entity/data/JobData.java | 0 .../cs/common/entity/data/LinkisJobData.java | 0 .../entity/enumeration/ContextScope.java | 0 .../entity/enumeration/ContextType.java | 0 .../cs/common/entity/enumeration/DBType.java | 0 .../common/entity/enumeration/ExpireType.java | 0 .../common/entity/enumeration/WorkType.java | 0 .../linkis/cs/common/entity/env/Env.java | 0 .../linkis/cs/common/entity/env/OSEnv.java | 0 .../cs/common/entity/env/SoftWareEnv.java | 0 .../cs/common/entity/env/SoftwareLibEnv.java | 0 .../CommonContextIDListenerDomain.java | 0 .../CommonContextKeyListenerDomain.java | 0 .../listener/ContextIDListenerDomain.java | 0 .../listener/ContextKeyListenerDomain.java | 0 .../entity/listener/ListenerDomain.java | 0 .../cs/common/entity/metadata/CSColumn.java | 0 .../cs/common/entity/metadata/CSDB.java | 0 .../common/entity/metadata/CSPartition.java | 0 .../cs/common/entity/metadata/CSTable.java | 0 .../cs/common/entity/metadata/Column.java | 0 .../linkis/cs/common/entity/metadata/DB.java | 0 .../cs/common/entity/metadata/Partition.java | 0 .../cs/common/entity/metadata/Table.java | 0 .../cs/common/entity/object/CSFlowInfos.java | 0 .../cs/common/entity/object/CSInfos.java | 0 .../cs/common/entity/object/CSProperty.java | 0 .../object/CommonGlobalConfiguration.java | 0 .../common/entity/object/CommonProperty.java | 0 .../common/entity/object/LinkisVariable.java | 0 .../common/entity/resource/BMLResource.java | 0 .../entity/resource/CommonFxResource.java | 0 .../entity/resource/CommonUDFResource.java | 0 .../cs/common/entity/resource/FxResource.java | 0 .../entity/resource/LinkisBMLResource.java | 0 .../cs/common/entity/resource/Resource.java | 0 .../common/entity/resource/UDFResource.java | 0 .../source/CombinedNodeIDContextID.java | 0 .../common/entity/source/CommonContextID.java | 0 .../entity/source/CommonContextKey.java | 0 .../entity/source/CommonContextKeyValue.java | 0 .../entity/source/CommonContextValue.java | 0 .../entity/source/CommonHAContextID.java | 0 .../cs/common/entity/source/ContextID.java | 0 .../common/entity/source/ContextIDParser.java | 0 .../cs/common/entity/source/ContextKey.java | 0 .../common/entity/source/ContextKeyValue.java | 0 .../cs/common/entity/source/ContextValue.java | 0 .../entity/source/CreatorContextKey.java | 0 .../cs/common/entity/source/HAContextID.java | 0 .../source/LinkisHAWorkFlowContextID.java | 0 .../source/LinkisWorkflowContextID.java | 0 .../common/entity/source/OrderContextKey.java | 0 .../cs/common/entity/source/Source.java | 0 .../common/entity/source/UserContextID.java | 0 .../cs/common/entity/source/ValueBean.java | 0 .../entity/source/VersionContextKey.java | 0 .../entity/source/WorkflowContextID.java | 0 .../common/entity/source/YMLContextKey.java | 0 .../cs/common/exception/CSErrorException.java | 0 .../cs/common/exception/CSWarnException.java | 0 .../linkis/cs/common/exception/ErrorCode.java | 0 .../cs/common/listener/ContextIDListener.java | 0 .../common/listener/ContextKeyListener.java | 0 .../common/protocol/ContextHTTPConstant.java | 0 .../common/protocol/ContextHistoryType.java | 0 .../cs/common/protocol/ContextIDType.java | 0 .../cs/common/protocol/ContextKeyType.java | 0 .../common/protocol/ContextKeyValueType.java | 0 .../cs/common/protocol/ContextValueType.java | 0 .../ContextSearchConditionMapBuilder.java | 0 .../common/serialize/AbstractSerializer.java | 0 .../common/serialize/ContextSerializer.java | 0 .../helper/AbstractSerializationHelper.java | 0 .../helper/ContextSerializationHelper.java | 0 .../serialize/helper/SerializationHelper.java | 0 .../CombinedNodeIDContextIDSerializer.java | 0 .../context/CommonContextKeySerializer.java | 0 .../context/ContextKeyValueSerializer.java | 0 .../impl/context/ContextValueSerializer.java | 0 .../LinkisHAWorkFlowContextIDSerializer.java | 0 .../value/LinkisBMLResourceSerializer.java | 0 .../value/data/CSResultDataSerializer.java | 0 .../value/data/LinkisJobDataSerializer.java | 0 .../value/metadata/CSTableSerializer.java | 0 .../value/object/CSFlowInfosSerializer.java | 0 .../object/LinkisVariableSerializer.java | 0 .../linkis/cs/common/utils/CSCommonUtils.java | 0 .../cs/common/utils/CSHighAvailableUtils.java | 0 .../linkis-cs-engine-support}/pom.xml | 4 +- .../cs/storage/CSTableResultSetWriter.scala | 0 .../linkis-cs-highavailable}/pom.xml | 2 +- .../AbstractContextHAManager.java | 0 .../cs/highavailable/ContextHAManager.java | 0 .../DefaultContextHAManager.java | 0 .../conf/ContextHighAvailableConf.java | 0 .../cs/highavailable/exception/ErrorCode.java | 0 .../ha/BackupInstanceGenerator.java | 0 .../cs/highavailable/ha/ContextHAChecker.java | 0 .../ha/ContextHAIDGenerator.java | 0 .../ha/impl/BackupInstanceGeneratorImpl.java | 0 .../ha/impl/ContextHACheckerImpl.java | 0 .../ha/impl/ContextHAIDGeneratorImpl.java | 0 .../HAContextPersistenceManagerImpl.java | 0 .../proxy/MethodInterceptorImpl.java | 0 .../test/TestContextHAManager.java | 0 .../cs/highavailable/test/haid/TestHAID.java | 0 .../test/persist/TestPersistence.java | 0 .../src/test/resources/application.yml | 0 .../src/test/resources/linkis.properties | 0 .../src/test/resources/log4j.properties | 0 .../src/test/resources/log4j2.xml | 0 .../linkis-cs-listener}/pom.xml | 2 +- .../linkis/cs/listener/CSIDListener.java | 0 .../linkis/cs/listener/CSKeyListener.java | 0 .../listener/ContextAsyncEventListener.java | 0 .../ListenerBus/ContextAsyncListenerBus.java | 0 .../callback/AbstractCallbackEngine.java | 0 .../cs/listener/callback/CallbackEngine.java | 0 .../callback/ContextIDCallbackEngine.java | 0 .../callback/ContextKeyCallbackEngine.java | 0 .../callback/imp/ContextKeyValueBean.java | 0 .../imp/DefaultContextIDCallbackEngine.java | 0 .../imp/DefaultContextKeyCallbackEngine.java | 0 .../cs/listener/conf/ContextListenerConf.java | 0 .../cs/listener/event/ContextIDEvent.java | 0 .../cs/listener/event/ContextKeyEvent.java | 0 .../event/enumeration/OperateType.java | 0 .../event/impl/DefaultContextIDEvent.java | 0 .../event/impl/DefaultContextKeyEvent.java | 0 .../cs/listener/manager/ListenerManager.java | 0 .../imp/DefaultContextListenerManager.java | 0 .../cs/listener/test/TestContextID.java | 0 .../cs/listener/test/TestContextKey.java | 0 .../cs/listener/test/TestContextKeyValue.java | 0 .../cs/listener/test/TestContextValue.java | 0 .../cs/listener/test/TestListenerManager.java | 0 .../linkis-cs-persistence}/pom.xml | 2 +- .../persistence/ContextPersistenceBeans.java | 0 .../ContextPersistenceManager.java | 0 .../ContextPersistenceManagerImpl.java | 0 .../cs/persistence/annotation/Ignore.java | 0 .../cs/persistence/annotation/Tuning.java | 0 .../aop/PersistenceTuningAspect.java | 0 .../cs/persistence/conf/PersistenceConf.java | 0 .../dao/ContextIDListenerMapper.java | 0 .../cs/persistence/dao/ContextIDMapper.java | 0 .../dao/ContextKeyListenerMapper.java | 0 .../cs/persistence/dao/ContextMapMapper.java | 0 .../dao/impl/contextIDListenerMapper.xml | 0 .../persistence/dao/impl/contextIDMapper.xml | 0 .../dao/impl/contextKeyListenerMapper.xml | 0 .../persistence/dao/impl/contextMapMapper.xml | 0 .../persistence/entity/ExtraFieldClass.java | 0 .../entity/PersistenceContextID.java | 0 .../entity/PersistenceContextIDListener.java | 0 .../entity/PersistenceContextKey.java | 0 .../entity/PersistenceContextKeyListener.java | 0 .../entity/PersistenceContextKeyValue.java | 0 .../entity/PersistenceContextValue.java | 0 .../exception/ThrowingFunction.java | 0 .../ContextIDListenerPersistence.java | 0 .../persistence/ContextIDPersistence.java | 0 .../ContextKeyListenerPersistence.java | 0 .../persistence/ContextMapPersistence.java | 0 .../ContextMetricsPersistence.java | 0 .../persistence/TransactionManager.java | 0 .../ContextIDListenerPersistenceImpl.java | 0 .../impl/ContextIDPersistenceImpl.java | 0 .../ContextKeyListenerPersistenceImpl.java | 0 .../impl/ContextMapPersistenceImpl.java | 0 .../impl/ContextMetricsPersistenceImpl.java | 0 .../impl/TransactionManagerImpl.java | 0 .../cs/persistence/util/PersistenceUtils.java | 0 .../src/main/resources/cs_ddl.sql | 0 .../linkis-cs-search}/pom.xml | 2 +- .../wedatasphere/linkis/cs/ContextSearch.java | 0 .../linkis/cs/DefaultContextSearch.java | 0 .../cs/condition/AbstractCommonCondition.java | 0 .../linkis/cs/condition/AtomicCondition.java | 0 .../cs/condition/BinaryLogicCondition.java | 0 .../linkis/cs/condition/Condition.java | 0 .../linkis/cs/condition/ConditionType.java | 0 .../cs/condition/UnaryLogicCondition.java | 0 .../construction/AndConditionParser.java | 0 .../construction/ConditionBuilder.java | 0 .../construction/ConditionBuilderImpl.java | 0 .../construction/ConditionParser.java | 0 .../construction/ContainsConditionParser.java | 0 .../ContextScopeConditionParser.java | 0 .../ContextTypeConditionParser.java | 0 .../ContextValueTypeConditionParser.java | 0 .../construction/NearestConditionParser.java | 0 .../construction/NotConditionParser.java | 0 .../construction/OrConditionParser.java | 0 .../construction/RegexConditionParser.java | 0 .../cs/condition/impl/AndCondition.java | 0 .../cs/condition/impl/ContainsCondition.java | 0 .../condition/impl/ContextScopeCondition.java | 0 .../condition/impl/ContextTypeCondition.java | 0 .../impl/ContextValueTypeCondition.java | 0 .../cs/condition/impl/NearestCondition.java | 0 .../cs/condition/impl/NotCondition.java | 0 .../linkis/cs/condition/impl/OrCondition.java | 0 .../cs/condition/impl/RegexCondition.java | 0 .../ContextSearchFailedException.java | 0 .../execution/AbstractConditionExecution.java | 0 .../cs/execution/ConditionExecution.java | 0 .../fetcher/AbstractContextCacheFetcher.java | 0 .../fetcher/ContextCacheFetcher.java | 0 .../ContextTypeContextSearchFetcher.java | 0 .../fetcher/IterateContextCacheFetcher.java | 0 .../execution/impl/AndConditionExecution.java | 0 .../impl/BinaryLogicConditionExecution.java | 0 .../impl/ContainsConditionExecution.java | 0 .../impl/ContextScopeConditionExecution.java | 0 .../impl/ContextTypeConditionExecution.java | 0 .../ContextValueTypeConditionExecution.java | 0 .../impl/NearestConditionExecution.java | 0 .../execution/impl/NotConditionExecution.java | 0 .../execution/impl/OrConditionExecution.java | 0 .../impl/RegexConditionExecution.java | 0 .../impl/UnaryLogicConditionExecution.java | 0 .../matcher/AbstractContextSearchMatcher.java | 0 .../matcher/AndLogicContextSearchMatcher.java | 0 .../BinaryLogicContextSearchMatcher.java | 0 .../matcher/ConditionMatcherResolver.java | 0 .../matcher/ContainsContextSearchMatcher.java | 0 .../ContextScopeContextSearchMatcher.java | 0 .../matcher/ContextSearchMatcher.java | 0 .../ContextTypeContextSearchMatcher.java | 0 .../ContextValueTypeContextSearchMatcher.java | 0 .../NearestLogicContextSearchMatcher.java | 0 .../matcher/NotLogicContextSearchMatcher.java | 0 .../matcher/OrLogicContextSearchMatcher.java | 0 .../matcher/RegexContextSearchMatcher.java | 0 .../matcher/SkipContextSearchMather.java | 0 .../UnaryLogicContextSearchMatcher.java | 0 .../ruler/AbstractContextSearchRuler.java | 0 .../ruler/CommonListContextSearchRuler.java | 0 .../execution/ruler/ContextSearchRuler.java | 0 .../ruler/NearestContextSearchRuler.java | 0 .../cs/optimize/ConditionOptimizer.java | 0 .../cs/optimize/OptimizedCondition.java | 0 .../cost/ConditionCostCalculator.java | 0 .../linkis/cs/optimize/dfs/BinaryTree.java | 0 .../cs/optimize/dfs/MinCostBinaryTree.java | 0 .../linkis/cs/optimize/dfs/Node.java | 0 .../impl/CostBasedConditionOptimizer.java | 0 .../wedatasphere/linkis/cs/AndTest.java | 0 .../wedatasphere/linkis/cs/ContainsTest.java | 0 .../linkis/cs/ContextScopeTest.java | 0 .../linkis/cs/ContextSearchTest.java | 0 .../linkis/cs/ContextTypeTest.java | 0 .../wedatasphere/linkis/cs/RegexTest.java | 0 .../linkis/cs/csid/TestContextID.java | 0 .../linkis/cs/keyword/TestContextKey.java | 0 .../cs/keyword/TestContextKeyValue.java | 0 .../linkis/cs/keyword/TestContextValue.java | 0 .../linkis/cs/parser/ApiJsonTest.java | 0 .../linkis-cs-server}/Dockerfile | 0 .../linkis-cs-server}/bin/start-cs-server.sh | 0 .../linkis-cs-server}/bin/startup.sh | 0 .../linkis-cs-server}/bin/stop-cs-server.sh | 0 .../linkis-cs-server}/bin/stop.sh | 0 .../linkis-cs-server}/conf/application.yml | 0 .../linkis-cs-server}/conf/linkis.properties | 0 .../linkis-cs-server}/conf/log4j.properties | 0 .../linkis-cs-server}/conf/log4j2.xml | 0 .../linkis-cs-server}/pom.xml | 2 +- .../linkis-cs-server}/pom_k8s.xml | 2 +- .../src/main/assembly/distribution.xml | 0 .../cs/server/conf/ContextServerConf.java | 0 .../cs/server/enumeration/ServiceMethod.java | 0 .../cs/server/enumeration/ServiceType.java | 0 .../server/parser/DefaultKeywordParser.java | 0 .../cs/server/parser/KeywordMethodEntity.java | 0 .../cs/server/parser/KeywordParser.java | 0 .../protocol/AbstractHttpRequestProtocol.java | 0 .../cs/server/protocol/ContextIDProtocol.java | 0 .../protocol/ContextListenerProtocol.java | 0 .../cs/server/protocol/ContextProtocol.java | 0 .../cs/server/protocol/HttpProtocol.java | 0 .../server/protocol/HttpRequestProtocol.java | 0 .../server/protocol/HttpResponseProtocol.java | 0 .../server/protocol/RestResponseProtocol.java | 0 .../server/restful/ContextIDRestfulApi.java | 0 .../restful/ContextListenerRestfulApi.java | 0 .../cs/server/restful/ContextRestfulApi.java | 0 .../cs/server/restful/CsRestfulParent.java | 0 .../cs/server/scheduler/CsScheduler.java | 0 .../server/scheduler/DefaultCsScheduler.java | 0 .../cs/server/scheduler/HttpAnswerJob.java | 0 .../scheduler/HttpAnswerJobBuilder.java | 0 .../linkis/cs/server/scheduler/HttpJob.java | 0 .../cs/server/scheduler/HttpJobBuilder.java | 0 .../cs/server/scheduler/HttpPriorityJob.java | 0 .../cs/server/scheduler/RestJobBuilder.java | 0 .../linkisImpl/CsExecuteRequest.java | 0 .../scheduler/linkisImpl/CsExecutor.java | 0 .../linkisImpl/CsExecutorManager.java | 0 .../scheduler/linkisImpl/CsJobListener.java | 0 .../scheduler/linkisImpl/CsSchedulerBean.java | 0 .../scheduler/linkisImpl/CsSchedulerJob.java | 0 .../JobToExecuteRequestConsumer.java | 0 .../cs/server/service/AbstractService.java | 0 .../cs/server/service/ContextIDService.java | 0 .../service/ContextListenerService.java | 0 .../cs/server/service/ContextService.java | 0 .../linkis/cs/server/service/Service.java | 0 .../service/impl/ContextIDServiceImpl.java | 0 .../impl/ContextListenerServiceImpl.java | 0 .../service/impl/ContextServiceImpl.java | 0 .../linkis/cs/server/util/CsUtils.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/linkis.properties | 0 .../src/main/resources/log4j.properties | 0 .../src/main/resources/log4j2.xml | 0 .../linkis-context-service/pom.xml | 33 +++++++++++ .../datasourcemanager/common/pom.xml | 2 +- .../common/DsmConfiguration.java | 0 .../common/ServiceErrorCode.java | 0 .../common/domain/DataSource.java | 0 .../common/domain/DataSourceEnv.java | 0 .../domain/DataSourceParamKeyDefinition.java | 0 .../common/domain/DataSourceType.java | 0 .../common/util/CryptoUtils.java | 0 .../common/util/PatternInjectUtils.java | 0 .../common/util/json/Json.java | 0 .../common/protocol/DsmQueryProtocol.scala | 0 .../datasourcemanager/server/Dockerfile | 0 .../server/bin/start-dsm-server.sh | 0 .../datasourcemanager/server/bin/startup.sh | 0 .../server/bin/stop-dsm-server.sh | 0 .../datasourcemanager/server/bin/stop.sh | 0 .../server/conf/application.yml | 0 .../server/conf/linkis.properties | 0 .../server/conf/log4j.properties | 0 .../datasourcemanager/server/conf/log4j2.xml | 0 .../datasourcemanager/server/pom.xml | 2 +- .../datasourcemanager/server/pom_k8s.xml | 2 +- .../server/src/main/assembly/distribution.xml | 0 .../core/dao/DataSourceDao.java | 0 .../core/dao/DataSourceEnvDao.java | 0 .../core/dao/DataSourceParamKeyDao.java | 0 .../core/dao/DataSourceTypeDao.java | 0 .../core/dao/DataSourceTypeEnvDao.java | 0 .../core/dao/mapper/DataSouceMapper.xml | 0 .../core/dao/mapper/DataSourceEnvMapper.xml | 0 .../dao/mapper/DataSourceParamKeyMapper.xml | 0 .../dao/mapper/DataSourceTypeEnvMapper.xml | 0 .../core/dao/mapper/DataSourceTypeMapper.xml | 0 .../CustomMultiPartFormDataTransformer.java | 0 .../formdata/FormDataTransformerFactory.java | 0 .../core/formdata/FormStreamContent.java | 0 .../MultiPartFormDataTransformer.java | 0 .../restful/DataSourceAdminRestfulApi.java | 0 .../restful/DataSourceCoreRestfulApi.java | 0 .../restful/DataSourceOperateRestfulApi.java | 0 .../core/restful/RestfulApiHelper.java | 0 .../BeanValidationExceptionMapper.java | 0 .../core/service/BmlAppService.java | 0 .../core/service/DataSourceInfoService.java | 0 .../core/service/DataSourceOpService.java | 0 .../core/service/DataSourceRelateService.java | 0 .../core/service/MetadataOperateService.java | 0 .../core/service/impl/BmlAppServiceImpl.java | 0 .../impl/DataSourceInfoServiceImpl.java | 0 .../impl/DataSourceRelateServiceImpl.java | 0 .../impl/MetadataOperateServiceImpl.java | 0 .../DataSourceParameterValidator.java | 0 .../validate/ParameterValidateException.java | 0 .../validate/ParameterValidateStrategy.java | 0 .../core/validate/ParameterValidator.java | 0 .../RegExpParameterValidateStrategy.java | 0 .../TypeParameterValidateStrategy.java | 0 .../core/vo/DataSourceEnvVo.java | 0 .../core/vo/DataSourceVo.java | 0 .../datasourcemanager/core/vo/PageViewVo.java | 0 .../core/receivers/DsmReceiver.scala | 0 .../linkis-metadata}/Dockerfile | 0 .../linkis-metadata}/bin/start-metadata.sh | 0 .../linkis-metadata}/bin/startup.sh | 0 .../linkis-metadata}/bin/stop-metadata.sh | 0 .../linkis-metadata}/bin/stop.sh | 0 .../linkis-metadata}/conf/application.yml | 0 .../linkis-metadata}/conf/linkis.properties | 0 .../linkis-metadata}/conf/log4j.properties | 0 .../linkis-metadata}/conf/log4j2.xml | 0 .../linkis-metadata}/pom.xml | 2 +- .../linkis-metadata}/pom_k8s.xml | 2 +- .../src/main/assembly/distribution.xml | 0 .../linkis/metadata/dao/MdqDao.java | 0 .../linkis/metadata/dao/impl/MdqDao.xml | 0 .../metadata/domain/AbstractAuditable.java | 0 .../linkis/metadata/domain/Column.java | 0 .../domain/mdq/DomainCoversionUtils.java | 0 .../metadata/domain/mdq/bo/ApplicationBO.java | 0 .../linkis/metadata/domain/mdq/bo/BaseBO.java | 0 .../metadata/domain/mdq/bo/MdqTableBO.java | 0 .../domain/mdq/bo/MdqTableBaseInfoBO.java | 0 .../domain/mdq/bo/MdqTableFieldsInfoBO.java | 0 .../domain/mdq/bo/MdqTableImportInfoBO.java | 0 .../metadata/domain/mdq/bo/ModelBO.java | 0 .../metadata/domain/mdq/po/MdqAccess.java | 0 .../metadata/domain/mdq/po/MdqField.java | 0 .../metadata/domain/mdq/po/MdqImport.java | 0 .../metadata/domain/mdq/po/MdqLineage.java | 0 .../metadata/domain/mdq/po/MdqTable.java | 0 .../metadata/domain/mdq/po/MdqTableInfo.java | 0 .../metadata/domain/mdq/vo/ApplicationVO.java | 0 .../linkis/metadata/domain/mdq/vo/BaseVO.java | 0 .../domain/mdq/vo/MdqImportInfoVO.java | 0 .../domain/mdq/vo/MdqTableBaseInfoVO.java | 0 .../domain/mdq/vo/MdqTableFieldsInfoVO.java | 0 .../vo/MdqTablePartitionStatisticInfoVO.java | 0 .../mdq/vo/MdqTableStatisticInfoVO.java | 0 .../metadata/domain/mdq/vo/MdqTableVO.java | 0 .../metadata/domain/mdq/vo/ModelVO.java | 0 .../linkis/metadata/hive/config/DSEnum.java | 0 .../metadata/hive/config/DataSource.java | 0 .../hive/config/DataSourceContextHolder.java | 0 .../hive/config/DynamicDataSource.java | 0 .../hive/config/LinkisMybatisConfig.java | 0 .../hive/config/MultiSourceExAop.java | 0 .../linkis/metadata/hive/dao/HiveMetaDao.java | 0 .../metadata/hive/dao/impl/HiveMetaDao.xml | 0 .../restful/api/DataSourceRestfulApi.java | 0 .../restful/api/MdqTableRestfulApi.java | 0 .../remote/DataSourceRestfulRemote.java | 0 .../metadata/service/DataSourceService.java | 0 .../linkis/metadata/service/MdqService.java | 0 .../service/impl/DataSourceServiceImpl.java | 0 .../metadata/service/impl/MdqServiceImpl.java | 0 .../linkis/metadata/type/Lifecycle.java | 0 .../linkis/metadata/type/MdqImportType.java | 0 .../linkis/metadata/type/ModelLevel.java | 0 .../linkis/metadata/type/UseWayType.java | 0 .../linkis/metadata/util/Constants.java | 0 .../linkis/metadata/util/DWSConfig.java | 0 .../metadata/conf/MdqConfiguration.scala | 0 .../linkis/metadata/ddl/DDLCreator.scala | 0 .../linkis/metadata/ddl/DDLHelper.scala | 0 .../metadata/ddl/ImportDDLCreator.scala | 0 .../linkis/metadata/ddl/ScalaDDLCreator.scala | 0 .../exception/MdqIllegalParamException.scala | 0 .../metadata/receiver/MDQReceiver.scala | 0 .../linkis/metadata/utils/MdqUtils.scala | 0 .../metadatamanager/common/pom.xml | 2 +- .../linkis/metadatamanager/common/Json.java | 0 .../common/MdmConfiguration.java | 0 .../common/cache/CacheConfiguration.java | 0 .../common/cache/CacheManager.java | 0 .../common/cache/ConnCacheManager.java | 0 .../common/domain/MetaColumnInfo.java | 0 .../common/domain/MetaPartitionInfo.java | 0 .../exception/MetaRuntimeException.java | 0 .../common/service/AbstractMetaService.java | 0 .../common/service/BaseMetadataService.java | 0 .../common/service/MetadataConnection.java | 0 .../common/service/MetadataDbService.java | 0 .../common/service/MetadataService.java | 0 .../protocol/MetadataOperateProtocol.scala | 0 .../common/protocol/MetadataProtocol.scala | 0 .../protocol/MetadataQueryProtocol.scala | 0 .../common/receiver/BaseMetaReceiver.scala | 0 .../metadatamanager/server/Dockerfile | 0 .../server/bin/start-mdm-server.sh | 0 .../metadatamanager/server/bin/startup.sh | 0 .../server/bin/stop-mdm-server.sh | 0 .../metadatamanager/server}/bin/stop.sh | 0 .../server/conf/application.yml | 0 .../server/conf/linkis.properties | 0 .../server/conf/log4j.properties | 0 .../metadatamanager/server/conf/log4j2.xml | 0 .../metadatamanager/server/pom.xml | 2 +- .../metadatamanager/server/pom_k8s.xml | 2 +- .../server/src/main/assembly/distribution.xml | 0 .../server/restful/MetadataCoreRestful.java | 0 .../server/service/MetadataAppService.java | 0 .../service/impl/MetadataAppServiceImpl.java | 0 .../service/elasticsearch/Dockerfile | 0 .../elasticsearch/bin/start-mdm-elastic.sh | 0 .../service/elasticsearch/bin/startup.sh | 0 .../elasticsearch/bin/stop-mdm-elastic.sh | 0 .../service/elasticsearch}/bin/stop.sh | 0 .../elasticsearch/conf/application.yml | 0 .../elasticsearch/conf/linkis.properties | 0 .../elasticsearch/conf/log4j.properties | 0 .../service/elasticsearch/conf/log4j2.xml | 0 .../service/elasticsearch/pom.xml | 2 +- .../service/elasticsearch/pom_k8s.xml | 2 +- .../src/main/assembly/distribution.xml | 0 .../service/ElasticConnection.java | 0 .../service/ElasticMetaService.java | 0 .../service/ElasticParamsMapper.java | 0 .../service/receiver/ElasticReceiver.scala | 0 .../metadatamanager/service/hive/Dockerfile | 0 .../service/hive/bin/start-mdm-hive.sh | 0 .../service/hive/bin/startup.sh | 0 .../service/hive/bin/stop-mdm-hive.sh | 0 .../metadatamanager/service/hive}/bin/stop.sh | 0 .../service/hive/conf/application.yml | 0 .../service/hive/conf/linkis.properties | 0 .../service/hive/conf/log4j.properties | 0 .../service/hive/conf/log4j2.xml | 0 .../metadatamanager/service/hive/pom.xml | 2 +- .../metadatamanager/service/hive/pom_k8s.xml | 2 +- .../hive/src/main/assembly/distribution.xml | 0 .../service/HiveConnection.java | 0 .../service/HiveMetaService.java | 0 .../service/HiveParamsMapper.java | 0 .../service/receiver/HiveReceiver.scala | 0 .../metadatamanager/service/mysql/Dockerfile | 0 .../service/mysql/bin/start-mdm-mysql.sh | 0 .../service/mysql/bin/startup.sh | 0 .../service/mysql/bin/stop-mdm-mysql.sh | 0 .../service/mysql}/bin/stop.sh | 0 .../service/mysql/conf/application.yml | 0 .../service/mysql/conf/linkis.properties | 0 .../service/mysql/conf/log4j.properties | 0 .../service/mysql/conf/log4j2.xml | 0 .../metadatamanager/service/mysql/pom.xml | 2 +- .../metadatamanager/service/mysql/pom_k8s.xml | 2 +- .../mysql/src/main/assembly/distribution.xml | 0 .../service/SqlConnection.java | 0 .../service/SqlMetaService.java | 0 .../service/SqlParamsMapper.java | 0 .../service/receiver/SqlReceiver.scala | 0 .../linkis-publicservice}/Dockerfile | 0 .../linkis-publicservice}/application/pom.xml | 2 +- .../conf/ApplicationConfiguration.java | 0 .../application/dao/ApplicationMapper.java | 0 .../dao/impl/ApplicationMapper.xml | 0 .../application/entity/Application.java | 0 .../application/entity/ApplicationUser.java | 0 .../linkis/application/entity/DWSParams.java | 0 .../linkis/application/entity/InitCenter.java | 0 .../linkis/application/entity/Org.java | 0 .../linkis/application/entity/Project.java | 0 .../application/entity/ProjectUser.java | 0 .../linkis/application/entity/ProjectVO.java | 0 .../linkis/application/entity/Right.java | 0 .../linkis/application/entity/Role.java | 0 .../linkis/application/entity/UserInfo.java | 0 .../exception/ApplicationException.java | 0 .../restful/api/ApplicationRestfulApi.java | 0 .../remote/ApplicationRestfulRemote.java.bak | 0 .../service/ApplicationService.java | 0 .../service/impl/ApplicationServiceImpl.java | 0 .../application/util/ApplicationUtils.java | 0 .../conf/ApplicationScalaConfiguration.scala | 0 .../application/util/ApplicationUtil.scala | 0 .../linkis/application/util/DdTest.scala | 0 .../bin/start-publicservice.sh | 0 .../linkis-publicservice}/bin/startup.sh | 0 .../bin/stop-publicservice.sh | 0 .../linkis-publicservice}/bin/stop.sh | 0 .../conf/application.yml | 0 .../conf/linkis.properties | 0 .../conf/log4j.properties | 0 .../linkis-publicservice}/conf/log4j2.xml | 0 .../configuration/pom.xml | 2 +- .../configuration/dao/ConfigMapper.java | 0 .../configuration/dao/impl/ConfigMapper.xml | 0 .../configuration/entity/ConfigKey.java | 0 .../configuration/entity/ConfigKeyUser.java | 0 .../configuration/entity/ConfigKeyValue.java | 0 .../entity/ConfigKeyValueVO.java | 0 .../configuration/entity/ConfigTree.java | 0 .../exception/ConfigurationException.java | 0 .../restful/api/ConfigurationRestfulApi.java | 0 .../util/ConfigurationConfiguration.java | 0 .../linkis/configuration/util/Constants.java | 0 .../receiver/ConfigurationReceiver.scala | 0 .../ConfigurationReceiverChooser.scala | 0 .../service/ConfigurationService.scala | 0 .../validate/ContainValidator.scala | 0 .../validate/FloatValidator.scala | 0 .../validate/NoneValidator.scala | 0 .../validate/NumericalValidator.scala | 0 .../validate/OneOfValidator.scala | 0 .../validate/RegexValidator.scala | 0 .../configuration/validate/Validator.scala | 0 .../validate/ValidatorManager.scala | 0 .../validate/ValidatorManagerImpl.scala | 0 .../linkis-publicservice}/jobhistory/pom.xml | 2 +- .../linkis/jobhistory/dao/TaskMapper.java | 0 .../linkis/jobhistory/dao/impl/taskMapper.xml | 0 .../linkis/jobhistory/entity/QueryTask.java | 0 .../linkis/jobhistory/entity/QueryTaskVO.java | 0 .../jobhistory/exception/QueryException.java | 0 .../restful/api/QueryRestfulApi.java | 0 .../jobhistory/transitional/TaskStatus.java | 0 .../linkis/jobhistory/util/Constants.java | 0 .../conversions/TaskConversions.scala | 0 .../jobhistory/receiver/QueryReceiver.scala | 0 .../receiver/QueryReceiverChooser.scala | 0 .../jobhistory/service/QueryService.java | 0 .../service/impl/QueryServiceImpl.scala | 0 .../linkis/jobhistory/util/QueryUtils.scala | 0 .../linkis-publicservice}/pom.xml | 2 +- .../linkis-publicservice}/pom_k8s.xml | 0 .../src/main/assembly/distribution.xml | 0 .../linkis-publicservice}/udf/pom.xml | 2 +- .../wedatasphere/linkis/udf/api/UDFApi.java | 0 .../wedatasphere/linkis/udf/dao/UDFDao.java | 0 .../linkis/udf/dao/UDFTreeDao.java | 0 .../linkis/udf/dao/impl/UDFDao.xml | 0 .../linkis/udf/dao/impl/UDFTreeDao.xml | 0 .../linkis/udf/entity/UDFInfo.java | 0 .../linkis/udf/entity/UDFManager.java | 0 .../linkis/udf/entity/UDFTree.java | 0 .../linkis/udf/excepiton/UDFException.java | 0 .../linkis/udf/service/UDFService.java | 0 .../linkis/udf/service/UDFTreeService.java | 0 .../udf/service/impl/UDFServiceImpl.java | 0 .../udf/service/impl/UDFTreeServiceImpl.java | 0 .../linkis/udf/utils/ConstantVar.java | 0 .../linkis/udf/api/rpc/RequestUdfTree.scala | 0 .../linkis/udf/api/rpc/ResponseUdfTree.scala | 0 .../linkis/udf/api/rpc/UdfReceiver.scala | 0 .../udf/api/rpc/UdfReceiverChooser.scala | 0 .../linkis/udf/utils/UdfConfiguration.scala | 0 .../wedatasphere/linkis/udf/TestUDFTree.java | 0 .../linkis-publicservice}/variable/pom.xml | 2 +- .../linkis/variable/dao/VarMapper.java | 0 .../linkis/variable/dao/impl/VarMapper.xml | 0 .../linkis/variable/entity/VarKey.java | 0 .../variable/entity/VarKeyAndValue.java | 0 .../linkis/variable/entity/VarKeyUser.java | 0 .../linkis/variable/entity/VarKeyValueVO.java | 0 .../linkis/variable/entity/VarTree.java | 0 .../variable/exception/VariableException.java | 0 .../restful/api/VariableRestfulApi.java | 0 .../variable/service/VariableService.java | 0 .../linkis/variable/util/Constants.java | 0 .../variable/receiver/VariableReceiver.scala | 0 .../receiver/VariableReceiverChooser.scala | 0 .../service/VariableServiceImpl.scala | 0 .../client/workspace-httpclient/pom.xml | 2 +- .../filesystem/WorkspaceClientFactory.scala | 0 .../filesystem/WorkspaceClientImpl.scala | 0 .../action/OpenScriptFromBMLAction.scala | 0 .../action/WorkspacePOSTAction.scala | 0 .../filesystem/conf/WorkspaceClientConf.scala | 0 .../filesystem/request/WorkspaceClient.scala | 0 .../request/WorkspaceHttpConf.scala | 0 .../response/ScriptFromBMLResponse.scala | 0 .../response/WorkspaceResponse.scala | 0 .../result/AbstractWorkspaceResult.scala | 0 .../result/ScriptFromBMLResult.scala | 0 .../filesystem/result/ScriptToBMLResult.scala | 0 .../linkis-publicservice}/workspace/pom.xml | 2 +- .../conf/WorkSpaceConfiguration.java | 0 .../constant/WorkSpaceConstants.java | 0 .../linkis/filesystem/entity/DirFileTree.java | 0 .../linkis/filesystem/entity/LogLevel.java | 0 .../exception/WorkSpaceException.java | 0 .../exception/WorkspaceExceptionManager.java | 0 .../restful/api/BMLFsRestfulApi.java | 0 .../filesystem/restful/api/FsRestfulApi.java | 0 .../restful/remote/FsRestfulRemote.java | 0 .../linkis/filesystem/util/WorkspaceUtil.java | 0 .../linkis/filesystem/bml/BMLHelper.scala | 0 .../filesystem/bml/BMLScriptReader.scala | 0 .../filesystem/bml/BMLScriptWriter.scala | 0 .../linkis/filesystem/cache/FsCache.scala | 0 .../conf/WorkspaceSpringConfiguration.scala | 0 .../linkis/filesystem/entity/FSInfo.scala | 0 .../linkis/filesystem/quartz/FSQuartz.scala | 0 .../linkis/filesystem/service/FsService.scala | 0 .../filesystem/validator/PathValidator.scala | 0 846 files changed, 131 insertions(+), 72 deletions(-) rename {bml/bmlclient => linkis-public-enhancements/linkis-bml/linkis-bml-client}/pom.xml (95%) rename {bml/bmlclient => linkis-public-enhancements/linkis-bml/linkis-bml-client}/src/main/java/com/webank/wedatasphere/linkis/bml/client/AbstractBmlClient.java (100%) rename {bml/bmlclient => linkis-public-enhancements/linkis-bml/linkis-bml-client}/src/main/java/com/webank/wedatasphere/linkis/bml/client/BmlClient.java (100%) rename {bml/bmlclient => linkis-public-enhancements/linkis-bml/linkis-bml-client}/src/main/java/com/webank/wedatasphere/linkis/bml/client/BmlClientFactory.java (100%) rename {bml/bmlclient => linkis-public-enhancements/linkis-bml/linkis-bml-client}/src/main/scala/com/webank/wedatasphere/linkis/bml/client/impl/HttpBmlClient.scala (100%) rename {bml/bmlclient => linkis-public-enhancements/linkis-bml/linkis-bml-client}/src/main/scala/com/webank/wedatasphere/linkis/bml/common/POSTActionFailException.scala (100%) rename {bml/bmlclient => linkis-public-enhancements/linkis-bml/linkis-bml-client}/src/main/scala/com/webank/wedatasphere/linkis/bml/conf/BmlConfiguration.scala (100%) rename {bml/bmlclient => linkis-public-enhancements/linkis-bml/linkis-bml-client}/src/main/scala/com/webank/wedatasphere/linkis/bml/http/HttpConf.scala (100%) rename {bml/bmlclient => linkis-public-enhancements/linkis-bml/linkis-bml-client}/src/main/scala/com/webank/wedatasphere/linkis/bml/request/BmlPOSTAction.scala (100%) rename {bml/bmlclient => linkis-public-enhancements/linkis-bml/linkis-bml-client}/src/main/scala/com/webank/wedatasphere/linkis/bml/response/BmlResult.scala (100%) rename {bml/bmlcommon => linkis-public-enhancements/linkis-bml/linkis-bml-common}/pom.xml (92%) rename {bml/bmlcommon => linkis-public-enhancements/linkis-bml/linkis-bml-common}/src/main/java/com/webank/wedatasphere/linkis/bml/model/AbstractAuditable.java (100%) rename {bml/bmlcommon => linkis-public-enhancements/linkis-bml/linkis-bml-common}/src/main/scala/com/webank/wedatasphere/linkis/bml/protocol/BmlProtocol.scala (100%) rename {bml/bml-engine-hook => linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook}/pom.xml (97%) rename {bml/bml-engine-hook => linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook}/src/main/scala/com/webank/wedatasphere/linkis/bml/conf/BmlHookConf.scala (100%) rename {bml/bml-engine-hook => linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook}/src/main/scala/com/webank/wedatasphere/linkis/bml/exception/BmlHookDownloadException.scala (100%) rename {bml/bml-engine-hook => linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook}/src/main/scala/com/webank/wedatasphere/linkis/bml/hook/BmlEnginePreExecuteHook.scala (100%) rename {bml/bml-engine-hook => linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook}/src/main/scala/com/webank/wedatasphere/linkis/bml/hook/BmlResourceParser.scala (100%) rename {bml/bml-engine-hook => linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook}/src/main/scala/com/webank/wedatasphere/linkis/bml/utils/BmlHookUtils.scala (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/Dockerfile (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/bin/start-bml.sh (100%) mode change 100755 => 100644 rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/bin/startup.sh (100%) mode change 100755 => 100644 rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/bin/stop-bml.sh (100%) mode change 100755 => 100644 rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/bin/stop.sh (100%) mode change 100755 => 100644 rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/conf/application.yml (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/conf/linkis.properties (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/conf/log4j2.xml (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/pom.xml (97%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/pom_k8s.xml (98%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/assembly/distribution.xml (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/DownloadModel.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/Resource.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/ResourceTask.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/ResourceVersion.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/Version.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/common/Constant.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/common/ExecutorManager.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/common/HdfsResourceHelper.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/common/OperationEnum.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/common/ResourceHelper.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/common/ResourceHelperFactory.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/common/ScheduledTask.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/dao/DownloadDao.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/dao/ResourceDao.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/dao/TaskDao.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/dao/VersionDao.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/dao/impl/DownloadMapper.xml (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/dao/impl/ResourceMapper.xml (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/dao/impl/TaskMapper.xml (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/dao/impl/VersionMapper.xml (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/restful/BmlRestfulApi.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/restful/RestfulUtils.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/service/BmlService.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/service/DownloadService.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/service/ResourceService.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/service/TaskService.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/service/VersionService.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/BmlServiceImpl.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/DownloadServiceImpl.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/ResourceServiceImpl.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/TaskServiceImpl.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/VersionServiceImpl.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/threading/Scheduler.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/threading/Task.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/threading/TaskState.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/util/HttpRequestHelper.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/util/MD5Utils.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/vo/ResourceBasicVO.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/vo/ResourceVO.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/java/com/webank/wedatasphere/linkis/bml/vo/ResourceVersionsVO.java (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlAuthorityException.scala (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlPermissionDeniedException.scala (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlQueryFailException.scala (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlResourceExpiredException.scala (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlServerParaErrorException.scala (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/scala/com/webank/wedatasphere/linkis/bml/conf/BmlServerConfiguration.scala (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/scala/com/webank/wedatasphere/linkis/bml/protocol/BmlServerProtocol.scala (100%) rename {bml/bmlserver => linkis-public-enhancements/linkis-bml/linkis-bml-server}/src/main/scala/com/webank/wedatasphere/linkis/bml/rpc/BmlReceiver.scala (100%) create mode 100644 linkis-public-enhancements/linkis-bml/pom.xml rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/pom.xml (98%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/ContextCacheService.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/DefaultContextCacheService.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/ContextCache.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/DefaultContextCache.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/csid/ContextIDValue.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/csid/ContextIDValueGenerator.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/csid/impl/ContextIDValueGeneratorImpl.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/csid/impl/ContextIDValueImpl.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/cskey/ContextKeyValueContext.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/cskey/ContextValueMapSet.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/cskey/impl/ContextValueMapSetImpl.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/cskey/impl/DefaultContextKeyValueContext.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/guava/ContextIDCacheLoader.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/guava/ContextIDRemoveListener.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cleaner/AUTOCleaner.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/conf/ContextCacheConf.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/index/ContextInvertedIndex.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/index/ContextInvertedIndexSet.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/index/ContextInvertedIndexSetImpl.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/index/DefaultContextInvertedIndex.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/ClassIntrospector.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/ContextCacheMetric.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/ContextIDMetric.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/DefaultContextCacheMetric.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/DefaultContextIDMetric.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/Metrtic.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/ObjectInfo.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/SizeEstimator.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/parser/ContextKeyValueParser.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/parser/DefaultContextKeyValueParser.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/utils/ContextCacheUtils.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/csid/TestContextID.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/keyword/TestContextKey.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/keyword/TestContextKeyValue.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/keyword/TestContextKeyValueParser.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/keyword/TestContextValue.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/service/TestContextCacheService.java (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/test/resources/linkis.properties (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/test/resources/log4j.properties (100%) rename {contextservice/cs-cache => linkis-public-enhancements/linkis-context-service/linkis-cs-cache}/src/test/resources/log4j2.xml (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/pom.xml (98%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/AbstractContextClient.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/Context.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/ContextClient.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/LinkisContext.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/LinkisWorkFlowContext.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/builder/ContextClientConfig.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/builder/ContextClientFactory.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/builder/HttpContextClientConfig.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/builder/RPCHttpContextClientConfig.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/http/ContextPostActionBuilder.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/http/HttpContextClient.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/http/HttpHeartBeater.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextClientEvent.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextClientListener.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextClientListenerBus.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextClientListenerManager.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextIDListener.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextKeyListener.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextUpdateEvent.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/HeartBeater.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSMetaDataService.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSNodeService.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSNodeServiceImpl.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSResourceService.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSResultDataService.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSResultDataServiceImpl.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSTableService.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSVariableService.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSWorkService.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSWorkServiceImpl.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/DefaultSearchService.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/LinkisJobDataService.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/LinkisJobDataServiceImpl.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/MetaDataService.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/ResourceService.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/SearchService.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/TableService.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/VariableService.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/utils/ContextServiceUtils.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/utils/ExceptionHelper.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/java/com/webank/wedatasphere/linkis/cs/client/utils/SerializeHelper.java (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/scala/com/webank/wedatasphere/linkis/cs/client/exception/ProtocolNotMatchException.scala (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/scala/com/webank/wedatasphere/linkis/cs/client/http/ContextAction.scala (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/scala/com/webank/wedatasphere/linkis/cs/client/http/ContextResult.scala (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/scala/com/webank/wedatasphere/linkis/cs/client/utils/ContextClientConf.scala (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/scala/com/webank/wedatasphere/linkis/cs/client/utils/ContextClientUtils.scala (100%) rename {contextservice/cs-client => linkis-public-enhancements/linkis-context-service/linkis-cs-client}/src/main/scala/com/webank/wedatasphere/linkis/cs/client/utils/ContextServerHttpConf.scala (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/pom.xml (97%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/annotation/KeywordMethod.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/data/CSResultData.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/data/Data.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/data/JobData.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/data/LinkisJobData.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/ContextScope.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/ContextType.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/DBType.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/ExpireType.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/WorkType.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/env/Env.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/env/OSEnv.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/env/SoftWareEnv.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/env/SoftwareLibEnv.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/CommonContextIDListenerDomain.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/CommonContextKeyListenerDomain.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/ContextIDListenerDomain.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/ContextKeyListenerDomain.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/ListenerDomain.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/CSColumn.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/CSDB.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/CSPartition.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/CSTable.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/Column.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/DB.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/Partition.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/Table.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CSFlowInfos.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CSInfos.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CSProperty.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CommonGlobalConfiguration.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CommonProperty.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/LinkisVariable.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/BMLResource.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/CommonFxResource.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/CommonUDFResource.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/FxResource.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/LinkisBMLResource.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/Resource.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/UDFResource.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CombinedNodeIDContextID.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonContextID.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonContextKey.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonContextKeyValue.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonContextValue.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonHAContextID.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextID.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextIDParser.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextKey.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextKeyValue.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextValue.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CreatorContextKey.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/HAContextID.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/LinkisHAWorkFlowContextID.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/LinkisWorkflowContextID.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/OrderContextKey.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/Source.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/UserContextID.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ValueBean.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/VersionContextKey.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/WorkflowContextID.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/YMLContextKey.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/exception/CSErrorException.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/exception/CSWarnException.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/exception/ErrorCode.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/listener/ContextIDListener.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/listener/ContextKeyListener.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextHTTPConstant.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextHistoryType.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextIDType.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextKeyType.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextKeyValueType.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextValueType.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/search/ContextSearchConditionMapBuilder.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/AbstractSerializer.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/ContextSerializer.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/helper/AbstractSerializationHelper.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/helper/ContextSerializationHelper.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/helper/SerializationHelper.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializer.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/CommonContextKeySerializer.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/ContextKeyValueSerializer.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/ContextValueSerializer.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/LinkisHAWorkFlowContextIDSerializer.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializer.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializer.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializer.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializer.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializer.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/object/LinkisVariableSerializer.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/utils/CSCommonUtils.java (100%) rename {contextservice/cs-common => linkis-public-enhancements/linkis-context-service/linkis-cs-common}/src/main/java/com/webank/wedatasphere/linkis/cs/common/utils/CSHighAvailableUtils.java (100%) rename {contextservice/cs-ujes-client => linkis-public-enhancements/linkis-context-service/linkis-cs-engine-support}/pom.xml (95%) rename {contextservice/cs-ujes-client => linkis-public-enhancements/linkis-context-service/linkis-cs-engine-support}/src/main/scala/com/webank/wedatasphere/linkis/cs/storage/CSTableResultSetWriter.scala (100%) rename {contextservice/cs-highavailable => linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable}/pom.xml (98%) rename {contextservice/cs-highavailable => linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable}/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/AbstractContextHAManager.java (100%) rename {contextservice/cs-highavailable => linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable}/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ContextHAManager.java (100%) rename {contextservice/cs-highavailable => linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable}/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/DefaultContextHAManager.java (100%) rename {contextservice/cs-highavailable => linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable}/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/conf/ContextHighAvailableConf.java (100%) rename {contextservice/cs-highavailable => linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable}/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/exception/ErrorCode.java (100%) rename {contextservice/cs-highavailable => linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable}/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/BackupInstanceGenerator.java (100%) rename {contextservice/cs-highavailable => linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable}/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/ContextHAChecker.java (100%) rename {contextservice/cs-highavailable => linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable}/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/ContextHAIDGenerator.java (100%) rename {contextservice/cs-highavailable => linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable}/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/impl/BackupInstanceGeneratorImpl.java (100%) rename {contextservice/cs-highavailable => linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable}/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java (100%) rename {contextservice/cs-highavailable => linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable}/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/impl/ContextHAIDGeneratorImpl.java (100%) rename {contextservice/cs-highavailable => linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable}/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/pluggable/HAContextPersistenceManagerImpl.java (100%) rename {contextservice/cs-highavailable => linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable}/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java (100%) rename {contextservice/cs-highavailable => linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable}/src/test/java/com/webank/wedatasphere/linkis/cs/highavailable/test/TestContextHAManager.java (100%) rename {contextservice/cs-highavailable => linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable}/src/test/java/com/webank/wedatasphere/linkis/cs/highavailable/test/haid/TestHAID.java (100%) rename {contextservice/cs-highavailable => linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable}/src/test/java/com/webank/wedatasphere/linkis/cs/highavailable/test/persist/TestPersistence.java (100%) rename {contextservice/cs-highavailable => linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable}/src/test/resources/application.yml (100%) rename {contextservice/cs-highavailable => linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable}/src/test/resources/linkis.properties (100%) rename {contextservice/cs-highavailable => linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable}/src/test/resources/log4j.properties (100%) rename {contextservice/cs-highavailable => linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable}/src/test/resources/log4j2.xml (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/pom.xml (97%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/main/java/com/webank/wedatasphere/linkis/cs/listener/CSIDListener.java (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/main/java/com/webank/wedatasphere/linkis/cs/listener/CSKeyListener.java (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/main/java/com/webank/wedatasphere/linkis/cs/listener/ContextAsyncEventListener.java (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/main/java/com/webank/wedatasphere/linkis/cs/listener/ListenerBus/ContextAsyncListenerBus.java (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/AbstractCallbackEngine.java (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/CallbackEngine.java (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/ContextIDCallbackEngine.java (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/ContextKeyCallbackEngine.java (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/imp/ContextKeyValueBean.java (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/imp/DefaultContextIDCallbackEngine.java (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/imp/DefaultContextKeyCallbackEngine.java (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/main/java/com/webank/wedatasphere/linkis/cs/listener/conf/ContextListenerConf.java (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/ContextIDEvent.java (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/ContextKeyEvent.java (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/enumeration/OperateType.java (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/impl/DefaultContextIDEvent.java (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/impl/DefaultContextKeyEvent.java (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/main/java/com/webank/wedatasphere/linkis/cs/listener/manager/ListenerManager.java (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/main/java/com/webank/wedatasphere/linkis/cs/listener/manager/imp/DefaultContextListenerManager.java (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestContextID.java (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestContextKey.java (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestContextKeyValue.java (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestContextValue.java (100%) rename {contextservice/cs-listener => linkis-public-enhancements/linkis-context-service/linkis-cs-listener}/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestListenerManager.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/pom.xml (98%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/ContextPersistenceBeans.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/ContextPersistenceManager.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/ContextPersistenceManagerImpl.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/annotation/Ignore.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/annotation/Tuning.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/aop/PersistenceTuningAspect.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/conf/PersistenceConf.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/ContextIDListenerMapper.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/ContextIDMapper.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/ContextKeyListenerMapper.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/ContextMapMapper.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/impl/contextIDListenerMapper.xml (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/impl/contextIDMapper.xml (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/impl/contextKeyListenerMapper.xml (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/impl/contextMapMapper.xml (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/ExtraFieldClass.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextID.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextIDListener.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextKey.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextKeyListener.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextKeyValue.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextValue.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/exception/ThrowingFunction.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextIDListenerPersistence.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextIDPersistence.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextKeyListenerPersistence.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextMapPersistence.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextMetricsPersistence.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/TransactionManager.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextIDListenerPersistenceImpl.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextIDPersistenceImpl.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextKeyListenerPersistenceImpl.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextMapPersistenceImpl.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextMetricsPersistenceImpl.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/TransactionManagerImpl.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/util/PersistenceUtils.java (100%) rename {contextservice/cs-persistence => linkis-public-enhancements/linkis-context-service/linkis-cs-persistence}/src/main/resources/cs_ddl.sql (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/pom.xml (98%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/ContextSearch.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/DefaultContextSearch.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/AbstractCommonCondition.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/AtomicCondition.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/BinaryLogicCondition.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/Condition.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/ConditionType.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/UnaryLogicCondition.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/AndConditionParser.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ConditionBuilder.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ConditionBuilderImpl.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ConditionParser.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ContainsConditionParser.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ContextScopeConditionParser.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ContextTypeConditionParser.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ContextValueTypeConditionParser.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/NearestConditionParser.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/NotConditionParser.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/OrConditionParser.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/RegexConditionParser.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/AndCondition.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/ContainsCondition.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/ContextScopeCondition.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/ContextTypeCondition.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/ContextValueTypeCondition.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/NearestCondition.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/NotCondition.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/OrCondition.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/RegexCondition.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/exception/ContextSearchFailedException.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/AbstractConditionExecution.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ConditionExecution.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/fetcher/AbstractContextCacheFetcher.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/fetcher/ContextCacheFetcher.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/fetcher/ContextTypeContextSearchFetcher.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/fetcher/IterateContextCacheFetcher.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/AndConditionExecution.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/BinaryLogicConditionExecution.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/ContainsConditionExecution.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/ContextScopeConditionExecution.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/ContextTypeConditionExecution.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/ContextValueTypeConditionExecution.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/NearestConditionExecution.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/NotConditionExecution.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/OrConditionExecution.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/RegexConditionExecution.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/UnaryLogicConditionExecution.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/AbstractContextSearchMatcher.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/AndLogicContextSearchMatcher.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/BinaryLogicContextSearchMatcher.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ConditionMatcherResolver.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContainsContextSearchMatcher.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContextScopeContextSearchMatcher.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContextSearchMatcher.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContextTypeContextSearchMatcher.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContextValueTypeContextSearchMatcher.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/NearestLogicContextSearchMatcher.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/NotLogicContextSearchMatcher.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/OrLogicContextSearchMatcher.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/RegexContextSearchMatcher.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/SkipContextSearchMather.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/UnaryLogicContextSearchMatcher.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ruler/AbstractContextSearchRuler.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ruler/CommonListContextSearchRuler.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ruler/ContextSearchRuler.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ruler/NearestContextSearchRuler.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/ConditionOptimizer.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/OptimizedCondition.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/cost/ConditionCostCalculator.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/dfs/BinaryTree.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/dfs/MinCostBinaryTree.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/dfs/Node.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/impl/CostBasedConditionOptimizer.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/test/java/com/webank/wedatasphere/linkis/cs/AndTest.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/test/java/com/webank/wedatasphere/linkis/cs/ContainsTest.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/test/java/com/webank/wedatasphere/linkis/cs/ContextScopeTest.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/test/java/com/webank/wedatasphere/linkis/cs/ContextSearchTest.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/test/java/com/webank/wedatasphere/linkis/cs/ContextTypeTest.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/test/java/com/webank/wedatasphere/linkis/cs/RegexTest.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/test/java/com/webank/wedatasphere/linkis/cs/csid/TestContextID.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/test/java/com/webank/wedatasphere/linkis/cs/keyword/TestContextKey.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/test/java/com/webank/wedatasphere/linkis/cs/keyword/TestContextKeyValue.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/test/java/com/webank/wedatasphere/linkis/cs/keyword/TestContextValue.java (100%) rename {contextservice/cs-search => linkis-public-enhancements/linkis-context-service/linkis-cs-search}/src/test/java/com/webank/wedatasphere/linkis/cs/parser/ApiJsonTest.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/Dockerfile (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/bin/start-cs-server.sh (100%) mode change 100755 => 100644 rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/bin/startup.sh (100%) mode change 100755 => 100644 rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/bin/stop-cs-server.sh (100%) mode change 100755 => 100644 rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/bin/stop.sh (100%) mode change 100755 => 100644 rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/conf/application.yml (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/conf/linkis.properties (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/conf/log4j.properties (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/conf/log4j2.xml (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/pom.xml (99%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/pom_k8s.xml (99%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/assembly/distribution.xml (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/conf/ContextServerConf.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/enumeration/ServiceMethod.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/enumeration/ServiceType.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/parser/DefaultKeywordParser.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/parser/KeywordMethodEntity.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/parser/KeywordParser.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/AbstractHttpRequestProtocol.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/ContextIDProtocol.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/ContextListenerProtocol.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/ContextProtocol.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/HttpProtocol.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/HttpRequestProtocol.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/HttpResponseProtocol.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/RestResponseProtocol.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/restful/ContextIDRestfulApi.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/restful/ContextListenerRestfulApi.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/restful/ContextRestfulApi.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/restful/CsRestfulParent.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/CsScheduler.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/DefaultCsScheduler.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpAnswerJob.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpAnswerJobBuilder.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpJob.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpJobBuilder.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpPriorityJob.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/RestJobBuilder.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsExecuteRequest.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsExecutor.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsExecutorManager.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsJobListener.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsSchedulerBean.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsSchedulerJob.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/JobToExecuteRequestConsumer.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/AbstractService.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/ContextIDService.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/ContextListenerService.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/ContextService.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/Service.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/impl/ContextIDServiceImpl.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/impl/ContextListenerServiceImpl.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/impl/ContextServiceImpl.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/java/com/webank/wedatasphere/linkis/cs/server/util/CsUtils.java (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/resources/application.yml (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/resources/linkis.properties (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/resources/log4j.properties (100%) rename {contextservice/cs-server => linkis-public-enhancements/linkis-context-service/linkis-cs-server}/src/main/resources/log4j2.xml (100%) create mode 100644 linkis-public-enhancements/linkis-context-service/pom.xml rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/common/pom.xml (97%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/DsmConfiguration.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/ServiceErrorCode.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/domain/DataSource.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/domain/DataSourceEnv.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/domain/DataSourceParamKeyDefinition.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/domain/DataSourceType.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/util/CryptoUtils.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/util/PatternInjectUtils.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/util/json/Json.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/common/src/main/scala/com/webank/wedatasphere/linkis/datasourcemanager/common/protocol/DsmQueryProtocol.scala (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/Dockerfile (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/bin/start-dsm-server.sh (100%) mode change 100755 => 100644 rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/bin/startup.sh (100%) mode change 100755 => 100644 rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/bin/stop-dsm-server.sh (100%) mode change 100755 => 100644 rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/bin/stop.sh (100%) mode change 100755 => 100644 rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/conf/application.yml (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/conf/linkis.properties (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/conf/log4j.properties (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/conf/log4j2.xml (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/pom.xml (99%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/pom_k8s.xml (99%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/assembly/distribution.xml (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceDao.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceEnvDao.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceParamKeyDao.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceTypeDao.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceTypeEnvDao.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSouceMapper.xml (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSourceEnvMapper.xml (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSourceParamKeyMapper.xml (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSourceTypeEnvMapper.xml (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSourceTypeMapper.xml (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/formdata/CustomMultiPartFormDataTransformer.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/formdata/FormDataTransformerFactory.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/formdata/FormStreamContent.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/formdata/MultiPartFormDataTransformer.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/DataSourceAdminRestfulApi.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/DataSourceOperateRestfulApi.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/RestfulApiHelper.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/exception/BeanValidationExceptionMapper.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/BmlAppService.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/DataSourceInfoService.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/DataSourceOpService.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/DataSourceRelateService.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/MetadataOperateService.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/impl/BmlAppServiceImpl.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/impl/DataSourceInfoServiceImpl.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/impl/DataSourceRelateServiceImpl.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/impl/MetadataOperateServiceImpl.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/DataSourceParameterValidator.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/ParameterValidateException.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/ParameterValidateStrategy.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/ParameterValidator.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/strategy/RegExpParameterValidateStrategy.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/strategy/TypeParameterValidateStrategy.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/vo/DataSourceEnvVo.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/vo/DataSourceVo.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/vo/PageViewVo.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/datasourcemanager/server/src/main/scala/com/webank/wedatasphere/linkis/datasourcemanager/core/receivers/DsmReceiver.scala (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/Dockerfile (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/bin/start-metadata.sh (100%) mode change 100755 => 100644 rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/bin/startup.sh (100%) mode change 100755 => 100644 rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/bin/stop-metadata.sh (100%) mode change 100755 => 100644 rename {datasource/metadatamanager/server => linkis-public-enhancements/linkis-datasource/linkis-metadata}/bin/stop.sh (100%) mode change 100755 => 100644 rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/conf/application.yml (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/conf/linkis.properties (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/conf/log4j.properties (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/conf/log4j2.xml (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/pom.xml (99%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/pom_k8s.xml (99%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/assembly/distribution.xml (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/dao/MdqDao.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/dao/impl/MdqDao.xml (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/AbstractAuditable.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/Column.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/DomainCoversionUtils.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/ApplicationBO.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/BaseBO.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/MdqTableBO.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/MdqTableBaseInfoBO.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/MdqTableFieldsInfoBO.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/MdqTableImportInfoBO.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/ModelBO.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqAccess.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqField.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqImport.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqLineage.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqTable.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqTableInfo.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/ApplicationVO.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/BaseVO.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqImportInfoVO.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTableBaseInfoVO.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTableFieldsInfoVO.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTablePartitionStatisticInfoVO.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTableStatisticInfoVO.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTableVO.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/ModelVO.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/DSEnum.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/DataSource.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/DataSourceContextHolder.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/DynamicDataSource.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/LinkisMybatisConfig.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/MultiSourceExAop.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/dao/HiveMetaDao.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/dao/impl/HiveMetaDao.xml (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/restful/api/DataSourceRestfulApi.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/restful/api/MdqTableRestfulApi.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/restful/remote/DataSourceRestfulRemote.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/service/DataSourceService.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/service/MdqService.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/service/impl/DataSourceServiceImpl.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/service/impl/MdqServiceImpl.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/type/Lifecycle.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/type/MdqImportType.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/type/ModelLevel.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/type/UseWayType.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/util/Constants.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/java/com/webank/wedatasphere/linkis/metadata/util/DWSConfig.java (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/scala/com/webank/wedatasphere/linkis/metadata/conf/MdqConfiguration.scala (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/scala/com/webank/wedatasphere/linkis/metadata/ddl/DDLCreator.scala (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/scala/com/webank/wedatasphere/linkis/metadata/ddl/DDLHelper.scala (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/scala/com/webank/wedatasphere/linkis/metadata/ddl/ImportDDLCreator.scala (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/scala/com/webank/wedatasphere/linkis/metadata/ddl/ScalaDDLCreator.scala (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/scala/com/webank/wedatasphere/linkis/metadata/exception/MdqIllegalParamException.scala (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/scala/com/webank/wedatasphere/linkis/metadata/receiver/MDQReceiver.scala (100%) rename {metadata => linkis-public-enhancements/linkis-datasource/linkis-metadata}/src/main/scala/com/webank/wedatasphere/linkis/metadata/utils/MdqUtils.scala (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/common/pom.xml (97%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/Json.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/MdmConfiguration.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/cache/CacheConfiguration.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/cache/CacheManager.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/cache/ConnCacheManager.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/domain/MetaColumnInfo.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/domain/MetaPartitionInfo.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/exception/MetaRuntimeException.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/AbstractMetaService.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/BaseMetadataService.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/MetadataConnection.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/MetadataDbService.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/MetadataService.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/common/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/common/protocol/MetadataOperateProtocol.scala (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/common/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/common/protocol/MetadataProtocol.scala (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/common/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/common/protocol/MetadataQueryProtocol.scala (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/common/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/common/receiver/BaseMetaReceiver.scala (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/server/Dockerfile (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/server/bin/start-mdm-server.sh (100%) mode change 100755 => 100644 rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/server/bin/startup.sh (100%) mode change 100755 => 100644 rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/server/bin/stop-mdm-server.sh (100%) mode change 100755 => 100644 rename {datasource/metadatamanager/service/elasticsearch => linkis-public-enhancements/linkis-datasource/metadatamanager/server}/bin/stop.sh (100%) mode change 100755 => 100644 rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/server/conf/application.yml (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/server/conf/linkis.properties (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/server/conf/log4j.properties (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/server/conf/log4j2.xml (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/server/pom.xml (98%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/server/pom_k8s.xml (98%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/server/src/main/assembly/distribution.xml (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/server/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/server/restful/MetadataCoreRestful.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/server/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/server/service/MetadataAppService.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/server/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/server/service/impl/MetadataAppServiceImpl.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/elasticsearch/Dockerfile (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/elasticsearch/bin/start-mdm-elastic.sh (100%) mode change 100755 => 100644 rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/elasticsearch/bin/startup.sh (100%) mode change 100755 => 100644 rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/elasticsearch/bin/stop-mdm-elastic.sh (100%) mode change 100755 => 100644 rename {datasource/metadatamanager/service/hive => linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch}/bin/stop.sh (100%) mode change 100755 => 100644 rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/elasticsearch/conf/application.yml (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/elasticsearch/conf/linkis.properties (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/elasticsearch/conf/log4j.properties (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/elasticsearch/conf/log4j2.xml (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/elasticsearch/pom.xml (98%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/elasticsearch/pom_k8s.xml (98%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/elasticsearch/src/main/assembly/distribution.xml (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/elasticsearch/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/ElasticConnection.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/elasticsearch/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/ElasticMetaService.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/elasticsearch/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/ElasticParamsMapper.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/elasticsearch/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/service/receiver/ElasticReceiver.scala (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/hive/Dockerfile (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/hive/bin/start-mdm-hive.sh (100%) mode change 100755 => 100644 rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/hive/bin/startup.sh (100%) mode change 100755 => 100644 rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/hive/bin/stop-mdm-hive.sh (100%) mode change 100755 => 100644 rename {datasource/metadatamanager/service/mysql => linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive}/bin/stop.sh (100%) mode change 100755 => 100644 rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/hive/conf/application.yml (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/hive/conf/linkis.properties (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/hive/conf/log4j.properties (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/hive/conf/log4j2.xml (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/hive/pom.xml (98%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/hive/pom_k8s.xml (99%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/hive/src/main/assembly/distribution.xml (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/hive/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/HiveConnection.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/hive/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/HiveMetaService.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/hive/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/HiveParamsMapper.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/hive/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/service/receiver/HiveReceiver.scala (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/mysql/Dockerfile (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/mysql/bin/start-mdm-mysql.sh (100%) mode change 100755 => 100644 rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/mysql/bin/startup.sh (100%) mode change 100755 => 100644 rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/mysql/bin/stop-mdm-mysql.sh (100%) mode change 100755 => 100644 rename {metadata => linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql}/bin/stop.sh (100%) mode change 100755 => 100644 rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/mysql/conf/application.yml (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/mysql/conf/linkis.properties (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/mysql/conf/log4j.properties (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/mysql/conf/log4j2.xml (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/mysql/pom.xml (98%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/mysql/pom_k8s.xml (98%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/mysql/src/main/assembly/distribution.xml (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/mysql/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/SqlConnection.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/mysql/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/SqlMetaService.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/mysql/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/SqlParamsMapper.java (100%) rename {datasource => linkis-public-enhancements/linkis-datasource}/metadatamanager/service/mysql/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/service/receiver/SqlReceiver.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/Dockerfile (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/pom.xml (98%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/src/main/java/com/webank/wedatasphere/linkis/application/conf/ApplicationConfiguration.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/src/main/java/com/webank/wedatasphere/linkis/application/dao/ApplicationMapper.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/src/main/java/com/webank/wedatasphere/linkis/application/dao/impl/ApplicationMapper.xml (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Application.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/ApplicationUser.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/DWSParams.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/InitCenter.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Org.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Project.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/ProjectUser.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/ProjectVO.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Right.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Role.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/UserInfo.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/src/main/java/com/webank/wedatasphere/linkis/application/exception/ApplicationException.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/src/main/java/com/webank/wedatasphere/linkis/application/restful/api/ApplicationRestfulApi.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/src/main/java/com/webank/wedatasphere/linkis/application/restful/remote/ApplicationRestfulRemote.java.bak (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/src/main/java/com/webank/wedatasphere/linkis/application/service/ApplicationService.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/src/main/java/com/webank/wedatasphere/linkis/application/service/impl/ApplicationServiceImpl.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/src/main/java/com/webank/wedatasphere/linkis/application/util/ApplicationUtils.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/src/main/scala/com/webank/wedatasphere/linkis/application/conf/ApplicationScalaConfiguration.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/src/main/scala/com/webank/wedatasphere/linkis/application/util/ApplicationUtil.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/application/src/main/scala/com/webank/wedatasphere/linkis/application/util/DdTest.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/bin/start-publicservice.sh (100%) mode change 100755 => 100644 rename {publicService => linkis-public-enhancements/linkis-publicservice}/bin/startup.sh (100%) mode change 100755 => 100644 rename {publicService => linkis-public-enhancements/linkis-publicservice}/bin/stop-publicservice.sh (100%) mode change 100755 => 100644 rename {publicService => linkis-public-enhancements/linkis-publicservice}/bin/stop.sh (100%) mode change 100755 => 100644 rename {publicService => linkis-public-enhancements/linkis-publicservice}/conf/application.yml (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/conf/linkis.properties (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/conf/log4j.properties (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/conf/log4j2.xml (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/pom.xml (98%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/dao/ConfigMapper.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/dao/impl/ConfigMapper.xml (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigKey.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigKeyUser.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigKeyValue.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigKeyValueVO.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigTree.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/exception/ConfigurationException.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/restful/api/ConfigurationRestfulApi.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/util/ConfigurationConfiguration.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/util/Constants.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/receiver/ConfigurationReceiver.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/receiver/ConfigurationReceiverChooser.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/service/ConfigurationService.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/ContainValidator.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/FloatValidator.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/NoneValidator.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/NumericalValidator.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/OneOfValidator.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/RegexValidator.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/Validator.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/ValidatorManager.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/ValidatorManagerImpl.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/jobhistory/pom.xml (98%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/dao/TaskMapper.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/dao/impl/taskMapper.xml (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/entity/QueryTask.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/entity/QueryTaskVO.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/exception/QueryException.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/restful/api/QueryRestfulApi.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/transitional/TaskStatus.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/util/Constants.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/conversions/TaskConversions.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/receiver/QueryReceiver.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/receiver/QueryReceiverChooser.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/service/QueryService.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/service/impl/QueryServiceImpl.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/util/QueryUtils.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/pom.xml (98%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/pom_k8s.xml (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/src/main/assembly/distribution.xml (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/udf/pom.xml (98%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/udf/src/main/java/com/webank/wedatasphere/linkis/udf/api/UDFApi.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/udf/src/main/java/com/webank/wedatasphere/linkis/udf/dao/UDFDao.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/udf/src/main/java/com/webank/wedatasphere/linkis/udf/dao/UDFTreeDao.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/udf/src/main/java/com/webank/wedatasphere/linkis/udf/dao/impl/UDFDao.xml (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/udf/src/main/java/com/webank/wedatasphere/linkis/udf/dao/impl/UDFTreeDao.xml (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/udf/src/main/java/com/webank/wedatasphere/linkis/udf/entity/UDFInfo.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/udf/src/main/java/com/webank/wedatasphere/linkis/udf/entity/UDFManager.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/udf/src/main/java/com/webank/wedatasphere/linkis/udf/entity/UDFTree.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/udf/src/main/java/com/webank/wedatasphere/linkis/udf/excepiton/UDFException.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/udf/src/main/java/com/webank/wedatasphere/linkis/udf/service/UDFService.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/udf/src/main/java/com/webank/wedatasphere/linkis/udf/service/UDFTreeService.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/udf/src/main/java/com/webank/wedatasphere/linkis/udf/service/impl/UDFServiceImpl.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/udf/src/main/java/com/webank/wedatasphere/linkis/udf/service/impl/UDFTreeServiceImpl.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/udf/src/main/java/com/webank/wedatasphere/linkis/udf/utils/ConstantVar.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/api/rpc/RequestUdfTree.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/api/rpc/ResponseUdfTree.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/api/rpc/UdfReceiver.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/api/rpc/UdfReceiverChooser.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/utils/UdfConfiguration.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/udf/src/test/java/com/webank/wedatasphere/linkis/udf/TestUDFTree.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/variable/pom.xml (98%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/variable/src/main/java/com/webank/wedatasphere/linkis/variable/dao/VarMapper.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/variable/src/main/java/com/webank/wedatasphere/linkis/variable/dao/impl/VarMapper.xml (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarKey.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarKeyAndValue.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarKeyUser.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarKeyValueVO.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarTree.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/variable/src/main/java/com/webank/wedatasphere/linkis/variable/exception/VariableException.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/variable/src/main/java/com/webank/wedatasphere/linkis/variable/restful/api/VariableRestfulApi.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/variable/src/main/java/com/webank/wedatasphere/linkis/variable/service/VariableService.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/variable/src/main/java/com/webank/wedatasphere/linkis/variable/util/Constants.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/variable/src/main/scala/com/webank/wedatasphere/linkis/variable/receiver/VariableReceiver.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/variable/src/main/scala/com/webank/wedatasphere/linkis/variable/receiver/VariableReceiverChooser.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/variable/src/main/scala/com/webank/wedatasphere/linkis/variable/service/VariableServiceImpl.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/client/workspace-httpclient/pom.xml (97%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/WorkspaceClientFactory.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/WorkspaceClientImpl.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/action/OpenScriptFromBMLAction.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/action/WorkspacePOSTAction.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/conf/WorkspaceClientConf.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/request/WorkspaceClient.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/request/WorkspaceHttpConf.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/response/ScriptFromBMLResponse.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/response/WorkspaceResponse.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/result/AbstractWorkspaceResult.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/result/ScriptFromBMLResult.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/result/ScriptToBMLResult.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/pom.xml (98%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/conf/WorkSpaceConfiguration.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/constant/WorkSpaceConstants.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/entity/DirFileTree.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/entity/LogLevel.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/exception/WorkSpaceException.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/exception/WorkspaceExceptionManager.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/restful/api/BMLFsRestfulApi.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/restful/api/FsRestfulApi.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/restful/remote/FsRestfulRemote.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/util/WorkspaceUtil.java (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/bml/BMLHelper.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/bml/BMLScriptReader.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/bml/BMLScriptWriter.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/cache/FsCache.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/conf/WorkspaceSpringConfiguration.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/entity/FSInfo.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/quartz/FSQuartz.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/service/FsService.scala (100%) rename {publicService => linkis-public-enhancements/linkis-publicservice}/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/validator/PathValidator.scala (100%) diff --git a/.gitignore b/.gitignore index 39589cd1c..f4773f828 100644 --- a/.gitignore +++ b/.gitignore @@ -20,36 +20,36 @@ linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-suppor linkis-spring-cloud-services/linkis-service-gateway/linkis-spring-cloud-gateway/target/ -metadata/target/ -publicService/application/target/ -publicService/configuration/target/ -publicService/jobhistory/target/ -publicService/target/ -publicService/udf/target/ -publicService/variable/target/ -publicService/workspace/target/ +linkis-public-enhancements/linkis-datasource/linkis-metadata/target/ +linkis-public-enhancements/linkis-publicservice/application/target/ +linkis-public-enhancements/linkis-publicservice/configuration/target/ +linkis-public-enhancements/linkis-publicservice/jobhistory/target/ +linkis-public-enhancements/linkis-publicservice/target/ +linkis-public-enhancements/linkis-publicservice/udf/target/ +linkis-public-enhancements/linkis-publicservice/variable/target/ +linkis-public-enhancements/linkis-publicservice/workspace/target/ resourceManager/resourcemanagerclient/target/ resourceManager/resourcemanagercommon/target/ resourceManager/resourcemanagerserver/target/ linkis-storage/target/ -contextservice/cs-cache/target -contextservice/cs-client/target -contextservice/cs-common/target -contextservice/cs-highavailable/target -contextservice/cs-listener/target -contextservice/cs-persistence/target -contextservice/cs-search/target -contextservice/cs-server/target -contextservice/cs-ujes-client/target +linkis-public-enhancements/linkis-context-service/linkis-cs-cache/target +linkis-public-enhancements/linkis-context-service/linkis-cs-client/target +linkis-public-enhancements/linkis-context-service/linkis-cs-common/target +linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/target +linkis-public-enhancements/linkis-context-service/linkis-cs-listener/target +linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/target +linkis-public-enhancements/linkis-context-service/linkis-cs-search/target +linkis-public-enhancements/linkis-context-service/linkis-cs-server/target +linkis-public-enhancements/linkis-context-service/linkis-cs-engine-support/target -datasource/datasourcemanager/common/target -datasource/datasourcemanager/server/target -datasource/metadatamanager/common/target -datasource/metadatamanager/server/target -datasource/metadatamanager/service/elasticsearch/target -datasource/metadatamanager/service/hive/target -datasource/metadatamanager/service/mysql/target +linkis-public-enhancements/linkis-datasource/datasourcemanager/common/target +linkis-public-enhancements/linkis-datasource/datasourcemanager/server/target +linkis-public-enhancements/linkis-datasource/metadatamanager/common/target +linkis-public-enhancements/linkis-datasource/metadatamanager/server/target +linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/target +linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/target +linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/target @@ -74,12 +74,12 @@ linkis-computation-governance/linkis-entrance/target/ ujes/definedEngines/mlsql/entrance/target/ assembly/public-module/target/ -bml/bml-engine-hook/target/ -bml/bmlclient/target/ -bml/bmlcommon/target/ -bml/bmlserver/target/ +linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook/target/ +linkis-public-enhancements/linkis-bml/linkis-bml-client/target/ +linkis-public-enhancements/linkis-bml/linkis-bml-common/target/ +linkis-public-enhancements/linkis-bml/linkis-bml-server/target/ linkis-commons/linkis-hadoop-common/target/ -publicService/workspace/client/workspace-httpclient/target/ +linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/target/ linkis-user-control/target/ diff --git a/bml/bmlclient/pom.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-client/pom.xml similarity index 95% rename from bml/bmlclient/pom.xml rename to linkis-public-enhancements/linkis-bml/linkis-bml-client/pom.xml index ffe447048..702ef746d 100644 --- a/bml/bmlclient/pom.xml +++ b/linkis-public-enhancements/linkis-bml/linkis-bml-client/pom.xml @@ -6,11 +6,11 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml 4.0.0 - linkis-bmlclient + linkis-bml-client diff --git a/bml/bmlclient/src/main/java/com/webank/wedatasphere/linkis/bml/client/AbstractBmlClient.java b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/java/com/webank/wedatasphere/linkis/bml/client/AbstractBmlClient.java similarity index 100% rename from bml/bmlclient/src/main/java/com/webank/wedatasphere/linkis/bml/client/AbstractBmlClient.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/java/com/webank/wedatasphere/linkis/bml/client/AbstractBmlClient.java diff --git a/bml/bmlclient/src/main/java/com/webank/wedatasphere/linkis/bml/client/BmlClient.java b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/java/com/webank/wedatasphere/linkis/bml/client/BmlClient.java similarity index 100% rename from bml/bmlclient/src/main/java/com/webank/wedatasphere/linkis/bml/client/BmlClient.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/java/com/webank/wedatasphere/linkis/bml/client/BmlClient.java diff --git a/bml/bmlclient/src/main/java/com/webank/wedatasphere/linkis/bml/client/BmlClientFactory.java b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/java/com/webank/wedatasphere/linkis/bml/client/BmlClientFactory.java similarity index 100% rename from bml/bmlclient/src/main/java/com/webank/wedatasphere/linkis/bml/client/BmlClientFactory.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/java/com/webank/wedatasphere/linkis/bml/client/BmlClientFactory.java diff --git a/bml/bmlclient/src/main/scala/com/webank/wedatasphere/linkis/bml/client/impl/HttpBmlClient.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/com/webank/wedatasphere/linkis/bml/client/impl/HttpBmlClient.scala similarity index 100% rename from bml/bmlclient/src/main/scala/com/webank/wedatasphere/linkis/bml/client/impl/HttpBmlClient.scala rename to linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/com/webank/wedatasphere/linkis/bml/client/impl/HttpBmlClient.scala diff --git a/bml/bmlclient/src/main/scala/com/webank/wedatasphere/linkis/bml/common/POSTActionFailException.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/com/webank/wedatasphere/linkis/bml/common/POSTActionFailException.scala similarity index 100% rename from bml/bmlclient/src/main/scala/com/webank/wedatasphere/linkis/bml/common/POSTActionFailException.scala rename to linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/com/webank/wedatasphere/linkis/bml/common/POSTActionFailException.scala diff --git a/bml/bmlclient/src/main/scala/com/webank/wedatasphere/linkis/bml/conf/BmlConfiguration.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/com/webank/wedatasphere/linkis/bml/conf/BmlConfiguration.scala similarity index 100% rename from bml/bmlclient/src/main/scala/com/webank/wedatasphere/linkis/bml/conf/BmlConfiguration.scala rename to linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/com/webank/wedatasphere/linkis/bml/conf/BmlConfiguration.scala diff --git a/bml/bmlclient/src/main/scala/com/webank/wedatasphere/linkis/bml/http/HttpConf.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/com/webank/wedatasphere/linkis/bml/http/HttpConf.scala similarity index 100% rename from bml/bmlclient/src/main/scala/com/webank/wedatasphere/linkis/bml/http/HttpConf.scala rename to linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/com/webank/wedatasphere/linkis/bml/http/HttpConf.scala diff --git a/bml/bmlclient/src/main/scala/com/webank/wedatasphere/linkis/bml/request/BmlPOSTAction.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/com/webank/wedatasphere/linkis/bml/request/BmlPOSTAction.scala similarity index 100% rename from bml/bmlclient/src/main/scala/com/webank/wedatasphere/linkis/bml/request/BmlPOSTAction.scala rename to linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/com/webank/wedatasphere/linkis/bml/request/BmlPOSTAction.scala diff --git a/bml/bmlclient/src/main/scala/com/webank/wedatasphere/linkis/bml/response/BmlResult.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/com/webank/wedatasphere/linkis/bml/response/BmlResult.scala similarity index 100% rename from bml/bmlclient/src/main/scala/com/webank/wedatasphere/linkis/bml/response/BmlResult.scala rename to linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/com/webank/wedatasphere/linkis/bml/response/BmlResult.scala diff --git a/bml/bmlcommon/pom.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-common/pom.xml similarity index 92% rename from bml/bmlcommon/pom.xml rename to linkis-public-enhancements/linkis-bml/linkis-bml-common/pom.xml index 5810ec719..40faf91ab 100644 --- a/bml/bmlcommon/pom.xml +++ b/linkis-public-enhancements/linkis-bml/linkis-bml-common/pom.xml @@ -6,11 +6,11 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml 4.0.0 - linkis-bmlcommon + linkis-bml-common diff --git a/bml/bmlcommon/src/main/java/com/webank/wedatasphere/linkis/bml/model/AbstractAuditable.java b/linkis-public-enhancements/linkis-bml/linkis-bml-common/src/main/java/com/webank/wedatasphere/linkis/bml/model/AbstractAuditable.java similarity index 100% rename from bml/bmlcommon/src/main/java/com/webank/wedatasphere/linkis/bml/model/AbstractAuditable.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-common/src/main/java/com/webank/wedatasphere/linkis/bml/model/AbstractAuditable.java diff --git a/bml/bmlcommon/src/main/scala/com/webank/wedatasphere/linkis/bml/protocol/BmlProtocol.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-common/src/main/scala/com/webank/wedatasphere/linkis/bml/protocol/BmlProtocol.scala similarity index 100% rename from bml/bmlcommon/src/main/scala/com/webank/wedatasphere/linkis/bml/protocol/BmlProtocol.scala rename to linkis-public-enhancements/linkis-bml/linkis-bml-common/src/main/scala/com/webank/wedatasphere/linkis/bml/protocol/BmlProtocol.scala diff --git a/bml/bml-engine-hook/pom.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook/pom.xml similarity index 97% rename from bml/bml-engine-hook/pom.xml rename to linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook/pom.xml index 055942935..94d0f87f2 100644 --- a/bml/bml-engine-hook/pom.xml +++ b/linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook/pom.xml @@ -6,11 +6,11 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml 4.0.0 - linkis-bml-hook + linkis-bml-engine-hook com.webank.wedatasphere.linkis diff --git a/bml/bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/conf/BmlHookConf.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/conf/BmlHookConf.scala similarity index 100% rename from bml/bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/conf/BmlHookConf.scala rename to linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/conf/BmlHookConf.scala diff --git a/bml/bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/exception/BmlHookDownloadException.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/exception/BmlHookDownloadException.scala similarity index 100% rename from bml/bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/exception/BmlHookDownloadException.scala rename to linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/exception/BmlHookDownloadException.scala diff --git a/bml/bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/hook/BmlEnginePreExecuteHook.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/hook/BmlEnginePreExecuteHook.scala similarity index 100% rename from bml/bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/hook/BmlEnginePreExecuteHook.scala rename to linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/hook/BmlEnginePreExecuteHook.scala diff --git a/bml/bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/hook/BmlResourceParser.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/hook/BmlResourceParser.scala similarity index 100% rename from bml/bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/hook/BmlResourceParser.scala rename to linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/hook/BmlResourceParser.scala diff --git a/bml/bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/utils/BmlHookUtils.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/utils/BmlHookUtils.scala similarity index 100% rename from bml/bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/utils/BmlHookUtils.scala rename to linkis-public-enhancements/linkis-bml/linkis-bml-engine-hook/src/main/scala/com/webank/wedatasphere/linkis/bml/utils/BmlHookUtils.scala diff --git a/bml/bmlserver/Dockerfile b/linkis-public-enhancements/linkis-bml/linkis-bml-server/Dockerfile similarity index 100% rename from bml/bmlserver/Dockerfile rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/Dockerfile diff --git a/bml/bmlserver/bin/start-bml.sh b/linkis-public-enhancements/linkis-bml/linkis-bml-server/bin/start-bml.sh old mode 100755 new mode 100644 similarity index 100% rename from bml/bmlserver/bin/start-bml.sh rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/bin/start-bml.sh diff --git a/bml/bmlserver/bin/startup.sh b/linkis-public-enhancements/linkis-bml/linkis-bml-server/bin/startup.sh old mode 100755 new mode 100644 similarity index 100% rename from bml/bmlserver/bin/startup.sh rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/bin/startup.sh diff --git a/bml/bmlserver/bin/stop-bml.sh b/linkis-public-enhancements/linkis-bml/linkis-bml-server/bin/stop-bml.sh old mode 100755 new mode 100644 similarity index 100% rename from bml/bmlserver/bin/stop-bml.sh rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/bin/stop-bml.sh diff --git a/bml/bmlserver/bin/stop.sh b/linkis-public-enhancements/linkis-bml/linkis-bml-server/bin/stop.sh old mode 100755 new mode 100644 similarity index 100% rename from bml/bmlserver/bin/stop.sh rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/bin/stop.sh diff --git a/bml/bmlserver/conf/application.yml b/linkis-public-enhancements/linkis-bml/linkis-bml-server/conf/application.yml similarity index 100% rename from bml/bmlserver/conf/application.yml rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/conf/application.yml diff --git a/bml/bmlserver/conf/linkis.properties b/linkis-public-enhancements/linkis-bml/linkis-bml-server/conf/linkis.properties similarity index 100% rename from bml/bmlserver/conf/linkis.properties rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/conf/linkis.properties diff --git a/bml/bmlserver/conf/log4j2.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-server/conf/log4j2.xml similarity index 100% rename from bml/bmlserver/conf/log4j2.xml rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/conf/log4j2.xml diff --git a/bml/bmlserver/pom.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml similarity index 97% rename from bml/bmlserver/pom.xml rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml index 3799c53af..14dbb12dd 100644 --- a/bml/bmlserver/pom.xml +++ b/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml @@ -6,11 +6,11 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml 4.0.0 - linkis-bmlserver + linkis-bml-server diff --git a/bml/bmlserver/pom_k8s.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom_k8s.xml similarity index 98% rename from bml/bmlserver/pom_k8s.xml rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/pom_k8s.xml index ec9e47855..59ce2441f 100644 --- a/bml/bmlserver/pom_k8s.xml +++ b/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom_k8s.xml @@ -6,11 +6,11 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml 4.0.0 - linkis-bmlserver + >linkis-bml-server diff --git a/bml/bmlserver/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/assembly/distribution.xml similarity index 100% rename from bml/bmlserver/src/main/assembly/distribution.xml rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/assembly/distribution.xml diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/DownloadModel.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/DownloadModel.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/DownloadModel.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/DownloadModel.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/Resource.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/Resource.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/Resource.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/Resource.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/ResourceTask.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/ResourceTask.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/ResourceTask.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/ResourceTask.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/ResourceVersion.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/ResourceVersion.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/ResourceVersion.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/ResourceVersion.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/Version.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/Version.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/Version.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/Entity/Version.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/common/Constant.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/common/Constant.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/common/Constant.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/common/Constant.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/common/ExecutorManager.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/common/ExecutorManager.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/common/ExecutorManager.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/common/ExecutorManager.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/common/HdfsResourceHelper.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/common/HdfsResourceHelper.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/common/HdfsResourceHelper.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/common/HdfsResourceHelper.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/common/OperationEnum.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/common/OperationEnum.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/common/OperationEnum.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/common/OperationEnum.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/common/ResourceHelper.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/common/ResourceHelper.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/common/ResourceHelper.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/common/ResourceHelper.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/common/ResourceHelperFactory.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/common/ResourceHelperFactory.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/common/ResourceHelperFactory.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/common/ResourceHelperFactory.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/common/ScheduledTask.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/common/ScheduledTask.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/common/ScheduledTask.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/common/ScheduledTask.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/dao/DownloadDao.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/dao/DownloadDao.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/dao/DownloadDao.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/dao/DownloadDao.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/dao/ResourceDao.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/dao/ResourceDao.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/dao/ResourceDao.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/dao/ResourceDao.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/dao/TaskDao.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/dao/TaskDao.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/dao/TaskDao.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/dao/TaskDao.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/dao/VersionDao.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/dao/VersionDao.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/dao/VersionDao.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/dao/VersionDao.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/dao/impl/DownloadMapper.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/dao/impl/DownloadMapper.xml similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/dao/impl/DownloadMapper.xml rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/dao/impl/DownloadMapper.xml diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/dao/impl/ResourceMapper.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/dao/impl/ResourceMapper.xml similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/dao/impl/ResourceMapper.xml rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/dao/impl/ResourceMapper.xml diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/dao/impl/TaskMapper.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/dao/impl/TaskMapper.xml similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/dao/impl/TaskMapper.xml rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/dao/impl/TaskMapper.xml diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/dao/impl/VersionMapper.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/dao/impl/VersionMapper.xml similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/dao/impl/VersionMapper.xml rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/dao/impl/VersionMapper.xml diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/restful/BmlRestfulApi.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/restful/BmlRestfulApi.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/restful/BmlRestfulApi.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/restful/BmlRestfulApi.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/restful/RestfulUtils.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/restful/RestfulUtils.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/restful/RestfulUtils.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/restful/RestfulUtils.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/service/BmlService.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/service/BmlService.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/service/BmlService.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/service/BmlService.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/service/DownloadService.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/service/DownloadService.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/service/DownloadService.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/service/DownloadService.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/service/ResourceService.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/service/ResourceService.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/service/ResourceService.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/service/ResourceService.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/service/TaskService.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/service/TaskService.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/service/TaskService.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/service/TaskService.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/service/VersionService.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/service/VersionService.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/service/VersionService.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/service/VersionService.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/BmlServiceImpl.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/BmlServiceImpl.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/BmlServiceImpl.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/BmlServiceImpl.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/DownloadServiceImpl.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/DownloadServiceImpl.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/DownloadServiceImpl.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/DownloadServiceImpl.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/ResourceServiceImpl.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/ResourceServiceImpl.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/ResourceServiceImpl.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/ResourceServiceImpl.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/TaskServiceImpl.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/TaskServiceImpl.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/TaskServiceImpl.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/TaskServiceImpl.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/VersionServiceImpl.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/VersionServiceImpl.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/VersionServiceImpl.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/service/impl/VersionServiceImpl.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/threading/Scheduler.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/threading/Scheduler.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/threading/Scheduler.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/threading/Scheduler.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/threading/Task.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/threading/Task.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/threading/Task.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/threading/Task.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/threading/TaskState.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/threading/TaskState.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/threading/TaskState.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/threading/TaskState.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/util/HttpRequestHelper.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/util/HttpRequestHelper.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/util/HttpRequestHelper.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/util/HttpRequestHelper.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/util/MD5Utils.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/util/MD5Utils.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/util/MD5Utils.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/util/MD5Utils.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/vo/ResourceBasicVO.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/vo/ResourceBasicVO.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/vo/ResourceBasicVO.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/vo/ResourceBasicVO.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/vo/ResourceVO.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/vo/ResourceVO.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/vo/ResourceVO.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/vo/ResourceVO.java diff --git a/bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/vo/ResourceVersionsVO.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/vo/ResourceVersionsVO.java similarity index 100% rename from bml/bmlserver/src/main/java/com/webank/wedatasphere/linkis/bml/vo/ResourceVersionsVO.java rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/com/webank/wedatasphere/linkis/bml/vo/ResourceVersionsVO.java diff --git a/bml/bmlserver/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlAuthorityException.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlAuthorityException.scala similarity index 100% rename from bml/bmlserver/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlAuthorityException.scala rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlAuthorityException.scala diff --git a/bml/bmlserver/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlPermissionDeniedException.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlPermissionDeniedException.scala similarity index 100% rename from bml/bmlserver/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlPermissionDeniedException.scala rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlPermissionDeniedException.scala diff --git a/bml/bmlserver/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlQueryFailException.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlQueryFailException.scala similarity index 100% rename from bml/bmlserver/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlQueryFailException.scala rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlQueryFailException.scala diff --git a/bml/bmlserver/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlResourceExpiredException.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlResourceExpiredException.scala similarity index 100% rename from bml/bmlserver/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlResourceExpiredException.scala rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlResourceExpiredException.scala diff --git a/bml/bmlserver/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlServerParaErrorException.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlServerParaErrorException.scala similarity index 100% rename from bml/bmlserver/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlServerParaErrorException.scala rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/com/webank/wedatasphere/linkis/bml/common/BmlServerParaErrorException.scala diff --git a/bml/bmlserver/src/main/scala/com/webank/wedatasphere/linkis/bml/conf/BmlServerConfiguration.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/com/webank/wedatasphere/linkis/bml/conf/BmlServerConfiguration.scala similarity index 100% rename from bml/bmlserver/src/main/scala/com/webank/wedatasphere/linkis/bml/conf/BmlServerConfiguration.scala rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/com/webank/wedatasphere/linkis/bml/conf/BmlServerConfiguration.scala diff --git a/bml/bmlserver/src/main/scala/com/webank/wedatasphere/linkis/bml/protocol/BmlServerProtocol.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/com/webank/wedatasphere/linkis/bml/protocol/BmlServerProtocol.scala similarity index 100% rename from bml/bmlserver/src/main/scala/com/webank/wedatasphere/linkis/bml/protocol/BmlServerProtocol.scala rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/com/webank/wedatasphere/linkis/bml/protocol/BmlServerProtocol.scala diff --git a/bml/bmlserver/src/main/scala/com/webank/wedatasphere/linkis/bml/rpc/BmlReceiver.scala b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/com/webank/wedatasphere/linkis/bml/rpc/BmlReceiver.scala similarity index 100% rename from bml/bmlserver/src/main/scala/com/webank/wedatasphere/linkis/bml/rpc/BmlReceiver.scala rename to linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/com/webank/wedatasphere/linkis/bml/rpc/BmlReceiver.scala diff --git a/linkis-public-enhancements/linkis-bml/pom.xml b/linkis-public-enhancements/linkis-bml/pom.xml new file mode 100644 index 000000000..7f2406c70 --- /dev/null +++ b/linkis-public-enhancements/linkis-bml/pom.xml @@ -0,0 +1,26 @@ + + + + linkis + com.webank.wedatasphere.linkis + 0.11.0 + ../../pom.xml + + 4.0.0 + + linkis-bml + + pom + + + linkis-bml-common + linkis-bml-server + linkis-bml-client + linkis-bml-engine-hook + + + + + \ No newline at end of file diff --git a/contextservice/cs-cache/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/pom.xml similarity index 98% rename from contextservice/cs-cache/pom.xml rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/pom.xml index 1969444d9..3ec8c7c4d 100644 --- a/contextservice/cs-cache/pom.xml +++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/pom.xml @@ -19,7 +19,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml 4.0.0 diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/ContextCacheService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/ContextCacheService.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/ContextCacheService.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/ContextCacheService.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/DefaultContextCacheService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/DefaultContextCacheService.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/DefaultContextCacheService.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/DefaultContextCacheService.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/ContextCache.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/ContextCache.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/ContextCache.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/ContextCache.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/DefaultContextCache.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/DefaultContextCache.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/DefaultContextCache.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/DefaultContextCache.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/csid/ContextIDValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/csid/ContextIDValue.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/csid/ContextIDValue.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/csid/ContextIDValue.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/csid/ContextIDValueGenerator.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/csid/ContextIDValueGenerator.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/csid/ContextIDValueGenerator.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/csid/ContextIDValueGenerator.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/csid/impl/ContextIDValueGeneratorImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/csid/impl/ContextIDValueGeneratorImpl.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/csid/impl/ContextIDValueGeneratorImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/csid/impl/ContextIDValueGeneratorImpl.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/csid/impl/ContextIDValueImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/csid/impl/ContextIDValueImpl.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/csid/impl/ContextIDValueImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/csid/impl/ContextIDValueImpl.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/cskey/ContextKeyValueContext.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/cskey/ContextKeyValueContext.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/cskey/ContextKeyValueContext.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/cskey/ContextKeyValueContext.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/cskey/ContextValueMapSet.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/cskey/ContextValueMapSet.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/cskey/ContextValueMapSet.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/cskey/ContextValueMapSet.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/cskey/impl/ContextValueMapSetImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/cskey/impl/ContextValueMapSetImpl.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/cskey/impl/ContextValueMapSetImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/cskey/impl/ContextValueMapSetImpl.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/cskey/impl/DefaultContextKeyValueContext.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/cskey/impl/DefaultContextKeyValueContext.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/cskey/impl/DefaultContextKeyValueContext.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/cskey/impl/DefaultContextKeyValueContext.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/guava/ContextIDCacheLoader.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/guava/ContextIDCacheLoader.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/guava/ContextIDCacheLoader.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/guava/ContextIDCacheLoader.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/guava/ContextIDRemoveListener.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/guava/ContextIDRemoveListener.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/guava/ContextIDRemoveListener.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cache/guava/ContextIDRemoveListener.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cleaner/AUTOCleaner.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cleaner/AUTOCleaner.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cleaner/AUTOCleaner.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/cleaner/AUTOCleaner.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/conf/ContextCacheConf.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/conf/ContextCacheConf.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/conf/ContextCacheConf.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/conf/ContextCacheConf.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/index/ContextInvertedIndex.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/index/ContextInvertedIndex.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/index/ContextInvertedIndex.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/index/ContextInvertedIndex.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/index/ContextInvertedIndexSet.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/index/ContextInvertedIndexSet.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/index/ContextInvertedIndexSet.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/index/ContextInvertedIndexSet.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/index/ContextInvertedIndexSetImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/index/ContextInvertedIndexSetImpl.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/index/ContextInvertedIndexSetImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/index/ContextInvertedIndexSetImpl.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/index/DefaultContextInvertedIndex.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/index/DefaultContextInvertedIndex.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/index/DefaultContextInvertedIndex.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/index/DefaultContextInvertedIndex.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/ClassIntrospector.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/ClassIntrospector.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/ClassIntrospector.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/ClassIntrospector.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/ContextCacheMetric.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/ContextCacheMetric.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/ContextCacheMetric.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/ContextCacheMetric.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/ContextIDMetric.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/ContextIDMetric.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/ContextIDMetric.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/ContextIDMetric.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/DefaultContextCacheMetric.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/DefaultContextCacheMetric.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/DefaultContextCacheMetric.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/DefaultContextCacheMetric.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/DefaultContextIDMetric.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/DefaultContextIDMetric.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/DefaultContextIDMetric.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/DefaultContextIDMetric.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/Metrtic.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/Metrtic.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/Metrtic.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/Metrtic.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/ObjectInfo.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/ObjectInfo.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/ObjectInfo.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/ObjectInfo.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/SizeEstimator.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/SizeEstimator.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/SizeEstimator.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/metric/SizeEstimator.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/parser/ContextKeyValueParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/parser/ContextKeyValueParser.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/parser/ContextKeyValueParser.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/parser/ContextKeyValueParser.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/parser/DefaultContextKeyValueParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/parser/DefaultContextKeyValueParser.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/parser/DefaultContextKeyValueParser.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/parser/DefaultContextKeyValueParser.java diff --git a/contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/utils/ContextCacheUtils.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/utils/ContextCacheUtils.java similarity index 100% rename from contextservice/cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/utils/ContextCacheUtils.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/main/java/com/webank/wedatasphere/linkis/cs/contextcache/utils/ContextCacheUtils.java diff --git a/contextservice/cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/csid/TestContextID.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/csid/TestContextID.java similarity index 100% rename from contextservice/cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/csid/TestContextID.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/csid/TestContextID.java diff --git a/contextservice/cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/keyword/TestContextKey.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/keyword/TestContextKey.java similarity index 100% rename from contextservice/cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/keyword/TestContextKey.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/keyword/TestContextKey.java diff --git a/contextservice/cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/keyword/TestContextKeyValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/keyword/TestContextKeyValue.java similarity index 100% rename from contextservice/cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/keyword/TestContextKeyValue.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/keyword/TestContextKeyValue.java diff --git a/contextservice/cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/keyword/TestContextKeyValueParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/keyword/TestContextKeyValueParser.java similarity index 100% rename from contextservice/cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/keyword/TestContextKeyValueParser.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/keyword/TestContextKeyValueParser.java diff --git a/contextservice/cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/keyword/TestContextValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/keyword/TestContextValue.java similarity index 100% rename from contextservice/cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/keyword/TestContextValue.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/keyword/TestContextValue.java diff --git a/contextservice/cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/service/TestContextCacheService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/service/TestContextCacheService.java similarity index 100% rename from contextservice/cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/service/TestContextCacheService.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/java/com/webank/wedatasphere/linkis/cs/contextcache/test/service/TestContextCacheService.java diff --git a/contextservice/cs-cache/src/test/resources/linkis.properties b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/resources/linkis.properties similarity index 100% rename from contextservice/cs-cache/src/test/resources/linkis.properties rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/resources/linkis.properties diff --git a/contextservice/cs-cache/src/test/resources/log4j.properties b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/resources/log4j.properties similarity index 100% rename from contextservice/cs-cache/src/test/resources/log4j.properties rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/resources/log4j.properties diff --git a/contextservice/cs-cache/src/test/resources/log4j2.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/resources/log4j2.xml similarity index 100% rename from contextservice/cs-cache/src/test/resources/log4j2.xml rename to linkis-public-enhancements/linkis-context-service/linkis-cs-cache/src/test/resources/log4j2.xml diff --git a/contextservice/cs-client/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/pom.xml similarity index 98% rename from contextservice/cs-client/pom.xml rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/pom.xml index 820c8df60..229deeb32 100644 --- a/contextservice/cs-client/pom.xml +++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/pom.xml @@ -19,7 +19,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml 4.0.0 diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/AbstractContextClient.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/AbstractContextClient.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/AbstractContextClient.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/AbstractContextClient.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/Context.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/Context.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/Context.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/Context.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/ContextClient.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/ContextClient.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/ContextClient.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/ContextClient.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/LinkisContext.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/LinkisContext.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/LinkisContext.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/LinkisContext.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/LinkisWorkFlowContext.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/LinkisWorkFlowContext.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/LinkisWorkFlowContext.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/LinkisWorkFlowContext.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/builder/ContextClientConfig.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/builder/ContextClientConfig.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/builder/ContextClientConfig.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/builder/ContextClientConfig.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/builder/ContextClientFactory.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/builder/ContextClientFactory.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/builder/ContextClientFactory.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/builder/ContextClientFactory.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/builder/HttpContextClientConfig.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/builder/HttpContextClientConfig.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/builder/HttpContextClientConfig.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/builder/HttpContextClientConfig.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/builder/RPCHttpContextClientConfig.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/builder/RPCHttpContextClientConfig.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/builder/RPCHttpContextClientConfig.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/builder/RPCHttpContextClientConfig.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/http/ContextPostActionBuilder.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/http/ContextPostActionBuilder.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/http/ContextPostActionBuilder.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/http/ContextPostActionBuilder.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/http/HttpContextClient.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/http/HttpContextClient.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/http/HttpContextClient.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/http/HttpContextClient.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/http/HttpHeartBeater.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/http/HttpHeartBeater.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/http/HttpHeartBeater.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/http/HttpHeartBeater.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextClientEvent.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextClientEvent.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextClientEvent.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextClientEvent.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextClientListener.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextClientListener.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextClientListener.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextClientListener.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextClientListenerBus.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextClientListenerBus.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextClientListenerBus.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextClientListenerBus.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextClientListenerManager.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextClientListenerManager.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextClientListenerManager.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextClientListenerManager.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextIDListener.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextIDListener.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextIDListener.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextIDListener.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextKeyListener.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextKeyListener.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextKeyListener.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextKeyListener.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextUpdateEvent.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextUpdateEvent.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextUpdateEvent.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/ContextUpdateEvent.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/HeartBeater.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/HeartBeater.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/HeartBeater.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/listener/HeartBeater.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSMetaDataService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSMetaDataService.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSMetaDataService.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSMetaDataService.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSNodeService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSNodeService.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSNodeService.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSNodeService.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSNodeServiceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSNodeServiceImpl.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSNodeServiceImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSNodeServiceImpl.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSResourceService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSResourceService.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSResourceService.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSResourceService.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSResultDataService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSResultDataService.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSResultDataService.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSResultDataService.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSResultDataServiceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSResultDataServiceImpl.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSResultDataServiceImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSResultDataServiceImpl.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSTableService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSTableService.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSTableService.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSTableService.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSVariableService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSVariableService.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSVariableService.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSVariableService.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSWorkService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSWorkService.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSWorkService.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSWorkService.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSWorkServiceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSWorkServiceImpl.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSWorkServiceImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/CSWorkServiceImpl.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/DefaultSearchService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/DefaultSearchService.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/DefaultSearchService.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/DefaultSearchService.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/LinkisJobDataService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/LinkisJobDataService.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/LinkisJobDataService.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/LinkisJobDataService.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/LinkisJobDataServiceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/LinkisJobDataServiceImpl.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/LinkisJobDataServiceImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/LinkisJobDataServiceImpl.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/MetaDataService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/MetaDataService.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/MetaDataService.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/MetaDataService.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/ResourceService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/ResourceService.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/ResourceService.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/ResourceService.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/SearchService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/SearchService.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/SearchService.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/SearchService.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/TableService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/TableService.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/TableService.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/TableService.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/VariableService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/VariableService.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/VariableService.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/service/VariableService.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/utils/ContextServiceUtils.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/utils/ContextServiceUtils.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/utils/ContextServiceUtils.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/utils/ContextServiceUtils.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/utils/ExceptionHelper.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/utils/ExceptionHelper.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/utils/ExceptionHelper.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/utils/ExceptionHelper.java diff --git a/contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/utils/SerializeHelper.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/utils/SerializeHelper.java similarity index 100% rename from contextservice/cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/utils/SerializeHelper.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/com/webank/wedatasphere/linkis/cs/client/utils/SerializeHelper.java diff --git a/contextservice/cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/exception/ProtocolNotMatchException.scala b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/exception/ProtocolNotMatchException.scala similarity index 100% rename from contextservice/cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/exception/ProtocolNotMatchException.scala rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/exception/ProtocolNotMatchException.scala diff --git a/contextservice/cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/http/ContextAction.scala b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/http/ContextAction.scala similarity index 100% rename from contextservice/cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/http/ContextAction.scala rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/http/ContextAction.scala diff --git a/contextservice/cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/http/ContextResult.scala b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/http/ContextResult.scala similarity index 100% rename from contextservice/cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/http/ContextResult.scala rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/http/ContextResult.scala diff --git a/contextservice/cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/utils/ContextClientConf.scala b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/utils/ContextClientConf.scala similarity index 100% rename from contextservice/cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/utils/ContextClientConf.scala rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/utils/ContextClientConf.scala diff --git a/contextservice/cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/utils/ContextClientUtils.scala b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/utils/ContextClientUtils.scala similarity index 100% rename from contextservice/cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/utils/ContextClientUtils.scala rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/utils/ContextClientUtils.scala diff --git a/contextservice/cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/utils/ContextServerHttpConf.scala b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/utils/ContextServerHttpConf.scala similarity index 100% rename from contextservice/cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/utils/ContextServerHttpConf.scala rename to linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/com/webank/wedatasphere/linkis/cs/client/utils/ContextServerHttpConf.scala diff --git a/contextservice/cs-common/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/pom.xml similarity index 97% rename from contextservice/cs-common/pom.xml rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/pom.xml index ea1ff3931..ed90b4a8a 100644 --- a/contextservice/cs-common/pom.xml +++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/pom.xml @@ -19,7 +19,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml 4.0.0 diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/annotation/KeywordMethod.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/annotation/KeywordMethod.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/annotation/KeywordMethod.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/annotation/KeywordMethod.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/data/CSResultData.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/data/CSResultData.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/data/CSResultData.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/data/CSResultData.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/data/Data.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/data/Data.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/data/Data.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/data/Data.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/data/JobData.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/data/JobData.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/data/JobData.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/data/JobData.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/data/LinkisJobData.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/data/LinkisJobData.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/data/LinkisJobData.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/data/LinkisJobData.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/ContextScope.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/ContextScope.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/ContextScope.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/ContextScope.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/ContextType.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/ContextType.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/ContextType.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/ContextType.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/DBType.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/DBType.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/DBType.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/DBType.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/ExpireType.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/ExpireType.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/ExpireType.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/ExpireType.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/WorkType.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/WorkType.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/WorkType.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/enumeration/WorkType.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/env/Env.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/env/Env.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/env/Env.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/env/Env.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/env/OSEnv.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/env/OSEnv.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/env/OSEnv.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/env/OSEnv.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/env/SoftWareEnv.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/env/SoftWareEnv.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/env/SoftWareEnv.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/env/SoftWareEnv.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/env/SoftwareLibEnv.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/env/SoftwareLibEnv.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/env/SoftwareLibEnv.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/env/SoftwareLibEnv.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/CommonContextIDListenerDomain.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/CommonContextIDListenerDomain.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/CommonContextIDListenerDomain.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/CommonContextIDListenerDomain.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/CommonContextKeyListenerDomain.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/CommonContextKeyListenerDomain.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/CommonContextKeyListenerDomain.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/CommonContextKeyListenerDomain.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/ContextIDListenerDomain.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/ContextIDListenerDomain.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/ContextIDListenerDomain.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/ContextIDListenerDomain.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/ContextKeyListenerDomain.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/ContextKeyListenerDomain.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/ContextKeyListenerDomain.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/ContextKeyListenerDomain.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/ListenerDomain.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/ListenerDomain.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/ListenerDomain.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/listener/ListenerDomain.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/CSColumn.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/CSColumn.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/CSColumn.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/CSColumn.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/CSDB.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/CSDB.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/CSDB.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/CSDB.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/CSPartition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/CSPartition.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/CSPartition.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/CSPartition.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/CSTable.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/CSTable.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/CSTable.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/CSTable.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/Column.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/Column.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/Column.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/Column.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/DB.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/DB.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/DB.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/DB.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/Partition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/Partition.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/Partition.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/Partition.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/Table.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/Table.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/Table.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/metadata/Table.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CSFlowInfos.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CSFlowInfos.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CSFlowInfos.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CSFlowInfos.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CSInfos.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CSInfos.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CSInfos.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CSInfos.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CSProperty.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CSProperty.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CSProperty.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CSProperty.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CommonGlobalConfiguration.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CommonGlobalConfiguration.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CommonGlobalConfiguration.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CommonGlobalConfiguration.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CommonProperty.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CommonProperty.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CommonProperty.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/CommonProperty.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/LinkisVariable.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/LinkisVariable.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/LinkisVariable.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/object/LinkisVariable.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/BMLResource.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/BMLResource.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/BMLResource.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/BMLResource.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/CommonFxResource.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/CommonFxResource.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/CommonFxResource.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/CommonFxResource.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/CommonUDFResource.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/CommonUDFResource.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/CommonUDFResource.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/CommonUDFResource.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/FxResource.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/FxResource.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/FxResource.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/FxResource.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/LinkisBMLResource.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/LinkisBMLResource.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/LinkisBMLResource.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/LinkisBMLResource.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/Resource.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/Resource.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/Resource.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/Resource.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/UDFResource.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/UDFResource.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/UDFResource.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/resource/UDFResource.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CombinedNodeIDContextID.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CombinedNodeIDContextID.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CombinedNodeIDContextID.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CombinedNodeIDContextID.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonContextID.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonContextID.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonContextID.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonContextID.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonContextKey.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonContextKey.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonContextKey.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonContextKey.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonContextKeyValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonContextKeyValue.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonContextKeyValue.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonContextKeyValue.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonContextValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonContextValue.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonContextValue.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonContextValue.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonHAContextID.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonHAContextID.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonHAContextID.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CommonHAContextID.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextID.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextID.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextID.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextID.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextIDParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextIDParser.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextIDParser.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextIDParser.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextKey.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextKey.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextKey.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextKey.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextKeyValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextKeyValue.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextKeyValue.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextKeyValue.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextValue.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextValue.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ContextValue.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CreatorContextKey.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CreatorContextKey.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CreatorContextKey.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/CreatorContextKey.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/HAContextID.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/HAContextID.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/HAContextID.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/HAContextID.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/LinkisHAWorkFlowContextID.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/LinkisHAWorkFlowContextID.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/LinkisHAWorkFlowContextID.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/LinkisHAWorkFlowContextID.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/LinkisWorkflowContextID.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/LinkisWorkflowContextID.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/LinkisWorkflowContextID.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/LinkisWorkflowContextID.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/OrderContextKey.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/OrderContextKey.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/OrderContextKey.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/OrderContextKey.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/Source.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/Source.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/Source.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/Source.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/UserContextID.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/UserContextID.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/UserContextID.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/UserContextID.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ValueBean.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ValueBean.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ValueBean.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/ValueBean.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/VersionContextKey.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/VersionContextKey.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/VersionContextKey.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/VersionContextKey.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/WorkflowContextID.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/WorkflowContextID.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/WorkflowContextID.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/WorkflowContextID.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/YMLContextKey.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/YMLContextKey.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/YMLContextKey.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/entity/source/YMLContextKey.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/exception/CSErrorException.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/exception/CSErrorException.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/exception/CSErrorException.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/exception/CSErrorException.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/exception/CSWarnException.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/exception/CSWarnException.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/exception/CSWarnException.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/exception/CSWarnException.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/exception/ErrorCode.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/exception/ErrorCode.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/exception/ErrorCode.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/exception/ErrorCode.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/listener/ContextIDListener.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/listener/ContextIDListener.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/listener/ContextIDListener.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/listener/ContextIDListener.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/listener/ContextKeyListener.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/listener/ContextKeyListener.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/listener/ContextKeyListener.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/listener/ContextKeyListener.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextHTTPConstant.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextHTTPConstant.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextHTTPConstant.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextHTTPConstant.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextHistoryType.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextHistoryType.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextHistoryType.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextHistoryType.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextIDType.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextIDType.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextIDType.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextIDType.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextKeyType.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextKeyType.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextKeyType.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextKeyType.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextKeyValueType.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextKeyValueType.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextKeyValueType.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextKeyValueType.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextValueType.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextValueType.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextValueType.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/protocol/ContextValueType.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/search/ContextSearchConditionMapBuilder.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/search/ContextSearchConditionMapBuilder.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/search/ContextSearchConditionMapBuilder.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/search/ContextSearchConditionMapBuilder.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/AbstractSerializer.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/AbstractSerializer.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/AbstractSerializer.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/AbstractSerializer.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/ContextSerializer.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/ContextSerializer.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/ContextSerializer.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/ContextSerializer.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/helper/AbstractSerializationHelper.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/helper/AbstractSerializationHelper.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/helper/AbstractSerializationHelper.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/helper/AbstractSerializationHelper.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/helper/ContextSerializationHelper.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/helper/ContextSerializationHelper.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/helper/ContextSerializationHelper.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/helper/ContextSerializationHelper.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/helper/SerializationHelper.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/helper/SerializationHelper.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/helper/SerializationHelper.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/helper/SerializationHelper.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializer.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializer.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializer.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializer.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/CommonContextKeySerializer.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/CommonContextKeySerializer.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/CommonContextKeySerializer.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/CommonContextKeySerializer.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/ContextKeyValueSerializer.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/ContextKeyValueSerializer.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/ContextKeyValueSerializer.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/ContextKeyValueSerializer.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/ContextValueSerializer.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/ContextValueSerializer.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/ContextValueSerializer.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/ContextValueSerializer.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/LinkisHAWorkFlowContextIDSerializer.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/LinkisHAWorkFlowContextIDSerializer.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/LinkisHAWorkFlowContextIDSerializer.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/context/LinkisHAWorkFlowContextIDSerializer.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializer.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializer.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializer.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializer.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializer.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializer.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializer.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializer.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializer.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializer.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializer.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializer.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializer.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializer.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializer.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializer.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializer.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializer.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializer.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializer.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/object/LinkisVariableSerializer.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/object/LinkisVariableSerializer.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/object/LinkisVariableSerializer.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/serialize/impl/value/object/LinkisVariableSerializer.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/utils/CSCommonUtils.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/utils/CSCommonUtils.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/utils/CSCommonUtils.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/utils/CSCommonUtils.java diff --git a/contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/utils/CSHighAvailableUtils.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/utils/CSHighAvailableUtils.java similarity index 100% rename from contextservice/cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/utils/CSHighAvailableUtils.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/com/webank/wedatasphere/linkis/cs/common/utils/CSHighAvailableUtils.java diff --git a/contextservice/cs-ujes-client/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-engine-support/pom.xml similarity index 95% rename from contextservice/cs-ujes-client/pom.xml rename to linkis-public-enhancements/linkis-context-service/linkis-cs-engine-support/pom.xml index fd8b60ecd..2e584d41f 100644 --- a/contextservice/cs-ujes-client/pom.xml +++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-engine-support/pom.xml @@ -19,11 +19,11 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml 4.0.0 - linkis-cs-ujes-client + linkis-cs-engine-support diff --git a/contextservice/cs-ujes-client/src/main/scala/com/webank/wedatasphere/linkis/cs/storage/CSTableResultSetWriter.scala b/linkis-public-enhancements/linkis-context-service/linkis-cs-engine-support/src/main/scala/com/webank/wedatasphere/linkis/cs/storage/CSTableResultSetWriter.scala similarity index 100% rename from contextservice/cs-ujes-client/src/main/scala/com/webank/wedatasphere/linkis/cs/storage/CSTableResultSetWriter.scala rename to linkis-public-enhancements/linkis-context-service/linkis-cs-engine-support/src/main/scala/com/webank/wedatasphere/linkis/cs/storage/CSTableResultSetWriter.scala diff --git a/contextservice/cs-highavailable/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/pom.xml similarity index 98% rename from contextservice/cs-highavailable/pom.xml rename to linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/pom.xml index de1787627..80b7c2d54 100644 --- a/contextservice/cs-highavailable/pom.xml +++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/pom.xml @@ -19,7 +19,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml 4.0.0 diff --git a/contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/AbstractContextHAManager.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/AbstractContextHAManager.java similarity index 100% rename from contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/AbstractContextHAManager.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/AbstractContextHAManager.java diff --git a/contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ContextHAManager.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ContextHAManager.java similarity index 100% rename from contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ContextHAManager.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ContextHAManager.java diff --git a/contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/DefaultContextHAManager.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/DefaultContextHAManager.java similarity index 100% rename from contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/DefaultContextHAManager.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/DefaultContextHAManager.java diff --git a/contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/conf/ContextHighAvailableConf.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/conf/ContextHighAvailableConf.java similarity index 100% rename from contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/conf/ContextHighAvailableConf.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/conf/ContextHighAvailableConf.java diff --git a/contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/exception/ErrorCode.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/exception/ErrorCode.java similarity index 100% rename from contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/exception/ErrorCode.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/exception/ErrorCode.java diff --git a/contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/BackupInstanceGenerator.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/BackupInstanceGenerator.java similarity index 100% rename from contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/BackupInstanceGenerator.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/BackupInstanceGenerator.java diff --git a/contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/ContextHAChecker.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/ContextHAChecker.java similarity index 100% rename from contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/ContextHAChecker.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/ContextHAChecker.java diff --git a/contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/ContextHAIDGenerator.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/ContextHAIDGenerator.java similarity index 100% rename from contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/ContextHAIDGenerator.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/ContextHAIDGenerator.java diff --git a/contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/impl/BackupInstanceGeneratorImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/impl/BackupInstanceGeneratorImpl.java similarity index 100% rename from contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/impl/BackupInstanceGeneratorImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/impl/BackupInstanceGeneratorImpl.java diff --git a/contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java similarity index 100% rename from contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java diff --git a/contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/impl/ContextHAIDGeneratorImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/impl/ContextHAIDGeneratorImpl.java similarity index 100% rename from contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/impl/ContextHAIDGeneratorImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/ha/impl/ContextHAIDGeneratorImpl.java diff --git a/contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/pluggable/HAContextPersistenceManagerImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/pluggable/HAContextPersistenceManagerImpl.java similarity index 100% rename from contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/pluggable/HAContextPersistenceManagerImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/pluggable/HAContextPersistenceManagerImpl.java diff --git a/contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java similarity index 100% rename from contextservice/cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/com/webank/wedatasphere/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java diff --git a/contextservice/cs-highavailable/src/test/java/com/webank/wedatasphere/linkis/cs/highavailable/test/TestContextHAManager.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/java/com/webank/wedatasphere/linkis/cs/highavailable/test/TestContextHAManager.java similarity index 100% rename from contextservice/cs-highavailable/src/test/java/com/webank/wedatasphere/linkis/cs/highavailable/test/TestContextHAManager.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/java/com/webank/wedatasphere/linkis/cs/highavailable/test/TestContextHAManager.java diff --git a/contextservice/cs-highavailable/src/test/java/com/webank/wedatasphere/linkis/cs/highavailable/test/haid/TestHAID.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/java/com/webank/wedatasphere/linkis/cs/highavailable/test/haid/TestHAID.java similarity index 100% rename from contextservice/cs-highavailable/src/test/java/com/webank/wedatasphere/linkis/cs/highavailable/test/haid/TestHAID.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/java/com/webank/wedatasphere/linkis/cs/highavailable/test/haid/TestHAID.java diff --git a/contextservice/cs-highavailable/src/test/java/com/webank/wedatasphere/linkis/cs/highavailable/test/persist/TestPersistence.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/java/com/webank/wedatasphere/linkis/cs/highavailable/test/persist/TestPersistence.java similarity index 100% rename from contextservice/cs-highavailable/src/test/java/com/webank/wedatasphere/linkis/cs/highavailable/test/persist/TestPersistence.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/java/com/webank/wedatasphere/linkis/cs/highavailable/test/persist/TestPersistence.java diff --git a/contextservice/cs-highavailable/src/test/resources/application.yml b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/resources/application.yml similarity index 100% rename from contextservice/cs-highavailable/src/test/resources/application.yml rename to linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/resources/application.yml diff --git a/contextservice/cs-highavailable/src/test/resources/linkis.properties b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/resources/linkis.properties similarity index 100% rename from contextservice/cs-highavailable/src/test/resources/linkis.properties rename to linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/resources/linkis.properties diff --git a/contextservice/cs-highavailable/src/test/resources/log4j.properties b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/resources/log4j.properties similarity index 100% rename from contextservice/cs-highavailable/src/test/resources/log4j.properties rename to linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/resources/log4j.properties diff --git a/contextservice/cs-highavailable/src/test/resources/log4j2.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/resources/log4j2.xml similarity index 100% rename from contextservice/cs-highavailable/src/test/resources/log4j2.xml rename to linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/test/resources/log4j2.xml diff --git a/contextservice/cs-listener/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/pom.xml similarity index 97% rename from contextservice/cs-listener/pom.xml rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/pom.xml index 1c5413d00..fe52f20ff 100644 --- a/contextservice/cs-listener/pom.xml +++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/pom.xml @@ -19,7 +19,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml 4.0.0 diff --git a/contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/CSIDListener.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/CSIDListener.java similarity index 100% rename from contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/CSIDListener.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/CSIDListener.java diff --git a/contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/CSKeyListener.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/CSKeyListener.java similarity index 100% rename from contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/CSKeyListener.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/CSKeyListener.java diff --git a/contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/ContextAsyncEventListener.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/ContextAsyncEventListener.java similarity index 100% rename from contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/ContextAsyncEventListener.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/ContextAsyncEventListener.java diff --git a/contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/ListenerBus/ContextAsyncListenerBus.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/ListenerBus/ContextAsyncListenerBus.java similarity index 100% rename from contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/ListenerBus/ContextAsyncListenerBus.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/ListenerBus/ContextAsyncListenerBus.java diff --git a/contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/AbstractCallbackEngine.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/AbstractCallbackEngine.java similarity index 100% rename from contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/AbstractCallbackEngine.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/AbstractCallbackEngine.java diff --git a/contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/CallbackEngine.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/CallbackEngine.java similarity index 100% rename from contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/CallbackEngine.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/CallbackEngine.java diff --git a/contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/ContextIDCallbackEngine.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/ContextIDCallbackEngine.java similarity index 100% rename from contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/ContextIDCallbackEngine.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/ContextIDCallbackEngine.java diff --git a/contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/ContextKeyCallbackEngine.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/ContextKeyCallbackEngine.java similarity index 100% rename from contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/ContextKeyCallbackEngine.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/ContextKeyCallbackEngine.java diff --git a/contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/imp/ContextKeyValueBean.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/imp/ContextKeyValueBean.java similarity index 100% rename from contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/imp/ContextKeyValueBean.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/imp/ContextKeyValueBean.java diff --git a/contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/imp/DefaultContextIDCallbackEngine.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/imp/DefaultContextIDCallbackEngine.java similarity index 100% rename from contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/imp/DefaultContextIDCallbackEngine.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/imp/DefaultContextIDCallbackEngine.java diff --git a/contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/imp/DefaultContextKeyCallbackEngine.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/imp/DefaultContextKeyCallbackEngine.java similarity index 100% rename from contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/imp/DefaultContextKeyCallbackEngine.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/callback/imp/DefaultContextKeyCallbackEngine.java diff --git a/contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/conf/ContextListenerConf.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/conf/ContextListenerConf.java similarity index 100% rename from contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/conf/ContextListenerConf.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/conf/ContextListenerConf.java diff --git a/contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/ContextIDEvent.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/ContextIDEvent.java similarity index 100% rename from contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/ContextIDEvent.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/ContextIDEvent.java diff --git a/contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/ContextKeyEvent.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/ContextKeyEvent.java similarity index 100% rename from contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/ContextKeyEvent.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/ContextKeyEvent.java diff --git a/contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/enumeration/OperateType.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/enumeration/OperateType.java similarity index 100% rename from contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/enumeration/OperateType.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/enumeration/OperateType.java diff --git a/contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/impl/DefaultContextIDEvent.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/impl/DefaultContextIDEvent.java similarity index 100% rename from contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/impl/DefaultContextIDEvent.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/impl/DefaultContextIDEvent.java diff --git a/contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/impl/DefaultContextKeyEvent.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/impl/DefaultContextKeyEvent.java similarity index 100% rename from contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/impl/DefaultContextKeyEvent.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/event/impl/DefaultContextKeyEvent.java diff --git a/contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/manager/ListenerManager.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/manager/ListenerManager.java similarity index 100% rename from contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/manager/ListenerManager.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/manager/ListenerManager.java diff --git a/contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/manager/imp/DefaultContextListenerManager.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/manager/imp/DefaultContextListenerManager.java similarity index 100% rename from contextservice/cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/manager/imp/DefaultContextListenerManager.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/com/webank/wedatasphere/linkis/cs/listener/manager/imp/DefaultContextListenerManager.java diff --git a/contextservice/cs-listener/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestContextID.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestContextID.java similarity index 100% rename from contextservice/cs-listener/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestContextID.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestContextID.java diff --git a/contextservice/cs-listener/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestContextKey.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestContextKey.java similarity index 100% rename from contextservice/cs-listener/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestContextKey.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestContextKey.java diff --git a/contextservice/cs-listener/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestContextKeyValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestContextKeyValue.java similarity index 100% rename from contextservice/cs-listener/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestContextKeyValue.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestContextKeyValue.java diff --git a/contextservice/cs-listener/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestContextValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestContextValue.java similarity index 100% rename from contextservice/cs-listener/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestContextValue.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestContextValue.java diff --git a/contextservice/cs-listener/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestListenerManager.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestListenerManager.java similarity index 100% rename from contextservice/cs-listener/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestListenerManager.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/com/webank/wedatasphere/linkis/cs/listener/test/TestListenerManager.java diff --git a/contextservice/cs-persistence/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/pom.xml similarity index 98% rename from contextservice/cs-persistence/pom.xml rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/pom.xml index b3a980dcd..a651b90cc 100644 --- a/contextservice/cs-persistence/pom.xml +++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/pom.xml @@ -19,7 +19,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml 4.0.0 diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/ContextPersistenceBeans.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/ContextPersistenceBeans.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/ContextPersistenceBeans.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/ContextPersistenceBeans.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/ContextPersistenceManager.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/ContextPersistenceManager.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/ContextPersistenceManager.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/ContextPersistenceManager.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/ContextPersistenceManagerImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/ContextPersistenceManagerImpl.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/ContextPersistenceManagerImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/ContextPersistenceManagerImpl.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/annotation/Ignore.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/annotation/Ignore.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/annotation/Ignore.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/annotation/Ignore.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/annotation/Tuning.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/annotation/Tuning.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/annotation/Tuning.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/annotation/Tuning.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/aop/PersistenceTuningAspect.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/aop/PersistenceTuningAspect.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/aop/PersistenceTuningAspect.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/aop/PersistenceTuningAspect.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/conf/PersistenceConf.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/conf/PersistenceConf.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/conf/PersistenceConf.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/conf/PersistenceConf.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/ContextIDListenerMapper.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/ContextIDListenerMapper.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/ContextIDListenerMapper.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/ContextIDListenerMapper.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/ContextIDMapper.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/ContextIDMapper.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/ContextIDMapper.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/ContextIDMapper.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/ContextKeyListenerMapper.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/ContextKeyListenerMapper.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/ContextKeyListenerMapper.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/ContextKeyListenerMapper.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/ContextMapMapper.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/ContextMapMapper.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/ContextMapMapper.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/ContextMapMapper.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/impl/contextIDListenerMapper.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/impl/contextIDListenerMapper.xml similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/impl/contextIDListenerMapper.xml rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/impl/contextIDListenerMapper.xml diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/impl/contextIDMapper.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/impl/contextIDMapper.xml similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/impl/contextIDMapper.xml rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/impl/contextIDMapper.xml diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/impl/contextKeyListenerMapper.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/impl/contextKeyListenerMapper.xml similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/impl/contextKeyListenerMapper.xml rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/impl/contextKeyListenerMapper.xml diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/impl/contextMapMapper.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/impl/contextMapMapper.xml similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/impl/contextMapMapper.xml rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/dao/impl/contextMapMapper.xml diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/ExtraFieldClass.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/ExtraFieldClass.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/ExtraFieldClass.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/ExtraFieldClass.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextID.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextID.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextID.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextID.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextIDListener.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextIDListener.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextIDListener.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextIDListener.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextKey.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextKey.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextKey.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextKey.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextKeyListener.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextKeyListener.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextKeyListener.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextKeyListener.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextKeyValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextKeyValue.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextKeyValue.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextKeyValue.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextValue.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextValue.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/entity/PersistenceContextValue.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/exception/ThrowingFunction.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/exception/ThrowingFunction.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/exception/ThrowingFunction.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/exception/ThrowingFunction.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextIDListenerPersistence.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextIDListenerPersistence.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextIDListenerPersistence.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextIDListenerPersistence.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextIDPersistence.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextIDPersistence.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextIDPersistence.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextIDPersistence.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextKeyListenerPersistence.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextKeyListenerPersistence.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextKeyListenerPersistence.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextKeyListenerPersistence.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextMapPersistence.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextMapPersistence.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextMapPersistence.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextMapPersistence.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextMetricsPersistence.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextMetricsPersistence.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextMetricsPersistence.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/ContextMetricsPersistence.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/TransactionManager.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/TransactionManager.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/TransactionManager.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/TransactionManager.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextIDListenerPersistenceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextIDListenerPersistenceImpl.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextIDListenerPersistenceImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextIDListenerPersistenceImpl.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextIDPersistenceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextIDPersistenceImpl.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextIDPersistenceImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextIDPersistenceImpl.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextKeyListenerPersistenceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextKeyListenerPersistenceImpl.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextKeyListenerPersistenceImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextKeyListenerPersistenceImpl.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextMapPersistenceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextMapPersistenceImpl.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextMapPersistenceImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextMapPersistenceImpl.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextMetricsPersistenceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextMetricsPersistenceImpl.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextMetricsPersistenceImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/ContextMetricsPersistenceImpl.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/TransactionManagerImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/TransactionManagerImpl.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/TransactionManagerImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/persistence/impl/TransactionManagerImpl.java diff --git a/contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/util/PersistenceUtils.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/util/PersistenceUtils.java similarity index 100% rename from contextservice/cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/util/PersistenceUtils.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/java/com/webank/wedatasphere/linkis/cs/persistence/util/PersistenceUtils.java diff --git a/contextservice/cs-persistence/src/main/resources/cs_ddl.sql b/linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/resources/cs_ddl.sql similarity index 100% rename from contextservice/cs-persistence/src/main/resources/cs_ddl.sql rename to linkis-public-enhancements/linkis-context-service/linkis-cs-persistence/src/main/resources/cs_ddl.sql diff --git a/contextservice/cs-search/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/pom.xml similarity index 98% rename from contextservice/cs-search/pom.xml rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/pom.xml index a30d66c54..cfd3a190d 100644 --- a/contextservice/cs-search/pom.xml +++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/pom.xml @@ -19,7 +19,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml 4.0.0 diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/ContextSearch.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/ContextSearch.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/ContextSearch.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/ContextSearch.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/DefaultContextSearch.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/DefaultContextSearch.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/DefaultContextSearch.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/DefaultContextSearch.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/AbstractCommonCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/AbstractCommonCondition.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/AbstractCommonCondition.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/AbstractCommonCondition.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/AtomicCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/AtomicCondition.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/AtomicCondition.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/AtomicCondition.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/BinaryLogicCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/BinaryLogicCondition.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/BinaryLogicCondition.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/BinaryLogicCondition.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/Condition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/Condition.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/Condition.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/Condition.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/ConditionType.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/ConditionType.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/ConditionType.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/ConditionType.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/UnaryLogicCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/UnaryLogicCondition.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/UnaryLogicCondition.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/UnaryLogicCondition.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/AndConditionParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/AndConditionParser.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/AndConditionParser.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/AndConditionParser.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ConditionBuilder.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ConditionBuilder.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ConditionBuilder.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ConditionBuilder.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ConditionBuilderImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ConditionBuilderImpl.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ConditionBuilderImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ConditionBuilderImpl.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ConditionParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ConditionParser.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ConditionParser.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ConditionParser.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ContainsConditionParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ContainsConditionParser.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ContainsConditionParser.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ContainsConditionParser.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ContextScopeConditionParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ContextScopeConditionParser.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ContextScopeConditionParser.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ContextScopeConditionParser.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ContextTypeConditionParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ContextTypeConditionParser.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ContextTypeConditionParser.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ContextTypeConditionParser.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ContextValueTypeConditionParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ContextValueTypeConditionParser.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ContextValueTypeConditionParser.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/ContextValueTypeConditionParser.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/NearestConditionParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/NearestConditionParser.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/NearestConditionParser.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/NearestConditionParser.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/NotConditionParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/NotConditionParser.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/NotConditionParser.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/NotConditionParser.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/OrConditionParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/OrConditionParser.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/OrConditionParser.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/OrConditionParser.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/RegexConditionParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/RegexConditionParser.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/RegexConditionParser.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/construction/RegexConditionParser.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/AndCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/AndCondition.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/AndCondition.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/AndCondition.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/ContainsCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/ContainsCondition.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/ContainsCondition.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/ContainsCondition.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/ContextScopeCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/ContextScopeCondition.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/ContextScopeCondition.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/ContextScopeCondition.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/ContextTypeCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/ContextTypeCondition.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/ContextTypeCondition.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/ContextTypeCondition.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/ContextValueTypeCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/ContextValueTypeCondition.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/ContextValueTypeCondition.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/ContextValueTypeCondition.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/NearestCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/NearestCondition.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/NearestCondition.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/NearestCondition.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/NotCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/NotCondition.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/NotCondition.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/NotCondition.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/OrCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/OrCondition.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/OrCondition.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/OrCondition.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/RegexCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/RegexCondition.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/RegexCondition.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/condition/impl/RegexCondition.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/exception/ContextSearchFailedException.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/exception/ContextSearchFailedException.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/exception/ContextSearchFailedException.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/exception/ContextSearchFailedException.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/AbstractConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/AbstractConditionExecution.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/AbstractConditionExecution.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/AbstractConditionExecution.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ConditionExecution.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ConditionExecution.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ConditionExecution.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/fetcher/AbstractContextCacheFetcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/fetcher/AbstractContextCacheFetcher.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/fetcher/AbstractContextCacheFetcher.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/fetcher/AbstractContextCacheFetcher.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/fetcher/ContextCacheFetcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/fetcher/ContextCacheFetcher.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/fetcher/ContextCacheFetcher.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/fetcher/ContextCacheFetcher.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/fetcher/ContextTypeContextSearchFetcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/fetcher/ContextTypeContextSearchFetcher.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/fetcher/ContextTypeContextSearchFetcher.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/fetcher/ContextTypeContextSearchFetcher.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/fetcher/IterateContextCacheFetcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/fetcher/IterateContextCacheFetcher.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/fetcher/IterateContextCacheFetcher.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/fetcher/IterateContextCacheFetcher.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/AndConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/AndConditionExecution.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/AndConditionExecution.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/AndConditionExecution.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/BinaryLogicConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/BinaryLogicConditionExecution.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/BinaryLogicConditionExecution.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/BinaryLogicConditionExecution.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/ContainsConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/ContainsConditionExecution.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/ContainsConditionExecution.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/ContainsConditionExecution.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/ContextScopeConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/ContextScopeConditionExecution.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/ContextScopeConditionExecution.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/ContextScopeConditionExecution.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/ContextTypeConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/ContextTypeConditionExecution.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/ContextTypeConditionExecution.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/ContextTypeConditionExecution.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/ContextValueTypeConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/ContextValueTypeConditionExecution.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/ContextValueTypeConditionExecution.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/ContextValueTypeConditionExecution.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/NearestConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/NearestConditionExecution.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/NearestConditionExecution.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/NearestConditionExecution.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/NotConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/NotConditionExecution.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/NotConditionExecution.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/NotConditionExecution.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/OrConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/OrConditionExecution.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/OrConditionExecution.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/OrConditionExecution.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/RegexConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/RegexConditionExecution.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/RegexConditionExecution.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/RegexConditionExecution.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/UnaryLogicConditionExecution.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/UnaryLogicConditionExecution.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/UnaryLogicConditionExecution.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/impl/UnaryLogicConditionExecution.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/AbstractContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/AbstractContextSearchMatcher.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/AbstractContextSearchMatcher.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/AbstractContextSearchMatcher.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/AndLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/AndLogicContextSearchMatcher.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/AndLogicContextSearchMatcher.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/AndLogicContextSearchMatcher.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/BinaryLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/BinaryLogicContextSearchMatcher.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/BinaryLogicContextSearchMatcher.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/BinaryLogicContextSearchMatcher.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ConditionMatcherResolver.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ConditionMatcherResolver.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ConditionMatcherResolver.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ConditionMatcherResolver.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContainsContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContainsContextSearchMatcher.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContainsContextSearchMatcher.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContainsContextSearchMatcher.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContextScopeContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContextScopeContextSearchMatcher.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContextScopeContextSearchMatcher.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContextScopeContextSearchMatcher.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContextSearchMatcher.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContextSearchMatcher.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContextSearchMatcher.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContextTypeContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContextTypeContextSearchMatcher.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContextTypeContextSearchMatcher.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContextTypeContextSearchMatcher.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContextValueTypeContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContextValueTypeContextSearchMatcher.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContextValueTypeContextSearchMatcher.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/ContextValueTypeContextSearchMatcher.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/NearestLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/NearestLogicContextSearchMatcher.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/NearestLogicContextSearchMatcher.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/NearestLogicContextSearchMatcher.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/NotLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/NotLogicContextSearchMatcher.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/NotLogicContextSearchMatcher.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/NotLogicContextSearchMatcher.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/OrLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/OrLogicContextSearchMatcher.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/OrLogicContextSearchMatcher.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/OrLogicContextSearchMatcher.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/RegexContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/RegexContextSearchMatcher.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/RegexContextSearchMatcher.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/RegexContextSearchMatcher.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/SkipContextSearchMather.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/SkipContextSearchMather.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/SkipContextSearchMather.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/SkipContextSearchMather.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/UnaryLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/UnaryLogicContextSearchMatcher.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/UnaryLogicContextSearchMatcher.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/matcher/UnaryLogicContextSearchMatcher.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ruler/AbstractContextSearchRuler.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ruler/AbstractContextSearchRuler.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ruler/AbstractContextSearchRuler.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ruler/AbstractContextSearchRuler.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ruler/CommonListContextSearchRuler.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ruler/CommonListContextSearchRuler.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ruler/CommonListContextSearchRuler.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ruler/CommonListContextSearchRuler.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ruler/ContextSearchRuler.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ruler/ContextSearchRuler.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ruler/ContextSearchRuler.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ruler/ContextSearchRuler.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ruler/NearestContextSearchRuler.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ruler/NearestContextSearchRuler.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ruler/NearestContextSearchRuler.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/execution/ruler/NearestContextSearchRuler.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/ConditionOptimizer.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/ConditionOptimizer.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/ConditionOptimizer.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/ConditionOptimizer.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/OptimizedCondition.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/OptimizedCondition.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/OptimizedCondition.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/OptimizedCondition.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/cost/ConditionCostCalculator.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/cost/ConditionCostCalculator.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/cost/ConditionCostCalculator.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/cost/ConditionCostCalculator.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/dfs/BinaryTree.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/dfs/BinaryTree.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/dfs/BinaryTree.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/dfs/BinaryTree.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/dfs/MinCostBinaryTree.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/dfs/MinCostBinaryTree.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/dfs/MinCostBinaryTree.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/dfs/MinCostBinaryTree.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/dfs/Node.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/dfs/Node.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/dfs/Node.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/dfs/Node.java diff --git a/contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/impl/CostBasedConditionOptimizer.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/impl/CostBasedConditionOptimizer.java similarity index 100% rename from contextservice/cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/impl/CostBasedConditionOptimizer.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/main/java/com/webank/wedatasphere/linkis/cs/optimize/impl/CostBasedConditionOptimizer.java diff --git a/contextservice/cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/AndTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/AndTest.java similarity index 100% rename from contextservice/cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/AndTest.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/AndTest.java diff --git a/contextservice/cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/ContainsTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/ContainsTest.java similarity index 100% rename from contextservice/cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/ContainsTest.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/ContainsTest.java diff --git a/contextservice/cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/ContextScopeTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/ContextScopeTest.java similarity index 100% rename from contextservice/cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/ContextScopeTest.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/ContextScopeTest.java diff --git a/contextservice/cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/ContextSearchTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/ContextSearchTest.java similarity index 100% rename from contextservice/cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/ContextSearchTest.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/ContextSearchTest.java diff --git a/contextservice/cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/ContextTypeTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/ContextTypeTest.java similarity index 100% rename from contextservice/cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/ContextTypeTest.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/ContextTypeTest.java diff --git a/contextservice/cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/RegexTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/RegexTest.java similarity index 100% rename from contextservice/cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/RegexTest.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/RegexTest.java diff --git a/contextservice/cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/csid/TestContextID.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/csid/TestContextID.java similarity index 100% rename from contextservice/cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/csid/TestContextID.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/csid/TestContextID.java diff --git a/contextservice/cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/keyword/TestContextKey.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/keyword/TestContextKey.java similarity index 100% rename from contextservice/cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/keyword/TestContextKey.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/keyword/TestContextKey.java diff --git a/contextservice/cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/keyword/TestContextKeyValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/keyword/TestContextKeyValue.java similarity index 100% rename from contextservice/cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/keyword/TestContextKeyValue.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/keyword/TestContextKeyValue.java diff --git a/contextservice/cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/keyword/TestContextValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/keyword/TestContextValue.java similarity index 100% rename from contextservice/cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/keyword/TestContextValue.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/keyword/TestContextValue.java diff --git a/contextservice/cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/parser/ApiJsonTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/parser/ApiJsonTest.java similarity index 100% rename from contextservice/cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/parser/ApiJsonTest.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-search/src/test/java/com/webank/wedatasphere/linkis/cs/parser/ApiJsonTest.java diff --git a/contextservice/cs-server/Dockerfile b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/Dockerfile similarity index 100% rename from contextservice/cs-server/Dockerfile rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/Dockerfile diff --git a/contextservice/cs-server/bin/start-cs-server.sh b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/bin/start-cs-server.sh old mode 100755 new mode 100644 similarity index 100% rename from contextservice/cs-server/bin/start-cs-server.sh rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/bin/start-cs-server.sh diff --git a/contextservice/cs-server/bin/startup.sh b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/bin/startup.sh old mode 100755 new mode 100644 similarity index 100% rename from contextservice/cs-server/bin/startup.sh rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/bin/startup.sh diff --git a/contextservice/cs-server/bin/stop-cs-server.sh b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/bin/stop-cs-server.sh old mode 100755 new mode 100644 similarity index 100% rename from contextservice/cs-server/bin/stop-cs-server.sh rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/bin/stop-cs-server.sh diff --git a/contextservice/cs-server/bin/stop.sh b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/bin/stop.sh old mode 100755 new mode 100644 similarity index 100% rename from contextservice/cs-server/bin/stop.sh rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/bin/stop.sh diff --git a/contextservice/cs-server/conf/application.yml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/conf/application.yml similarity index 100% rename from contextservice/cs-server/conf/application.yml rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/conf/application.yml diff --git a/contextservice/cs-server/conf/linkis.properties b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/conf/linkis.properties similarity index 100% rename from contextservice/cs-server/conf/linkis.properties rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/conf/linkis.properties diff --git a/contextservice/cs-server/conf/log4j.properties b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/conf/log4j.properties similarity index 100% rename from contextservice/cs-server/conf/log4j.properties rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/conf/log4j.properties diff --git a/contextservice/cs-server/conf/log4j2.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/conf/log4j2.xml similarity index 100% rename from contextservice/cs-server/conf/log4j2.xml rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/conf/log4j2.xml diff --git a/contextservice/cs-server/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml similarity index 99% rename from contextservice/cs-server/pom.xml rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml index 3679595cf..196c5c959 100644 --- a/contextservice/cs-server/pom.xml +++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml @@ -19,7 +19,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml 4.0.0 diff --git a/contextservice/cs-server/pom_k8s.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom_k8s.xml similarity index 99% rename from contextservice/cs-server/pom_k8s.xml rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom_k8s.xml index 65491d939..2076efa9e 100644 --- a/contextservice/cs-server/pom_k8s.xml +++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom_k8s.xml @@ -19,7 +19,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml 4.0.0 diff --git a/contextservice/cs-server/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/assembly/distribution.xml similarity index 100% rename from contextservice/cs-server/src/main/assembly/distribution.xml rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/assembly/distribution.xml diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/conf/ContextServerConf.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/conf/ContextServerConf.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/conf/ContextServerConf.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/conf/ContextServerConf.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/enumeration/ServiceMethod.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/enumeration/ServiceMethod.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/enumeration/ServiceMethod.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/enumeration/ServiceMethod.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/enumeration/ServiceType.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/enumeration/ServiceType.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/enumeration/ServiceType.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/enumeration/ServiceType.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/parser/DefaultKeywordParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/parser/DefaultKeywordParser.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/parser/DefaultKeywordParser.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/parser/DefaultKeywordParser.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/parser/KeywordMethodEntity.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/parser/KeywordMethodEntity.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/parser/KeywordMethodEntity.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/parser/KeywordMethodEntity.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/parser/KeywordParser.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/parser/KeywordParser.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/parser/KeywordParser.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/parser/KeywordParser.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/AbstractHttpRequestProtocol.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/AbstractHttpRequestProtocol.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/AbstractHttpRequestProtocol.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/AbstractHttpRequestProtocol.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/ContextIDProtocol.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/ContextIDProtocol.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/ContextIDProtocol.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/ContextIDProtocol.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/ContextListenerProtocol.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/ContextListenerProtocol.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/ContextListenerProtocol.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/ContextListenerProtocol.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/ContextProtocol.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/ContextProtocol.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/ContextProtocol.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/ContextProtocol.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/HttpProtocol.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/HttpProtocol.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/HttpProtocol.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/HttpProtocol.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/HttpRequestProtocol.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/HttpRequestProtocol.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/HttpRequestProtocol.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/HttpRequestProtocol.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/HttpResponseProtocol.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/HttpResponseProtocol.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/HttpResponseProtocol.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/HttpResponseProtocol.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/RestResponseProtocol.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/RestResponseProtocol.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/RestResponseProtocol.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/protocol/RestResponseProtocol.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/restful/ContextIDRestfulApi.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/restful/ContextIDRestfulApi.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/restful/ContextIDRestfulApi.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/restful/ContextIDRestfulApi.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/restful/ContextListenerRestfulApi.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/restful/ContextListenerRestfulApi.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/restful/ContextListenerRestfulApi.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/restful/ContextListenerRestfulApi.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/restful/ContextRestfulApi.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/restful/ContextRestfulApi.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/restful/ContextRestfulApi.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/restful/ContextRestfulApi.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/restful/CsRestfulParent.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/restful/CsRestfulParent.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/restful/CsRestfulParent.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/restful/CsRestfulParent.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/CsScheduler.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/CsScheduler.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/CsScheduler.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/CsScheduler.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/DefaultCsScheduler.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/DefaultCsScheduler.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/DefaultCsScheduler.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/DefaultCsScheduler.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpAnswerJob.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpAnswerJob.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpAnswerJob.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpAnswerJob.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpAnswerJobBuilder.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpAnswerJobBuilder.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpAnswerJobBuilder.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpAnswerJobBuilder.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpJob.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpJob.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpJob.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpJob.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpJobBuilder.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpJobBuilder.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpJobBuilder.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpJobBuilder.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpPriorityJob.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpPriorityJob.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpPriorityJob.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/HttpPriorityJob.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/RestJobBuilder.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/RestJobBuilder.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/RestJobBuilder.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/RestJobBuilder.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsExecuteRequest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsExecuteRequest.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsExecuteRequest.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsExecuteRequest.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsExecutor.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsExecutor.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsExecutor.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsExecutor.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsExecutorManager.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsExecutorManager.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsExecutorManager.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsExecutorManager.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsJobListener.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsJobListener.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsJobListener.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsJobListener.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsSchedulerBean.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsSchedulerBean.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsSchedulerBean.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsSchedulerBean.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsSchedulerJob.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsSchedulerJob.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsSchedulerJob.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/CsSchedulerJob.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/JobToExecuteRequestConsumer.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/JobToExecuteRequestConsumer.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/JobToExecuteRequestConsumer.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/scheduler/linkisImpl/JobToExecuteRequestConsumer.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/AbstractService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/AbstractService.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/AbstractService.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/AbstractService.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/ContextIDService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/ContextIDService.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/ContextIDService.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/ContextIDService.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/ContextListenerService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/ContextListenerService.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/ContextListenerService.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/ContextListenerService.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/ContextService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/ContextService.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/ContextService.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/ContextService.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/Service.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/Service.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/Service.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/Service.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/impl/ContextIDServiceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/impl/ContextIDServiceImpl.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/impl/ContextIDServiceImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/impl/ContextIDServiceImpl.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/impl/ContextListenerServiceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/impl/ContextListenerServiceImpl.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/impl/ContextListenerServiceImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/impl/ContextListenerServiceImpl.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/impl/ContextServiceImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/impl/ContextServiceImpl.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/impl/ContextServiceImpl.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/service/impl/ContextServiceImpl.java diff --git a/contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/util/CsUtils.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/util/CsUtils.java similarity index 100% rename from contextservice/cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/util/CsUtils.java rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/com/webank/wedatasphere/linkis/cs/server/util/CsUtils.java diff --git a/contextservice/cs-server/src/main/resources/application.yml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/application.yml similarity index 100% rename from contextservice/cs-server/src/main/resources/application.yml rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/application.yml diff --git a/contextservice/cs-server/src/main/resources/linkis.properties b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/linkis.properties similarity index 100% rename from contextservice/cs-server/src/main/resources/linkis.properties rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/linkis.properties diff --git a/contextservice/cs-server/src/main/resources/log4j.properties b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/log4j.properties similarity index 100% rename from contextservice/cs-server/src/main/resources/log4j.properties rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/log4j.properties diff --git a/contextservice/cs-server/src/main/resources/log4j2.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/log4j2.xml similarity index 100% rename from contextservice/cs-server/src/main/resources/log4j2.xml rename to linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/log4j2.xml diff --git a/linkis-public-enhancements/linkis-context-service/pom.xml b/linkis-public-enhancements/linkis-context-service/pom.xml new file mode 100644 index 000000000..485cbc78e --- /dev/null +++ b/linkis-public-enhancements/linkis-context-service/pom.xml @@ -0,0 +1,33 @@ + + + + linkis + com.webank.wedatasphere.linkis + 0.11.0 + ../../pom.xml + + 4.0.0 + + linkis-context-service + + pom + + + + linkis-cs-common + linkis-cs-client + linkis-cs-listener + + linkis-cs-cache + linkis-cs-persistence + linkis-cs-highavailable + linkis-cs-search + linkis-cs-server + linkis-cs-engine-support + + + + + \ No newline at end of file diff --git a/datasource/datasourcemanager/common/pom.xml b/linkis-public-enhancements/linkis-datasource/datasourcemanager/common/pom.xml similarity index 97% rename from datasource/datasourcemanager/common/pom.xml rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/common/pom.xml index 340baeb4c..94c5d14cf 100644 --- a/datasource/datasourcemanager/common/pom.xml +++ b/linkis-public-enhancements/linkis-datasource/datasourcemanager/common/pom.xml @@ -19,7 +19,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../../pom.xml + ../../../../pom.xml 4.0.0 diff --git a/datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/DsmConfiguration.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/DsmConfiguration.java similarity index 100% rename from datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/DsmConfiguration.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/DsmConfiguration.java diff --git a/datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/ServiceErrorCode.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/ServiceErrorCode.java similarity index 100% rename from datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/ServiceErrorCode.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/ServiceErrorCode.java diff --git a/datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/domain/DataSource.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/domain/DataSource.java similarity index 100% rename from datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/domain/DataSource.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/domain/DataSource.java diff --git a/datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/domain/DataSourceEnv.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/domain/DataSourceEnv.java similarity index 100% rename from datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/domain/DataSourceEnv.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/domain/DataSourceEnv.java diff --git a/datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/domain/DataSourceParamKeyDefinition.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/domain/DataSourceParamKeyDefinition.java similarity index 100% rename from datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/domain/DataSourceParamKeyDefinition.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/domain/DataSourceParamKeyDefinition.java diff --git a/datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/domain/DataSourceType.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/domain/DataSourceType.java similarity index 100% rename from datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/domain/DataSourceType.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/domain/DataSourceType.java diff --git a/datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/util/CryptoUtils.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/util/CryptoUtils.java similarity index 100% rename from datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/util/CryptoUtils.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/util/CryptoUtils.java diff --git a/datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/util/PatternInjectUtils.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/util/PatternInjectUtils.java similarity index 100% rename from datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/util/PatternInjectUtils.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/util/PatternInjectUtils.java diff --git a/datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/util/json/Json.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/util/json/Json.java similarity index 100% rename from datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/util/json/Json.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/common/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/common/util/json/Json.java diff --git a/datasource/datasourcemanager/common/src/main/scala/com/webank/wedatasphere/linkis/datasourcemanager/common/protocol/DsmQueryProtocol.scala b/linkis-public-enhancements/linkis-datasource/datasourcemanager/common/src/main/scala/com/webank/wedatasphere/linkis/datasourcemanager/common/protocol/DsmQueryProtocol.scala similarity index 100% rename from datasource/datasourcemanager/common/src/main/scala/com/webank/wedatasphere/linkis/datasourcemanager/common/protocol/DsmQueryProtocol.scala rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/common/src/main/scala/com/webank/wedatasphere/linkis/datasourcemanager/common/protocol/DsmQueryProtocol.scala diff --git a/datasource/datasourcemanager/server/Dockerfile b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/Dockerfile similarity index 100% rename from datasource/datasourcemanager/server/Dockerfile rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/Dockerfile diff --git a/datasource/datasourcemanager/server/bin/start-dsm-server.sh b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/bin/start-dsm-server.sh old mode 100755 new mode 100644 similarity index 100% rename from datasource/datasourcemanager/server/bin/start-dsm-server.sh rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/bin/start-dsm-server.sh diff --git a/datasource/datasourcemanager/server/bin/startup.sh b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/bin/startup.sh old mode 100755 new mode 100644 similarity index 100% rename from datasource/datasourcemanager/server/bin/startup.sh rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/bin/startup.sh diff --git a/datasource/datasourcemanager/server/bin/stop-dsm-server.sh b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/bin/stop-dsm-server.sh old mode 100755 new mode 100644 similarity index 100% rename from datasource/datasourcemanager/server/bin/stop-dsm-server.sh rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/bin/stop-dsm-server.sh diff --git a/datasource/datasourcemanager/server/bin/stop.sh b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/bin/stop.sh old mode 100755 new mode 100644 similarity index 100% rename from datasource/datasourcemanager/server/bin/stop.sh rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/bin/stop.sh diff --git a/datasource/datasourcemanager/server/conf/application.yml b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/conf/application.yml similarity index 100% rename from datasource/datasourcemanager/server/conf/application.yml rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/conf/application.yml diff --git a/datasource/datasourcemanager/server/conf/linkis.properties b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/conf/linkis.properties similarity index 100% rename from datasource/datasourcemanager/server/conf/linkis.properties rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/conf/linkis.properties diff --git a/datasource/datasourcemanager/server/conf/log4j.properties b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/conf/log4j.properties similarity index 100% rename from datasource/datasourcemanager/server/conf/log4j.properties rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/conf/log4j.properties diff --git a/datasource/datasourcemanager/server/conf/log4j2.xml b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/conf/log4j2.xml similarity index 100% rename from datasource/datasourcemanager/server/conf/log4j2.xml rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/conf/log4j2.xml diff --git a/datasource/datasourcemanager/server/pom.xml b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/pom.xml similarity index 99% rename from datasource/datasourcemanager/server/pom.xml rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/pom.xml index efdf6ed8f..fca584529 100644 --- a/datasource/datasourcemanager/server/pom.xml +++ b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/pom.xml @@ -19,7 +19,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../../pom.xml + ../../../../pom.xml 4.0.0 diff --git a/datasource/datasourcemanager/server/pom_k8s.xml b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/pom_k8s.xml similarity index 99% rename from datasource/datasourcemanager/server/pom_k8s.xml rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/pom_k8s.xml index 2eefaa0a4..dbf211bb6 100644 --- a/datasource/datasourcemanager/server/pom_k8s.xml +++ b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/pom_k8s.xml @@ -19,7 +19,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../../pom.xml + ../../../../pom.xml 4.0.0 diff --git a/datasource/datasourcemanager/server/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/assembly/distribution.xml similarity index 100% rename from datasource/datasourcemanager/server/src/main/assembly/distribution.xml rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/assembly/distribution.xml diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceDao.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceDao.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceDao.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceDao.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceEnvDao.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceEnvDao.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceEnvDao.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceEnvDao.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceParamKeyDao.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceParamKeyDao.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceParamKeyDao.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceParamKeyDao.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceTypeDao.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceTypeDao.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceTypeDao.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceTypeDao.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceTypeEnvDao.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceTypeEnvDao.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceTypeEnvDao.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/DataSourceTypeEnvDao.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSouceMapper.xml b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSouceMapper.xml similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSouceMapper.xml rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSouceMapper.xml diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSourceEnvMapper.xml b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSourceEnvMapper.xml similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSourceEnvMapper.xml rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSourceEnvMapper.xml diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSourceParamKeyMapper.xml b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSourceParamKeyMapper.xml similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSourceParamKeyMapper.xml rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSourceParamKeyMapper.xml diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSourceTypeEnvMapper.xml b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSourceTypeEnvMapper.xml similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSourceTypeEnvMapper.xml rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSourceTypeEnvMapper.xml diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSourceTypeMapper.xml b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSourceTypeMapper.xml similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSourceTypeMapper.xml rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/dao/mapper/DataSourceTypeMapper.xml diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/formdata/CustomMultiPartFormDataTransformer.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/formdata/CustomMultiPartFormDataTransformer.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/formdata/CustomMultiPartFormDataTransformer.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/formdata/CustomMultiPartFormDataTransformer.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/formdata/FormDataTransformerFactory.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/formdata/FormDataTransformerFactory.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/formdata/FormDataTransformerFactory.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/formdata/FormDataTransformerFactory.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/formdata/FormStreamContent.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/formdata/FormStreamContent.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/formdata/FormStreamContent.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/formdata/FormStreamContent.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/formdata/MultiPartFormDataTransformer.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/formdata/MultiPartFormDataTransformer.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/formdata/MultiPartFormDataTransformer.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/formdata/MultiPartFormDataTransformer.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/DataSourceAdminRestfulApi.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/DataSourceAdminRestfulApi.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/DataSourceAdminRestfulApi.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/DataSourceAdminRestfulApi.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/DataSourceOperateRestfulApi.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/DataSourceOperateRestfulApi.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/DataSourceOperateRestfulApi.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/DataSourceOperateRestfulApi.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/RestfulApiHelper.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/RestfulApiHelper.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/RestfulApiHelper.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/RestfulApiHelper.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/exception/BeanValidationExceptionMapper.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/exception/BeanValidationExceptionMapper.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/exception/BeanValidationExceptionMapper.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/restful/exception/BeanValidationExceptionMapper.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/BmlAppService.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/BmlAppService.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/BmlAppService.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/BmlAppService.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/DataSourceInfoService.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/DataSourceInfoService.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/DataSourceInfoService.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/DataSourceInfoService.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/DataSourceOpService.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/DataSourceOpService.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/DataSourceOpService.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/DataSourceOpService.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/DataSourceRelateService.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/DataSourceRelateService.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/DataSourceRelateService.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/DataSourceRelateService.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/MetadataOperateService.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/MetadataOperateService.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/MetadataOperateService.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/MetadataOperateService.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/impl/BmlAppServiceImpl.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/impl/BmlAppServiceImpl.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/impl/BmlAppServiceImpl.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/impl/BmlAppServiceImpl.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/impl/DataSourceInfoServiceImpl.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/impl/DataSourceInfoServiceImpl.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/impl/DataSourceInfoServiceImpl.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/impl/DataSourceInfoServiceImpl.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/impl/DataSourceRelateServiceImpl.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/impl/DataSourceRelateServiceImpl.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/impl/DataSourceRelateServiceImpl.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/impl/DataSourceRelateServiceImpl.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/impl/MetadataOperateServiceImpl.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/impl/MetadataOperateServiceImpl.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/impl/MetadataOperateServiceImpl.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/service/impl/MetadataOperateServiceImpl.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/DataSourceParameterValidator.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/DataSourceParameterValidator.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/DataSourceParameterValidator.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/DataSourceParameterValidator.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/ParameterValidateException.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/ParameterValidateException.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/ParameterValidateException.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/ParameterValidateException.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/ParameterValidateStrategy.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/ParameterValidateStrategy.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/ParameterValidateStrategy.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/ParameterValidateStrategy.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/ParameterValidator.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/ParameterValidator.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/ParameterValidator.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/ParameterValidator.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/strategy/RegExpParameterValidateStrategy.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/strategy/RegExpParameterValidateStrategy.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/strategy/RegExpParameterValidateStrategy.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/strategy/RegExpParameterValidateStrategy.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/strategy/TypeParameterValidateStrategy.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/strategy/TypeParameterValidateStrategy.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/strategy/TypeParameterValidateStrategy.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/validate/strategy/TypeParameterValidateStrategy.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/vo/DataSourceEnvVo.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/vo/DataSourceEnvVo.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/vo/DataSourceEnvVo.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/vo/DataSourceEnvVo.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/vo/DataSourceVo.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/vo/DataSourceVo.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/vo/DataSourceVo.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/vo/DataSourceVo.java diff --git a/datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/vo/PageViewVo.java b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/vo/PageViewVo.java similarity index 100% rename from datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/vo/PageViewVo.java rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/java/com/webank/wedatasphere/linkis/datasourcemanager/core/vo/PageViewVo.java diff --git a/datasource/datasourcemanager/server/src/main/scala/com/webank/wedatasphere/linkis/datasourcemanager/core/receivers/DsmReceiver.scala b/linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/scala/com/webank/wedatasphere/linkis/datasourcemanager/core/receivers/DsmReceiver.scala similarity index 100% rename from datasource/datasourcemanager/server/src/main/scala/com/webank/wedatasphere/linkis/datasourcemanager/core/receivers/DsmReceiver.scala rename to linkis-public-enhancements/linkis-datasource/datasourcemanager/server/src/main/scala/com/webank/wedatasphere/linkis/datasourcemanager/core/receivers/DsmReceiver.scala diff --git a/metadata/Dockerfile b/linkis-public-enhancements/linkis-datasource/linkis-metadata/Dockerfile similarity index 100% rename from metadata/Dockerfile rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/Dockerfile diff --git a/metadata/bin/start-metadata.sh b/linkis-public-enhancements/linkis-datasource/linkis-metadata/bin/start-metadata.sh old mode 100755 new mode 100644 similarity index 100% rename from metadata/bin/start-metadata.sh rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/bin/start-metadata.sh diff --git a/metadata/bin/startup.sh b/linkis-public-enhancements/linkis-datasource/linkis-metadata/bin/startup.sh old mode 100755 new mode 100644 similarity index 100% rename from metadata/bin/startup.sh rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/bin/startup.sh diff --git a/metadata/bin/stop-metadata.sh b/linkis-public-enhancements/linkis-datasource/linkis-metadata/bin/stop-metadata.sh old mode 100755 new mode 100644 similarity index 100% rename from metadata/bin/stop-metadata.sh rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/bin/stop-metadata.sh diff --git a/datasource/metadatamanager/server/bin/stop.sh b/linkis-public-enhancements/linkis-datasource/linkis-metadata/bin/stop.sh old mode 100755 new mode 100644 similarity index 100% rename from datasource/metadatamanager/server/bin/stop.sh rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/bin/stop.sh diff --git a/metadata/conf/application.yml b/linkis-public-enhancements/linkis-datasource/linkis-metadata/conf/application.yml similarity index 100% rename from metadata/conf/application.yml rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/conf/application.yml diff --git a/metadata/conf/linkis.properties b/linkis-public-enhancements/linkis-datasource/linkis-metadata/conf/linkis.properties similarity index 100% rename from metadata/conf/linkis.properties rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/conf/linkis.properties diff --git a/metadata/conf/log4j.properties b/linkis-public-enhancements/linkis-datasource/linkis-metadata/conf/log4j.properties similarity index 100% rename from metadata/conf/log4j.properties rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/conf/log4j.properties diff --git a/metadata/conf/log4j2.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata/conf/log4j2.xml similarity index 100% rename from metadata/conf/log4j2.xml rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/conf/log4j2.xml diff --git a/metadata/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata/pom.xml similarity index 99% rename from metadata/pom.xml rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/pom.xml index 5937953af..67724bee7 100644 --- a/metadata/pom.xml +++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata/pom.xml @@ -22,7 +22,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../pom.xml + ../../../pom.xml 4.0.0 jar diff --git a/metadata/pom_k8s.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata/pom_k8s.xml similarity index 99% rename from metadata/pom_k8s.xml rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/pom_k8s.xml index 3c321cb9e..42fc08288 100644 --- a/metadata/pom_k8s.xml +++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata/pom_k8s.xml @@ -22,7 +22,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../pom.xml + ../../../pom.xml 4.0.0 jar diff --git a/metadata/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/assembly/distribution.xml similarity index 100% rename from metadata/src/main/assembly/distribution.xml rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/assembly/distribution.xml diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/dao/MdqDao.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/dao/MdqDao.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/dao/MdqDao.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/dao/MdqDao.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/dao/impl/MdqDao.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/dao/impl/MdqDao.xml similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/dao/impl/MdqDao.xml rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/dao/impl/MdqDao.xml diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/AbstractAuditable.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/AbstractAuditable.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/AbstractAuditable.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/AbstractAuditable.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/Column.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/Column.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/Column.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/Column.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/DomainCoversionUtils.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/DomainCoversionUtils.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/DomainCoversionUtils.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/DomainCoversionUtils.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/ApplicationBO.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/ApplicationBO.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/ApplicationBO.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/ApplicationBO.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/BaseBO.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/BaseBO.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/BaseBO.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/BaseBO.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/MdqTableBO.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/MdqTableBO.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/MdqTableBO.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/MdqTableBO.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/MdqTableBaseInfoBO.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/MdqTableBaseInfoBO.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/MdqTableBaseInfoBO.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/MdqTableBaseInfoBO.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/MdqTableFieldsInfoBO.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/MdqTableFieldsInfoBO.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/MdqTableFieldsInfoBO.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/MdqTableFieldsInfoBO.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/MdqTableImportInfoBO.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/MdqTableImportInfoBO.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/MdqTableImportInfoBO.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/MdqTableImportInfoBO.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/ModelBO.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/ModelBO.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/ModelBO.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/bo/ModelBO.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqAccess.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqAccess.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqAccess.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqAccess.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqField.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqField.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqField.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqField.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqImport.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqImport.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqImport.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqImport.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqLineage.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqLineage.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqLineage.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqLineage.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqTable.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqTable.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqTable.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqTable.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqTableInfo.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqTableInfo.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqTableInfo.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/po/MdqTableInfo.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/ApplicationVO.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/ApplicationVO.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/ApplicationVO.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/ApplicationVO.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/BaseVO.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/BaseVO.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/BaseVO.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/BaseVO.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqImportInfoVO.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqImportInfoVO.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqImportInfoVO.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqImportInfoVO.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTableBaseInfoVO.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTableBaseInfoVO.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTableBaseInfoVO.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTableBaseInfoVO.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTableFieldsInfoVO.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTableFieldsInfoVO.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTableFieldsInfoVO.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTableFieldsInfoVO.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTablePartitionStatisticInfoVO.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTablePartitionStatisticInfoVO.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTablePartitionStatisticInfoVO.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTablePartitionStatisticInfoVO.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTableStatisticInfoVO.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTableStatisticInfoVO.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTableStatisticInfoVO.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTableStatisticInfoVO.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTableVO.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTableVO.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTableVO.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/MdqTableVO.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/ModelVO.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/ModelVO.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/ModelVO.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/domain/mdq/vo/ModelVO.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/DSEnum.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/DSEnum.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/DSEnum.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/DSEnum.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/DataSource.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/DataSource.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/DataSource.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/DataSource.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/DataSourceContextHolder.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/DataSourceContextHolder.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/DataSourceContextHolder.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/DataSourceContextHolder.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/DynamicDataSource.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/DynamicDataSource.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/DynamicDataSource.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/DynamicDataSource.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/LinkisMybatisConfig.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/LinkisMybatisConfig.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/LinkisMybatisConfig.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/LinkisMybatisConfig.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/MultiSourceExAop.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/MultiSourceExAop.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/MultiSourceExAop.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/config/MultiSourceExAop.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/dao/HiveMetaDao.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/dao/HiveMetaDao.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/dao/HiveMetaDao.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/dao/HiveMetaDao.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/dao/impl/HiveMetaDao.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/dao/impl/HiveMetaDao.xml similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/dao/impl/HiveMetaDao.xml rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/hive/dao/impl/HiveMetaDao.xml diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/restful/api/DataSourceRestfulApi.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/restful/api/DataSourceRestfulApi.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/restful/api/DataSourceRestfulApi.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/restful/api/DataSourceRestfulApi.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/restful/api/MdqTableRestfulApi.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/restful/api/MdqTableRestfulApi.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/restful/api/MdqTableRestfulApi.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/restful/api/MdqTableRestfulApi.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/restful/remote/DataSourceRestfulRemote.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/restful/remote/DataSourceRestfulRemote.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/restful/remote/DataSourceRestfulRemote.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/restful/remote/DataSourceRestfulRemote.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/service/DataSourceService.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/service/DataSourceService.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/service/DataSourceService.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/service/DataSourceService.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/service/MdqService.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/service/MdqService.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/service/MdqService.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/service/MdqService.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/service/impl/DataSourceServiceImpl.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/service/impl/DataSourceServiceImpl.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/service/impl/DataSourceServiceImpl.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/service/impl/DataSourceServiceImpl.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/service/impl/MdqServiceImpl.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/service/impl/MdqServiceImpl.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/service/impl/MdqServiceImpl.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/service/impl/MdqServiceImpl.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/type/Lifecycle.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/type/Lifecycle.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/type/Lifecycle.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/type/Lifecycle.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/type/MdqImportType.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/type/MdqImportType.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/type/MdqImportType.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/type/MdqImportType.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/type/ModelLevel.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/type/ModelLevel.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/type/ModelLevel.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/type/ModelLevel.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/type/UseWayType.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/type/UseWayType.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/type/UseWayType.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/type/UseWayType.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/util/Constants.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/util/Constants.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/util/Constants.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/util/Constants.java diff --git a/metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/util/DWSConfig.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/util/DWSConfig.java similarity index 100% rename from metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/util/DWSConfig.java rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/java/com/webank/wedatasphere/linkis/metadata/util/DWSConfig.java diff --git a/metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/conf/MdqConfiguration.scala b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/conf/MdqConfiguration.scala similarity index 100% rename from metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/conf/MdqConfiguration.scala rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/conf/MdqConfiguration.scala diff --git a/metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/ddl/DDLCreator.scala b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/ddl/DDLCreator.scala similarity index 100% rename from metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/ddl/DDLCreator.scala rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/ddl/DDLCreator.scala diff --git a/metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/ddl/DDLHelper.scala b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/ddl/DDLHelper.scala similarity index 100% rename from metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/ddl/DDLHelper.scala rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/ddl/DDLHelper.scala diff --git a/metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/ddl/ImportDDLCreator.scala b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/ddl/ImportDDLCreator.scala similarity index 100% rename from metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/ddl/ImportDDLCreator.scala rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/ddl/ImportDDLCreator.scala diff --git a/metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/ddl/ScalaDDLCreator.scala b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/ddl/ScalaDDLCreator.scala similarity index 100% rename from metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/ddl/ScalaDDLCreator.scala rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/ddl/ScalaDDLCreator.scala diff --git a/metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/exception/MdqIllegalParamException.scala b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/exception/MdqIllegalParamException.scala similarity index 100% rename from metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/exception/MdqIllegalParamException.scala rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/exception/MdqIllegalParamException.scala diff --git a/metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/receiver/MDQReceiver.scala b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/receiver/MDQReceiver.scala similarity index 100% rename from metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/receiver/MDQReceiver.scala rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/receiver/MDQReceiver.scala diff --git a/metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/utils/MdqUtils.scala b/linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/utils/MdqUtils.scala similarity index 100% rename from metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/utils/MdqUtils.scala rename to linkis-public-enhancements/linkis-datasource/linkis-metadata/src/main/scala/com/webank/wedatasphere/linkis/metadata/utils/MdqUtils.scala diff --git a/datasource/metadatamanager/common/pom.xml b/linkis-public-enhancements/linkis-datasource/metadatamanager/common/pom.xml similarity index 97% rename from datasource/metadatamanager/common/pom.xml rename to linkis-public-enhancements/linkis-datasource/metadatamanager/common/pom.xml index c3b938141..0aa65815a 100644 --- a/datasource/metadatamanager/common/pom.xml +++ b/linkis-public-enhancements/linkis-datasource/metadatamanager/common/pom.xml @@ -19,7 +19,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../../pom.xml + ../../../../pom.xml 4.0.0 diff --git a/datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/Json.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/Json.java similarity index 100% rename from datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/Json.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/Json.java diff --git a/datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/MdmConfiguration.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/MdmConfiguration.java similarity index 100% rename from datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/MdmConfiguration.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/MdmConfiguration.java diff --git a/datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/cache/CacheConfiguration.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/cache/CacheConfiguration.java similarity index 100% rename from datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/cache/CacheConfiguration.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/cache/CacheConfiguration.java diff --git a/datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/cache/CacheManager.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/cache/CacheManager.java similarity index 100% rename from datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/cache/CacheManager.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/cache/CacheManager.java diff --git a/datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/cache/ConnCacheManager.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/cache/ConnCacheManager.java similarity index 100% rename from datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/cache/ConnCacheManager.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/cache/ConnCacheManager.java diff --git a/datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/domain/MetaColumnInfo.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/domain/MetaColumnInfo.java similarity index 100% rename from datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/domain/MetaColumnInfo.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/domain/MetaColumnInfo.java diff --git a/datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/domain/MetaPartitionInfo.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/domain/MetaPartitionInfo.java similarity index 100% rename from datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/domain/MetaPartitionInfo.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/domain/MetaPartitionInfo.java diff --git a/datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/exception/MetaRuntimeException.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/exception/MetaRuntimeException.java similarity index 100% rename from datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/exception/MetaRuntimeException.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/exception/MetaRuntimeException.java diff --git a/datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/AbstractMetaService.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/AbstractMetaService.java similarity index 100% rename from datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/AbstractMetaService.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/AbstractMetaService.java diff --git a/datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/BaseMetadataService.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/BaseMetadataService.java similarity index 100% rename from datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/BaseMetadataService.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/BaseMetadataService.java diff --git a/datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/MetadataConnection.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/MetadataConnection.java similarity index 100% rename from datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/MetadataConnection.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/MetadataConnection.java diff --git a/datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/MetadataDbService.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/MetadataDbService.java similarity index 100% rename from datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/MetadataDbService.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/MetadataDbService.java diff --git a/datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/MetadataService.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/MetadataService.java similarity index 100% rename from datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/MetadataService.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/common/service/MetadataService.java diff --git a/datasource/metadatamanager/common/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/common/protocol/MetadataOperateProtocol.scala b/linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/common/protocol/MetadataOperateProtocol.scala similarity index 100% rename from datasource/metadatamanager/common/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/common/protocol/MetadataOperateProtocol.scala rename to linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/common/protocol/MetadataOperateProtocol.scala diff --git a/datasource/metadatamanager/common/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/common/protocol/MetadataProtocol.scala b/linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/common/protocol/MetadataProtocol.scala similarity index 100% rename from datasource/metadatamanager/common/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/common/protocol/MetadataProtocol.scala rename to linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/common/protocol/MetadataProtocol.scala diff --git a/datasource/metadatamanager/common/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/common/protocol/MetadataQueryProtocol.scala b/linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/common/protocol/MetadataQueryProtocol.scala similarity index 100% rename from datasource/metadatamanager/common/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/common/protocol/MetadataQueryProtocol.scala rename to linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/common/protocol/MetadataQueryProtocol.scala diff --git a/datasource/metadatamanager/common/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/common/receiver/BaseMetaReceiver.scala b/linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/common/receiver/BaseMetaReceiver.scala similarity index 100% rename from datasource/metadatamanager/common/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/common/receiver/BaseMetaReceiver.scala rename to linkis-public-enhancements/linkis-datasource/metadatamanager/common/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/common/receiver/BaseMetaReceiver.scala diff --git a/datasource/metadatamanager/server/Dockerfile b/linkis-public-enhancements/linkis-datasource/metadatamanager/server/Dockerfile similarity index 100% rename from datasource/metadatamanager/server/Dockerfile rename to linkis-public-enhancements/linkis-datasource/metadatamanager/server/Dockerfile diff --git a/datasource/metadatamanager/server/bin/start-mdm-server.sh b/linkis-public-enhancements/linkis-datasource/metadatamanager/server/bin/start-mdm-server.sh old mode 100755 new mode 100644 similarity index 100% rename from datasource/metadatamanager/server/bin/start-mdm-server.sh rename to linkis-public-enhancements/linkis-datasource/metadatamanager/server/bin/start-mdm-server.sh diff --git a/datasource/metadatamanager/server/bin/startup.sh b/linkis-public-enhancements/linkis-datasource/metadatamanager/server/bin/startup.sh old mode 100755 new mode 100644 similarity index 100% rename from datasource/metadatamanager/server/bin/startup.sh rename to linkis-public-enhancements/linkis-datasource/metadatamanager/server/bin/startup.sh diff --git a/datasource/metadatamanager/server/bin/stop-mdm-server.sh b/linkis-public-enhancements/linkis-datasource/metadatamanager/server/bin/stop-mdm-server.sh old mode 100755 new mode 100644 similarity index 100% rename from datasource/metadatamanager/server/bin/stop-mdm-server.sh rename to linkis-public-enhancements/linkis-datasource/metadatamanager/server/bin/stop-mdm-server.sh diff --git a/datasource/metadatamanager/service/elasticsearch/bin/stop.sh b/linkis-public-enhancements/linkis-datasource/metadatamanager/server/bin/stop.sh old mode 100755 new mode 100644 similarity index 100% rename from datasource/metadatamanager/service/elasticsearch/bin/stop.sh rename to linkis-public-enhancements/linkis-datasource/metadatamanager/server/bin/stop.sh diff --git a/datasource/metadatamanager/server/conf/application.yml b/linkis-public-enhancements/linkis-datasource/metadatamanager/server/conf/application.yml similarity index 100% rename from datasource/metadatamanager/server/conf/application.yml rename to linkis-public-enhancements/linkis-datasource/metadatamanager/server/conf/application.yml diff --git a/datasource/metadatamanager/server/conf/linkis.properties b/linkis-public-enhancements/linkis-datasource/metadatamanager/server/conf/linkis.properties similarity index 100% rename from datasource/metadatamanager/server/conf/linkis.properties rename to linkis-public-enhancements/linkis-datasource/metadatamanager/server/conf/linkis.properties diff --git a/datasource/metadatamanager/server/conf/log4j.properties b/linkis-public-enhancements/linkis-datasource/metadatamanager/server/conf/log4j.properties similarity index 100% rename from datasource/metadatamanager/server/conf/log4j.properties rename to linkis-public-enhancements/linkis-datasource/metadatamanager/server/conf/log4j.properties diff --git a/datasource/metadatamanager/server/conf/log4j2.xml b/linkis-public-enhancements/linkis-datasource/metadatamanager/server/conf/log4j2.xml similarity index 100% rename from datasource/metadatamanager/server/conf/log4j2.xml rename to linkis-public-enhancements/linkis-datasource/metadatamanager/server/conf/log4j2.xml diff --git a/datasource/metadatamanager/server/pom.xml b/linkis-public-enhancements/linkis-datasource/metadatamanager/server/pom.xml similarity index 98% rename from datasource/metadatamanager/server/pom.xml rename to linkis-public-enhancements/linkis-datasource/metadatamanager/server/pom.xml index 1aaa0b765..b8d705b98 100644 --- a/datasource/metadatamanager/server/pom.xml +++ b/linkis-public-enhancements/linkis-datasource/metadatamanager/server/pom.xml @@ -19,7 +19,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../../pom.xml + ../../../../pom.xml 4.0.0 linkis-metadatamanager-server diff --git a/datasource/metadatamanager/server/pom_k8s.xml b/linkis-public-enhancements/linkis-datasource/metadatamanager/server/pom_k8s.xml similarity index 98% rename from datasource/metadatamanager/server/pom_k8s.xml rename to linkis-public-enhancements/linkis-datasource/metadatamanager/server/pom_k8s.xml index 69f3f675f..e5f0369ad 100644 --- a/datasource/metadatamanager/server/pom_k8s.xml +++ b/linkis-public-enhancements/linkis-datasource/metadatamanager/server/pom_k8s.xml @@ -19,7 +19,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../../pom.xml + ../../../../pom.xml 4.0.0 linkis-metadatamanager-server diff --git a/datasource/metadatamanager/server/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/metadatamanager/server/src/main/assembly/distribution.xml similarity index 100% rename from datasource/metadatamanager/server/src/main/assembly/distribution.xml rename to linkis-public-enhancements/linkis-datasource/metadatamanager/server/src/main/assembly/distribution.xml diff --git a/datasource/metadatamanager/server/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/server/restful/MetadataCoreRestful.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/server/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/server/restful/MetadataCoreRestful.java similarity index 100% rename from datasource/metadatamanager/server/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/server/restful/MetadataCoreRestful.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/server/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/server/restful/MetadataCoreRestful.java diff --git a/datasource/metadatamanager/server/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/server/service/MetadataAppService.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/server/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/server/service/MetadataAppService.java similarity index 100% rename from datasource/metadatamanager/server/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/server/service/MetadataAppService.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/server/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/server/service/MetadataAppService.java diff --git a/datasource/metadatamanager/server/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/server/service/impl/MetadataAppServiceImpl.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/server/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/server/service/impl/MetadataAppServiceImpl.java similarity index 100% rename from datasource/metadatamanager/server/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/server/service/impl/MetadataAppServiceImpl.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/server/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/server/service/impl/MetadataAppServiceImpl.java diff --git a/datasource/metadatamanager/service/elasticsearch/Dockerfile b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/Dockerfile similarity index 100% rename from datasource/metadatamanager/service/elasticsearch/Dockerfile rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/Dockerfile diff --git a/datasource/metadatamanager/service/elasticsearch/bin/start-mdm-elastic.sh b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/bin/start-mdm-elastic.sh old mode 100755 new mode 100644 similarity index 100% rename from datasource/metadatamanager/service/elasticsearch/bin/start-mdm-elastic.sh rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/bin/start-mdm-elastic.sh diff --git a/datasource/metadatamanager/service/elasticsearch/bin/startup.sh b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/bin/startup.sh old mode 100755 new mode 100644 similarity index 100% rename from datasource/metadatamanager/service/elasticsearch/bin/startup.sh rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/bin/startup.sh diff --git a/datasource/metadatamanager/service/elasticsearch/bin/stop-mdm-elastic.sh b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/bin/stop-mdm-elastic.sh old mode 100755 new mode 100644 similarity index 100% rename from datasource/metadatamanager/service/elasticsearch/bin/stop-mdm-elastic.sh rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/bin/stop-mdm-elastic.sh diff --git a/datasource/metadatamanager/service/hive/bin/stop.sh b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/bin/stop.sh old mode 100755 new mode 100644 similarity index 100% rename from datasource/metadatamanager/service/hive/bin/stop.sh rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/bin/stop.sh diff --git a/datasource/metadatamanager/service/elasticsearch/conf/application.yml b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/conf/application.yml similarity index 100% rename from datasource/metadatamanager/service/elasticsearch/conf/application.yml rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/conf/application.yml diff --git a/datasource/metadatamanager/service/elasticsearch/conf/linkis.properties b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/conf/linkis.properties similarity index 100% rename from datasource/metadatamanager/service/elasticsearch/conf/linkis.properties rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/conf/linkis.properties diff --git a/datasource/metadatamanager/service/elasticsearch/conf/log4j.properties b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/conf/log4j.properties similarity index 100% rename from datasource/metadatamanager/service/elasticsearch/conf/log4j.properties rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/conf/log4j.properties diff --git a/datasource/metadatamanager/service/elasticsearch/conf/log4j2.xml b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/conf/log4j2.xml similarity index 100% rename from datasource/metadatamanager/service/elasticsearch/conf/log4j2.xml rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/conf/log4j2.xml diff --git a/datasource/metadatamanager/service/elasticsearch/pom.xml b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/pom.xml similarity index 98% rename from datasource/metadatamanager/service/elasticsearch/pom.xml rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/pom.xml index d710bf810..7988465f8 100644 --- a/datasource/metadatamanager/service/elasticsearch/pom.xml +++ b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/pom.xml @@ -19,7 +19,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../../../pom.xml + ../../../../../pom.xml 4.0.0 diff --git a/datasource/metadatamanager/service/elasticsearch/pom_k8s.xml b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/pom_k8s.xml similarity index 98% rename from datasource/metadatamanager/service/elasticsearch/pom_k8s.xml rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/pom_k8s.xml index 540fd2db4..c6dbf5f8a 100644 --- a/datasource/metadatamanager/service/elasticsearch/pom_k8s.xml +++ b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/pom_k8s.xml @@ -19,7 +19,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../../../pom.xml + ../../../../../pom.xml 4.0.0 diff --git a/datasource/metadatamanager/service/elasticsearch/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/src/main/assembly/distribution.xml similarity index 100% rename from datasource/metadatamanager/service/elasticsearch/src/main/assembly/distribution.xml rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/src/main/assembly/distribution.xml diff --git a/datasource/metadatamanager/service/elasticsearch/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/ElasticConnection.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/ElasticConnection.java similarity index 100% rename from datasource/metadatamanager/service/elasticsearch/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/ElasticConnection.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/ElasticConnection.java diff --git a/datasource/metadatamanager/service/elasticsearch/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/ElasticMetaService.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/ElasticMetaService.java similarity index 100% rename from datasource/metadatamanager/service/elasticsearch/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/ElasticMetaService.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/ElasticMetaService.java diff --git a/datasource/metadatamanager/service/elasticsearch/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/ElasticParamsMapper.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/ElasticParamsMapper.java similarity index 100% rename from datasource/metadatamanager/service/elasticsearch/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/ElasticParamsMapper.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/ElasticParamsMapper.java diff --git a/datasource/metadatamanager/service/elasticsearch/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/service/receiver/ElasticReceiver.scala b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/service/receiver/ElasticReceiver.scala similarity index 100% rename from datasource/metadatamanager/service/elasticsearch/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/service/receiver/ElasticReceiver.scala rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/elasticsearch/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/service/receiver/ElasticReceiver.scala diff --git a/datasource/metadatamanager/service/hive/Dockerfile b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/Dockerfile similarity index 100% rename from datasource/metadatamanager/service/hive/Dockerfile rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/Dockerfile diff --git a/datasource/metadatamanager/service/hive/bin/start-mdm-hive.sh b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/bin/start-mdm-hive.sh old mode 100755 new mode 100644 similarity index 100% rename from datasource/metadatamanager/service/hive/bin/start-mdm-hive.sh rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/bin/start-mdm-hive.sh diff --git a/datasource/metadatamanager/service/hive/bin/startup.sh b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/bin/startup.sh old mode 100755 new mode 100644 similarity index 100% rename from datasource/metadatamanager/service/hive/bin/startup.sh rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/bin/startup.sh diff --git a/datasource/metadatamanager/service/hive/bin/stop-mdm-hive.sh b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/bin/stop-mdm-hive.sh old mode 100755 new mode 100644 similarity index 100% rename from datasource/metadatamanager/service/hive/bin/stop-mdm-hive.sh rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/bin/stop-mdm-hive.sh diff --git a/datasource/metadatamanager/service/mysql/bin/stop.sh b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/bin/stop.sh old mode 100755 new mode 100644 similarity index 100% rename from datasource/metadatamanager/service/mysql/bin/stop.sh rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/bin/stop.sh diff --git a/datasource/metadatamanager/service/hive/conf/application.yml b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/conf/application.yml similarity index 100% rename from datasource/metadatamanager/service/hive/conf/application.yml rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/conf/application.yml diff --git a/datasource/metadatamanager/service/hive/conf/linkis.properties b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/conf/linkis.properties similarity index 100% rename from datasource/metadatamanager/service/hive/conf/linkis.properties rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/conf/linkis.properties diff --git a/datasource/metadatamanager/service/hive/conf/log4j.properties b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/conf/log4j.properties similarity index 100% rename from datasource/metadatamanager/service/hive/conf/log4j.properties rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/conf/log4j.properties diff --git a/datasource/metadatamanager/service/hive/conf/log4j2.xml b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/conf/log4j2.xml similarity index 100% rename from datasource/metadatamanager/service/hive/conf/log4j2.xml rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/conf/log4j2.xml diff --git a/datasource/metadatamanager/service/hive/pom.xml b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/pom.xml similarity index 98% rename from datasource/metadatamanager/service/hive/pom.xml rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/pom.xml index 3c842514d..364333c3c 100644 --- a/datasource/metadatamanager/service/hive/pom.xml +++ b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/pom.xml @@ -19,7 +19,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../../../pom.xml + ../../../../../pom.xml 4.0.0 linkis-metadatamanager-service-hive diff --git a/datasource/metadatamanager/service/hive/pom_k8s.xml b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/pom_k8s.xml similarity index 99% rename from datasource/metadatamanager/service/hive/pom_k8s.xml rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/pom_k8s.xml index cb3df7168..40a71fb0f 100644 --- a/datasource/metadatamanager/service/hive/pom_k8s.xml +++ b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/pom_k8s.xml @@ -19,7 +19,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../../../pom.xml + ../../../../../pom.xml 4.0.0 linkis-metadatamanager-service-hive diff --git a/datasource/metadatamanager/service/hive/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/src/main/assembly/distribution.xml similarity index 100% rename from datasource/metadatamanager/service/hive/src/main/assembly/distribution.xml rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/src/main/assembly/distribution.xml diff --git a/datasource/metadatamanager/service/hive/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/HiveConnection.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/HiveConnection.java similarity index 100% rename from datasource/metadatamanager/service/hive/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/HiveConnection.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/HiveConnection.java diff --git a/datasource/metadatamanager/service/hive/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/HiveMetaService.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/HiveMetaService.java similarity index 100% rename from datasource/metadatamanager/service/hive/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/HiveMetaService.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/HiveMetaService.java diff --git a/datasource/metadatamanager/service/hive/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/HiveParamsMapper.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/HiveParamsMapper.java similarity index 100% rename from datasource/metadatamanager/service/hive/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/HiveParamsMapper.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/HiveParamsMapper.java diff --git a/datasource/metadatamanager/service/hive/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/service/receiver/HiveReceiver.scala b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/service/receiver/HiveReceiver.scala similarity index 100% rename from datasource/metadatamanager/service/hive/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/service/receiver/HiveReceiver.scala rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/hive/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/service/receiver/HiveReceiver.scala diff --git a/datasource/metadatamanager/service/mysql/Dockerfile b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/Dockerfile similarity index 100% rename from datasource/metadatamanager/service/mysql/Dockerfile rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/Dockerfile diff --git a/datasource/metadatamanager/service/mysql/bin/start-mdm-mysql.sh b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/bin/start-mdm-mysql.sh old mode 100755 new mode 100644 similarity index 100% rename from datasource/metadatamanager/service/mysql/bin/start-mdm-mysql.sh rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/bin/start-mdm-mysql.sh diff --git a/datasource/metadatamanager/service/mysql/bin/startup.sh b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/bin/startup.sh old mode 100755 new mode 100644 similarity index 100% rename from datasource/metadatamanager/service/mysql/bin/startup.sh rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/bin/startup.sh diff --git a/datasource/metadatamanager/service/mysql/bin/stop-mdm-mysql.sh b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/bin/stop-mdm-mysql.sh old mode 100755 new mode 100644 similarity index 100% rename from datasource/metadatamanager/service/mysql/bin/stop-mdm-mysql.sh rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/bin/stop-mdm-mysql.sh diff --git a/metadata/bin/stop.sh b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/bin/stop.sh old mode 100755 new mode 100644 similarity index 100% rename from metadata/bin/stop.sh rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/bin/stop.sh diff --git a/datasource/metadatamanager/service/mysql/conf/application.yml b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/conf/application.yml similarity index 100% rename from datasource/metadatamanager/service/mysql/conf/application.yml rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/conf/application.yml diff --git a/datasource/metadatamanager/service/mysql/conf/linkis.properties b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/conf/linkis.properties similarity index 100% rename from datasource/metadatamanager/service/mysql/conf/linkis.properties rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/conf/linkis.properties diff --git a/datasource/metadatamanager/service/mysql/conf/log4j.properties b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/conf/log4j.properties similarity index 100% rename from datasource/metadatamanager/service/mysql/conf/log4j.properties rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/conf/log4j.properties diff --git a/datasource/metadatamanager/service/mysql/conf/log4j2.xml b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/conf/log4j2.xml similarity index 100% rename from datasource/metadatamanager/service/mysql/conf/log4j2.xml rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/conf/log4j2.xml diff --git a/datasource/metadatamanager/service/mysql/pom.xml b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/pom.xml similarity index 98% rename from datasource/metadatamanager/service/mysql/pom.xml rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/pom.xml index cbe8df0df..9256cb4de 100644 --- a/datasource/metadatamanager/service/mysql/pom.xml +++ b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/pom.xml @@ -19,7 +19,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../../../pom.xml + ../../../../../pom.xml 4.0.0 diff --git a/datasource/metadatamanager/service/mysql/pom_k8s.xml b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/pom_k8s.xml similarity index 98% rename from datasource/metadatamanager/service/mysql/pom_k8s.xml rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/pom_k8s.xml index e93710bfe..2711beb19 100644 --- a/datasource/metadatamanager/service/mysql/pom_k8s.xml +++ b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/pom_k8s.xml @@ -19,7 +19,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../../../pom.xml + ../../../../../pom.xml 4.0.0 diff --git a/datasource/metadatamanager/service/mysql/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/src/main/assembly/distribution.xml similarity index 100% rename from datasource/metadatamanager/service/mysql/src/main/assembly/distribution.xml rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/src/main/assembly/distribution.xml diff --git a/datasource/metadatamanager/service/mysql/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/SqlConnection.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/SqlConnection.java similarity index 100% rename from datasource/metadatamanager/service/mysql/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/SqlConnection.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/SqlConnection.java diff --git a/datasource/metadatamanager/service/mysql/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/SqlMetaService.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/SqlMetaService.java similarity index 100% rename from datasource/metadatamanager/service/mysql/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/SqlMetaService.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/SqlMetaService.java diff --git a/datasource/metadatamanager/service/mysql/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/SqlParamsMapper.java b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/SqlParamsMapper.java similarity index 100% rename from datasource/metadatamanager/service/mysql/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/SqlParamsMapper.java rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/src/main/java/com/webank/wedatasphere/linkis/metadatamanager/service/SqlParamsMapper.java diff --git a/datasource/metadatamanager/service/mysql/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/service/receiver/SqlReceiver.scala b/linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/service/receiver/SqlReceiver.scala similarity index 100% rename from datasource/metadatamanager/service/mysql/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/service/receiver/SqlReceiver.scala rename to linkis-public-enhancements/linkis-datasource/metadatamanager/service/mysql/src/main/scala/com/webank/wedatasphere/linkis/metadatamanager/service/receiver/SqlReceiver.scala diff --git a/publicService/Dockerfile b/linkis-public-enhancements/linkis-publicservice/Dockerfile similarity index 100% rename from publicService/Dockerfile rename to linkis-public-enhancements/linkis-publicservice/Dockerfile diff --git a/publicService/application/pom.xml b/linkis-public-enhancements/linkis-publicservice/application/pom.xml similarity index 98% rename from publicService/application/pom.xml rename to linkis-public-enhancements/linkis-publicservice/application/pom.xml index f7114a892..f5b338714 100644 --- a/publicService/application/pom.xml +++ b/linkis-public-enhancements/linkis-publicservice/application/pom.xml @@ -24,7 +24,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml linkis-application diff --git a/publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/conf/ApplicationConfiguration.java b/linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/conf/ApplicationConfiguration.java similarity index 100% rename from publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/conf/ApplicationConfiguration.java rename to linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/conf/ApplicationConfiguration.java diff --git a/publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/dao/ApplicationMapper.java b/linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/dao/ApplicationMapper.java similarity index 100% rename from publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/dao/ApplicationMapper.java rename to linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/dao/ApplicationMapper.java diff --git a/publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/dao/impl/ApplicationMapper.xml b/linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/dao/impl/ApplicationMapper.xml similarity index 100% rename from publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/dao/impl/ApplicationMapper.xml rename to linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/dao/impl/ApplicationMapper.xml diff --git a/publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Application.java b/linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Application.java similarity index 100% rename from publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Application.java rename to linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Application.java diff --git a/publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/ApplicationUser.java b/linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/ApplicationUser.java similarity index 100% rename from publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/ApplicationUser.java rename to linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/ApplicationUser.java diff --git a/publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/DWSParams.java b/linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/DWSParams.java similarity index 100% rename from publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/DWSParams.java rename to linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/DWSParams.java diff --git a/publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/InitCenter.java b/linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/InitCenter.java similarity index 100% rename from publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/InitCenter.java rename to linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/InitCenter.java diff --git a/publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Org.java b/linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Org.java similarity index 100% rename from publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Org.java rename to linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Org.java diff --git a/publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Project.java b/linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Project.java similarity index 100% rename from publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Project.java rename to linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Project.java diff --git a/publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/ProjectUser.java b/linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/ProjectUser.java similarity index 100% rename from publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/ProjectUser.java rename to linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/ProjectUser.java diff --git a/publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/ProjectVO.java b/linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/ProjectVO.java similarity index 100% rename from publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/ProjectVO.java rename to linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/ProjectVO.java diff --git a/publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Right.java b/linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Right.java similarity index 100% rename from publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Right.java rename to linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Right.java diff --git a/publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Role.java b/linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Role.java similarity index 100% rename from publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Role.java rename to linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/Role.java diff --git a/publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/UserInfo.java b/linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/UserInfo.java similarity index 100% rename from publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/UserInfo.java rename to linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/entity/UserInfo.java diff --git a/publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/exception/ApplicationException.java b/linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/exception/ApplicationException.java similarity index 100% rename from publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/exception/ApplicationException.java rename to linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/exception/ApplicationException.java diff --git a/publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/restful/api/ApplicationRestfulApi.java b/linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/restful/api/ApplicationRestfulApi.java similarity index 100% rename from publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/restful/api/ApplicationRestfulApi.java rename to linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/restful/api/ApplicationRestfulApi.java diff --git a/publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/restful/remote/ApplicationRestfulRemote.java.bak b/linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/restful/remote/ApplicationRestfulRemote.java.bak similarity index 100% rename from publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/restful/remote/ApplicationRestfulRemote.java.bak rename to linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/restful/remote/ApplicationRestfulRemote.java.bak diff --git a/publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/service/ApplicationService.java b/linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/service/ApplicationService.java similarity index 100% rename from publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/service/ApplicationService.java rename to linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/service/ApplicationService.java diff --git a/publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/service/impl/ApplicationServiceImpl.java b/linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/service/impl/ApplicationServiceImpl.java similarity index 100% rename from publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/service/impl/ApplicationServiceImpl.java rename to linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/service/impl/ApplicationServiceImpl.java diff --git a/publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/util/ApplicationUtils.java b/linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/util/ApplicationUtils.java similarity index 100% rename from publicService/application/src/main/java/com/webank/wedatasphere/linkis/application/util/ApplicationUtils.java rename to linkis-public-enhancements/linkis-publicservice/application/src/main/java/com/webank/wedatasphere/linkis/application/util/ApplicationUtils.java diff --git a/publicService/application/src/main/scala/com/webank/wedatasphere/linkis/application/conf/ApplicationScalaConfiguration.scala b/linkis-public-enhancements/linkis-publicservice/application/src/main/scala/com/webank/wedatasphere/linkis/application/conf/ApplicationScalaConfiguration.scala similarity index 100% rename from publicService/application/src/main/scala/com/webank/wedatasphere/linkis/application/conf/ApplicationScalaConfiguration.scala rename to linkis-public-enhancements/linkis-publicservice/application/src/main/scala/com/webank/wedatasphere/linkis/application/conf/ApplicationScalaConfiguration.scala diff --git a/publicService/application/src/main/scala/com/webank/wedatasphere/linkis/application/util/ApplicationUtil.scala b/linkis-public-enhancements/linkis-publicservice/application/src/main/scala/com/webank/wedatasphere/linkis/application/util/ApplicationUtil.scala similarity index 100% rename from publicService/application/src/main/scala/com/webank/wedatasphere/linkis/application/util/ApplicationUtil.scala rename to linkis-public-enhancements/linkis-publicservice/application/src/main/scala/com/webank/wedatasphere/linkis/application/util/ApplicationUtil.scala diff --git a/publicService/application/src/main/scala/com/webank/wedatasphere/linkis/application/util/DdTest.scala b/linkis-public-enhancements/linkis-publicservice/application/src/main/scala/com/webank/wedatasphere/linkis/application/util/DdTest.scala similarity index 100% rename from publicService/application/src/main/scala/com/webank/wedatasphere/linkis/application/util/DdTest.scala rename to linkis-public-enhancements/linkis-publicservice/application/src/main/scala/com/webank/wedatasphere/linkis/application/util/DdTest.scala diff --git a/publicService/bin/start-publicservice.sh b/linkis-public-enhancements/linkis-publicservice/bin/start-publicservice.sh old mode 100755 new mode 100644 similarity index 100% rename from publicService/bin/start-publicservice.sh rename to linkis-public-enhancements/linkis-publicservice/bin/start-publicservice.sh diff --git a/publicService/bin/startup.sh b/linkis-public-enhancements/linkis-publicservice/bin/startup.sh old mode 100755 new mode 100644 similarity index 100% rename from publicService/bin/startup.sh rename to linkis-public-enhancements/linkis-publicservice/bin/startup.sh diff --git a/publicService/bin/stop-publicservice.sh b/linkis-public-enhancements/linkis-publicservice/bin/stop-publicservice.sh old mode 100755 new mode 100644 similarity index 100% rename from publicService/bin/stop-publicservice.sh rename to linkis-public-enhancements/linkis-publicservice/bin/stop-publicservice.sh diff --git a/publicService/bin/stop.sh b/linkis-public-enhancements/linkis-publicservice/bin/stop.sh old mode 100755 new mode 100644 similarity index 100% rename from publicService/bin/stop.sh rename to linkis-public-enhancements/linkis-publicservice/bin/stop.sh diff --git a/publicService/conf/application.yml b/linkis-public-enhancements/linkis-publicservice/conf/application.yml similarity index 100% rename from publicService/conf/application.yml rename to linkis-public-enhancements/linkis-publicservice/conf/application.yml diff --git a/publicService/conf/linkis.properties b/linkis-public-enhancements/linkis-publicservice/conf/linkis.properties similarity index 100% rename from publicService/conf/linkis.properties rename to linkis-public-enhancements/linkis-publicservice/conf/linkis.properties diff --git a/publicService/conf/log4j.properties b/linkis-public-enhancements/linkis-publicservice/conf/log4j.properties similarity index 100% rename from publicService/conf/log4j.properties rename to linkis-public-enhancements/linkis-publicservice/conf/log4j.properties diff --git a/publicService/conf/log4j2.xml b/linkis-public-enhancements/linkis-publicservice/conf/log4j2.xml similarity index 100% rename from publicService/conf/log4j2.xml rename to linkis-public-enhancements/linkis-publicservice/conf/log4j2.xml diff --git a/publicService/configuration/pom.xml b/linkis-public-enhancements/linkis-publicservice/configuration/pom.xml similarity index 98% rename from publicService/configuration/pom.xml rename to linkis-public-enhancements/linkis-publicservice/configuration/pom.xml index c21e16048..49b5767e6 100644 --- a/publicService/configuration/pom.xml +++ b/linkis-public-enhancements/linkis-publicservice/configuration/pom.xml @@ -24,7 +24,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml linkis-configuration diff --git a/publicService/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/dao/ConfigMapper.java b/linkis-public-enhancements/linkis-publicservice/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/dao/ConfigMapper.java similarity index 100% rename from publicService/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/dao/ConfigMapper.java rename to linkis-public-enhancements/linkis-publicservice/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/dao/ConfigMapper.java diff --git a/publicService/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/dao/impl/ConfigMapper.xml b/linkis-public-enhancements/linkis-publicservice/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/dao/impl/ConfigMapper.xml similarity index 100% rename from publicService/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/dao/impl/ConfigMapper.xml rename to linkis-public-enhancements/linkis-publicservice/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/dao/impl/ConfigMapper.xml diff --git a/publicService/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigKey.java b/linkis-public-enhancements/linkis-publicservice/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigKey.java similarity index 100% rename from publicService/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigKey.java rename to linkis-public-enhancements/linkis-publicservice/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigKey.java diff --git a/publicService/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigKeyUser.java b/linkis-public-enhancements/linkis-publicservice/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigKeyUser.java similarity index 100% rename from publicService/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigKeyUser.java rename to linkis-public-enhancements/linkis-publicservice/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigKeyUser.java diff --git a/publicService/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigKeyValue.java b/linkis-public-enhancements/linkis-publicservice/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigKeyValue.java similarity index 100% rename from publicService/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigKeyValue.java rename to linkis-public-enhancements/linkis-publicservice/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigKeyValue.java diff --git a/publicService/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigKeyValueVO.java b/linkis-public-enhancements/linkis-publicservice/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigKeyValueVO.java similarity index 100% rename from publicService/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigKeyValueVO.java rename to linkis-public-enhancements/linkis-publicservice/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigKeyValueVO.java diff --git a/publicService/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigTree.java b/linkis-public-enhancements/linkis-publicservice/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigTree.java similarity index 100% rename from publicService/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigTree.java rename to linkis-public-enhancements/linkis-publicservice/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/entity/ConfigTree.java diff --git a/publicService/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/exception/ConfigurationException.java b/linkis-public-enhancements/linkis-publicservice/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/exception/ConfigurationException.java similarity index 100% rename from publicService/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/exception/ConfigurationException.java rename to linkis-public-enhancements/linkis-publicservice/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/exception/ConfigurationException.java diff --git a/publicService/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/restful/api/ConfigurationRestfulApi.java b/linkis-public-enhancements/linkis-publicservice/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/restful/api/ConfigurationRestfulApi.java similarity index 100% rename from publicService/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/restful/api/ConfigurationRestfulApi.java rename to linkis-public-enhancements/linkis-publicservice/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/restful/api/ConfigurationRestfulApi.java diff --git a/publicService/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/util/ConfigurationConfiguration.java b/linkis-public-enhancements/linkis-publicservice/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/util/ConfigurationConfiguration.java similarity index 100% rename from publicService/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/util/ConfigurationConfiguration.java rename to linkis-public-enhancements/linkis-publicservice/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/util/ConfigurationConfiguration.java diff --git a/publicService/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/util/Constants.java b/linkis-public-enhancements/linkis-publicservice/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/util/Constants.java similarity index 100% rename from publicService/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/util/Constants.java rename to linkis-public-enhancements/linkis-publicservice/configuration/src/main/java/com/webank/wedatasphere/linkis/configuration/util/Constants.java diff --git a/publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/receiver/ConfigurationReceiver.scala b/linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/receiver/ConfigurationReceiver.scala similarity index 100% rename from publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/receiver/ConfigurationReceiver.scala rename to linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/receiver/ConfigurationReceiver.scala diff --git a/publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/receiver/ConfigurationReceiverChooser.scala b/linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/receiver/ConfigurationReceiverChooser.scala similarity index 100% rename from publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/receiver/ConfigurationReceiverChooser.scala rename to linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/receiver/ConfigurationReceiverChooser.scala diff --git a/publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/service/ConfigurationService.scala b/linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/service/ConfigurationService.scala similarity index 100% rename from publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/service/ConfigurationService.scala rename to linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/service/ConfigurationService.scala diff --git a/publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/ContainValidator.scala b/linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/ContainValidator.scala similarity index 100% rename from publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/ContainValidator.scala rename to linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/ContainValidator.scala diff --git a/publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/FloatValidator.scala b/linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/FloatValidator.scala similarity index 100% rename from publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/FloatValidator.scala rename to linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/FloatValidator.scala diff --git a/publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/NoneValidator.scala b/linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/NoneValidator.scala similarity index 100% rename from publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/NoneValidator.scala rename to linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/NoneValidator.scala diff --git a/publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/NumericalValidator.scala b/linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/NumericalValidator.scala similarity index 100% rename from publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/NumericalValidator.scala rename to linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/NumericalValidator.scala diff --git a/publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/OneOfValidator.scala b/linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/OneOfValidator.scala similarity index 100% rename from publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/OneOfValidator.scala rename to linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/OneOfValidator.scala diff --git a/publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/RegexValidator.scala b/linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/RegexValidator.scala similarity index 100% rename from publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/RegexValidator.scala rename to linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/RegexValidator.scala diff --git a/publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/Validator.scala b/linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/Validator.scala similarity index 100% rename from publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/Validator.scala rename to linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/Validator.scala diff --git a/publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/ValidatorManager.scala b/linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/ValidatorManager.scala similarity index 100% rename from publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/ValidatorManager.scala rename to linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/ValidatorManager.scala diff --git a/publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/ValidatorManagerImpl.scala b/linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/ValidatorManagerImpl.scala similarity index 100% rename from publicService/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/ValidatorManagerImpl.scala rename to linkis-public-enhancements/linkis-publicservice/configuration/src/main/scala/com/webank/wedatasphere/linkis/configuration/validate/ValidatorManagerImpl.scala diff --git a/publicService/jobhistory/pom.xml b/linkis-public-enhancements/linkis-publicservice/jobhistory/pom.xml similarity index 98% rename from publicService/jobhistory/pom.xml rename to linkis-public-enhancements/linkis-publicservice/jobhistory/pom.xml index 2a7578a3f..911db3225 100644 --- a/publicService/jobhistory/pom.xml +++ b/linkis-public-enhancements/linkis-publicservice/jobhistory/pom.xml @@ -25,7 +25,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml linkis-jobhistory diff --git a/publicService/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/dao/TaskMapper.java b/linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/dao/TaskMapper.java similarity index 100% rename from publicService/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/dao/TaskMapper.java rename to linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/dao/TaskMapper.java diff --git a/publicService/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/dao/impl/taskMapper.xml b/linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/dao/impl/taskMapper.xml similarity index 100% rename from publicService/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/dao/impl/taskMapper.xml rename to linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/dao/impl/taskMapper.xml diff --git a/publicService/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/entity/QueryTask.java b/linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/entity/QueryTask.java similarity index 100% rename from publicService/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/entity/QueryTask.java rename to linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/entity/QueryTask.java diff --git a/publicService/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/entity/QueryTaskVO.java b/linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/entity/QueryTaskVO.java similarity index 100% rename from publicService/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/entity/QueryTaskVO.java rename to linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/entity/QueryTaskVO.java diff --git a/publicService/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/exception/QueryException.java b/linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/exception/QueryException.java similarity index 100% rename from publicService/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/exception/QueryException.java rename to linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/exception/QueryException.java diff --git a/publicService/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/restful/api/QueryRestfulApi.java b/linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/restful/api/QueryRestfulApi.java similarity index 100% rename from publicService/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/restful/api/QueryRestfulApi.java rename to linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/restful/api/QueryRestfulApi.java diff --git a/publicService/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/transitional/TaskStatus.java b/linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/transitional/TaskStatus.java similarity index 100% rename from publicService/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/transitional/TaskStatus.java rename to linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/transitional/TaskStatus.java diff --git a/publicService/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/util/Constants.java b/linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/util/Constants.java similarity index 100% rename from publicService/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/util/Constants.java rename to linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/java/com/webank/wedatasphere/linkis/jobhistory/util/Constants.java diff --git a/publicService/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/conversions/TaskConversions.scala b/linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/conversions/TaskConversions.scala similarity index 100% rename from publicService/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/conversions/TaskConversions.scala rename to linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/conversions/TaskConversions.scala diff --git a/publicService/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/receiver/QueryReceiver.scala b/linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/receiver/QueryReceiver.scala similarity index 100% rename from publicService/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/receiver/QueryReceiver.scala rename to linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/receiver/QueryReceiver.scala diff --git a/publicService/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/receiver/QueryReceiverChooser.scala b/linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/receiver/QueryReceiverChooser.scala similarity index 100% rename from publicService/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/receiver/QueryReceiverChooser.scala rename to linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/receiver/QueryReceiverChooser.scala diff --git a/publicService/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/service/QueryService.java b/linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/service/QueryService.java similarity index 100% rename from publicService/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/service/QueryService.java rename to linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/service/QueryService.java diff --git a/publicService/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/service/impl/QueryServiceImpl.scala b/linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/service/impl/QueryServiceImpl.scala similarity index 100% rename from publicService/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/service/impl/QueryServiceImpl.scala rename to linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/service/impl/QueryServiceImpl.scala diff --git a/publicService/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/util/QueryUtils.scala b/linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/util/QueryUtils.scala similarity index 100% rename from publicService/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/util/QueryUtils.scala rename to linkis-public-enhancements/linkis-publicservice/jobhistory/src/main/scala/com/webank/wedatasphere/linkis/jobhistory/util/QueryUtils.scala diff --git a/publicService/pom.xml b/linkis-public-enhancements/linkis-publicservice/pom.xml similarity index 98% rename from publicService/pom.xml rename to linkis-public-enhancements/linkis-publicservice/pom.xml index 7ad3d116d..dc8f33e9d 100644 --- a/publicService/pom.xml +++ b/linkis-public-enhancements/linkis-publicservice/pom.xml @@ -22,7 +22,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../pom.xml + ../../pom.xml 4.0.0 diff --git a/publicService/pom_k8s.xml b/linkis-public-enhancements/linkis-publicservice/pom_k8s.xml similarity index 100% rename from publicService/pom_k8s.xml rename to linkis-public-enhancements/linkis-publicservice/pom_k8s.xml diff --git a/publicService/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-publicservice/src/main/assembly/distribution.xml similarity index 100% rename from publicService/src/main/assembly/distribution.xml rename to linkis-public-enhancements/linkis-publicservice/src/main/assembly/distribution.xml diff --git a/publicService/udf/pom.xml b/linkis-public-enhancements/linkis-publicservice/udf/pom.xml similarity index 98% rename from publicService/udf/pom.xml rename to linkis-public-enhancements/linkis-publicservice/udf/pom.xml index 888e74cb8..c6b521abe 100644 --- a/publicService/udf/pom.xml +++ b/linkis-public-enhancements/linkis-publicservice/udf/pom.xml @@ -22,7 +22,7 @@ com.webank.wedatasphere.linkis linkis 0.11.0 - ../../pom.xml + ../../../pom.xml 4.0.0 diff --git a/publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/api/UDFApi.java b/linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/api/UDFApi.java similarity index 100% rename from publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/api/UDFApi.java rename to linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/api/UDFApi.java diff --git a/publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/dao/UDFDao.java b/linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/dao/UDFDao.java similarity index 100% rename from publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/dao/UDFDao.java rename to linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/dao/UDFDao.java diff --git a/publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/dao/UDFTreeDao.java b/linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/dao/UDFTreeDao.java similarity index 100% rename from publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/dao/UDFTreeDao.java rename to linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/dao/UDFTreeDao.java diff --git a/publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/dao/impl/UDFDao.xml b/linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/dao/impl/UDFDao.xml similarity index 100% rename from publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/dao/impl/UDFDao.xml rename to linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/dao/impl/UDFDao.xml diff --git a/publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/dao/impl/UDFTreeDao.xml b/linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/dao/impl/UDFTreeDao.xml similarity index 100% rename from publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/dao/impl/UDFTreeDao.xml rename to linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/dao/impl/UDFTreeDao.xml diff --git a/publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/entity/UDFInfo.java b/linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/entity/UDFInfo.java similarity index 100% rename from publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/entity/UDFInfo.java rename to linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/entity/UDFInfo.java diff --git a/publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/entity/UDFManager.java b/linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/entity/UDFManager.java similarity index 100% rename from publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/entity/UDFManager.java rename to linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/entity/UDFManager.java diff --git a/publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/entity/UDFTree.java b/linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/entity/UDFTree.java similarity index 100% rename from publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/entity/UDFTree.java rename to linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/entity/UDFTree.java diff --git a/publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/excepiton/UDFException.java b/linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/excepiton/UDFException.java similarity index 100% rename from publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/excepiton/UDFException.java rename to linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/excepiton/UDFException.java diff --git a/publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/service/UDFService.java b/linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/service/UDFService.java similarity index 100% rename from publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/service/UDFService.java rename to linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/service/UDFService.java diff --git a/publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/service/UDFTreeService.java b/linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/service/UDFTreeService.java similarity index 100% rename from publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/service/UDFTreeService.java rename to linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/service/UDFTreeService.java diff --git a/publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/service/impl/UDFServiceImpl.java b/linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/service/impl/UDFServiceImpl.java similarity index 100% rename from publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/service/impl/UDFServiceImpl.java rename to linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/service/impl/UDFServiceImpl.java diff --git a/publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/service/impl/UDFTreeServiceImpl.java b/linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/service/impl/UDFTreeServiceImpl.java similarity index 100% rename from publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/service/impl/UDFTreeServiceImpl.java rename to linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/service/impl/UDFTreeServiceImpl.java diff --git a/publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/utils/ConstantVar.java b/linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/utils/ConstantVar.java similarity index 100% rename from publicService/udf/src/main/java/com/webank/wedatasphere/linkis/udf/utils/ConstantVar.java rename to linkis-public-enhancements/linkis-publicservice/udf/src/main/java/com/webank/wedatasphere/linkis/udf/utils/ConstantVar.java diff --git a/publicService/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/api/rpc/RequestUdfTree.scala b/linkis-public-enhancements/linkis-publicservice/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/api/rpc/RequestUdfTree.scala similarity index 100% rename from publicService/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/api/rpc/RequestUdfTree.scala rename to linkis-public-enhancements/linkis-publicservice/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/api/rpc/RequestUdfTree.scala diff --git a/publicService/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/api/rpc/ResponseUdfTree.scala b/linkis-public-enhancements/linkis-publicservice/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/api/rpc/ResponseUdfTree.scala similarity index 100% rename from publicService/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/api/rpc/ResponseUdfTree.scala rename to linkis-public-enhancements/linkis-publicservice/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/api/rpc/ResponseUdfTree.scala diff --git a/publicService/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/api/rpc/UdfReceiver.scala b/linkis-public-enhancements/linkis-publicservice/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/api/rpc/UdfReceiver.scala similarity index 100% rename from publicService/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/api/rpc/UdfReceiver.scala rename to linkis-public-enhancements/linkis-publicservice/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/api/rpc/UdfReceiver.scala diff --git a/publicService/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/api/rpc/UdfReceiverChooser.scala b/linkis-public-enhancements/linkis-publicservice/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/api/rpc/UdfReceiverChooser.scala similarity index 100% rename from publicService/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/api/rpc/UdfReceiverChooser.scala rename to linkis-public-enhancements/linkis-publicservice/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/api/rpc/UdfReceiverChooser.scala diff --git a/publicService/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/utils/UdfConfiguration.scala b/linkis-public-enhancements/linkis-publicservice/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/utils/UdfConfiguration.scala similarity index 100% rename from publicService/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/utils/UdfConfiguration.scala rename to linkis-public-enhancements/linkis-publicservice/udf/src/main/scala/com/webank/wedatasphere/linkis/udf/utils/UdfConfiguration.scala diff --git a/publicService/udf/src/test/java/com/webank/wedatasphere/linkis/udf/TestUDFTree.java b/linkis-public-enhancements/linkis-publicservice/udf/src/test/java/com/webank/wedatasphere/linkis/udf/TestUDFTree.java similarity index 100% rename from publicService/udf/src/test/java/com/webank/wedatasphere/linkis/udf/TestUDFTree.java rename to linkis-public-enhancements/linkis-publicservice/udf/src/test/java/com/webank/wedatasphere/linkis/udf/TestUDFTree.java diff --git a/publicService/variable/pom.xml b/linkis-public-enhancements/linkis-publicservice/variable/pom.xml similarity index 98% rename from publicService/variable/pom.xml rename to linkis-public-enhancements/linkis-publicservice/variable/pom.xml index 30a2b5c4b..8bbe35af9 100644 --- a/publicService/variable/pom.xml +++ b/linkis-public-enhancements/linkis-publicservice/variable/pom.xml @@ -24,7 +24,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml linkis-variable diff --git a/publicService/variable/src/main/java/com/webank/wedatasphere/linkis/variable/dao/VarMapper.java b/linkis-public-enhancements/linkis-publicservice/variable/src/main/java/com/webank/wedatasphere/linkis/variable/dao/VarMapper.java similarity index 100% rename from publicService/variable/src/main/java/com/webank/wedatasphere/linkis/variable/dao/VarMapper.java rename to linkis-public-enhancements/linkis-publicservice/variable/src/main/java/com/webank/wedatasphere/linkis/variable/dao/VarMapper.java diff --git a/publicService/variable/src/main/java/com/webank/wedatasphere/linkis/variable/dao/impl/VarMapper.xml b/linkis-public-enhancements/linkis-publicservice/variable/src/main/java/com/webank/wedatasphere/linkis/variable/dao/impl/VarMapper.xml similarity index 100% rename from publicService/variable/src/main/java/com/webank/wedatasphere/linkis/variable/dao/impl/VarMapper.xml rename to linkis-public-enhancements/linkis-publicservice/variable/src/main/java/com/webank/wedatasphere/linkis/variable/dao/impl/VarMapper.xml diff --git a/publicService/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarKey.java b/linkis-public-enhancements/linkis-publicservice/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarKey.java similarity index 100% rename from publicService/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarKey.java rename to linkis-public-enhancements/linkis-publicservice/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarKey.java diff --git a/publicService/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarKeyAndValue.java b/linkis-public-enhancements/linkis-publicservice/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarKeyAndValue.java similarity index 100% rename from publicService/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarKeyAndValue.java rename to linkis-public-enhancements/linkis-publicservice/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarKeyAndValue.java diff --git a/publicService/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarKeyUser.java b/linkis-public-enhancements/linkis-publicservice/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarKeyUser.java similarity index 100% rename from publicService/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarKeyUser.java rename to linkis-public-enhancements/linkis-publicservice/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarKeyUser.java diff --git a/publicService/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarKeyValueVO.java b/linkis-public-enhancements/linkis-publicservice/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarKeyValueVO.java similarity index 100% rename from publicService/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarKeyValueVO.java rename to linkis-public-enhancements/linkis-publicservice/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarKeyValueVO.java diff --git a/publicService/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarTree.java b/linkis-public-enhancements/linkis-publicservice/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarTree.java similarity index 100% rename from publicService/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarTree.java rename to linkis-public-enhancements/linkis-publicservice/variable/src/main/java/com/webank/wedatasphere/linkis/variable/entity/VarTree.java diff --git a/publicService/variable/src/main/java/com/webank/wedatasphere/linkis/variable/exception/VariableException.java b/linkis-public-enhancements/linkis-publicservice/variable/src/main/java/com/webank/wedatasphere/linkis/variable/exception/VariableException.java similarity index 100% rename from publicService/variable/src/main/java/com/webank/wedatasphere/linkis/variable/exception/VariableException.java rename to linkis-public-enhancements/linkis-publicservice/variable/src/main/java/com/webank/wedatasphere/linkis/variable/exception/VariableException.java diff --git a/publicService/variable/src/main/java/com/webank/wedatasphere/linkis/variable/restful/api/VariableRestfulApi.java b/linkis-public-enhancements/linkis-publicservice/variable/src/main/java/com/webank/wedatasphere/linkis/variable/restful/api/VariableRestfulApi.java similarity index 100% rename from publicService/variable/src/main/java/com/webank/wedatasphere/linkis/variable/restful/api/VariableRestfulApi.java rename to linkis-public-enhancements/linkis-publicservice/variable/src/main/java/com/webank/wedatasphere/linkis/variable/restful/api/VariableRestfulApi.java diff --git a/publicService/variable/src/main/java/com/webank/wedatasphere/linkis/variable/service/VariableService.java b/linkis-public-enhancements/linkis-publicservice/variable/src/main/java/com/webank/wedatasphere/linkis/variable/service/VariableService.java similarity index 100% rename from publicService/variable/src/main/java/com/webank/wedatasphere/linkis/variable/service/VariableService.java rename to linkis-public-enhancements/linkis-publicservice/variable/src/main/java/com/webank/wedatasphere/linkis/variable/service/VariableService.java diff --git a/publicService/variable/src/main/java/com/webank/wedatasphere/linkis/variable/util/Constants.java b/linkis-public-enhancements/linkis-publicservice/variable/src/main/java/com/webank/wedatasphere/linkis/variable/util/Constants.java similarity index 100% rename from publicService/variable/src/main/java/com/webank/wedatasphere/linkis/variable/util/Constants.java rename to linkis-public-enhancements/linkis-publicservice/variable/src/main/java/com/webank/wedatasphere/linkis/variable/util/Constants.java diff --git a/publicService/variable/src/main/scala/com/webank/wedatasphere/linkis/variable/receiver/VariableReceiver.scala b/linkis-public-enhancements/linkis-publicservice/variable/src/main/scala/com/webank/wedatasphere/linkis/variable/receiver/VariableReceiver.scala similarity index 100% rename from publicService/variable/src/main/scala/com/webank/wedatasphere/linkis/variable/receiver/VariableReceiver.scala rename to linkis-public-enhancements/linkis-publicservice/variable/src/main/scala/com/webank/wedatasphere/linkis/variable/receiver/VariableReceiver.scala diff --git a/publicService/variable/src/main/scala/com/webank/wedatasphere/linkis/variable/receiver/VariableReceiverChooser.scala b/linkis-public-enhancements/linkis-publicservice/variable/src/main/scala/com/webank/wedatasphere/linkis/variable/receiver/VariableReceiverChooser.scala similarity index 100% rename from publicService/variable/src/main/scala/com/webank/wedatasphere/linkis/variable/receiver/VariableReceiverChooser.scala rename to linkis-public-enhancements/linkis-publicservice/variable/src/main/scala/com/webank/wedatasphere/linkis/variable/receiver/VariableReceiverChooser.scala diff --git a/publicService/variable/src/main/scala/com/webank/wedatasphere/linkis/variable/service/VariableServiceImpl.scala b/linkis-public-enhancements/linkis-publicservice/variable/src/main/scala/com/webank/wedatasphere/linkis/variable/service/VariableServiceImpl.scala similarity index 100% rename from publicService/variable/src/main/scala/com/webank/wedatasphere/linkis/variable/service/VariableServiceImpl.scala rename to linkis-public-enhancements/linkis-publicservice/variable/src/main/scala/com/webank/wedatasphere/linkis/variable/service/VariableServiceImpl.scala diff --git a/publicService/workspace/client/workspace-httpclient/pom.xml b/linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/pom.xml similarity index 97% rename from publicService/workspace/client/workspace-httpclient/pom.xml rename to linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/pom.xml index 75c2e0eb6..224fa071b 100644 --- a/publicService/workspace/client/workspace-httpclient/pom.xml +++ b/linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/pom.xml @@ -8,7 +8,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../../../pom.xml + ../../../../../pom.xml linkis-workspace-httpclient diff --git a/publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/WorkspaceClientFactory.scala b/linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/WorkspaceClientFactory.scala similarity index 100% rename from publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/WorkspaceClientFactory.scala rename to linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/WorkspaceClientFactory.scala diff --git a/publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/WorkspaceClientImpl.scala b/linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/WorkspaceClientImpl.scala similarity index 100% rename from publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/WorkspaceClientImpl.scala rename to linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/WorkspaceClientImpl.scala diff --git a/publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/action/OpenScriptFromBMLAction.scala b/linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/action/OpenScriptFromBMLAction.scala similarity index 100% rename from publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/action/OpenScriptFromBMLAction.scala rename to linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/action/OpenScriptFromBMLAction.scala diff --git a/publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/action/WorkspacePOSTAction.scala b/linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/action/WorkspacePOSTAction.scala similarity index 100% rename from publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/action/WorkspacePOSTAction.scala rename to linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/action/WorkspacePOSTAction.scala diff --git a/publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/conf/WorkspaceClientConf.scala b/linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/conf/WorkspaceClientConf.scala similarity index 100% rename from publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/conf/WorkspaceClientConf.scala rename to linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/conf/WorkspaceClientConf.scala diff --git a/publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/request/WorkspaceClient.scala b/linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/request/WorkspaceClient.scala similarity index 100% rename from publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/request/WorkspaceClient.scala rename to linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/request/WorkspaceClient.scala diff --git a/publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/request/WorkspaceHttpConf.scala b/linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/request/WorkspaceHttpConf.scala similarity index 100% rename from publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/request/WorkspaceHttpConf.scala rename to linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/request/WorkspaceHttpConf.scala diff --git a/publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/response/ScriptFromBMLResponse.scala b/linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/response/ScriptFromBMLResponse.scala similarity index 100% rename from publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/response/ScriptFromBMLResponse.scala rename to linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/response/ScriptFromBMLResponse.scala diff --git a/publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/response/WorkspaceResponse.scala b/linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/response/WorkspaceResponse.scala similarity index 100% rename from publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/response/WorkspaceResponse.scala rename to linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/response/WorkspaceResponse.scala diff --git a/publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/result/AbstractWorkspaceResult.scala b/linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/result/AbstractWorkspaceResult.scala similarity index 100% rename from publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/result/AbstractWorkspaceResult.scala rename to linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/result/AbstractWorkspaceResult.scala diff --git a/publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/result/ScriptFromBMLResult.scala b/linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/result/ScriptFromBMLResult.scala similarity index 100% rename from publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/result/ScriptFromBMLResult.scala rename to linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/result/ScriptFromBMLResult.scala diff --git a/publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/result/ScriptToBMLResult.scala b/linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/result/ScriptToBMLResult.scala similarity index 100% rename from publicService/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/result/ScriptToBMLResult.scala rename to linkis-public-enhancements/linkis-publicservice/workspace/client/workspace-httpclient/src/main/scala/com/webank/wedatasphere/linkis/filesystem/result/ScriptToBMLResult.scala diff --git a/publicService/workspace/pom.xml b/linkis-public-enhancements/linkis-publicservice/workspace/pom.xml similarity index 98% rename from publicService/workspace/pom.xml rename to linkis-public-enhancements/linkis-publicservice/workspace/pom.xml index bb071bde8..ff44564f7 100644 --- a/publicService/workspace/pom.xml +++ b/linkis-public-enhancements/linkis-publicservice/workspace/pom.xml @@ -24,7 +24,7 @@ linkis com.webank.wedatasphere.linkis 0.11.0 - ../../pom.xml + ../../../pom.xml linkis-workspace jar diff --git a/publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/conf/WorkSpaceConfiguration.java b/linkis-public-enhancements/linkis-publicservice/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/conf/WorkSpaceConfiguration.java similarity index 100% rename from publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/conf/WorkSpaceConfiguration.java rename to linkis-public-enhancements/linkis-publicservice/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/conf/WorkSpaceConfiguration.java diff --git a/publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/constant/WorkSpaceConstants.java b/linkis-public-enhancements/linkis-publicservice/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/constant/WorkSpaceConstants.java similarity index 100% rename from publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/constant/WorkSpaceConstants.java rename to linkis-public-enhancements/linkis-publicservice/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/constant/WorkSpaceConstants.java diff --git a/publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/entity/DirFileTree.java b/linkis-public-enhancements/linkis-publicservice/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/entity/DirFileTree.java similarity index 100% rename from publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/entity/DirFileTree.java rename to linkis-public-enhancements/linkis-publicservice/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/entity/DirFileTree.java diff --git a/publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/entity/LogLevel.java b/linkis-public-enhancements/linkis-publicservice/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/entity/LogLevel.java similarity index 100% rename from publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/entity/LogLevel.java rename to linkis-public-enhancements/linkis-publicservice/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/entity/LogLevel.java diff --git a/publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/exception/WorkSpaceException.java b/linkis-public-enhancements/linkis-publicservice/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/exception/WorkSpaceException.java similarity index 100% rename from publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/exception/WorkSpaceException.java rename to linkis-public-enhancements/linkis-publicservice/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/exception/WorkSpaceException.java diff --git a/publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/exception/WorkspaceExceptionManager.java b/linkis-public-enhancements/linkis-publicservice/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/exception/WorkspaceExceptionManager.java similarity index 100% rename from publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/exception/WorkspaceExceptionManager.java rename to linkis-public-enhancements/linkis-publicservice/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/exception/WorkspaceExceptionManager.java diff --git a/publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/restful/api/BMLFsRestfulApi.java b/linkis-public-enhancements/linkis-publicservice/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/restful/api/BMLFsRestfulApi.java similarity index 100% rename from publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/restful/api/BMLFsRestfulApi.java rename to linkis-public-enhancements/linkis-publicservice/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/restful/api/BMLFsRestfulApi.java diff --git a/publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/restful/api/FsRestfulApi.java b/linkis-public-enhancements/linkis-publicservice/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/restful/api/FsRestfulApi.java similarity index 100% rename from publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/restful/api/FsRestfulApi.java rename to linkis-public-enhancements/linkis-publicservice/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/restful/api/FsRestfulApi.java diff --git a/publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/restful/remote/FsRestfulRemote.java b/linkis-public-enhancements/linkis-publicservice/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/restful/remote/FsRestfulRemote.java similarity index 100% rename from publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/restful/remote/FsRestfulRemote.java rename to linkis-public-enhancements/linkis-publicservice/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/restful/remote/FsRestfulRemote.java diff --git a/publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/util/WorkspaceUtil.java b/linkis-public-enhancements/linkis-publicservice/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/util/WorkspaceUtil.java similarity index 100% rename from publicService/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/util/WorkspaceUtil.java rename to linkis-public-enhancements/linkis-publicservice/workspace/src/main/java/com/webank/wedatasphere/linkis/filesystem/util/WorkspaceUtil.java diff --git a/publicService/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/bml/BMLHelper.scala b/linkis-public-enhancements/linkis-publicservice/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/bml/BMLHelper.scala similarity index 100% rename from publicService/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/bml/BMLHelper.scala rename to linkis-public-enhancements/linkis-publicservice/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/bml/BMLHelper.scala diff --git a/publicService/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/bml/BMLScriptReader.scala b/linkis-public-enhancements/linkis-publicservice/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/bml/BMLScriptReader.scala similarity index 100% rename from publicService/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/bml/BMLScriptReader.scala rename to linkis-public-enhancements/linkis-publicservice/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/bml/BMLScriptReader.scala diff --git a/publicService/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/bml/BMLScriptWriter.scala b/linkis-public-enhancements/linkis-publicservice/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/bml/BMLScriptWriter.scala similarity index 100% rename from publicService/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/bml/BMLScriptWriter.scala rename to linkis-public-enhancements/linkis-publicservice/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/bml/BMLScriptWriter.scala diff --git a/publicService/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/cache/FsCache.scala b/linkis-public-enhancements/linkis-publicservice/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/cache/FsCache.scala similarity index 100% rename from publicService/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/cache/FsCache.scala rename to linkis-public-enhancements/linkis-publicservice/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/cache/FsCache.scala diff --git a/publicService/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/conf/WorkspaceSpringConfiguration.scala b/linkis-public-enhancements/linkis-publicservice/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/conf/WorkspaceSpringConfiguration.scala similarity index 100% rename from publicService/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/conf/WorkspaceSpringConfiguration.scala rename to linkis-public-enhancements/linkis-publicservice/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/conf/WorkspaceSpringConfiguration.scala diff --git a/publicService/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/entity/FSInfo.scala b/linkis-public-enhancements/linkis-publicservice/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/entity/FSInfo.scala similarity index 100% rename from publicService/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/entity/FSInfo.scala rename to linkis-public-enhancements/linkis-publicservice/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/entity/FSInfo.scala diff --git a/publicService/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/quartz/FSQuartz.scala b/linkis-public-enhancements/linkis-publicservice/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/quartz/FSQuartz.scala similarity index 100% rename from publicService/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/quartz/FSQuartz.scala rename to linkis-public-enhancements/linkis-publicservice/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/quartz/FSQuartz.scala diff --git a/publicService/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/service/FsService.scala b/linkis-public-enhancements/linkis-publicservice/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/service/FsService.scala similarity index 100% rename from publicService/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/service/FsService.scala rename to linkis-public-enhancements/linkis-publicservice/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/service/FsService.scala diff --git a/publicService/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/validator/PathValidator.scala b/linkis-public-enhancements/linkis-publicservice/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/validator/PathValidator.scala similarity index 100% rename from publicService/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/validator/PathValidator.scala rename to linkis-public-enhancements/linkis-publicservice/workspace/src/main/scala/com/webank/wedatasphere/linkis/filesystem/validator/PathValidator.scala -- Gitee From 4113c00f5b372a5dedf86766f2bba8e336963b9b Mon Sep 17 00:00:00 2001 From: leeebai <120190695@qq.com> Date: Tue, 9 Mar 2021 21:20:38 +0800 Subject: [PATCH 061/148] Enhance EngineManager, newly defined and implemented EngineConnManager module fixes #571 --- .../linkis-engineconn-linux-launch/pom.xml | 70 +++++++ .../launch/LinuxProcessEngineConnLaunch.scala | 29 +++ .../linkis-engineconn-manager-core/pom.xml | 85 +++++++++ .../ecm/core/engineconn/EngineConn.scala | 73 ++++++++ .../ecm/core/engineconn/EngineConnInfo.scala | 33 ++++ .../ecm/core/engineconn/YarnEngineConn.scala | 35 ++++ .../core/launch/DiscoveryMsgGenerator.scala | 34 ++++ .../ecm/core/launch/EngineConnLaunch.scala | 35 ++++ .../core/launch/EngineConnLaunchRunner.scala | 49 +++++ .../core/launch/EngineConnManagerEnv.scala | 31 ++++ .../launch/ProcessEngineCommandBuilder.scala | 91 ++++++++++ .../launch/ProcessEngineCommandExec.scala | 54 ++++++ .../core/launch/ProcessEngineConnLaunch.scala | 171 ++++++++++++++++++ .../core/listener/ECMAsyncListenerBus.scala | 30 +++ .../linkis/ecm/core/listener/ECMEvent.java | 23 +++ .../ecm/core/listener/ECMEventListener.scala | 30 +++ .../core/listener/ECMSyncListenerBus.scala | 27 +++ .../linkis/ecm/core/metrics/ECMMetrics.scala | 41 +++++ .../ecm/core/report/ECMHealthReport.scala | 38 ++++ .../ecm/core/report/NodeHealthReport.scala | 49 +++++ .../linkis-engineconn-manager-server/pom.xml | 141 +++++++++++++++ .../src/main/assembly/distribution.xml | 73 ++++++++ .../linkis/ecm/server/ECMApplication.java | 122 +++++++++++++ .../src/main/resources/application.yml | 29 +++ .../main/resources/linkis-server.properties | 18 ++ .../src/main/resources/log4j2.xml | 33 ++++ .../ecm/server/conf/ECMConfiguration.scala | 75 ++++++++ .../server/context/DefaultECMContext.scala | 41 +++++ .../ecm/server/context/ECMContext.scala | 31 ++++ .../server/converter/ECMEngineConverter.scala | 33 ++++ .../server/engineConn/DefaultEngineConn.scala | 99 ++++++++++ .../engineConn/DefaultYarnEngineConn.scala | 42 +++++ .../server/exception/ECMErrorException.scala | 32 ++++ .../ecm/server/listener/ECMReadyEvent.scala | 42 +++++ .../server/metrics/DefaultECMMetrics.scala | 106 +++++++++++ .../report/DefaultECMHealthReport.scala | 81 +++++++++ .../ecm/server/service/ECMHealthService.scala | 33 ++++ .../server/service/ECMMetricsService.scala | 22 +++ .../server/service/ECMRegisterService.scala | 27 +++ .../service/EngineConnKillService.scala | 26 +++ .../service/EngineConnLaunchService.scala | 34 ++++ .../service/EngineConnListService.scala | 48 +++++ .../EngineConnPidCallbackService.scala | 27 +++ .../EngineConnStatusCallbackService.scala | 26 +++ .../service/LocalDirsHandleService.scala | 34 ++++ .../server/service/LogCallbackService.scala | 27 +++ .../service/ResourceLocalizationService.scala | 27 +++ .../server/service/YarnCallbackService.scala | 28 +++ .../AbstractEngineConnLaunchService.scala | 134 ++++++++++++++ .../impl/BmlResourceLocalizationService.scala | 131 ++++++++++++++ .../impl/DefaultECMHealthService.scala | 137 ++++++++++++++ .../impl/DefaultECMMetricsService.scala | 25 +++ .../impl/DefaultECMRegisterService.scala | 99 ++++++++++ .../impl/DefaultEngineConnKillService.java | 139 ++++++++++++++ .../impl/DefaultEngineConnListService.scala | 124 +++++++++++++ .../DefaultEngineConnPidCallbackService.scala | 38 ++++ ...faultEngineConnStatusCallbackService.scala | 51 ++++++ .../impl/DefaultLocalDirsHandleService.scala | 47 +++++ .../impl/DefaultYarnCallbackService.scala | 37 ++++ .../LinuxProcessEngineConnLaunchService.scala | 64 +++++++ .../impl/ProcessEngineConnLaunchService.scala | 86 +++++++++ .../spring/ECMSpringConfiguration.scala | 118 ++++++++++++ .../linkis/ecm/server/util/ECMUtils.scala | 69 +++++++ .../linkis-engineconn-manager/pom.xml | 36 ++++ 64 files changed, 3720 insertions(+) create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-linux-launch/pom.xml create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-linux-launch/src/main/scala/com/webank/wedatasphere/linkis/ecm/linux/launch/LinuxProcessEngineConnLaunch.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/pom.xml create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/engineconn/EngineConn.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/engineconn/EngineConnInfo.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/engineconn/YarnEngineConn.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/DiscoveryMsgGenerator.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/EngineConnLaunch.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/EngineConnLaunchRunner.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/EngineConnManagerEnv.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/ProcessEngineCommandBuilder.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/ProcessEngineCommandExec.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/ProcessEngineConnLaunch.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/listener/ECMAsyncListenerBus.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/listener/ECMEvent.java create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/listener/ECMEventListener.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/listener/ECMSyncListenerBus.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/metrics/ECMMetrics.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/report/ECMHealthReport.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/report/NodeHealthReport.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/pom.xml create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/assembly/distribution.xml create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/java/com/webank/wedatasphere/linkis/ecm/server/ECMApplication.java create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/resources/application.yml create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/resources/linkis-server.properties create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/resources/log4j2.xml create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/conf/ECMConfiguration.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/context/DefaultECMContext.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/context/ECMContext.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/converter/ECMEngineConverter.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/engineConn/DefaultEngineConn.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/engineConn/DefaultYarnEngineConn.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/exception/ECMErrorException.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/listener/ECMReadyEvent.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/metrics/DefaultECMMetrics.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/report/DefaultECMHealthReport.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/ECMHealthService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/ECMMetricsService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/ECMRegisterService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/EngineConnKillService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/EngineConnLaunchService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/EngineConnListService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/EngineConnPidCallbackService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/EngineConnStatusCallbackService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/LocalDirsHandleService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/LogCallbackService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/ResourceLocalizationService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/YarnCallbackService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/AbstractEngineConnLaunchService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/BmlResourceLocalizationService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultECMHealthService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultECMMetricsService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultECMRegisterService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultEngineConnKillService.java create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultEngineConnListService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultEngineConnPidCallbackService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultEngineConnStatusCallbackService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultLocalDirsHandleService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultYarnCallbackService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/LinuxProcessEngineConnLaunchService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/ProcessEngineConnLaunchService.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/spring/ECMSpringConfiguration.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/util/ECMUtils.scala create mode 100644 linkis-computation-governance/linkis-engineconn-manager/pom.xml diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-linux-launch/pom.xml b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-linux-launch/pom.xml new file mode 100644 index 000000000..5fc877dda --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-linux-launch/pom.xml @@ -0,0 +1,70 @@ + + + + + + linkis + com.webank.wedatasphere.linkis + dev-1.0.0 + ../../../pom.xml + + 4.0.0 + + linkis-engineconn-linux-launch + + + + com.webank.wedatasphere.linkis + linkis-engineconn-manager-core + ${linkis.version} + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + + + net.alchim31.maven + scala-maven-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + + + + + + + + + + + src/main/resources + + + ${project.artifactId}-${project.version} + + + \ No newline at end of file diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-linux-launch/src/main/scala/com/webank/wedatasphere/linkis/ecm/linux/launch/LinuxProcessEngineConnLaunch.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-linux-launch/src/main/scala/com/webank/wedatasphere/linkis/ecm/linux/launch/LinuxProcessEngineConnLaunch.scala new file mode 100644 index 000000000..1782faa25 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-linux-launch/src/main/scala/com/webank/wedatasphere/linkis/ecm/linux/launch/LinuxProcessEngineConnLaunch.scala @@ -0,0 +1,29 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.linux.launch + +import com.webank.wedatasphere.linkis.ecm.core.launch.ProcessEngineConnLaunch + + + +class LinuxProcessEngineConnLaunch extends ProcessEngineConnLaunch { + + override protected def execFile: Array[String] = Array("sh", getPreparedExecFile) + + override protected def sudoCommand(user: String, command: String): Array[String] = + Array("sudo", "su", "-", user, "-c", command) +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/pom.xml b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/pom.xml new file mode 100644 index 000000000..60d55133b --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/pom.xml @@ -0,0 +1,85 @@ + + + + + + linkis + com.webank.wedatasphere.linkis + dev-1.0.0 + ../../pom.xml + + 4.0.0 + + linkis-engineconn-manager-core + + + + + com.webank.wedatasphere.linkis + linkis-manager-common + ${linkis.version} + + + + com.webank.wedatasphere.linkis + linkis-computation-governance-common + ${linkis.version} + + + + + com.webank.wedatasphere.linkis + linkis-engineconn-plugin-core + ${linkis.version} + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + + + net.alchim31.maven + scala-maven-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + + + + + + + + + + + ${basedir}/src/main/resources + + + ${project.artifactId}-${project.version} + + + \ No newline at end of file diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/engineconn/EngineConn.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/engineconn/EngineConn.scala new file mode 100644 index 000000000..df8b71f7d --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/engineconn/EngineConn.scala @@ -0,0 +1,73 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.core.engineconn + +import java.io.Closeable +import java.util + +import com.webank.wedatasphere.linkis.common.ServiceInstance +import com.webank.wedatasphere.linkis.ecm.core.launch.{EngineConnLaunchRunner, EngineConnManagerEnv} +import com.webank.wedatasphere.linkis.manager.common.entity.enumeration.NodeStatus +import com.webank.wedatasphere.linkis.manager.common.entity.resource.NodeResource +import com.webank.wedatasphere.linkis.manager.engineplugin.common.launch.entity.EngineConnCreationDesc +import com.webank.wedatasphere.linkis.manager.label.entity.Label + + +trait EngineConn extends Closeable { + + def getTickedId: String + + def setTickedId(tickedId: String) + + def getServiceInstance: ServiceInstance + + def setServiceInstance(serviceInstance: ServiceInstance): Unit + + def getResource: NodeResource + + def setResource(resource: NodeResource): Unit + + def getLabels: util.List[Label[_]] + + def setLabels(labels: util.List[Label[_]]): Unit + + def getStatus: NodeStatus + + def setStatus(status: NodeStatus): Unit + + def getCreationDesc: EngineConnCreationDesc + + def setCreationDesc(desc: EngineConnCreationDesc): Unit + + def getEngineConnInfo: EngineConnInfo + + def setEngineConnInfo(engineConnInfo: EngineConnInfo): Unit + + def getEngineConnManagerEnv: EngineConnManagerEnv + + def setEngineConnManagerEnv(env: EngineConnManagerEnv): Unit + + def getEngineConnLaunchRunner: EngineConnLaunchRunner + + def setEngineConnLaunchRunner(runner: EngineConnLaunchRunner): Unit + + def setPid(pid: String): Unit + + def getPid: String + + override def close(): Unit = {} +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/engineconn/EngineConnInfo.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/engineconn/EngineConnInfo.scala new file mode 100644 index 000000000..e2fcd4a81 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/engineconn/EngineConnInfo.scala @@ -0,0 +1,33 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.core.engineconn + + +class EngineConnInfo { + + private var errorCode: Int = 0 + private var errorMsg: String = _ + + def setErrorCode(errorCode: Int): Unit = this.errorCode = errorCode + + def getErrorCode: Int = errorCode + + def setErrorMsg(errorMsg: String): Unit = this.errorMsg = errorMsg + + def getErrorMsg: String = errorMsg + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/engineconn/YarnEngineConn.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/engineconn/YarnEngineConn.scala new file mode 100644 index 000000000..2a31060f3 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/engineconn/YarnEngineConn.scala @@ -0,0 +1,35 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.core.engineconn + + +trait YarnEngineConn extends EngineConn { + + def getApplicationId: String + + def setApplicationId(applicationId: String): Unit + + def getApplicationURL: String + + def setApplicationURL(applicationURL: String): Unit + + def getYarnMode: String + + def setYarnMode(yarnMode: String): Unit + + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/DiscoveryMsgGenerator.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/DiscoveryMsgGenerator.scala new file mode 100644 index 000000000..dafe19cc9 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/DiscoveryMsgGenerator.scala @@ -0,0 +1,34 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.core.launch + +import java.util + +import scala.collection.JavaConversions._ + + +trait DiscoveryMsgGenerator { + + def generate(engineConnManagerEnv: EngineConnManagerEnv): java.util.Map[String, String] + +} + +class EurekaDiscoveryMsgGenerator extends DiscoveryMsgGenerator { + override def generate(engineConnManagerEnv: EngineConnManagerEnv): util.Map[String, String] = + engineConnManagerEnv.properties.get("eureka.client.serviceUrl.defaultZone") + .map(v => Map("eureka.client.serviceUrl.defaultZone" -> v)).getOrElse[Map[String,String]](Map.empty) +} \ No newline at end of file diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/EngineConnLaunch.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/EngineConnLaunch.scala new file mode 100644 index 000000000..e2973b61d --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/EngineConnLaunch.scala @@ -0,0 +1,35 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.core.launch + +import com.webank.wedatasphere.linkis.manager.engineplugin.common.launch.entity.EngineConnLaunchRequest + + + +trait EngineConnLaunch { + + def setEngineConnLaunchRequest(request: EngineConnLaunchRequest): Unit + + def setEngineConnManagerEnv(engineConnManagerEnv: EngineConnManagerEnv): Unit + + def launch(): Unit + + def kill(): Unit + + def isAlive: Boolean + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/EngineConnLaunchRunner.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/EngineConnLaunchRunner.scala new file mode 100644 index 000000000..bf81c3ac3 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/EngineConnLaunchRunner.scala @@ -0,0 +1,49 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.core.launch + + +trait EngineConnLaunchRunner extends Runnable { + + /** + * + * @param launch + */ + def setEngineConnLaunch(launch: EngineConnLaunch): Unit + + def getEngineConnLaunch: EngineConnLaunch + + def stop(): Unit + +} +class EngineConnLaunchRunnerImpl extends EngineConnLaunchRunner { + + private var launch: EngineConnLaunch = _ + /** + * + * @param launch + */ + override def setEngineConnLaunch(launch: EngineConnLaunch): Unit = this.launch = launch + + override def getEngineConnLaunch: EngineConnLaunch = launch + + override def stop(): Unit = launch.kill() + + override def run(): Unit = { + launch.launch() + } +} \ No newline at end of file diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/EngineConnManagerEnv.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/EngineConnManagerEnv.scala new file mode 100644 index 000000000..71ef80222 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/EngineConnManagerEnv.scala @@ -0,0 +1,31 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.core.launch + + +trait EngineConnManagerEnv { + + val engineConnManagerHomeDir: String + val engineConnWorkDir: String + val engineConnLogDirs: String + val engineConnTempDirs: String + val engineConnManagerHost: String + val engineConnManagerPort: String + val linkDirs: Map[String, String] + val properties: Map[String, String] + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/ProcessEngineCommandBuilder.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/ProcessEngineCommandBuilder.scala new file mode 100644 index 000000000..1f851a6e9 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/ProcessEngineCommandBuilder.scala @@ -0,0 +1,91 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.core.launch + +import java.io.OutputStream + +import com.webank.wedatasphere.linkis.manager.engineplugin.common.launch.process.LaunchConstants +import org.apache.commons.io.IOUtils + + +trait ProcessEngineCommandBuilder { + + def setCommand(command: Array[String]): Unit + + def setEnv(key: String, value: String): Unit + + def newLine(command: Array[String]) + + def link(fromPath: String, toPath: String) + + def mkdir(dir: String): Unit + + def writeTo(output: OutputStream): Unit + + def replaceExpansionMarker(value: String): String + +} + +abstract class ShellProcessEngineCommandBuilder extends ProcessEngineCommandBuilder { + + private val LINE_SEPARATOR = System.getProperty("line.separator") + private val sb = new StringBuilder + + def newLine(command: String): Unit = newLine(Array(command)) + + override def newLine(command: Array[String]): Unit = { + command.foreach(sb ++= _) + sb ++= LINE_SEPARATOR + } + + def writeTo(output: OutputStream): Unit = { + IOUtils.write(sb, output) + } + + override def replaceExpansionMarker(value: String): String = value.replaceAll(LaunchConstants.EXPANSION_MARKER_LEFT, "\\${") + .replaceAll(LaunchConstants.EXPANSION_MARKER_RIGHT, "}") +} + +class UnixProcessEngineCommandBuilder extends ShellProcessEngineCommandBuilder { + + newLine("#!/bin/bash") + + private def addErrorCheck(): Unit = { + newLine("linkis_engineconn_errorcode=$?") + newLine("if [ $linkis_engineconn_errorcode -ne 0 ]") + newLine("then") + newLine(" exit $linkis_engineconn_errorcode") + newLine("fi") + } + + override def setCommand(command: Array[String]): Unit = { + newLine(Array(s"exec /bin/bash -c ${"\""}${command.mkString(" ")}${"\""}")) + addErrorCheck() + } + + override def setEnv(key: String, value: String): Unit = newLine(Array("export ", key, "=\"", value, "\"")) + + override def link(fromPath: String, toPath: String): Unit = { + newLine(Array("ln -sf \"", fromPath, "\" \"", toPath, "\"")) + addErrorCheck() + } + + override def mkdir(dir: String): Unit = { + newLine(Array("mkdir -p ", dir)) + addErrorCheck() + } +} \ No newline at end of file diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/ProcessEngineCommandExec.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/ProcessEngineCommandExec.scala new file mode 100644 index 000000000..fbc172460 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/ProcessEngineCommandExec.scala @@ -0,0 +1,54 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.core.launch + +import java.io.File +import java.util + +import com.webank.wedatasphere.linkis.common.utils.Logging + + +trait ProcessEngineCommandExec { + + def execute(): Unit + + def getProcess: Process + +} + +class ShellProcessEngineCommandExec(command: Array[String], baseDir: String, + environment: util.Map[String, String], timeout: Long) extends + ProcessEngineCommandExec with Logging { + + private var process: Process = _ + + def this(command: Array[String], baseDir: String) = this(command, baseDir, null, 0) + + def this(command: Array[String]) = this(command, null) + + override def execute(): Unit = { + + info(s"Invoke subProcess, base dir ${this.baseDir} cmd is: ${command.mkString}") + val builder = new ProcessBuilder(command: _*) + if (environment != null) builder.environment.putAll(this.environment) + if (baseDir != null) builder.directory(new File(this.baseDir)) + builder.redirectErrorStream(true) + process = builder.start + } + + override def getProcess: Process = process +} \ No newline at end of file diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/ProcessEngineConnLaunch.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/ProcessEngineConnLaunch.scala new file mode 100644 index 000000000..9146b5661 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/launch/ProcessEngineConnLaunch.scala @@ -0,0 +1,171 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.core.launch + +import java.io.{File, InputStream, OutputStream} +import java.net.ServerSocket + +import com.webank.wedatasphere.linkis.common.conf.CommonVars +import com.webank.wedatasphere.linkis.common.exception.ErrorException +import com.webank.wedatasphere.linkis.common.utils.{Logging, Utils} +import com.webank.wedatasphere.linkis.governance.common.conf.GovernanceCommonConf +import com.webank.wedatasphere.linkis.governance.common.utils.{EngineConnArgumentsBuilder, EngineConnArgumentsParser} +import com.webank.wedatasphere.linkis.manager.engineplugin.common.conf.EnvConfiguration +import com.webank.wedatasphere.linkis.manager.engineplugin.common.launch.entity.EngineConnLaunchRequest +import com.webank.wedatasphere.linkis.manager.engineplugin.common.launch.process.Environment._ +import com.webank.wedatasphere.linkis.manager.engineplugin.common.launch.process.LaunchConstants._ +import com.webank.wedatasphere.linkis.manager.engineplugin.common.launch.process.{Environment, ProcessEngineConnLaunchRequest} +import org.apache.commons.io.{FileUtils, IOUtils} +import org.apache.commons.lang.StringUtils + +import scala.collection.JavaConversions._ + + +trait ProcessEngineConnLaunch extends EngineConnLaunch with Logging { + + private var request: ProcessEngineConnLaunchRequest = _ + private var engineConnManagerEnv: EngineConnManagerEnv = _ + private var discoveryMsgGenerator: DiscoveryMsgGenerator = _ + private var processBuilder: ProcessEngineCommandBuilder = _ + private var preparedExecFile: String = _ + private var process: Process = _ + + private var engineConnPort: String = _ + + protected def newProcessEngineConnCommandBuilder(): ProcessEngineCommandBuilder = new UnixProcessEngineCommandBuilder + + protected def newProcessEngineConnCommandExec(command: Array[String], workDir: String): ProcessEngineCommandExec = + new ShellProcessEngineCommandExec(command, workDir) + + override def setEngineConnLaunchRequest(request: EngineConnLaunchRequest): Unit = request match { + case processEngineConnLaunchRequest: ProcessEngineConnLaunchRequest => + this.request = processEngineConnLaunchRequest + case _ => //TODO exception + } + + override def setEngineConnManagerEnv(engineConnManagerEnv: EngineConnManagerEnv): Unit = this.engineConnManagerEnv = engineConnManagerEnv + + def setDiscoveryMsgGenerator(discoveryMsgGenerator: DiscoveryMsgGenerator): Unit = this.discoveryMsgGenerator = discoveryMsgGenerator + + def getEngineConnLaunchRequest: EngineConnLaunchRequest = request + + private def initializeEnv(): Unit = { + val environment = request.environment + def putIfExists(enum: Environment): Unit = { + val key = enum.toString + val conf = CommonVars.apply(key, "") + if(StringUtils.isNotBlank(conf.getValue)) environment.put(key, conf.getValue) + } + Environment.values foreach { + case USER => environment.put(USER.toString, request.user) + case ECM_HOME => environment.put(ECM_HOME.toString, engineConnManagerEnv.engineConnManagerHomeDir) + case PWD => environment.put(PWD.toString, engineConnManagerEnv.engineConnWorkDir) + case LOG_DIRS => environment.put(LOG_DIRS.toString, engineConnManagerEnv.engineConnLogDirs) + case TEMP_DIRS => environment.put(TEMP_DIRS.toString, engineConnManagerEnv.engineConnTempDirs) + case ECM_HOST => environment.put(ECM_HOST.toString, engineConnManagerEnv.engineConnManagerHost) + case ECM_PORT => environment.put(ECM_PORT.toString, engineConnManagerEnv.engineConnManagerPort) + case HADOOP_HOME => putIfExists(HADOOP_HOME) + case HADOOP_CONF_DIR => putIfExists(HADOOP_CONF_DIR) + case HIVE_CONF_DIR => putIfExists(HIVE_CONF_DIR) + case RANDOM_PORT => environment.put(RANDOM_PORT.toString, findAvailPort().toString) + case _ => + } + } + + private def findAvailPort(): Int = { + val socket = new ServerSocket(0) + Utils.tryFinally(socket.getLocalPort)(IOUtils.closeQuietly(socket)) + } + + private def addAvailPort(value: String): String = { + var existsRandomPort = value.contains(CLASS_PATH_SEPARATOR) + var newValue = value + while(existsRandomPort) { + newValue = value.replaceFirst(CLASS_PATH_SEPARATOR, findAvailPort().toString) + existsRandomPort = value.contains(CLASS_PATH_SEPARATOR) + } + newValue + } + + override def launch(): Unit = { + request.necessaryEnvironments.foreach{e => + val env = CommonVars(e, "") + if(StringUtils.isEmpty(env.getValue)) + throw new ErrorException(30000, s"Necessary environment $e is not exists!(必须的环境变量 $e 不存在!)") //TODO exception + else request.environment.put(e, env.getValue) + } + prepareCommand() + val exec = newProcessEngineConnCommandExec(sudoCommand(request.user, execFile.mkString(" ")), engineConnManagerEnv.engineConnWorkDir) + exec.execute() + process = exec.getProcess + } + + protected def execFile: Array[String] + + def getEngineConnPort: String = engineConnPort + + protected def getCommandArgs: Array[String] = { + if (request.creationDesc.properties.exists { case (k, v) => k.contains(" ") || (v != null && v.contains(" ")) }) + throw new ErrorException(30000, "Startup parameters contain spaces!(启动参数中包含空格!)") //TODO exception + val arguments = EngineConnArgumentsBuilder.newBuilder() + engineConnPort = findAvailPort().toString + var springConf = Map("spring.application.name" -> GovernanceCommonConf.ENGINE_CONN_SPRING_NAME.getValue, + "server.port" -> engineConnPort, "spring.profiles.active" -> "engineconn", + "logging.config" -> s"classpath:${EnvConfiguration.LOG4J2_XML_FILE.getValue}") ++: discoveryMsgGenerator.generate(engineConnManagerEnv) + request.creationDesc.properties.filter(_._1.startsWith("spring.")).foreach { case (k, v) => + springConf = springConf += (k -> v) + } + arguments.addSpringConf(springConf.toMap) + var engineConnConf = Map("ticketId" -> request.ticketId, "user" -> request.user) + engineConnConf = engineConnConf ++: request.labels.map(l => EngineConnArgumentsParser.LABEL_PREFIX + l.getLabelKey -> l.getStringValue).toMap + engineConnConf = engineConnConf ++: request.creationDesc.properties.filterNot(_._1.startsWith("spring.")).toMap + arguments.addEngineConnConf(engineConnConf) + EngineConnArgumentsParser.getEngineConnArgumentsParser.parseToArgs(arguments.build()) + } + + override def kill(): Unit = process.destroy() + + override def isAlive: Boolean = process.isAlive + + protected def prepareCommand(): Unit = { + processBuilder = newProcessEngineConnCommandBuilder() + engineConnManagerEnv.linkDirs.foreach{case (k, v) => processBuilder.link(k, v)} + initializeEnv() + request.environment.foreach{ case (k, v) => + var value = v.replaceAll(CLASS_PATH_SEPARATOR, File.pathSeparator) + value = addAvailPort(value) + processBuilder.setEnv(k, processBuilder.replaceExpansionMarker(value)) + } + val execCommand = request.commands.map(processBuilder.replaceExpansionMarker(_)).map(addAvailPort) ++ getCommandArgs + //execCommand = sudoCommand(request.user, execCommand.mkString(" ")) + processBuilder.setCommand(execCommand) + preparedExecFile = new File(engineConnManagerEnv.engineConnWorkDir, "engineConnExec.sh").getPath + val output = getFileOutputStream + Utils.tryFinally(processBuilder.writeTo(output))(output.close()) + } + + protected def sudoCommand(user: String, command: String): Array[String] + + protected def getFileOutputStream: OutputStream = FileUtils.openOutputStream(new File(preparedExecFile)) + + protected def getPreparedExecFile: String = preparedExecFile + + def getProcessInputStream:InputStream = process.getInputStream + + def processWaitFor:Int =process.waitFor + +} \ No newline at end of file diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/listener/ECMAsyncListenerBus.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/listener/ECMAsyncListenerBus.scala new file mode 100644 index 000000000..fc13ec07d --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/listener/ECMAsyncListenerBus.scala @@ -0,0 +1,30 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.core.listener + +import com.webank.wedatasphere.linkis.common.listener.ListenerEventBus + + +class ECMAsyncListenerBus(capacity: Int, name: String) + (consumerThreadSize: Int, threadMaxFreeTime: Long) + extends ListenerEventBus[ECMEventListener, ECMEvent](capacity, name)(consumerThreadSize, threadMaxFreeTime) { + /** + * Post an event to the specified listener. `onPostEvent` is guaranteed to be called in the same + * thread for all listeners. + */ + override protected def doPostEvent(listener: ECMEventListener, event: ECMEvent): Unit = listener.onEvent(event) +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/listener/ECMEvent.java b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/listener/ECMEvent.java new file mode 100644 index 000000000..011137d69 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/listener/ECMEvent.java @@ -0,0 +1,23 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.core.listener; + +import com.webank.wedatasphere.linkis.common.listener.Event; + + +public interface ECMEvent extends Event { +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/listener/ECMEventListener.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/listener/ECMEventListener.scala new file mode 100644 index 000000000..242972feb --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/listener/ECMEventListener.scala @@ -0,0 +1,30 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.core.listener + +import com.webank.wedatasphere.linkis.common.listener.{Event, EventListener} +import com.webank.wedatasphere.linkis.common.utils.Logging + + +trait ECMEventListener extends EventListener with Logging { + + def onEvent(event: ECMEvent) + + override def onEventError(event: Event, t: Throwable): Unit = { + error(s"async message invoke failed ${event.toString}", t) + } +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/listener/ECMSyncListenerBus.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/listener/ECMSyncListenerBus.scala new file mode 100644 index 000000000..208fe6fd6 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/listener/ECMSyncListenerBus.scala @@ -0,0 +1,27 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.core.listener + +import com.webank.wedatasphere.linkis.common.listener.ListenerBus + +class ECMSyncListenerBus extends ListenerBus[ECMEventListener, ECMEvent] { + /** + * Post an event to the specified listener. `onPostEvent` is guaranteed to be called in the same + * thread for all listeners. + */ + override protected def doPostEvent(listener: ECMEventListener, event: ECMEvent): Unit = listener.onEvent(event) +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/metrics/ECMMetrics.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/metrics/ECMMetrics.scala new file mode 100644 index 000000000..6245c57b5 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/metrics/ECMMetrics.scala @@ -0,0 +1,41 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.core.metrics + +import com.webank.wedatasphere.linkis.ecm.core.engineconn.EngineConn + + + +trait ECMMetrics { + + def getStartingEngineConns: Array[_ <: EngineConn] + + def getRunningEngineConns: Array[EngineConn] + + def getSucceedEngineConns: Array[EngineConn] + + def getFailedEngineConns: Array[EngineConn] + + def increaseStartingEngineConn(engineConn: EngineConn): Unit + + def increaseRunningEngineConn(engineConn: EngineConn): Unit + + def increaseSuccessEngineConn(engineConn: EngineConn): Unit + + def increaseFailedEngineConn(engineConn: EngineConn): Unit + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/report/ECMHealthReport.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/report/ECMHealthReport.scala new file mode 100644 index 000000000..44fef7ce3 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/report/ECMHealthReport.scala @@ -0,0 +1,38 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.core.report + +import com.webank.wedatasphere.linkis.ecm.core.engineconn.EngineConn +import com.webank.wedatasphere.linkis.manager.common.entity.metrics.NodeOverLoadInfo +import com.webank.wedatasphere.linkis.manager.common.entity.resource.Resource + + +trait ECMHealthReport extends NodeHealthReport { + + def setProtectedResource(protectedResource: Resource): Unit + + def getProtectResource: Resource + + def setOverload(nodeOverLoadInfo: NodeOverLoadInfo): Unit + + def getOverload: NodeOverLoadInfo + + def setRunningEngineConns(runningEngines: Array[EngineConn]) + + def getRunningEngineConns: Array[EngineConn] + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/report/NodeHealthReport.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/report/NodeHealthReport.scala new file mode 100644 index 000000000..ebd7c87a2 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/com/webank/wedatasphere/linkis/ecm/core/report/NodeHealthReport.scala @@ -0,0 +1,49 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.core.report + +import com.webank.wedatasphere.linkis.manager.common.entity.enumeration.NodeStatus +import com.webank.wedatasphere.linkis.manager.common.entity.resource.Resource + + +trait NodeHealthReport { + + def getReportTime: Long + + def setReportTime(reportTime: Long): Unit + + def getNodeStatus: NodeStatus + + def setNodeStatus(nodeStatus: NodeStatus): Unit + + def setNodeMsg(msg: String): Unit + + def getNodeMsg: String + + def getUsedResource: Resource + + def setUsedResource(resource: Resource): Unit + + def getTotalResource: Resource + + def setTotalResource(resource: Resource): Unit + + def setNodeId(nodeId: String): Unit + + def getNodeId: String + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/pom.xml b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/pom.xml new file mode 100644 index 000000000..95dda2b9c --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/pom.xml @@ -0,0 +1,141 @@ + + + + + + linkis + com.webank.wedatasphere.linkis + dev-1.0.0 + ../../pom.xml + + 4.0.0 + + linkis-engineconn-manager-server + + + + + com.webank.wedatasphere.linkis + linkis-engineconn-manager-core + ${linkis.version} + + + + com.webank.wedatasphere.linkis + linkis-engineconn-linux-launch + ${linkis.version} + + + + com.webank.wedatasphere.linkis + linkis-message-scheduler + ${linkis.version} + provided + + + + + com.webank.wedatasphere.linkis + linkis-bml-client + ${linkis.version} + + + + com.webank.wedatasphere.linkis + linkis-common + ${linkis.version} + provided + + + + com.webank.wedatasphere.linkis + linkis-storage + ${linkis.version} + provided + + + + org.json4s + json4s-jackson_${scala.binary.version} + ${json4s.version} + provided + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + + + net.alchim31.maven + scala-maven-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.3 + false + + + make-assembly + package + + single + + + + src/main/assembly/distribution.xml + + + + + + false + out + false + false + + src/main/assembly/distribution.xml + + + + + + + ${basedir}/src/main/resources + + **/*.properties + **/*.xml + **/*.yml + + + + ${project.artifactId}-${project.version} + + + \ No newline at end of file diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/assembly/distribution.xml b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/assembly/distribution.xml new file mode 100644 index 000000000..ef1578ec9 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/assembly/distribution.xml @@ -0,0 +1,73 @@ + + + + linkis-engineconn-manager + + dir + + false + linkis-engineconn-manager + + + + + + lib + true + true + false + true + true + + + + + + + + ${basedir}/src/main/resources + + * + + 0777 + conf + unix + + + + + + + diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/java/com/webank/wedatasphere/linkis/ecm/server/ECMApplication.java b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/java/com/webank/wedatasphere/linkis/ecm/server/ECMApplication.java new file mode 100644 index 000000000..9e38ce879 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/java/com/webank/wedatasphere/linkis/ecm/server/ECMApplication.java @@ -0,0 +1,122 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server; + +import com.webank.wedatasphere.linkis.DataWorkCloudApplication; +import com.webank.wedatasphere.linkis.common.ServiceInstance; +import com.webank.wedatasphere.linkis.ecm.core.listener.ECMAsyncListenerBus; +import com.webank.wedatasphere.linkis.ecm.core.listener.ECMSyncListenerBus; +import com.webank.wedatasphere.linkis.ecm.server.context.ECMContext; +import com.webank.wedatasphere.linkis.ecm.server.listener.ECMClosedEvent; +import com.webank.wedatasphere.linkis.ecm.server.listener.ECMReadyEvent; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.boot.context.event.ApplicationReadyEvent; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.event.ContextClosedEvent; +import org.springframework.context.event.EventListener; + +import static com.webank.wedatasphere.linkis.ecm.server.conf.ECMConfiguration.ECM_ASYNC_BUS_WAITTOEMPTY_TIME; + + +public class ECMApplication extends DataWorkCloudApplication { + + private static ECMContext ecmContext; + + private volatile static boolean ready; + + private static ServiceInstance ecmServiceInstance; + + private static String[] parmas; + + public static void main(String[] args) throws ReflectiveOperationException { + parmas = args; + DataWorkCloudApplication.main(args); + } + + public static ECMContext getContext() { + return ecmContext; + } + + public static void setContext(ECMContext context) { + ecmContext = context; + } + + public static ServiceInstance getECMServiceInstance() { + return ecmServiceInstance; + } + + public static void setECMServiceInstance(ServiceInstance serviceInstance) { + ecmServiceInstance = serviceInstance; + } + + public static boolean isReady() { + return ready; + } + + public static void setReady(boolean applicationReady) { + ready = applicationReady; + } + + public static String[] getParmas() { + return parmas; + } +} + + +@Configuration +class ECMApplicationListener { + + private final Log logger = LogFactory.getLog(this.getClass()); + + @EventListener + public void onApplicationReady(ApplicationReadyEvent event) { + ServiceInstance serviceInstance = DataWorkCloudApplication.getServiceInstance(); + ECMApplication.setECMServiceInstance(serviceInstance); + ECMContext context = event.getApplicationContext().getBean(ECMContext.class); + ECMApplication.setContext(context); + ECMAsyncListenerBus emAsyncListenerBus = context.getECMAsyncListenerBus(); + ECMSyncListenerBus emSyncListenerBus = context.getECMSyncListenerBus(); + emAsyncListenerBus.start(); + ECMReadyEvent ecmReadyEvent = new ECMReadyEvent(ECMApplication.getParmas()); + emAsyncListenerBus.postToAll(ecmReadyEvent); + emSyncListenerBus.postToAll(ecmReadyEvent); + ECMApplication.setReady(true); + logger.info(String.format("ECM:%s is ready", serviceInstance)); + } + + @EventListener + public void onApplicationClosed(ContextClosedEvent contextClosedEvent) { + ServiceInstance serviceInstance = DataWorkCloudApplication.getServiceInstance(); + ECMApplication.setReady(false); + ECMClosedEvent ecmClosedEvent = new ECMClosedEvent(); + ECMApplication.getContext().getECMSyncListenerBus().postToAll(ecmClosedEvent); + ECMAsyncListenerBus ecmAsyncListenerBus = ECMApplication.getContext().getECMAsyncListenerBus(); + ecmAsyncListenerBus.postToAll(ecmClosedEvent); + logger.info(String.format("wait ECM:%s asyncBus empty", serviceInstance)); + try { + ecmAsyncListenerBus.waitUntilEmpty(ECM_ASYNC_BUS_WAITTOEMPTY_TIME()); + } catch (Throwable e) { + logger.error("wait ECM asyncBus empty failed", e); + } + logger.info("ECM asyncBus is empty"); + ecmAsyncListenerBus.stop(); + logger.info("ECM is closed"); + } + +} + diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/resources/application.yml b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/resources/application.yml new file mode 100644 index 000000000..b644f75f8 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/resources/application.yml @@ -0,0 +1,29 @@ +server: + port: 9102 +spring: + application: + name: linkis-cg-engineconnmanager + + +eureka: + client: + serviceUrl: + defaultZone: http://127.0.0.1:20303/eureka/ + instance: + metadata-map: + test: wedatasphere + +management: + endpoints: + web: + exposure: + include: refresh,info + health: + db: + enabled: false +logging: + config: classpath:log4j2.xml + +ribbon: + ReadTimeout: 60000 + ConnectTimeout: 60000 \ No newline at end of file diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/resources/linkis-server.properties b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/resources/linkis-server.properties new file mode 100644 index 000000000..6c12e6aa2 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/resources/linkis-server.properties @@ -0,0 +1,18 @@ +# +# Copyright 2019 WeBank +# +# Licensed 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. +# +##restful +wds.linkis.server.restful.scan.packages=com.webank.wedatasphere.linkis.em.restful + diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/resources/log4j2.xml b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/resources/log4j2.xml new file mode 100644 index 000000000..0f19fc3c1 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/resources/log4j2.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/conf/ECMConfiguration.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/conf/ECMConfiguration.scala new file mode 100644 index 000000000..3ad3d7379 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/conf/ECMConfiguration.scala @@ -0,0 +1,75 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.conf + +import java.io.File +import java.util.concurrent.TimeUnit + +import com.webank.wedatasphere.linkis.common.conf.{CommonVars, TimeType} +import com.webank.wedatasphere.linkis.common.utils.ByteTimeUtils +import com.webank.wedatasphere.linkis.governance.common.conf.GovernanceCommonConf + +import scala.concurrent.duration.Duration + + +object ECMConfiguration { + + //listenerbus + val ECM_ASYNC_BUS_CAPACITY: Int = CommonVars("wds.linkis.ecm.async.bus.capacity", 500).getValue + val ECM_ASYNC_BUS_NAME: String = CommonVars("wds.linkis.ecm.async.bus.name", "em_async_bus").getValue + val ECM_ASYNC_BUS_CONSUMER_SIZE: Int = CommonVars("wds.linkis.ecm.async.bus.consumer.size", 30).getValue + val ECM_ASYNC_BUS_THREAD_MAX_FREE_TIME: Long = CommonVars("wds.linkis.ecm.async.bus.max.free.time", ByteTimeUtils.timeStringAsMs("2m")).getValue + val ECM_ASYNC_BUS_WAITTOEMPTY_TIME: Long = CommonVars("wds.linkis.ecm.async.bus.waittoempty.time", 5000L).getValue + + //resource + val ECM_MAX_MEMORY_AVAILABLE: Long = CommonVars[Long]("wds.linkis.ecm.memory.max", ByteTimeUtils.byteStringAsBytes("80g")).getValue + val ECM_MAX_CORES_AVAILABLE: Int = CommonVars[Integer]("wds.linkis.ecm.cores.max", 50).getValue + val ECM_MAX_CREATE_INSTANCES: Int = CommonVars[Integer]("wds.linkis.ecm.engineconn.instances.max", 50).getValue + + val ECM_PROTECTED_MEMORY: Long = CommonVars[Long]("wds.linkis.ecm.protected.memory", ByteTimeUtils.byteStringAsBytes("4g")).getValue + val ECM_PROTECTED_CORES: Int = CommonVars[Integer]("wds.linkis.ecm.protected.cores.max", 2).getValue + val ECM_PROTECTED_INSTANCES: Int = CommonVars[Integer]("wds.linkis.ecm.protected.engine.instances", 2).getValue + + val MANAGER_SPRING_NAME: String = GovernanceCommonConf.MANAGER_SPRING_NAME.getValue + + val ENGINE_CONN_MANAGER_SPRING_NAME: String = GovernanceCommonConf.ENGINE_CONN_MANAGER_SPRING_NAME.getValue + + val ECM_HEALTH_REPORT_PERIOD: Long = CommonVars("wds.linkis.ecm.health.report.period", 5).getValue + + val ECM_HEALTH_REPORT_DELAY: Long = CommonVars("wds.linkis.ecm.health.report.delay", 10).getValue + + val ENGINECONN_SPRING_NAME: String = CommonVars("wds.linkis.engineconn.spring.name", "linkis-cg-engineplugin").getValue + + val ECM_HOME_DIR: String = CommonVars("wds.linkis.ecm.home.dir", this.getClass.getResource("/").getPath).getValue + + val ENGINECONN_ROOT_DIR: String = CommonVars("wds.linkis.engineconn.root.dir", s"${ECM_HOME_DIR}engineConnRootDir").getValue + + val ENGINECONN_PUBLIC_DIR: String = CommonVars("wds.linkis.engineconn.public.dir", s"$ENGINECONN_ROOT_DIR${File.separator}engineConnPublickDir").getValue + + val ECM_LAUNCH_MAX_THREAD_SIZE: Int = CommonVars("wds.linkis.ecm.launch.max.thread.size", 100).getValue + + val ECM_EUREKA_DEFAULTZONE: String = CommonVars("wds.linkis.eureka.defaultZone", "http://127.0.0.1:20303/eureka/").getValue + + /** + * engineconn创建时间,如果为0,则使用ms中默认的 + */ + val ENGINECONN_CREATE_DURATION: Duration = Duration(CommonVars("wds.linkis.ecm.engineconn.create.duration", 0).getValue, TimeUnit.MILLISECONDS) + + val WAIT_ENGINECONN_PID = CommonVars("wds.linkis.engineconn.wait.callback.pid", new TimeType("3s")) + + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/context/DefaultECMContext.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/context/DefaultECMContext.scala new file mode 100644 index 000000000..226c0a404 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/context/DefaultECMContext.scala @@ -0,0 +1,41 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.context + +import com.webank.wedatasphere.linkis.ecm.core.listener.{ECMAsyncListenerBus, ECMSyncListenerBus} +import com.webank.wedatasphere.linkis.ecm.core.metrics.ECMMetrics +import com.webank.wedatasphere.linkis.ecm.server.conf.ECMConfiguration._ +import com.webank.wedatasphere.linkis.ecm.server.metrics.DefaultECMMetrics +import org.springframework.stereotype.Component + + +@Component +class DefaultECMContext extends ECMContext { + + private val emSyncListenerBus = new ECMSyncListenerBus + + private val emAsyncListenerBus = new ECMAsyncListenerBus(ECM_ASYNC_BUS_CAPACITY, ECM_ASYNC_BUS_NAME)(ECM_ASYNC_BUS_CONSUMER_SIZE, ECM_ASYNC_BUS_THREAD_MAX_FREE_TIME) + + private val metrics = new DefaultECMMetrics + + + override def getECMAsyncListenerBus: ECMAsyncListenerBus = emAsyncListenerBus + + override def getECMSyncListenerBus: ECMSyncListenerBus = emSyncListenerBus + + override def getECMMetrics: ECMMetrics = metrics +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/context/ECMContext.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/context/ECMContext.scala new file mode 100644 index 000000000..42312ff75 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/context/ECMContext.scala @@ -0,0 +1,31 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.context + +import com.webank.wedatasphere.linkis.ecm.core.listener.{ECMAsyncListenerBus, ECMSyncListenerBus} +import com.webank.wedatasphere.linkis.ecm.core.metrics.ECMMetrics + + +trait ECMContext { + + def getECMAsyncListenerBus: ECMAsyncListenerBus + + def getECMSyncListenerBus: ECMSyncListenerBus + + def getECMMetrics:ECMMetrics + +} \ No newline at end of file diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/converter/ECMEngineConverter.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/converter/ECMEngineConverter.scala new file mode 100644 index 000000000..ebdec3aff --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/converter/ECMEngineConverter.scala @@ -0,0 +1,33 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.converter + +import com.webank.wedatasphere.linkis.ecm.core.engineconn.{EngineConn, YarnEngineConn} +import com.webank.wedatasphere.linkis.ecm.server.engineConn.DefaultYarnEngineConn +import org.springframework.beans.BeanUtils + + +object ECMEngineConverter { + + def engineConn2YarnEngineConn(engineConn: EngineConn)(implicit updateFunction: YarnEngineConn => Unit): YarnEngineConn = { + val conn = new DefaultYarnEngineConn + BeanUtils.copyProperties(engineConn, conn) + updateFunction(conn) + conn + } + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/engineConn/DefaultEngineConn.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/engineConn/DefaultEngineConn.scala new file mode 100644 index 000000000..620eed4b8 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/engineConn/DefaultEngineConn.scala @@ -0,0 +1,99 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.engineConn + +import java.util + +import com.webank.wedatasphere.linkis.common.ServiceInstance +import com.webank.wedatasphere.linkis.ecm.core.engineconn.{EngineConn, EngineConnInfo} +import com.webank.wedatasphere.linkis.ecm.core.launch.{EngineConnLaunchRunner, EngineConnManagerEnv} +import com.webank.wedatasphere.linkis.manager.common.entity.enumeration.NodeStatus +import com.webank.wedatasphere.linkis.manager.common.entity.resource.NodeResource +import com.webank.wedatasphere.linkis.manager.engineplugin.common.launch.entity.EngineConnCreationDesc +import com.webank.wedatasphere.linkis.manager.label.entity.Label + + +class DefaultEngineConn extends EngineConn { + + /** + * starting :初始状态 + * success:成功启动并且安全退出 + * Failed:启动失败 + * Running:容器运行中 + */ + @volatile private var status: NodeStatus = _ + + private var tickedId: String = _ + + private var resource: NodeResource = _ + + private var labels: util.List[Label[_]] = _ + + private var engineConnCreationDesc: EngineConnCreationDesc = _ + + private var engineConnInfo: EngineConnInfo = _ + + private var ecmEnv: EngineConnManagerEnv = _ + + private var engineConnLaunchRunner: EngineConnLaunchRunner = _ + + private var instance: ServiceInstance = _ + + private var pid: String = _ + + override def getResource: NodeResource = resource + + override def setResource(resource: NodeResource): Unit = this.resource = resource + + override def getLabels: util.List[Label[_]] = labels + + override def setLabels(labels: util.List[Label[_]]): Unit = this.labels = labels + + override def getStatus: NodeStatus = status + + override def getCreationDesc: EngineConnCreationDesc = engineConnCreationDesc + + override def getEngineConnInfo: EngineConnInfo = engineConnInfo + + override def getEngineConnLaunchRunner: EngineConnLaunchRunner = engineConnLaunchRunner + + override def setEngineConnLaunchRunner(runner: EngineConnLaunchRunner): Unit = this.engineConnLaunchRunner = runner + + override def setEngineConnInfo(engineConnInfo: EngineConnInfo): Unit = this.engineConnInfo = engineConnInfo + + override def getTickedId: String = tickedId + + override def setTickedId(tickedId: String): Unit = this.tickedId = tickedId + + override def setStatus(status: NodeStatus): Unit = this.status = status + + override def setCreationDesc(engineConnCreationDesc: EngineConnCreationDesc): Unit = this.engineConnCreationDesc = engineConnCreationDesc + + override def getServiceInstance: ServiceInstance = instance + + override def setServiceInstance(instance: ServiceInstance): Unit = this.instance = instance + + override def getPid: String = pid + + override def setPid(pid: String): Unit = this.pid = pid + + override def getEngineConnManagerEnv: EngineConnManagerEnv = ecmEnv + + override def setEngineConnManagerEnv(env: EngineConnManagerEnv): Unit = this.ecmEnv = env + + override def toString = s"DefaultEngineConn($status, $tickedId, $resource, $labels, $engineConnCreationDesc, $engineConnInfo, $ecmEnv, $engineConnLaunchRunner, $instance, $pid)" +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/engineConn/DefaultYarnEngineConn.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/engineConn/DefaultYarnEngineConn.scala new file mode 100644 index 000000000..001361d4e --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/engineConn/DefaultYarnEngineConn.scala @@ -0,0 +1,42 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.engineConn + +import com.webank.wedatasphere.linkis.ecm.core.engineconn.YarnEngineConn + + +class DefaultYarnEngineConn extends DefaultEngineConn with YarnEngineConn { + + var applicationId: String = _ + + var applicationURL: String = _ + + var yarnMode: String = _ + + override def getApplicationId: String = applicationId + + override def setApplicationId(applicationId: String): Unit = this.applicationId = applicationId + + override def getApplicationURL: String = applicationURL + + override def setApplicationURL(applicationURL: String): Unit = this.applicationURL = applicationURL + + override def getYarnMode: String = yarnMode + + override def setYarnMode(yarnMode: String): Unit = this.yarnMode = yarnMode + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/exception/ECMErrorException.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/exception/ECMErrorException.scala new file mode 100644 index 000000000..03f6b9a4e --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/exception/ECMErrorException.scala @@ -0,0 +1,32 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.exception + +import com.webank.wedatasphere.linkis.common.exception.{ErrorException, WarnException} + + +class ECMErrorException(errorCode: Int, desc: String) extends ErrorException(errorCode, desc) { + def this(errorCode: Int, desc: String, t: Throwable) { + this(errorCode, desc) + this.initCause(t) + } +} + +class ECMWarnException(errCode: Int, desc: String) extends WarnException(errCode, desc) + + + diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/listener/ECMReadyEvent.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/listener/ECMReadyEvent.scala new file mode 100644 index 000000000..ba6fa5c62 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/listener/ECMReadyEvent.scala @@ -0,0 +1,42 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.listener + +import com.webank.wedatasphere.linkis.ecm.core.engineconn.EngineConn +import com.webank.wedatasphere.linkis.ecm.core.listener.ECMEvent +import com.webank.wedatasphere.linkis.governance.common.protocol.task.ResponseEngineConnPid +import com.webank.wedatasphere.linkis.manager.common.entity.enumeration.NodeStatus +import com.webank.wedatasphere.linkis.protocol.callback.{YarnAPPIdCallbackProtocol, YarnInfoCallbackProtocol} + + +case class ECMReadyEvent(params: Array[String]) extends ECMEvent + +case class ECMClosedEvent() extends ECMEvent + +case class EngineConnStatusChageEvent(from: NodeStatus, to: NodeStatus) extends ECMEvent + +case class YarnAppIdCallbackEvent(protocol: YarnAPPIdCallbackProtocol) extends ECMEvent + +case class YarnInfoCallbackEvent(protocol: YarnInfoCallbackProtocol) extends ECMEvent + +case class EngineConnPidCallbackEvent(protocol: ResponseEngineConnPid) extends ECMEvent + +case class EngineConnAddEvent(conn: EngineConn) extends ECMEvent + +case class EngineConnStatusChangeEvent(tickedId: String, updateStatus: NodeStatus) extends ECMEvent + + diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/metrics/DefaultECMMetrics.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/metrics/DefaultECMMetrics.scala new file mode 100644 index 000000000..5b24a7d8b --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/metrics/DefaultECMMetrics.scala @@ -0,0 +1,106 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.metrics + + +import java.util.concurrent.ConcurrentHashMap +import java.util.concurrent.atomic.AtomicInteger + +import com.webank.wedatasphere.linkis.ecm.core.engineconn.EngineConn +import com.webank.wedatasphere.linkis.ecm.core.metrics.ECMMetrics +import com.webank.wedatasphere.linkis.manager.common.entity.enumeration.NodeStatus +import com.webank.wedatasphere.linkis.manager.common.entity.enumeration.NodeStatus._ + +import scala.collection.JavaConversions._ + + +class DefaultECMMetrics extends ECMMetrics { + + + private val startingEngineConnCount = new AtomicInteger(0) + + private val runningEngineConnCount = new AtomicInteger(0) + + private val successEngineConnCount = new AtomicInteger(0) + + private val failedEngineConnCount = new AtomicInteger(0) + + private val startingEngineConnMap = new ConcurrentHashMap[String, EngineConn](64) + + private val runningEngineConnMap = new ConcurrentHashMap[String, EngineConn](64) + + private val successEngineConnMap = new ConcurrentHashMap[String, EngineConn](64) + + private val failedEngineConnMap = new ConcurrentHashMap[String, EngineConn](64) + + override def getStartingEngineConns: Array[EngineConn] = getEngineConns(startingEngineConnMap) + + override def getRunningEngineConns: Array[EngineConn] = getEngineConns(runningEngineConnMap) + + override def getSucceedEngineConns: Array[EngineConn] = getEngineConns(successEngineConnMap) + + override def getFailedEngineConns: Array[EngineConn] = getEngineConns(failedEngineConnMap) + + private val getEngineConns = (map: ConcurrentHashMap[String, EngineConn]) => map.values().toSeq.toArray + + private val decreaseEngineConnMetric = (engineConn: EngineConn, map: ConcurrentHashMap[String, EngineConn], count: AtomicInteger) => { + val conn = map.remove(engineConn.getTickedId) + if (conn != null) { + count.decrementAndGet() + } + } + + private val increaseEngineConnMetric = (engineConn: EngineConn, map: ConcurrentHashMap[String, EngineConn], count: AtomicInteger, status: NodeStatus) => { + if (engineConn.getStatus.equals(status)) { + count.incrementAndGet() + map.put(engineConn.getTickedId, engineConn) + } + } + + override def increaseStartingEngineConn(engineConn: EngineConn): Unit = { + increaseEngineConnMetric(engineConn, startingEngineConnMap, startingEngineConnCount, Starting) + } + + def decreseStartingEngineConn(engineConn: EngineConn): Unit = { + decreaseEngineConnMetric(engineConn, startingEngineConnMap, startingEngineConnCount) + } + + override def increaseRunningEngineConn(engineConn: EngineConn): Unit = { + increaseEngineConnMetric(engineConn, runningEngineConnMap, runningEngineConnCount, Running) + } + + def decreseRunningEngineConn(engineConn: EngineConn): Unit = { + decreaseEngineConnMetric(engineConn, runningEngineConnMap, runningEngineConnCount) + } + + override def increaseSuccessEngineConn(engineConn: EngineConn): Unit = { + increaseEngineConnMetric(engineConn, successEngineConnMap, successEngineConnCount, Success) + } + + def decreaseSuccessEngineConn(engineConn: EngineConn): Unit = { + decreaseEngineConnMetric(engineConn, successEngineConnMap, successEngineConnCount) + } + + override def increaseFailedEngineConn(engineConn: EngineConn): Unit = { + increaseEngineConnMetric(engineConn, failedEngineConnMap, failedEngineConnCount, Failed) + } + + def decreaseFailedEngineConn(engineConn: EngineConn): Unit = { + decreaseEngineConnMetric(engineConn, failedEngineConnMap, failedEngineConnCount) + } + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/report/DefaultECMHealthReport.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/report/DefaultECMHealthReport.scala new file mode 100644 index 000000000..de3e6e75d --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/report/DefaultECMHealthReport.scala @@ -0,0 +1,81 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.report + +import com.webank.wedatasphere.linkis.ecm.core.engineconn.EngineConn +import com.webank.wedatasphere.linkis.ecm.core.report.ECMHealthReport +import com.webank.wedatasphere.linkis.manager.common.entity.enumeration.NodeStatus +import com.webank.wedatasphere.linkis.manager.common.entity.metrics.NodeOverLoadInfo +import com.webank.wedatasphere.linkis.manager.common.entity.resource.Resource + + +class DefaultECMHealthReport extends ECMHealthReport { + + private var protectedResource: Resource = _ + + private var totalResource: Resource = _ + + private var usedResource: Resource = _ + + private var overload: NodeOverLoadInfo = _ + + private var runningEngineConns: Array[EngineConn] = _ + + private var reportTime: Long = _ + + private var nodeStatus: NodeStatus = _ + + private var nodeMsg: String = _ + + private var nodeId: String = _ + + override def setProtectedResource(protectedResource: Resource): Unit = this.protectedResource = protectedResource + + override def getProtectResource: Resource = protectedResource + + override def setOverload(overload: NodeOverLoadInfo): Unit = this.overload = overload + + override def getOverload: NodeOverLoadInfo = overload + + override def setRunningEngineConns(runningEngines: Array[EngineConn]): Unit = this.runningEngineConns = runningEngineConns + + override def getRunningEngineConns: Array[EngineConn] = runningEngineConns + + override def getReportTime: Long = reportTime + + override def setReportTime(reportTime: Long): Unit = this.reportTime = reportTime + + override def getNodeStatus: NodeStatus = nodeStatus + + override def setNodeStatus(nodeStatus: NodeStatus): Unit = this.nodeStatus = nodeStatus + + override def setNodeMsg(nodeMsg: String): Unit = this.nodeMsg = nodeMsg + + override def getNodeMsg: String = nodeMsg + + override def getUsedResource: Resource = usedResource + + override def setUsedResource(usedResource: Resource): Unit = this.usedResource = usedResource + + override def getTotalResource: Resource = totalResource + + override def setTotalResource(totalResource: Resource): Unit = this.totalResource = totalResource + + override def setNodeId(nodeId: String): Unit = this.nodeId = nodeId + + override def getNodeId: String = nodeId +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/ECMHealthService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/ECMHealthService.scala new file mode 100644 index 000000000..2df4e9d45 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/ECMHealthService.scala @@ -0,0 +1,33 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service + +import com.webank.wedatasphere.linkis.ecm.core.report.ECMHealthReport +import com.webank.wedatasphere.linkis.manager.common.protocol.node.{NodeHeartbeatMsg, NodeHeartbeatRequest} + + +trait ECMHealthService{ + + def getLastEMHealthReport: ECMHealthReport + + def reportHealth(report: ECMHealthReport): Unit + + def generateHealthReport(reportTime:Long): ECMHealthReport + + def dealNodeHeartbeatRequest(nodeHeartbeatRequest: NodeHeartbeatRequest): NodeHeartbeatMsg + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/ECMMetricsService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/ECMMetricsService.scala new file mode 100644 index 000000000..408bf25c6 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/ECMMetricsService.scala @@ -0,0 +1,22 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service + + +trait ECMMetricsService { + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/ECMRegisterService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/ECMRegisterService.scala new file mode 100644 index 000000000..2ade991a7 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/ECMRegisterService.scala @@ -0,0 +1,27 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service + +import com.webank.wedatasphere.linkis.manager.common.protocol.em.{RegisterEMRequest, StopEMRequest} + + +trait ECMRegisterService { + + def registerECM(event: RegisterEMRequest): Unit + + def unRegisterECM(event: StopEMRequest): Unit +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/EngineConnKillService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/EngineConnKillService.scala new file mode 100644 index 000000000..de7c5b852 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/EngineConnKillService.scala @@ -0,0 +1,26 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service + +import com.webank.wedatasphere.linkis.manager.common.protocol.engine.{EngineStopRequest, EngineStopResponse} + + +trait EngineConnKillService { + + def dealEngineConnStop(engineStopRequest: EngineStopRequest): EngineStopResponse + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/EngineConnLaunchService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/EngineConnLaunchService.scala new file mode 100644 index 000000000..c98801d37 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/EngineConnLaunchService.scala @@ -0,0 +1,34 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service + +import com.webank.wedatasphere.linkis.manager.common.entity.node.EngineNode +import com.webank.wedatasphere.linkis.manager.engineplugin.common.launch.entity.{EngineConnBuildRequest, EngineConnLaunchRequest} + + + +trait EngineConnLaunchService { + /** + * launchEngine启动一个引擎的方法 + * + * @param engineConnBuildRequest 封装了引擎启动的参数 + */ + def launchEngineConn(engineConnBuildRequest: EngineConnBuildRequest): EngineNode + + def launchEngineConn(engineConnLaunchRequest: EngineConnLaunchRequest, duration: Long): EngineNode + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/EngineConnListService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/EngineConnListService.scala new file mode 100644 index 000000000..bfb7ef894 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/EngineConnListService.scala @@ -0,0 +1,48 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service + +import java.util + +import com.webank.wedatasphere.linkis.ecm.core.engineconn.EngineConn +import com.webank.wedatasphere.linkis.ecm.core.launch.EngineConnLaunchRunner +import com.webank.wedatasphere.linkis.manager.common.entity.resource.Resource + + +/** + * The enginelistservice interface manages the interface started by the engine + * The most important submit method is to put the thread that starts the engine into the thread pool to start + * EngineListService接口管理引擎启动的接口 + * 最重要的submit方法是将启动引擎的线程放入到线程池中进行启动 + */ +trait EngineConnListService { + + def init(): Unit + + def getEngineConn(engineConnId: String): Option[EngineConn] + + def getEngineConns: util.List[EngineConn] + + def addEngineConn(engineConn: EngineConn): Unit + + def killEngineConn(engineConnId: String): Unit + + def getUsedResources: Resource + + def submit(runner: EngineConnLaunchRunner): Option[EngineConn] + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/EngineConnPidCallbackService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/EngineConnPidCallbackService.scala new file mode 100644 index 000000000..4d751de00 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/EngineConnPidCallbackService.scala @@ -0,0 +1,27 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service + +import com.webank.wedatasphere.linkis.governance.common.protocol.task.ResponseEngineConnPid + + +trait EngineConnPidCallbackService { + + + def dealPid(protocol: ResponseEngineConnPid): Unit + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/EngineConnStatusCallbackService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/EngineConnStatusCallbackService.scala new file mode 100644 index 000000000..8e234ded2 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/EngineConnStatusCallbackService.scala @@ -0,0 +1,26 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service + +import com.webank.wedatasphere.linkis.manager.common.protocol.engine.EngineConnStatusCallback + + +trait EngineConnStatusCallbackService { + + def dealEngineConnStatusCallback(protocol: EngineConnStatusCallback): Unit + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/LocalDirsHandleService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/LocalDirsHandleService.scala new file mode 100644 index 000000000..6ff1b3509 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/LocalDirsHandleService.scala @@ -0,0 +1,34 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service + + +trait LocalDirsHandleService { + + def getEngineConnManagerHomeDir: String + + def getEngineConnWorkDir(user: String, ticketId: String): String + + def getEngineConnPublicDir: String + + def getEngineConnLogDir(user: String, ticketId: String): String + + def getEngineConnTmpDir(user: String, ticketId: String): String + + def cleanup(): Unit + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/LogCallbackService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/LogCallbackService.scala new file mode 100644 index 000000000..74f829d20 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/LogCallbackService.scala @@ -0,0 +1,27 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service + +import com.webank.wedatasphere.linkis.protocol.callback.LogCallbackProtocol + + + +trait LogCallbackService { + + def dealLog(protocol: LogCallbackProtocol): Unit + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/ResourceLocalizationService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/ResourceLocalizationService.scala new file mode 100644 index 000000000..0a74ea8dc --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/ResourceLocalizationService.scala @@ -0,0 +1,27 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service + +import com.webank.wedatasphere.linkis.ecm.core.engineconn.EngineConn +import com.webank.wedatasphere.linkis.manager.engineplugin.common.launch.entity.EngineConnLaunchRequest + + +trait ResourceLocalizationService { + + def handleInitEngineConnResources(request: EngineConnLaunchRequest, engineConn: EngineConn): Unit + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/YarnCallbackService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/YarnCallbackService.scala new file mode 100644 index 000000000..4ed8ecf75 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/YarnCallbackService.scala @@ -0,0 +1,28 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service + +import com.webank.wedatasphere.linkis.protocol.callback.{YarnAPPIdCallbackProtocol, YarnInfoCallbackProtocol} + + +trait YarnCallbackService { + + def dealApplicationId(protocol: YarnAPPIdCallbackProtocol): Unit + + def dealApplicationURI(protocol: YarnInfoCallbackProtocol): Unit + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/AbstractEngineConnLaunchService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/AbstractEngineConnLaunchService.scala new file mode 100644 index 000000000..7a0e7d433 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/AbstractEngineConnLaunchService.scala @@ -0,0 +1,134 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service.impl + +import java.util.concurrent.TimeUnit + +import com.webank.wedatasphere.linkis.common.ServiceInstance +import com.webank.wedatasphere.linkis.common.utils.{Logging, Utils} +import com.webank.wedatasphere.linkis.ecm.core.engineconn.{EngineConn, EngineConnInfo} +import com.webank.wedatasphere.linkis.ecm.core.launch._ +import com.webank.wedatasphere.linkis.ecm.server.ECMApplication +import com.webank.wedatasphere.linkis.ecm.server.conf.ECMConfiguration._ +import com.webank.wedatasphere.linkis.ecm.server.engineConn.DefaultEngineConn +import com.webank.wedatasphere.linkis.ecm.server.listener.{EngineConnAddEvent, EngineConnStatusChangeEvent} +import com.webank.wedatasphere.linkis.ecm.server.service.{EngineConnLaunchService, ResourceLocalizationService} +import com.webank.wedatasphere.linkis.ecm.server.util.ECMUtils +import com.webank.wedatasphere.linkis.governance.common.conf.GovernanceCommonConf +import com.webank.wedatasphere.linkis.manager.common.entity.enumeration.NodeStatus +import com.webank.wedatasphere.linkis.manager.common.entity.enumeration.NodeStatus.Failed +import com.webank.wedatasphere.linkis.manager.common.entity.node.{AMEngineNode, EngineNode} +import com.webank.wedatasphere.linkis.manager.common.protocol.engine.EngineConnStatusCallbackToAM +import com.webank.wedatasphere.linkis.manager.engineplugin.common.launch.entity.EngineConnLaunchRequest +import com.webank.wedatasphere.linkis.rpc.Sender +import org.apache.commons.lang.exception.ExceptionUtils + +import scala.concurrent.duration.Duration +import scala.concurrent.{Await, ExecutionContextExecutorService, Future} +import scala.util.{Failure, Success} + + +abstract class AbstractEngineConnLaunchService extends EngineConnLaunchService with Logging { + + + protected implicit val executor: ExecutionContextExecutorService = Utils.newCachedExecutionContext(ECM_LAUNCH_MAX_THREAD_SIZE, "EngineConn-Manager-Thread-") + + protected var resourceLocalizationService: ResourceLocalizationService = _ + + def setResourceLocalizationService(service: ResourceLocalizationService): Unit = this.resourceLocalizationService = service + + + def beforeLaunch(conn: EngineConn, duration: Long): Unit = {} + + def afterLaunch(conn: EngineConn, duration: Long): Unit = {} + + override def launchEngineConn(request: EngineConnLaunchRequest, duration: Long): EngineNode = { + //1.创建engineConn和runner,launch 并设置基础属性 + val conn = createEngineConn + val runner = createEngineConnLaunchRunner + val launch = createEngineConnLaunch + launch.setEngineConnLaunchRequest(request) + runner.setEngineConnLaunch(launch) + conn.setEngineConnLaunchRunner(runner) + conn.setLabels(request.labels) + conn.setCreationDesc(request.creationDesc) + conn.setResource(request.nodeResource) + conn.setTickedId(request.ticketId) + conn.setStatus(NodeStatus.Starting) + conn.setEngineConnInfo(new EngineConnInfo) + //2.资源本地化,并且设置ecm的env环境信息 + getResourceLocalizationServie.handleInitEngineConnResources(request, conn) + //3.添加到list + ECMApplication.getContext.getECMSyncListenerBus.postToAll(EngineConnAddEvent(conn)) + //4.run + try { + beforeLaunch(conn, duration) + runner.run() + launch match { + case pro: ProcessEngineConnLaunch => + val serviceInstance = ServiceInstance(GovernanceCommonConf.ENGINE_CONN_SPRING_NAME.getValue, ECMUtils.getInstanceByPort(pro.getEngineConnPort)) + conn.setServiceInstance(serviceInstance) + case _ => + } + + val future = Future { + afterLaunch(conn, duration) + } + + future onComplete { + case Failure(t) => + throw t + case Success(_) => + info(s"init ${conn.getServiceInstance} succeed.") + } + //超时忽略,如果状态翻转了则直接返回 + Utils.tryQuietly(Await.result(future, Duration(WAIT_ENGINECONN_PID.getValue.toLong, TimeUnit.MILLISECONDS))) + } catch { + //failed,1.被ms打断,2.超时,3.普通错误,比如process + case t: Throwable => + error(s"init ${conn.getServiceInstance} failed, now stop and delete it. message: ${t.getMessage}") + conn.getEngineConnLaunchRunner.stop() + Sender.getSender(MANAGER_SPRING_NAME).send(EngineConnStatusCallbackToAM(conn.getServiceInstance, + NodeStatus.ShuttingDown, " wait init failed , reason " + ExceptionUtils.getRootCauseMessage(t))) + ECMApplication.getContext.getECMSyncListenerBus.postToAll(EngineConnStatusChangeEvent(conn.getTickedId, Failed)) + throw t + } + val engineNode = new AMEngineNode() + engineNode.setLabels(conn.getLabels) + + engineNode.setServiceInstance(conn.getServiceInstance) + engineNode.setOwner(request.user) + engineNode.setMark("process") + engineNode + } + + def createEngineConn: EngineConn = new DefaultEngineConn + + + def createEngineConnLaunchRunner: EngineConnLaunchRunner = new EngineConnLaunchRunnerImpl + + + def createEngineConnLaunch: EngineConnLaunch + + + def getResourceLocalizationServie: ResourceLocalizationService = { + // TODO: null 抛出异常 + this.resourceLocalizationService + } + +} + diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/BmlResourceLocalizationService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/BmlResourceLocalizationService.scala new file mode 100644 index 000000000..d8c292c02 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/BmlResourceLocalizationService.scala @@ -0,0 +1,131 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service.impl + +import java.io.File +import java.nio.file.Paths + +import com.webank.wedatasphere.linkis.DataWorkCloudApplication +import com.webank.wedatasphere.linkis.common.io.FsPath +import com.webank.wedatasphere.linkis.common.utils.{Utils, ZipUtils} +import com.webank.wedatasphere.linkis.ecm.core.engineconn.EngineConn +import com.webank.wedatasphere.linkis.ecm.core.launch.EngineConnManagerEnv +import com.webank.wedatasphere.linkis.ecm.server.conf.ECMConfiguration._ +import com.webank.wedatasphere.linkis.ecm.server.service.{LocalDirsHandleService, ResourceLocalizationService} +import com.webank.wedatasphere.linkis.ecm.server.util.ECMUtils +import com.webank.wedatasphere.linkis.manager.common.protocol.bml.BmlResource +import com.webank.wedatasphere.linkis.manager.engineplugin.common.launch.entity.EngineConnLaunchRequest +import com.webank.wedatasphere.linkis.manager.engineplugin.common.launch.process.ProcessEngineConnLaunchRequest +import com.webank.wedatasphere.linkis.storage.FSFactory +import com.webank.wedatasphere.linkis.storage.fs.FileSystem +import com.webank.wedatasphere.linkis.storage.utils.{FileSystemUtils, StorageUtils} + +import scala.collection.JavaConversions._ +import scala.collection.mutable + + +class BmlResourceLocalizationService extends ResourceLocalizationService { + + private implicit val fs: FileSystem = FSFactory.getFs(StorageUtils.FILE).asInstanceOf[FileSystem] + + fs.init(null) + + private val seperator = File.separator + + private val schema = StorageUtils.FILE_SCHEMA + + private var localDirsHandleService: LocalDirsHandleService = _ + + def setLocalDirsHandleService(localDirsHandleService: LocalDirsHandleService): Unit = this.localDirsHandleService = localDirsHandleService + + override def handleInitEngineConnResources(request: EngineConnLaunchRequest, engineConn: EngineConn): Unit = { + // TODO: engineType判断是否下载到本地 unzip + //engine_type resourceId version判断是否更新,或者重新下载,将path给到properties + request match { + case request: ProcessEngineConnLaunchRequest => + val files = request.bmlResources + val linkDirsP = new mutable.HashMap[String, String] + val user = request.user + val ticketId = request.ticketId + val workDir = createDirIfNotExit(localDirsHandleService.getEngineConnWorkDir(user, ticketId)) + val emHomeDir = createDirIfNotExit(localDirsHandleService.getEngineConnManagerHomeDir) + val logDirs = createDirIfNotExit(localDirsHandleService.getEngineConnLogDir(user, ticketId)) + val tmpDirs = createDirIfNotExit(localDirsHandleService.getEngineConnTmpDir(user, ticketId)) + files.foreach(downloadBmlResource(request, linkDirsP, _, workDir)) + engineConn.getEngineConnLaunchRunner.getEngineConnLaunch.setEngineConnManagerEnv(new EngineConnManagerEnv { + override val engineConnManagerHomeDir: String = emHomeDir + override val engineConnWorkDir: String = workDir + override val engineConnLogDirs: String = logDirs + override val engineConnTempDirs: String = tmpDirs + override val engineConnManagerHost: String = Utils.getComputerName + override val engineConnManagerPort: String = DataWorkCloudApplication.getApplicationContext.getEnvironment.getProperty("server.port") + override val linkDirs: Map[String, String] = linkDirsP.toMap + // TODO: 注册发现信息的配置化 + override val properties: Map[String, String] = Map("eureka.client.serviceUrl.defaultZone" -> ECM_EUREKA_DEFAULTZONE) + }) + case _ => + } + } + + + private val bmlResourceSuffix = ".zip" + + private def createDirIfNotExit(noSchemaPath: String): String = { + val fsPath = new FsPath(schema + noSchemaPath) + if (!fs.exists(fsPath)) { + FileSystemUtils.mkdirs(fs, fsPath, Utils.getJvmUser) + fs.setPermission(fsPath, "rwxrwx---") + } + noSchemaPath + } + + def downloadBmlResource(request: ProcessEngineConnLaunchRequest, linkDirs: mutable.HashMap[String, String], resource: BmlResource, workDir: String): Unit = { + val resourceId = resource.getResourceId + val version = resource.getVersion + val user = request.user + resource.getVisibility match { + case BmlResource.BmlResourceVisibility.Public => + val publicDir = localDirsHandleService.getEngineConnPublicDir + val bmlResourceDir = schema + Paths.get(publicDir, resourceId, version).toFile.getPath + val fsPath = new FsPath(bmlResourceDir) + if (!fs.exists(fsPath)) { + ECMUtils.downLoadBmlResourceToLocal(resource, user, fsPath.getPath) + val unzipDir = fsPath.getSchemaPath + File.separator + resource.getFileName.substring(0, resource.getFileName.lastIndexOf(".")) + FileSystemUtils.mkdirs(fs, new FsPath(unzipDir), Utils.getJvmUser) + ZipUtils.unzip(bmlResourceDir + File.separator + resource.getFileName, unzipDir) + fs.delete(new FsPath(bmlResourceDir + File.separator + resource.getFileName)) + } + //2.软连,并且添加到map + val dirAndFileList = fs.listPathWithError(fsPath) + dirAndFileList.getFsPaths.foreach { + case path: FsPath => + val name = new File(path.getPath).getName + linkDirs.put(path.getPath, workDir + seperator + name) + } + case BmlResource.BmlResourceVisibility.Private => + val fsPath = new FsPath(schema + workDir) + if (!fs.exists(fsPath)) { + FileSystemUtils.mkdirs(fs, fsPath, Utils.getJvmUser) + ECMUtils.downLoadBmlResourceToLocal(resource, user, fsPath.getPath) + ZipUtils.unzip(schema + workDir + File.separator + resource.getFileName, fsPath.getSchemaPath) + fs.delete(new FsPath(schema + workDir + File.separator + resource.getFileName)) + } + case BmlResource.BmlResourceVisibility.Label => + } + } + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultECMHealthService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultECMHealthService.scala new file mode 100644 index 000000000..feb5cb107 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultECMHealthService.scala @@ -0,0 +1,137 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service.impl + +import java.util.Date +import java.util.concurrent.TimeUnit + +import com.webank.wedatasphere.linkis.common.utils.Utils +import com.webank.wedatasphere.linkis.ecm.core.listener.{ECMEvent, ECMEventListener} +import com.webank.wedatasphere.linkis.ecm.core.report.ECMHealthReport +import com.webank.wedatasphere.linkis.ecm.server.ECMApplication +import com.webank.wedatasphere.linkis.ecm.server.conf.ECMConfiguration._ +import com.webank.wedatasphere.linkis.ecm.server.listener.{ECMClosedEvent, ECMReadyEvent} +import com.webank.wedatasphere.linkis.ecm.server.report.DefaultECMHealthReport +import com.webank.wedatasphere.linkis.ecm.server.service.{ECMHealthService, EngineConnListService} +import com.webank.wedatasphere.linkis.manager.common.entity.enumeration.{NodeHealthy, NodeStatus} +import com.webank.wedatasphere.linkis.manager.common.entity.metrics.{NodeHealthyInfo, NodeOverLoadInfo} +import com.webank.wedatasphere.linkis.manager.common.entity.resource.{CommonNodeResource, LoadInstanceResource} +import com.webank.wedatasphere.linkis.manager.common.protocol.node.{NodeHeartbeatMsg, NodeHeartbeatRequest} +import com.webank.wedatasphere.linkis.message.annotation.Receiver +import com.webank.wedatasphere.linkis.rpc.Sender +import org.springframework.beans.factory.annotation.Autowired + + +class DefaultECMHealthService extends ECMHealthService with ECMEventListener { + + val maxResource = new LoadInstanceResource(ECM_MAX_MEMORY_AVAILABLE, ECM_MAX_CORES_AVAILABLE, ECM_MAX_CREATE_INSTANCES) + val minResource = new LoadInstanceResource(ECM_PROTECTED_MEMORY, ECM_PROTECTED_CORES, ECM_PROTECTED_INSTANCES) + private val runtime: Runtime = Runtime.getRuntime + + private val future = Utils.defaultScheduler.scheduleAtFixedRate(new Runnable { + override def run(): Unit = { + if (ECMApplication.isReady) { + reportHealth(getLastEMHealthReport) + } + } + }, ECM_HEALTH_REPORT_DELAY, ECM_HEALTH_REPORT_PERIOD, TimeUnit.SECONDS) + + @Autowired + private var engineConnListService: EngineConnListService = _ + + override def getLastEMHealthReport: ECMHealthReport = { + val report = new DefaultECMHealthReport + report.setNodeId(ECMApplication.getECMServiceInstance.toString) + report.setNodeStatus(NodeStatus.Running) + report.setTotalResource(maxResource) + report.setProtectedResource(minResource) + report.setUsedResource(engineConnListService.getUsedResources) + report.setReportTime(new Date().getTime) + report.setRunningEngineConns(ECMApplication.getContext.getECMMetrics.getRunningEngineConns) + val info = new NodeOverLoadInfo + info.setMaxMemory(runtime.maxMemory()) + info.setUsedMemory(runtime.totalMemory() - runtime.freeMemory()) + // TODO: 根据系统获取当前操作系统负载 + report.setOverload(info) + report + } + + // TODO: 可能还需要个判断health状态的方法 + + override def reportHealth(report: ECMHealthReport): Unit = { + val heartbeat: NodeHeartbeatMsg = transferECMHealthReportToNodeHeartbeatMsg(report) + Sender.getSender(MANAGER_SPRING_NAME).send(heartbeat) + } + + private def transferECMHealthReportToNodeHeartbeatMsg(report: ECMHealthReport) = { + val heartbeat = new NodeHeartbeatMsg + heartbeat.setOverLoadInfo(report.getOverload) + heartbeat.setStatus(report.getNodeStatus) + heartbeat.setServiceInstance(ECMApplication.getECMServiceInstance) + val resource = new CommonNodeResource + resource.setMaxResource(maxResource) + resource.setMinResource(minResource) + resource.setUsedResource(resource.getUsedResource) + heartbeat.setNodeResource(resource) + heartbeat.setHeartBeatMsg("") + val nodeHealthyInfo = new NodeHealthyInfo + nodeHealthyInfo.setMsg("") + nodeHealthyInfo.setNodeHealthy(NodeHealthy.Healthy) + heartbeat.setHealthyInfo(nodeHealthyInfo) + heartbeat + } + + override def generateHealthReport(reportTime: Long): ECMHealthReport = { + // TODO: 历史查询 + null + } + + private def emShutdownHealthReport(event: ECMClosedEvent): Unit = { + val report = getLastEMHealthReport + report.setNodeStatus(NodeStatus.ShuttingDown) + reportHealth(report) + } + + private def emReadyHealthReport(event: ECMReadyEvent): Unit = reportHealth(getLastEMHealthReport) + + + override def onEvent(event: ECMEvent): Unit = event match { + case event: ECMReadyEvent => + emReadyHealthReport(event) + case event: ECMClosedEvent => + cancelHealthReportThread(event) + emShutdownHealthReport(event) + presistenceLeftReports(event) + case _ => + } + + private def cancelHealthReportThread(event: ECMClosedEvent): Unit = { + + } + + private def presistenceLeftReports(event: ECMClosedEvent): Unit = { + // TODO: 持久化 剩余的reports + } + + @Receiver + override def dealNodeHeartbeatRequest(nodeHeartbeatRequest: NodeHeartbeatRequest): NodeHeartbeatMsg = { + val hearlthReport = getLastEMHealthReport + transferECMHealthReportToNodeHeartbeatMsg(hearlthReport) + } + + + } diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultECMMetricsService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultECMMetricsService.scala new file mode 100644 index 000000000..9185b6305 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultECMMetricsService.scala @@ -0,0 +1,25 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service.impl + +import com.webank.wedatasphere.linkis.ecm.core.listener.{ECMEvent, ECMEventListener} +import com.webank.wedatasphere.linkis.ecm.server.service.ECMMetricsService + + +class DefaultECMMetricsService extends ECMMetricsService with ECMEventListener{ + override def onEvent(event: ECMEvent): Unit = ??? +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultECMRegisterService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultECMRegisterService.scala new file mode 100644 index 000000000..7607230a6 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultECMRegisterService.scala @@ -0,0 +1,99 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service.impl + +import java.util +import java.util.Collections + +import com.webank.wedatasphere.linkis.common.utils.{Logging, Utils} +import com.webank.wedatasphere.linkis.ecm.core.listener.{ECMEvent, ECMEventListener} +import com.webank.wedatasphere.linkis.ecm.server.conf.ECMConfiguration._ +import com.webank.wedatasphere.linkis.ecm.server.listener.{ECMClosedEvent, ECMReadyEvent} +import com.webank.wedatasphere.linkis.ecm.server.service.ECMRegisterService +import com.webank.wedatasphere.linkis.manager.common.entity.resource._ +import com.webank.wedatasphere.linkis.manager.common.protocol.em.{RegisterEMRequest, StopEMRequest} +import com.webank.wedatasphere.linkis.manager.label.constant.LabelKeyConstant +import com.webank.wedatasphere.linkis.rpc.Sender + + +class DefaultECMRegisterService extends ECMRegisterService with ECMEventListener with Logging { + + private implicit def readyEvent2RegisterECMRequest(event: ECMReadyEvent): RegisterEMRequest = { + val request = new RegisterEMRequest + val instance = Sender.getThisServiceInstance + request.setUser(Utils.getJvmUser) + request.setServiceInstance(instance) + request.setAlias(instance.getApplicationName) + request.setLabels(getLabelsFromArgs(event.params)) + request.setNodeResource(getEMRegiterResourceFromConfiguration) + request + } + + private def getLabelsFromArgs(params: Array[String]): util.Map[String, AnyRef] = { + import scala.collection.JavaConversions._ + val labelRegex = """label\.(.+)\.(.+)=(.+)""".r + val labels = new util.HashMap[String, AnyRef]() + // TODO: magic + labels += LabelKeyConstant.SERVER_ALIAS_KEY -> Collections.singletonMap("alias", ENGINE_CONN_MANAGER_SPRING_NAME) + // TODO: group by key + /* params.foreach { + case labelRegex(key, valueKey, valueContent) => labels += key -> (valueKey, valueContent) + case _ => + }*/ + labels + } + + private def getEMRegiterResourceFromConfiguration: NodeResource = { + val maxResource = new LoadInstanceResource(ECM_MAX_MEMORY_AVAILABLE, ECM_MAX_CORES_AVAILABLE, ECM_MAX_CREATE_INSTANCES) + val minResource = new LoadInstanceResource(ECM_PROTECTED_MEMORY, ECM_PROTECTED_CORES, ECM_PROTECTED_INSTANCES) + val nodeResource = new CommonNodeResource + nodeResource.setResourceType(ResourceType.LoadInstance) + nodeResource.setExpectedResource(Resource.getZeroResource(maxResource)) + nodeResource.setLeftResource(maxResource) + nodeResource.setLockedResource(Resource.getZeroResource(maxResource)) + nodeResource.setMaxResource(maxResource) + nodeResource.setMinResource(minResource) + nodeResource.setUsedResource(Resource.getZeroResource(maxResource)) + nodeResource + } + + override def onEvent(event: ECMEvent): Unit = event match { + case event: ECMReadyEvent => registerECM(event) + case event: ECMClosedEvent => unRegisterECM(event) + case _ => + } + + private implicit def closeEvent2StopECMRequest(event: ECMClosedEvent): StopEMRequest = { + val request = new StopEMRequest + val instance = Sender.getThisServiceInstance + request.setUser(Utils.getJvmUser) + request.setEm(instance) + request + } + + override def registerECM(request: RegisterEMRequest): Unit = { + info("start register ecm") + Sender.getSender(MANAGER_SPRING_NAME).send(request) + } + + override def unRegisterECM(request: StopEMRequest): Unit = { + info("start unRegister ecm") + Sender.getSender(MANAGER_SPRING_NAME).send(request) + } + +} + diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultEngineConnKillService.java b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultEngineConnKillService.java new file mode 100644 index 000000000..bb139669a --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultEngineConnKillService.java @@ -0,0 +1,139 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service.impl; + +import com.webank.wedatasphere.linkis.common.ServiceInstance; +import com.webank.wedatasphere.linkis.common.utils.Utils; +import com.webank.wedatasphere.linkis.ecm.core.engineconn.EngineConn; +import com.webank.wedatasphere.linkis.ecm.server.service.EngineConnKillService; +import com.webank.wedatasphere.linkis.ecm.server.service.EngineConnListService; +import com.webank.wedatasphere.linkis.manager.common.protocol.engine.EngineStopRequest; +import com.webank.wedatasphere.linkis.manager.common.protocol.engine.EngineStopResponse; +import com.webank.wedatasphere.linkis.manager.common.protocol.engine.EngineSuicideRequest; +import com.webank.wedatasphere.linkis.message.annotation.Receiver; +import com.webank.wedatasphere.linkis.rpc.Sender; +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.List; + + +public class DefaultEngineConnKillService implements EngineConnKillService { + + private static final Logger logger = LoggerFactory.getLogger(DefaultEngineConnKillService.class); + + private EngineConnListService engineConnListService; + + public void setEngineConnListService(EngineConnListService engineConnListService) { + this.engineConnListService = engineConnListService; + } + + @Override + @Receiver + public EngineStopResponse dealEngineConnStop(EngineStopRequest engineStopRequest) { + EngineConn engineConn = getEngineConnByServiceInstance(engineStopRequest.getServiceInstance()); + EngineStopResponse response = new EngineStopResponse(); + if (null != engineConn) { + if(!killEngineConnByPid(engineConn)) { + response.setStopStatus(false); + response.setMsg("Kill engine " + engineConn.getServiceInstance().toString() + " failed."); + } else { + response.setStopStatus(true); + response.setMsg("Kill engine " + engineConn.getServiceInstance().toString() + " succeed."); + } + } else { + logger.warn("Cannot find engineconn : " + engineStopRequest.getServiceInstance().toString() + " in this engineConnManager engineConn list, cannot kill."); + response.setStopStatus(false); + response.setMsg("EngineConn " + engineStopRequest.getServiceInstance().toString() + " was not found in this engineConnManager."); + } + if (!response.getStopStatus()) { + EngineSuicideRequest request = new EngineSuicideRequest(engineStopRequest.getServiceInstance(), engineStopRequest.getUser()); + try { + Sender.getSender(engineStopRequest.getServiceInstance()).send(request); + response.setStopStatus(true); + response.setMsg(response.getMsg() + " Now send suicide request to engine."); + } catch (Exception e) { + response.setMsg(response.getMsg() + " Sended suicide request to engine error, " + e.getMessage()); + } + } + return response; + } + + private EngineConn getEngineConnByServiceInstance(ServiceInstance serviceInstance) { + if (null == serviceInstance) { + return null; + } + List engineConnList = engineConnListService.getEngineConns(); + for (EngineConn engineConn : engineConnList) { + if (engineConn.getServiceInstance().equals(serviceInstance)) { + return engineConn; + } + } + return null; + } + + private boolean killEngineConnByPid(EngineConn engineConn) { + logger.info("try to kill {} toString with pid({}).", engineConn.getServiceInstance().toString(), engineConn.getPid()); + if (StringUtils.isNotBlank(engineConn.getPid())) { + String k15cmd = "sudo kill " + engineConn.getPid(); + String k9cmd = "sudo kill -9 " + engineConn.getPid(); + int tryNum = 1; + try { + while (isProcessAlive(engineConn.getPid()) && tryNum <= 3) { + logger.info("{} still alive with pid({}), use shell command to kill it. try {}++", engineConn.getServiceInstance().toString(), engineConn.getPid(), tryNum++); + if (tryNum < 3) { + Utils.exec(k15cmd.split(" "), 3000L); + } else { + Utils.exec(k9cmd.split(" "), 3000L); + } + Thread.sleep(3000); + } + } catch (InterruptedException e) { + logger.error("Interrupted while killing engine {} with pid({})." + engineConn.getServiceInstance().toString(), engineConn.getPid()); + } + if (isProcessAlive(engineConn.getPid())) { + return false; + } else { + return true; + } + } else { + logger.warn("cannot kill {} with empty pid.", engineConn.getServiceInstance().toString()); + return false; + } + } + + private boolean isProcessAlive(String pid) { + String findCmd = "\"ps -ef | grep " + pid + " | grep EngineConnServer | awk '{print \\\"exists_\\\"$2}' | grep " + pid + " \""; + List cmdList = new ArrayList<>(); + cmdList.add("sudo"); + cmdList.add("-S"); + cmdList.add("bash"); + cmdList.add("-c"); + cmdList.add(findCmd); + try { + // todo + String rs = Utils.exec(cmdList.toArray(new String[0]), 5000L); + return null != rs && rs.contains("exists_" + pid); + } catch (Exception e) { + logger.error("Method isProcessAlive failed, " + e.getMessage()); + } + return true; + } + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultEngineConnListService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultEngineConnListService.scala new file mode 100644 index 000000000..04d20229c --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultEngineConnListService.scala @@ -0,0 +1,124 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service.impl + +import java.util +import java.util.concurrent.ConcurrentHashMap + +import com.google.common.collect.Interners +import com.webank.wedatasphere.linkis.common.utils.{Logging, Utils} +import com.webank.wedatasphere.linkis.ecm.core.engineconn.{EngineConn, YarnEngineConn} +import com.webank.wedatasphere.linkis.ecm.core.launch.EngineConnLaunchRunner +import com.webank.wedatasphere.linkis.ecm.core.listener.{ECMEvent, ECMEventListener} +import com.webank.wedatasphere.linkis.ecm.server.ECMApplication +import com.webank.wedatasphere.linkis.ecm.server.converter.ECMEngineConverter +import com.webank.wedatasphere.linkis.ecm.server.listener._ +import com.webank.wedatasphere.linkis.ecm.server.service.EngineConnListService +import com.webank.wedatasphere.linkis.manager.common.entity.enumeration.NodeStatus +import com.webank.wedatasphere.linkis.manager.common.entity.resource.{Resource, ResourceType} + +import scala.collection.JavaConversions._ + + +class DefaultEngineConnListService extends EngineConnListService with ECMEventListener with Logging { + /** + * key:tickedId,value :engineConn + */ + private val engineConnMap = new ConcurrentHashMap[String, EngineConn] + + val lock = Interners.newWeakInterner[String] + + override def init(): Unit = {} + + override def getEngineConn(engineConnId: String): Option[EngineConn] = Option(engineConnMap.get(engineConnId)) + + override def getEngineConns: util.List[EngineConn] = engineConnMap.values().toList + + override def addEngineConn(engineConn: EngineConn): Unit = { + if (ECMApplication.isReady) + engineConnMap.put(engineConn.getTickedId, engineConn) + } + + override def killEngineConn(engineConnId: String): Unit = { + val conn = engineConnMap.remove(engineConnId) + if (conn != null) { + Utils.tryAndWarn{ + conn.close() + info(s"engineconn ${conn.getPid} was closed.") + } + } + } + + override def getUsedResources: Resource = engineConnMap.values().map(_.getResource.getMinResource).fold(Resource.initResource(ResourceType.Default))(_ + _) + + override def submit(runner: EngineConnLaunchRunner): Option[EngineConn] = ??? + + def updateYarnAppId(event: YarnAppIdCallbackEvent): Unit = { + updateYarnEngineConn(x => x.setApplicationId(event.protocol.applicationId), event.protocol.nodeId) + } + + def updateYarnEngineConn(implicit updateFunction: YarnEngineConn => Unit, nodeId: String): Unit = { + lock.intern(nodeId) synchronized { + engineConnMap.get(nodeId) match { + case e: YarnEngineConn => updateFunction(e) + case e: EngineConn => + engineConnMap.put(nodeId, ECMEngineConverter.engineConn2YarnEngineConn(e)) + } + } + } + + def updateEngineConn(updateFunction: EngineConn => Unit, nodeId: String): Unit = { + lock.intern(nodeId) synchronized { + engineConnMap.get(nodeId) match { + case e: EngineConn => updateFunction(e) + } + } + } + + def updateYarnInfo(event: YarnInfoCallbackEvent): Unit = { + updateYarnEngineConn(x => x.setApplicationURL(event.protocol.uri), event.protocol.nodeId) + } + + def updatePid(event: EngineConnPidCallbackEvent): Unit = { + updateEngineConn(x => { + x.setPid(event.protocol.pid) + x.setServiceInstance(event.protocol.serviceInstance) + }, event.protocol.ticketId) + } + + def updateEngineConnStatus(tickedId: String, updateStatus: NodeStatus): Unit = { + updateEngineConn(x => x.setStatus(updateStatus), tickedId) + } + + override def onEvent(event: ECMEvent): Unit = { + info(s"Deal event $event") + event match { + case event: ECMClosedEvent => shutdownEngineConns(event) + case event: YarnAppIdCallbackEvent => updateYarnAppId(event) + case event: YarnInfoCallbackEvent => updateYarnInfo(event) + case event: EngineConnPidCallbackEvent => updatePid(event) + case EngineConnAddEvent(engineConn) => addEngineConn(engineConn) + case EngineConnStatusChangeEvent(tickedId, updateStatus) => updateEngineConnStatus(tickedId, updateStatus) + case _ => + } + } + + private def shutdownEngineConns(event: ECMClosedEvent): Unit = { + engineConnMap.keys().foreach(killEngineConn) + } + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultEngineConnPidCallbackService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultEngineConnPidCallbackService.scala new file mode 100644 index 000000000..1f0a6b300 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultEngineConnPidCallbackService.scala @@ -0,0 +1,38 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service.impl + +import com.webank.wedatasphere.linkis.common.utils.Logging +import com.webank.wedatasphere.linkis.ecm.server.ECMApplication +import com.webank.wedatasphere.linkis.ecm.server.listener.EngineConnPidCallbackEvent +import com.webank.wedatasphere.linkis.ecm.server.service.EngineConnPidCallbackService +import com.webank.wedatasphere.linkis.governance.common.protocol.task.ResponseEngineConnPid +import com.webank.wedatasphere.linkis.message.annotation.Receiver + + +class DefaultEngineConnPidCallbackService extends EngineConnPidCallbackService with Logging { + + @Receiver + override def dealPid(protocol: ResponseEngineConnPid): Unit = { + //1.设置pid + //2.设置serviceInstance + //3.状态为running + ECMApplication.getContext.getECMSyncListenerBus.postToAll(EngineConnPidCallbackEvent(protocol)) + } + + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultEngineConnStatusCallbackService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultEngineConnStatusCallbackService.scala new file mode 100644 index 000000000..bea04016b --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultEngineConnStatusCallbackService.scala @@ -0,0 +1,51 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service.impl + +import com.webank.wedatasphere.linkis.common.utils.Logging +import com.webank.wedatasphere.linkis.ecm.server.ECMApplication +import com.webank.wedatasphere.linkis.ecm.server.conf.ECMConfiguration.MANAGER_SPRING_NAME +import com.webank.wedatasphere.linkis.ecm.server.listener.EngineConnStatusChangeEvent +import com.webank.wedatasphere.linkis.ecm.server.service.EngineConnStatusCallbackService +import com.webank.wedatasphere.linkis.manager.common.entity.enumeration.NodeStatus +import com.webank.wedatasphere.linkis.manager.common.entity.enumeration.NodeStatus.{Failed, Running} +import com.webank.wedatasphere.linkis.manager.common.protocol.engine.{EngineConnStatusCallback, EngineConnStatusCallbackToAM} +import com.webank.wedatasphere.linkis.message.annotation.Receiver +import com.webank.wedatasphere.linkis.rpc.Sender +import org.springframework.stereotype.Service + + +@Service +class DefaultEngineConnStatusCallbackService extends EngineConnStatusCallbackService with Logging { + + @Receiver + override def dealEngineConnStatusCallback(protocol: EngineConnStatusCallback): Unit = { + info(s"Start to deal EngineConnStatusCallback $protocol") + + if (NodeStatus.isAvailable(protocol.status)) { + + ECMApplication.getContext.getECMSyncListenerBus.postToAll(EngineConnStatusChangeEvent(protocol.ticketId, Running)) + } else { + + Sender.getSender(MANAGER_SPRING_NAME).send(EngineConnStatusCallbackToAM(protocol.serviceInstance, + protocol.status, protocol.initErrorMsg)) + ECMApplication.getContext.getECMSyncListenerBus.postToAll(EngineConnStatusChangeEvent(protocol.ticketId, Failed)) + } + + info(s"Finished to deal EngineConnStatusCallback $protocol") + } +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultLocalDirsHandleService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultLocalDirsHandleService.scala new file mode 100644 index 000000000..039a58f84 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultLocalDirsHandleService.scala @@ -0,0 +1,47 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service.impl + +import java.io.File +import java.nio.file.Paths + +import com.webank.wedatasphere.linkis.common.io.FsPath +import com.webank.wedatasphere.linkis.ecm.server.conf.ECMConfiguration._ +import com.webank.wedatasphere.linkis.ecm.server.service.LocalDirsHandleService + + +class DefaultLocalDirsHandleService extends LocalDirsHandleService { + + // TODO: 检测当前磁盘的健康状态,如果目录满了,需要上报am + + override def cleanup(): Unit = ??? + + + override def getEngineConnManagerHomeDir: String = ECM_HOME_DIR + + override def getEngineConnWorkDir(user: String, ticketId: String): String = new FsPath(Paths.get(ENGINECONN_ROOT_DIR, user, "workDir", ticketId).toFile.getPath).getPath + + override def getEngineConnPublicDir: String = ENGINECONN_PUBLIC_DIR + + override def getEngineConnLogDir(user: String, ticketId: String): String = s"${getEngineConnWorkDir(user, ticketId)}${File.separator}logs" + + override def getEngineConnTmpDir(user: String, ticketId: String): String = s"${getEngineConnWorkDir(user, ticketId)}${File.separator}tmp" + + +} + + diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultYarnCallbackService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultYarnCallbackService.scala new file mode 100644 index 000000000..381a5276f --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/DefaultYarnCallbackService.scala @@ -0,0 +1,37 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service.impl + +import com.webank.wedatasphere.linkis.ecm.server.ECMApplication +import com.webank.wedatasphere.linkis.ecm.server.listener.{YarnAppIdCallbackEvent, YarnInfoCallbackEvent} +import com.webank.wedatasphere.linkis.ecm.server.service.YarnCallbackService +import com.webank.wedatasphere.linkis.message.annotation.Receiver +import com.webank.wedatasphere.linkis.protocol.callback.{YarnAPPIdCallbackProtocol, YarnInfoCallbackProtocol} + + +class DefaultYarnCallbackService extends YarnCallbackService { + + @Receiver + override def dealApplicationId(protocol: YarnAPPIdCallbackProtocol): Unit = { + ECMApplication.getContext.getECMSyncListenerBus.postToAll(YarnAppIdCallbackEvent(protocol)) + } + + @Receiver + override def dealApplicationURI(protocol: YarnInfoCallbackProtocol): Unit = { + ECMApplication.getContext.getECMSyncListenerBus.postToAll(YarnInfoCallbackEvent(protocol)) + } +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/LinuxProcessEngineConnLaunchService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/LinuxProcessEngineConnLaunchService.scala new file mode 100644 index 000000000..8dfcbedc9 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/LinuxProcessEngineConnLaunchService.scala @@ -0,0 +1,64 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service.impl + +import com.webank.wedatasphere.linkis.ecm.core.launch.{DiscoveryMsgGenerator, EngineConnLaunch, EurekaDiscoveryMsgGenerator} +import com.webank.wedatasphere.linkis.ecm.linux.launch.LinuxProcessEngineConnLaunch +import com.webank.wedatasphere.linkis.ecm.server.conf.ECMConfiguration.{ENGINECONN_SPRING_NAME, _} +import com.webank.wedatasphere.linkis.manager.common.entity.node.EngineNode +import com.webank.wedatasphere.linkis.manager.engineplugin.common.launch.entity.{EngineConnBuildRequest, EngineConnLaunchRequest} +import com.webank.wedatasphere.linkis.message.annotation.Receiver +import com.webank.wedatasphere.linkis.message.builder.ServiceMethodContext +import com.webank.wedatasphere.linkis.message.conf.MessageSchedulerConf._ +import com.webank.wedatasphere.linkis.rpc.Sender + +import scala.concurrent.duration.Duration + + +class LinuxProcessEngineConnLaunchService extends ProcessEngineConnLaunchService { + + /** + * launchEngine启动一个引擎的方法 + * + * @param engineConnBuildRequest 封装了引擎启动的参数 + */ + @Receiver + def launchEngineConn(engineConnBuildRequest: EngineConnBuildRequest, smc: ServiceMethodContext): EngineNode = { + Sender.getSender(ENGINECONN_SPRING_NAME).ask(engineConnBuildRequest) match { + case request: EngineConnLaunchRequest if ENGINECONN_CREATE_DURATION._1 != 0L => + launchEngineConn(request, ENGINECONN_CREATE_DURATION._1) + case request: EngineConnLaunchRequest => + launchEngineConn(request, smc.getAttribute(DURATION_KEY).asInstanceOf[Duration]._1) + } + } + + override def launchEngineConn(engineConnBuildRequest: EngineConnBuildRequest): EngineNode = { + Sender.getSender(ENGINECONN_SPRING_NAME).ask(engineConnBuildRequest) match { + case request: EngineConnLaunchRequest => + launchEngineConn(request, ENGINECONN_CREATE_DURATION._1) + } + } + + def createDiscoveryMsgGenerator: DiscoveryMsgGenerator = new EurekaDiscoveryMsgGenerator + + override def createEngineConnLaunch: EngineConnLaunch = { + val launch = new LinuxProcessEngineConnLaunch + launch.setDiscoveryMsgGenerator(createDiscoveryMsgGenerator) + launch + } + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/ProcessEngineConnLaunchService.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/ProcessEngineConnLaunchService.scala new file mode 100644 index 000000000..852499e75 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/service/impl/ProcessEngineConnLaunchService.scala @@ -0,0 +1,86 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.service.impl + +import java.util.concurrent.TimeUnit + +import com.webank.wedatasphere.linkis.common.utils.Utils +import com.webank.wedatasphere.linkis.ecm.core.engineconn.EngineConn +import com.webank.wedatasphere.linkis.ecm.core.launch.ProcessEngineConnLaunch +import com.webank.wedatasphere.linkis.ecm.server.ECMApplication +import com.webank.wedatasphere.linkis.ecm.server.conf.ECMConfiguration.MANAGER_SPRING_NAME +import com.webank.wedatasphere.linkis.ecm.server.exception.ECMErrorException +import com.webank.wedatasphere.linkis.ecm.server.listener.EngineConnStatusChangeEvent +import com.webank.wedatasphere.linkis.manager.common.entity.enumeration.NodeStatus +import com.webank.wedatasphere.linkis.manager.common.entity.enumeration.NodeStatus._ +import com.webank.wedatasphere.linkis.manager.common.protocol.engine.EngineConnStatusCallbackToAM +import com.webank.wedatasphere.linkis.rpc.Sender +import org.apache.commons.io.IOUtils +import org.apache.commons.lang.exception.ExceptionUtils + +import scala.concurrent.duration.Duration +import scala.concurrent.{Future, TimeoutException} + + +abstract class ProcessEngineConnLaunchService extends AbstractEngineConnLaunchService { + + override def afterLaunch(conn: EngineConn, duration: Long): Unit = { + conn.getEngineConnLaunchRunner.getEngineConnLaunch match { + case launch: ProcessEngineConnLaunch => try { + processMonitorThread(conn, launch, duration) + } catch { + case e: ECMErrorException => + warn("EngineConn init failed", e) + val logPath = conn.getEngineConnManagerEnv.engineConnWorkDir + "/logs" + Sender.getSender(MANAGER_SPRING_NAME).send(EngineConnStatusCallbackToAM(conn.getServiceInstance, + NodeStatus.ShuttingDown, "Failed to start EngineConn, reason: " + ExceptionUtils.getRootCauseMessage(e) + s"You can go to this path($logPath) to find the reason or ask the administrator for help")) + } + case _ => + } + } + + private def processMonitorThread(engineConn: EngineConn, launch: ProcessEngineConnLaunch, timeout: Long): Unit = { + val isCompleted: EngineConn => Boolean = engineConn => engineConn.getStatus == Success || engineConn.getStatus == Failed + val tickedId = engineConn.getTickedId + Future { + val iterator = IOUtils.lineIterator(launch.getProcessInputStream, "utf-8") + while (!isCompleted(engineConn) && iterator.hasNext) { + println(s"${engineConn.getTickedId}:${iterator.next()}") + } + val exitCode = Option(launch.processWaitFor) + if (exitCode.exists(_ != 0)) { + // TODO: 错误日志获取 + ECMApplication.getContext.getECMSyncListenerBus.postToAll(EngineConnStatusChangeEvent(tickedId, ShuttingDown)) + } else { + ECMApplication.getContext.getECMSyncListenerBus.postToAll(EngineConnStatusChangeEvent(tickedId, Success)) + } + } + Utils.tryThrow(Utils.waitUntil(() => engineConn.getStatus != Starting, Duration(timeout, TimeUnit.MILLISECONDS))) { + case e: TimeoutException => + throw new ECMErrorException(10000, s"wait for $engineConn initial timeout.") + case e: InterruptedException => //比如被ms cancel + throw new ECMErrorException(10000, s"wait for $engineConn initial interrupted.") + case t: Throwable => + error(s"unexpected error, now shutdown it.") + throw t + } + if (engineConn.getStatus == ShuttingDown) { + throw new ECMErrorException(10000, s"Failed to init $engineConn, status shutting down") + } + } + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/spring/ECMSpringConfiguration.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/spring/ECMSpringConfiguration.scala new file mode 100644 index 000000000..21e0b74ff --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/spring/ECMSpringConfiguration.scala @@ -0,0 +1,118 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.spring + +import com.webank.wedatasphere.linkis.ecm.core.listener.ECMEventListener +import com.webank.wedatasphere.linkis.ecm.server.context.{DefaultECMContext, ECMContext} +import com.webank.wedatasphere.linkis.ecm.server.service._ +import com.webank.wedatasphere.linkis.ecm.server.service.impl._ +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean +import org.springframework.context.annotation.{Bean, Configuration} + + +@Configuration +class ECMSpringConfiguration { + + @Bean + @ConditionalOnMissingBean + def getDefaultEngineConnManagerContext: ECMContext = { + new DefaultECMContext + } + + @Bean + @ConditionalOnMissingBean + def getDefaultYarnCallbackService: YarnCallbackService = { + new DefaultYarnCallbackService + } + + @Bean + @ConditionalOnMissingBean + def getBmlResourceLocalizationService(context: ECMContext, localDirsHandleService: LocalDirsHandleService): ResourceLocalizationService = { + val service: BmlResourceLocalizationService = new BmlResourceLocalizationService + service.setLocalDirsHandleService(localDirsHandleService) + service + } + + @Bean + @ConditionalOnMissingBean + def getDefaultLogCallbackService: LogCallbackService = { + null + } + + @Bean + @ConditionalOnMissingBean + def getDefaultlocalDirsHandleService: LocalDirsHandleService = { + new DefaultLocalDirsHandleService + } + + + @Bean + @ConditionalOnMissingBean + def getDefaultEngineConnPidCallbackService: EngineConnPidCallbackService = { + new DefaultEngineConnPidCallbackService + } + + @Bean + @ConditionalOnMissingBean + def getDefaultEngineConnListService(context: ECMContext): EngineConnListService = { + implicit val service: DefaultEngineConnListService = new DefaultEngineConnListService + registerSyncListener(context) + service + } + + @Bean + @ConditionalOnMissingBean + def getLinuxProcessEngineConnLaunchService(resourceLocalizationService: ResourceLocalizationService): EngineConnLaunchService = { + val service = new LinuxProcessEngineConnLaunchService + service.setResourceLocalizationService(resourceLocalizationService) + service + } + + @Bean + @ConditionalOnMissingBean + def getDefaultECMRegisterService(context: ECMContext): ECMRegisterService = { + implicit val service: DefaultECMRegisterService = new DefaultECMRegisterService + registerSyncListener(context) + service + } + + + @Bean + @ConditionalOnMissingBean + def getDefaultECMHealthService(context: ECMContext): ECMHealthService = { + implicit val service: DefaultECMHealthService = new DefaultECMHealthService + registerSyncListener(context) + service + } + + @Bean + @ConditionalOnMissingBean + def getDefaultEngineConnKillService(engineConnListService: EngineConnListService): EngineConnKillService = { + val service = new DefaultEngineConnKillService + service.setEngineConnListService(engineConnListService) + service + } + + private def registerSyncListener(context: ECMContext)(implicit listener: ECMEventListener): Unit = { + context.getECMSyncListenerBus.addListener(listener) + } + + private def registerASyncListener(context: ECMContext)(implicit listener: ECMEventListener): Unit = { + context.getECMAsyncListenerBus.addListener(listener) + } + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/util/ECMUtils.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/util/ECMUtils.scala new file mode 100644 index 000000000..0c41ac14b --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/scala/com/webank/wedatasphere/linkis/ecm/server/util/ECMUtils.scala @@ -0,0 +1,69 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.ecm.server.util + +import java.io.{File, InputStream} +import java.util + +import com.webank.wedatasphere.linkis.bml.client.{BmlClient, BmlClientFactory} +import com.webank.wedatasphere.linkis.bml.protocol.BmlDownloadResponse +import com.webank.wedatasphere.linkis.ecm.server.exception.ECMErrorException +import com.webank.wedatasphere.linkis.manager.common.protocol.bml.BmlResource +import com.webank.wedatasphere.linkis.rpc.Sender +import com.webank.wedatasphere.linkis.storage.fs.FileSystem +import org.apache.commons.io.{FileUtils, IOUtils} + +import scala.collection.JavaConversions._ + + +object ECMUtils { + + private def download(resource: BmlResource, userName: String): util.Map[String, Object] = { + val client: BmlClient = createBMLClient(userName) + var response: BmlDownloadResponse = null + if (resource.getVersion == null) { + response = client.downloadShareResource(userName, resource.getResourceId) + } else { + response = client.downloadShareResource(userName, resource.getResourceId, resource.getVersion) + } + if (!response.isSuccess) throw new ECMErrorException(911115, "下载失败") + val map = new util.HashMap[String, Object] + map += "path" -> response.fullFilePath + map += "is" -> response.inputStream + } + + def downLoadBmlResourceToLocal(resource: BmlResource, userName: String, path: String)(implicit fs: FileSystem): Unit = { + val is = download(resource, userName).get("is").asInstanceOf[InputStream] + val os = FileUtils.openOutputStream(new File(path + File.separator + resource.getFileName)) + IOUtils.copy(is, os) + IOUtils.closeQuietly(os) + IOUtils.closeQuietly(is) + } + + private def createBMLClient(userName: String): BmlClient = { + if (userName == null) + BmlClientFactory.createBmlClient() + else + BmlClientFactory.createBmlClient(userName) + } + + + private val address = Sender.getThisInstance.substring(0, Sender.getThisInstance.lastIndexOf(":")) + + def getInstanceByPort(port: String): String = address + ":" + port + +} diff --git a/linkis-computation-governance/linkis-engineconn-manager/pom.xml b/linkis-computation-governance/linkis-engineconn-manager/pom.xml new file mode 100644 index 000000000..03da50f43 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn-manager/pom.xml @@ -0,0 +1,36 @@ + + + + + + linkis + com.webank.wedatasphere.linkis + dev-1.0.0 + + 4.0.0 + + linkis-engineconn-manager + pom + + linkis-engineconn-manager-core + linkis-engineconn-manager-server + linkis-engineconn-linux-launch + + + \ No newline at end of file -- Gitee From 6ec52f27b9efd360b78716b77ef8e50abe12e961 Mon Sep 17 00:00:00 2001 From: owenlovemika Date: Tue, 9 Mar 2021 21:31:29 +0800 Subject: [PATCH 062/148] Add top-level design of interactive EngineConn, making it easier for users to implement interactive engine. fixes #573 --- .../linkis-computation-engineconn/pom.xml | 128 +++++++ .../conf/ComputationExecutorConf.scala | 34 ++ .../executor/cs/CSEnginePreExecuteHook.scala | 49 +++ .../executor/cs/CSResourceParser.scala | 68 ++++ .../executor/cs/CSTableRegister.scala | 88 +++++ .../entity/CommonEngineConnTask.scala | 58 +++ .../executor/entity/EngineConnTask.scala | 54 +++ .../executor/entity/TaskStatus.scala | 33 ++ .../ComputationEngineConnExecution.scala | 84 +++++ .../execute/ComputationExecutor.scala | 271 ++++++++++++++ .../ConcurrentComputationExecutor.scala | 47 +++ .../execute/EngineExecutionContext.scala | 217 +++++++++++ .../hook/ComputationEngineConnHook.scala | 74 ++++ .../hook/ComputationExecutorHook.scala | 58 +++ .../executor/listener/ResultSetListener.scala | 30 ++ .../listener/TaskProgressListener.scala | 27 ++ .../listener/TaskStatusListener.scala | 27 ++ .../executor/parser/CodeParser.scala | 235 ++++++++++++ .../executor/rs/RsOutputStream.scala | 68 ++++ .../service/TaskExecutionService.scala | 50 +++ .../service/TaskExecutionServiceImpl.scala | 349 ++++++++++++++++++ .../utlis/ComputaionEngineContant.scala | 25 ++ .../utlis/ComputationEngineUtils.scala | 29 ++ 23 files changed, 2103 insertions(+) create mode 100644 linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/pom.xml create mode 100644 linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/conf/ComputationExecutorConf.scala create mode 100644 linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/cs/CSEnginePreExecuteHook.scala create mode 100644 linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/cs/CSResourceParser.scala create mode 100644 linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/cs/CSTableRegister.scala create mode 100644 linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/entity/CommonEngineConnTask.scala create mode 100644 linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/entity/EngineConnTask.scala create mode 100644 linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/entity/TaskStatus.scala create mode 100644 linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/execute/ComputationEngineConnExecution.scala create mode 100644 linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/execute/ComputationExecutor.scala create mode 100644 linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/execute/ConcurrentComputationExecutor.scala create mode 100644 linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala create mode 100644 linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/hook/ComputationEngineConnHook.scala create mode 100644 linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/hook/ComputationExecutorHook.scala create mode 100644 linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/listener/ResultSetListener.scala create mode 100644 linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/listener/TaskProgressListener.scala create mode 100644 linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/listener/TaskStatusListener.scala create mode 100644 linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/parser/CodeParser.scala create mode 100644 linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/rs/RsOutputStream.scala create mode 100644 linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/service/TaskExecutionService.scala create mode 100644 linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala create mode 100644 linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/utlis/ComputaionEngineContant.scala create mode 100644 linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/utlis/ComputationEngineUtils.scala diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/pom.xml b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/pom.xml new file mode 100644 index 000000000..4203404dc --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/pom.xml @@ -0,0 +1,128 @@ + + + + + + linkis + com.webank.wedatasphere.linkis + dev-1.0.0 + ../../pom.xml + + 4.0.0 + + linkis-computation-engineconn + + + + com.webank.wedatasphere.linkis + linkis-executor-core + ${linkis.version} + + + + com.webank.wedatasphere.linkis + linkis-accessible-executor + ${linkis.version} + + + + com.webank.wedatasphere.linkis + linkis-resource-executor + ${linkis.version} + + + + com.webank.wedatasphere.linkis + linkis-callback-service + ${linkis.version} + + + + com.webank.wedatasphere.linkis + linkis-storage + ${linkis.version} + provided + + + + com.webank.wedatasphere.linkis + linkis-message-scheduler + ${linkis.version} + provided + + + + com.webank.wedatasphere.linkis + linkis-cs-engine-support + ${linkis.version} + + + reflections + org.reflections + + + + + + com.webank.wedatasphere.linkis + linkis-computation-governance-common + ${linkis.version} + + + + com.google.guava + guava + ${guava.version} + + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + + + net.alchim31.maven + scala-maven-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + + + + + + + + + + + ${basedir}/src/main/resources + + + ${project.artifactId}-${project.version} + + + \ No newline at end of file diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/conf/ComputationExecutorConf.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/conf/ComputationExecutorConf.scala new file mode 100644 index 000000000..cc4661aaf --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/conf/ComputationExecutorConf.scala @@ -0,0 +1,34 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.engineconn.computation.executor.conf + +import com.webank.wedatasphere.linkis.common.conf.{ByteType, CommonVars} + + +object ComputationExecutorConf { + + val ENGINECONN_RESULT_SET_STORE_PATH = CommonVars("wds.linkis.engineconn.resultSet.default.store.path", "hdfs:///tmp") + + val ENGINE_RESULT_SET_MAX_CACHE = CommonVars("wds.linkis.engine.resultSet.cache.max", new ByteType("0k")) + + val ENGINE_DEFAULT_LIMIT = CommonVars("wds.linkis.engine.default.limit", 5000) + + val ENGINE_LOCK_DEFAULT_EXPIRE_TIME = CommonVars("wds.linkis.engine.lock.expire.time", 2 * 60 * 1000) + + + +} diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/cs/CSEnginePreExecuteHook.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/cs/CSEnginePreExecuteHook.scala new file mode 100644 index 000000000..dc0774004 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/cs/CSEnginePreExecuteHook.scala @@ -0,0 +1,49 @@ +/* + * Copyright 2019 WeBank + * Licensed 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 com.webank.wedatasphere.linkis.engineconn.computation.executor.cs + +import com.webank.wedatasphere.linkis.common.utils.Logging +import com.webank.wedatasphere.linkis.cs.client.utils.ContextServiceUtils +import com.webank.wedatasphere.linkis.cs.common.utils.CSCommonUtils +import com.webank.wedatasphere.linkis.engineconn.common.creation.EngineCreationContext +import com.webank.wedatasphere.linkis.engineconn.computation.executor.execute.EngineExecutionContext +import com.webank.wedatasphere.linkis.engineconn.computation.executor.hook.ComputationExecutorHook +import com.webank.wedatasphere.linkis.scheduler.executer.ExecuteRequest + + +class CSEnginePreExecuteHook extends ComputationExecutorHook with Logging { + + private val csResourceParser: CSResourceParser = new CSResourceParser + + override def getHookName: String = "ContextServicePreHook" + + override def beforeExecutorExecute(engineExecutionContext: EngineExecutionContext, engineCreationContext: EngineCreationContext, code: String): String = { + val props = engineExecutionContext.getProperties + if (null != props && props.containsKey(CSCommonUtils.CONTEXT_ID_STR)) { + var parsedCode = code + val contextIDValueStr = ContextServiceUtils.getContextIDStrByMap (props) + val nodeNameStr = ContextServiceUtils.getNodeNameStrByMap (props) + engineExecutionContext.addProperty (CSCommonUtils.CONTEXT_ID_STR, contextIDValueStr) + engineExecutionContext.addProperty (CSCommonUtils.NODE_NAME_STR, nodeNameStr) + info (s"Start to call cs engine pre hook,contextID is $contextIDValueStr, nodeNameStr is $nodeNameStr") + parsedCode = csResourceParser.parse (props, parsedCode, contextIDValueStr, nodeNameStr) + info (s"Finished to call cs engine pre hook,contextID is $contextIDValueStr, nodeNameStr is $nodeNameStr") + parsedCode + } else { + code + } + } + + +} diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/cs/CSResourceParser.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/cs/CSResourceParser.scala new file mode 100644 index 000000000..fb70c01b9 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/cs/CSResourceParser.scala @@ -0,0 +1,68 @@ +/* + * Copyright 2019 WeBank + * Licensed 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 com.webank.wedatasphere.linkis.engineconn.computation.executor.cs + +import java.util +import java.util.regex.Pattern + +import com.webank.wedatasphere.linkis.cs.client.service.CSResourceService +import org.apache.commons.lang.StringUtils + +import scala.collection.JavaConversions._ +import scala.collection.mutable.ArrayBuffer + + +class CSResourceParser { + + private val pb = Pattern.compile("cs://[^\\s\"]+[$\\s]{0,1}", Pattern.CASE_INSENSITIVE) + + private val PREFIX = "cs://" + + private def getPreFixResourceNames(code: String): Array[String] = { + val bmlResourceNames = new ArrayBuffer[String]() + val mb = pb.matcher(code) + while (mb.find) bmlResourceNames.append(mb.group.trim) + bmlResourceNames.toArray + } + + def parse(props: util.Map[String, Object], code: String, contextIDValueStr: String, nodeNameStr: String): String = { + + //TODO getBMLResource peaceWong + val bmlResourceList = CSResourceService.getInstance().getUpstreamBMLResource(contextIDValueStr, nodeNameStr) + + val parsedResources = new util.ArrayList[util.Map[String, Object]]() + val preFixResourceNames = getPreFixResourceNames(code) + + val preFixNames = new ArrayBuffer[String]() + val parsedNames = new ArrayBuffer[String]() + preFixResourceNames.foreach { preFixResourceName => + val resourceName = preFixResourceName.replace(PREFIX, "").trim + val bmlResourceOption = bmlResourceList.find(_.getDownloadedFileName.equals(resourceName)) + if (bmlResourceOption.isDefined) { + val bmlResource = bmlResourceOption.get + val map = new util.HashMap[String, Object]() + map.put("resourceId", bmlResource.getResourceId) + map.put("version", bmlResource.getVersion) + map.put("fileName", resourceName) + parsedResources.add(map) + preFixNames.append(preFixResourceName) + parsedNames.append(resourceName) + } + + } + props.put("resources", parsedResources) + StringUtils.replaceEach(code, preFixNames.toArray, parsedNames.toArray) + } + +} diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/cs/CSTableRegister.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/cs/CSTableRegister.scala new file mode 100644 index 000000000..e2ff4593c --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/cs/CSTableRegister.scala @@ -0,0 +1,88 @@ +/* + * Copyright 2019 WeBank + * Licensed 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 com.webank.wedatasphere.linkis.engineconn.computation.executor.cs + +import java.util.Date +import com.webank.wedatasphere.linkis.common.io.resultset.ResultSetWriter +import com.webank.wedatasphere.linkis.common.io.{MetaData, Record} +import com.webank.wedatasphere.linkis.common.utils.Logging +import com.webank.wedatasphere.linkis.cs.client.service.CSTableService +import com.webank.wedatasphere.linkis.cs.client.utils.{ContextServiceUtils, SerializeHelper} +import com.webank.wedatasphere.linkis.cs.common.entity.enumeration.{ContextScope, ContextType} +import com.webank.wedatasphere.linkis.cs.common.entity.metadata.{CSColumn, CSTable} +import com.webank.wedatasphere.linkis.cs.common.entity.source.CommonContextKey +import com.webank.wedatasphere.linkis.cs.common.utils.CSCommonUtils +import com.webank.wedatasphere.linkis.engineconn.computation.executor.execute.EngineExecutionContext +import com.webank.wedatasphere.linkis.storage.domain.Column +import com.webank.wedatasphere.linkis.storage.utils.StorageUtils +import org.apache.commons.lang.StringUtils + + +object CSTableRegister extends Logging{ + + def registerTempTable(engineExecutionContext: EngineExecutionContext, + writer: ResultSetWriter[_ <: MetaData, _ <: Record], alias: String, columns: Array[Column]): Unit = { + + val contextIDValueStr = ContextServiceUtils.getContextIDStrByMap(engineExecutionContext.getProperties) + val nodeNameStr = ContextServiceUtils.getNodeNameStrByMap(engineExecutionContext.getProperties) + + if (StringUtils.isNotBlank(contextIDValueStr) && StringUtils.isNotBlank(nodeNameStr)) { + info(s"Start to register TempTable nodeName:$nodeNameStr") + writer.flush() + val tableName = if (StringUtils.isNotBlank(alias)) s"${CSCommonUtils.CS_TMP_TABLE_PREFIX}${nodeNameStr}_${alias}" else { + var i = 1; + var rsName: String = null; + while (StringUtils.isEmpty(rsName)) { + val tmpTable = s"${CSCommonUtils.CS_TMP_TABLE_PREFIX}${nodeNameStr}_rs${i}" + i = i + 1 + val contextKey = new CommonContextKey + contextKey.setContextScope(ContextScope.FRIENDLY) + contextKey.setContextType(ContextType.METADATA) + contextKey.setKey(CSCommonUtils.getTableKey(nodeNameStr, tmpTable)) + val table = CSTableService.getInstance().getCSTable(contextIDValueStr, SerializeHelper.serializeContextKey(contextKey)) + if (null == table) { + rsName = tmpTable + } + } + rsName + } + val csTable = new CSTable + csTable.setName(tableName) + csTable.setAlias(alias) + csTable.setAvailable(true) + csTable.setComment("cs temp table") + csTable.setCreateTime(new Date()) + csTable.setCreator(StorageUtils.getJvmUser) + csTable.setExternalUse(true) + csTable.setImport(false) + csTable.setLocation(writer.toString) + csTable.setPartitionTable(false) + csTable.setView(true) + val csColumns = columns.map { column => + val csColumn = new CSColumn + csColumn.setName(column.columnName) + csColumn.setType(column.dataType.typeName) + csColumn.setComment(column.comment) + csColumn + } + csTable.setColumns(csColumns) + val contextKey = new CommonContextKey + contextKey.setContextScope(ContextScope.PUBLIC) + contextKey.setContextType(ContextType.METADATA) + contextKey.setKey(CSCommonUtils.getTableKey(nodeNameStr, tableName)) + CSTableService.getInstance().putCSTable(contextIDValueStr, SerializeHelper.serializeContextKey(contextKey), csTable) + info(s"Finished to register TempTable nodeName:$nodeNameStr") + } + } +} diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/entity/CommonEngineConnTask.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/entity/CommonEngineConnTask.scala new file mode 100644 index 000000000..ef1e0cf3d --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/entity/CommonEngineConnTask.scala @@ -0,0 +1,58 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.engineconn.computation.executor.entity +import java.util + +import com.webank.wedatasphere.linkis.common.ServiceInstance +import com.webank.wedatasphere.linkis.governance.common.entity.ExecutionNodeStatus +import com.webank.wedatasphere.linkis.manager.label.entity.Label + + +class CommonEngineConnTask(val taskId: String, var taskSupportRetry: Boolean = false) extends EngineConnTask { + + private var code: String = _ + private var prop: util.Map[String, Object] = _ + private var status: ExecutionNodeStatus = ExecutionNodeStatus.Inited + private var labels: Array[Label[_]] = new Array[Label[_]](0) + private var serviceInstance: ServiceInstance = _ + + override def getTaskId: String = taskId + + override def isTaskSupportRetry: Boolean = taskSupportRetry + + override def getCode: String = code + + override def setCode(code: String): Unit = this.code = code + + override def getProperties: util.Map[String, Object] = prop + + override def setProperties(properties: util.Map[String, Object]): Unit = this.prop = properties + + override def data(key: String, value: Object): Unit = this.prop.put(key, value) + + override def getStatus: ExecutionNodeStatus = status + + override def setStatus(status: ExecutionNodeStatus): Unit = this.status = status + + override def getLables: Array[Label[_]] = labels + + override def setLabels(labels: Array[Label[_]]): Unit = this.labels = labels + + override def getCallbackServiceInstance(): ServiceInstance = serviceInstance + + override def setCallbackServiceInstance(serviceInstance: ServiceInstance): Unit = this.serviceInstance = serviceInstance +} diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/entity/EngineConnTask.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/entity/EngineConnTask.scala new file mode 100644 index 000000000..3f5e95778 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/entity/EngineConnTask.scala @@ -0,0 +1,54 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.engineconn.computation.executor.entity + +import java.util + +import com.webank.wedatasphere.linkis.common.ServiceInstance +import com.webank.wedatasphere.linkis.governance.common.entity.ExecutionNodeStatus +import com.webank.wedatasphere.linkis.manager.label.entity.Label + + +trait EngineConnTask { + + def getTaskId: String + + def isTaskSupportRetry: Boolean + + def getCode: String + + def setCode(code: String): Unit + + def getProperties: util.Map[String, Object] + + def setProperties(properties: util.Map[String, Object]) + + def data(key: String, value: Object): Unit + + def getStatus: ExecutionNodeStatus + + def setStatus(taskStatus: ExecutionNodeStatus): Unit + + + def getLables: Array[Label[_]] + + def setLabels(labels: Array[Label[_]]): Unit + + def getCallbackServiceInstance(): ServiceInstance + + def setCallbackServiceInstance(serviceInstance: ServiceInstance): Unit +} diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/entity/TaskStatus.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/entity/TaskStatus.scala new file mode 100644 index 000000000..dd150e5fe --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/entity/TaskStatus.scala @@ -0,0 +1,33 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.engineconn.computation.executor.entity + + +object TaskStatus extends Enumeration { + + type TaskStatus = Value + val PENDING = Value(0) + val RUNNING = Value(1) + val SUCCESS = Value(2) + val ERROR = Value(3) + val CANCEL = Value(4) + + def isCompleted(status: TaskStatus): Boolean = { + if (status == PENDING || status == RUNNING) false + else true + } +} diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/execute/ComputationEngineConnExecution.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/execute/ComputationEngineConnExecution.scala new file mode 100644 index 000000000..32b23d104 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/execute/ComputationEngineConnExecution.scala @@ -0,0 +1,84 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.engineconn.computation.executor.execute + +import java.util + +import com.webank.wedatasphere.linkis.common.utils.{Logging, Utils} +import com.webank.wedatasphere.linkis.engineconn.common.creation.EngineCreationContext +import com.webank.wedatasphere.linkis.engineconn.common.engineconn.EngineConn +import com.webank.wedatasphere.linkis.engineconn.common.execution.EngineExecution +import com.webank.wedatasphere.linkis.engineconn.core.executor.ExecutorManager +import com.webank.wedatasphere.linkis.engineconn.executor.entity.{Executor, ResourceExecutor} +import com.webank.wedatasphere.linkis.engineconn.executor.listener.ExecutorListenerBusContext +import com.webank.wedatasphere.linkis.engineconn.executor.service.ManagerService +import com.webank.wedatasphere.linkis.governance.common.exception.engineconn.{EngineConnExecutorErrorCode, EngineConnExecutorErrorException} +import com.webank.wedatasphere.linkis.manager.common.protocol.resource.ResourceUsedProtocol +import com.webank.wedatasphere.linkis.manager.label.entity.Label +import com.webank.wedatasphere.linkis.rpc.Sender +import com.webank.wedatasphere.linkis.server.BDPJettyServerHelper + + +class ComputationEngineConnExecution extends EngineExecution with Logging { + + private val executorManager: ExecutorManager = ExecutorManager.getInstance() + + /** + * 创建出默认的Executor + * + * @param engineCreationContext + * @param engineConn + */ + override def execute(engineCreationContext: EngineCreationContext, engineConn: EngineConn): Unit = { + Utils.tryCatch{ + init(engineCreationContext) + val defaultExecutor = executorManager.getDefaultExecutor.asInstanceOf[ComputationExecutor] + reportUsedResource(defaultExecutor, engineCreationContext) + reportLabel(defaultExecutor.getExecutorLabels()) + info(s"Engine Executor ${defaultExecutor.getId()} started.") + info("Debug: engineCreationContext: " + BDPJettyServerHelper.gson.toJson(engineCreationContext)) + }{ + t => + error(s"Init executor error. ", t) + throw new EngineConnExecutorErrorException(EngineConnExecutorErrorCode.INIT_EXECUTOR_FAILED, "Init executor failed. ", t) + } + } + + private def init(engineCreationContext: EngineCreationContext): Unit = { + // msContext.getPublisher.publish(RequestTaskExecute) + val listenerBusContext = ExecutorListenerBusContext.getExecutorListenerBusContext + listenerBusContext.getEngineConnAsyncListenerBus.start() + } + + private def reportUsedResource(executor: Executor, engineCreationContext: EngineCreationContext): Unit = { + Utils.tryCatch( + executor match { + case resourceExecutor: ResourceExecutor => + ManagerService.getManagerService.reportUsedResource(ResourceUsedProtocol(Sender.getThisServiceInstance, resourceExecutor.getCurrentNodeResource(), engineCreationContext.getTicketId)) + case _ => + info("do not to report usedResource") + } + ) { + t => error("ReportUsedResource error. cause: " + t.getCause) + } + } + + private def reportLabel(labels: util.List[Label[_]]): Unit = { + ManagerService.getManagerService.labelReport(labels) + info("Reported label to am.") + } +} diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/execute/ComputationExecutor.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/execute/ComputationExecutor.scala new file mode 100644 index 000000000..c10fcf5f7 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/execute/ComputationExecutor.scala @@ -0,0 +1,271 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.engineconn.computation.executor.execute + +import java.util.concurrent.TimeUnit + +import com.google.common.cache.{Cache, CacheBuilder} +import com.webank.wedatasphere.linkis.DataWorkCloudApplication +import com.webank.wedatasphere.linkis.common.utils.{Logging, Utils} +import com.webank.wedatasphere.linkis.engineconn.acessible.executor.entity.AccessibleExecutor +import com.webank.wedatasphere.linkis.engineconn.acessible.executor.listener.event.TaskStatusChangedEvent +import com.webank.wedatasphere.linkis.engineconn.common.conf.{EngineConnConf, EngineConnConstant} +import com.webank.wedatasphere.linkis.engineconn.computation.executor.entity.EngineConnTask +import com.webank.wedatasphere.linkis.engineconn.computation.executor.hook.ComputationExecutorHook +import com.webank.wedatasphere.linkis.engineconn.computation.executor.parser.CodeParser +import com.webank.wedatasphere.linkis.engineconn.core.engineconn.EngineConnManager +import com.webank.wedatasphere.linkis.engineconn.executor.entity.{LabelExecutor, ResourceExecutor} +import com.webank.wedatasphere.linkis.engineconn.executor.listener.ExecutorListenerBusContext +import com.webank.wedatasphere.linkis.governance.common.entity.ExecutionNodeStatus +import com.webank.wedatasphere.linkis.governance.common.protocol.task.{EngineConcurrentInfo, RequestTask} +import com.webank.wedatasphere.linkis.manager.common.entity.enumeration.NodeStatus +import com.webank.wedatasphere.linkis.manager.engineplugin.common.creation.ExecutorFactory +import com.webank.wedatasphere.linkis.protocol.engine.JobProgressInfo +import com.webank.wedatasphere.linkis.scheduler.executer._ +import org.apache.commons.lang.StringUtils +import org.apache.commons.lang.exception.ExceptionUtils + + +abstract class ComputationExecutor(val outputPrintLimit: Int = 1000) extends AccessibleExecutor with ResourceExecutor with LabelExecutor with Logging { + + private val listenerBusContext = ExecutorListenerBusContext.getExecutorListenerBusContext + + // private val taskMap: util.Map[String, EngineConnTask] = new ConcurrentHashMap[String, EngineConnTask](8) + private val taskCache: Cache[String, EngineConnTask] = CacheBuilder.newBuilder().expireAfterAccess(EngineConnConf.ENGINE_TASK_EXPIRE_TIME.getValue, TimeUnit.MILLISECONDS) + .maximumSize(EngineConnConstant.MAX_TASK_NUM).build() + + private var engineInitialized: Boolean = false + + private var codeParser: Option[CodeParser] = None + + private var runningTasks: Int = 0 + + private var pendingTasks: Int = 0 + + private var succeedTasks: Int = 0 + + private var failedTasks: Int = 0 + + private var lastTask: EngineConnTask = null + + final override def tryReady: Boolean = { + transition(NodeStatus.Unlock) + if (!engineInitialized) { + engineInitialized = true + } + true + } + + + override def init: Unit = { + info(s"executor($getId()) is ready ") + tryReady + } + + def tryShutdown(): Boolean = { + this.ensureAvailable(transition(NodeStatus.ShuttingDown)) + close() + true + } + + def tryFailed(): Boolean = { + this.whenStatus(NodeStatus.ShuttingDown, transition(NodeStatus.Failed)) + true + } + + + def getSucceedNum = succeedTasks + + def getFailedNum = failedTasks + + def getRunningTask: Int = runningTasks + + private def getExecutorConcurrentInfo: EngineConcurrentInfo = EngineConcurrentInfo(runningTasks, pendingTasks, succeedTasks, failedTasks) + + def isEngineInitialized = engineInitialized + + protected def callback(): Unit = {} + + override def close(): Unit = { + if (null != lastTask) synchronized { + killTask(lastTask.getTaskId) + } else { + killTask("By close") + } + super.close() + } + + // override def getName: String = ComputationExecutorConf.DEFAULT_COMPUTATION_NAME + + protected def ensureOp[A](f: => A): A = if (!this.engineInitialized) + f + else ensureIdle(f) + + def execute(engineConnTask: EngineConnTask): ExecuteResponse = { + + runningTasks += 1 + + taskCache.put(engineConnTask.getTaskId, engineConnTask) + lastTask = engineConnTask + + transformTaskStatus(engineConnTask, ExecutionNodeStatus.Running) + + ensureOp { + val engineExecutionContext = createEngineExecutionContext(engineConnTask) + var hookedCode = engineConnTask.getCode + Utils.tryCatch { + val engineCreationContext = EngineConnManager.getEngineConnManager.getEngineConn().getEngineCreationContext + ComputationExecutorHook.getComputationExecutorHooks.foreach(hook => { + hookedCode = hook.beforeExecutorExecute(engineExecutionContext, engineCreationContext, hookedCode) + }) + } { + case e: Throwable => logger.info("failed to do with hook", e) + } + if (hookedCode.length > 100) { + info(s"hooked after code: ${hookedCode.substring(0, 100)} ....") + } else { + info(s"hooked after code: $hookedCode ") + } + val localPath = System.getenv(EngineConnConf.ENGINE_CONN_LOCAL_LOG_DIRS_KEY.getValue) + engineExecutionContext.appendStdout(s"EngineConn local log path : ${DataWorkCloudApplication.getServiceInstance.toString} ${localPath}") + var response: ExecuteResponse = null + val incomplete = new StringBuilder + val codes = Utils.tryCatch(getCodeParser().map(_.parse(hookedCode, engineExecutionContext)).getOrElse(Array(hookedCode))) { e => + info("Your code will be submitted in overall mode") + Array(hookedCode) + } + engineExecutionContext.setTotalParagraph(codes.length) + codes.indices.foreach({ + index => + 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 => ErrorExecuteResponse(ExceptionUtils.getRootCauseMessage(t), t) + } + info(s"Finished to execute task ${engineConnTask.getTaskId}") + incomplete ++= code + response match { + case e: ErrorExecuteResponse => + failedTasks += 1 + error("execute code failed!", e.t) + return response + case SuccessExecuteResponse() => + engineExecutionContext.appendStdout("\n") + incomplete.setLength(0) + case e: OutputExecuteResponse => + incomplete.setLength(0) + val output = if (StringUtils.isNotEmpty(e.getOutput) && e.getOutput.length > outputPrintLimit) + e.getOutput.substring(0, outputPrintLimit) else e.getOutput + engineExecutionContext.appendStdout(output) + if (StringUtils.isNotBlank(e.getOutput)) engineExecutionContext.sendResultSet(e) + case _: IncompleteExecuteResponse => + incomplete ++= incompleteSplitter + } + }) + Utils.tryCatch(engineExecutionContext.close()) { + t => + response = ErrorExecuteResponse("send resultSet to entrance failed!", t) + failedTasks += 1 + } + runningTasks -= 1 + lastTask = null + response match { + case _: OutputExecuteResponse => + succeedTasks += 1 + transformTaskStatus(engineConnTask, ExecutionNodeStatus.Succeed) + SuccessExecuteResponse() + case s: SuccessExecuteResponse => + succeedTasks += 1 + transformTaskStatus(engineConnTask, ExecutionNodeStatus.Succeed) + s + case _ => response + } + } + + + } + + def setCodeParser(codeParser: CodeParser) = this.codeParser = Some(codeParser) + + def getCodeParser(): Option[CodeParser] = this.codeParser + + def executeLine(engineExecutorContext: EngineExecutionContext, code: String): ExecuteResponse + + protected def incompleteSplitter = "\n" + + def executeCompletely(engineExecutorContext: EngineExecutionContext, code: String, completedLine: String): ExecuteResponse + + def progress(): Float + + def getProgressInfo: Array[JobProgressInfo] + + protected def createEngineExecutionContext(engineConnTask: EngineConnTask): EngineExecutionContext = { + val userCreator = ExecutorFactory.parseUserWithCreator(engineConnTask.getLables) + + val engineExecutionContext = if (null != userCreator && StringUtils.isNotBlank(userCreator.user)) { + new EngineExecutionContext(this, userCreator.user) + } else { + new EngineExecutionContext(this) + } + if (engineConnTask.getProperties.containsKey(RequestTask.RESULT_SET_STORE_PATH)) { + engineExecutionContext.setStorePath(engineConnTask.getProperties.get(RequestTask.RESULT_SET_STORE_PATH).toString) + } + engineExecutionContext.setJobId(engineConnTask.getTaskId) + engineExecutionContext.getProperties.putAll(engineConnTask.getProperties) + engineExecutionContext.setLabels(engineConnTask.getLables) + engineExecutionContext + } + + def killTask(taskId: String): Unit = { + Utils.tryAndWarn { + val task = taskCache.getIfPresent(taskId) + task.setStatus(ExecutionNodeStatus.Cancelled) + if (null != task) { + transformTaskStatus(task, ExecutionNodeStatus.Cancelled) + } + } + } + + def transformTaskStatus(task: EngineConnTask, newStatus: ExecutionNodeStatus) = { + val oriStatus = task.getStatus + oriStatus match { + case ExecutionNodeStatus.Scheduled => + if (task.getStatus != newStatus) { + task.setStatus(newStatus) + } + case ExecutionNodeStatus.Running => + if (newStatus == ExecutionNodeStatus.Succeed || newStatus == ExecutionNodeStatus.Failed || newStatus == ExecutionNodeStatus.Cancelled) { + task.setStatus(newStatus) + } else { + error(s"Task status change error. task: ${task}, newStatus : ${newStatus}") + } + case _ => + error(s"Task status change error. task: ${task}, newStatus : ${newStatus}") + } + if (oriStatus != newStatus) { + listenerBusContext.getEngineConnSyncListenerBus.postToAll(TaskStatusChangedEvent(task.getTaskId, oriStatus, newStatus)) + } + } + + def getTaskById(taskId: String): EngineConnTask = { + taskCache.getIfPresent(taskId) + } + +} diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/execute/ConcurrentComputationExecutor.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/execute/ConcurrentComputationExecutor.scala new file mode 100644 index 000000000..c8bfe2c59 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/execute/ConcurrentComputationExecutor.scala @@ -0,0 +1,47 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.engineconn.computation.executor.execute + +import com.webank.wedatasphere.linkis.engineconn.computation.executor.entity.EngineConnTask +import com.webank.wedatasphere.linkis.engineconn.executor.entity.ConcurrentExecutor +import com.webank.wedatasphere.linkis.manager.common.entity.enumeration.NodeStatus +import com.webank.wedatasphere.linkis.scheduler.executer.ExecuteResponse + + +abstract class ConcurrentComputationExecutor(override val outputPrintLimit: Int = 1000) extends ComputationExecutor(outputPrintLimit) with ConcurrentExecutor { + + override def execute(engineConnTask: EngineConnTask): ExecuteResponse = { + if (getRunningTask >= getConcurrentLimit) synchronized { + if (getRunningTask >= getConcurrentLimit) { + info(s"running task($getRunningTask) > concurrent limit $getConcurrentLimit, now to mark engine to busy ") + transition(NodeStatus.Busy) + } + } + val response = super.execute(engineConnTask) + if (getStatus == NodeStatus.Busy && getConcurrentLimit > getRunningTask) synchronized { + if (getStatus == NodeStatus.Busy && getConcurrentLimit > getRunningTask) { + info(s"running task($getRunningTask) < concurrent limit $getConcurrentLimit, now to mark engine to Unlock ") + transition(NodeStatus.Unlock) + } + } + response + } + + protected override def ensureOp[A](f: => A): A = if (!isEngineInitialized) + f + else ensureIdle(f, false) +} diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala new file mode 100644 index 000000000..5e268f682 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala @@ -0,0 +1,217 @@ +/* + * Copyright 2019 WeBank + * Licensed 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 com.webank.wedatasphere.linkis.engineconn.computation.executor.execute + +import java.io.File +import java.util +import java.util.concurrent.atomic.AtomicInteger + +import com.webank.wedatasphere.linkis.common.io.resultset.{ResultSet, ResultSetWriter} +import com.webank.wedatasphere.linkis.common.io.{FsPath, MetaData, Record} +import com.webank.wedatasphere.linkis.common.utils.{Logging, Utils} +import com.webank.wedatasphere.linkis.cs.client.utils.ContextServiceUtils +import com.webank.wedatasphere.linkis.cs.storage.CSTableResultSetWriter +import com.webank.wedatasphere.linkis.engineconn.acessible.executor.listener.event.{TaskLogUpdateEvent, TaskProgressUpdateEvent, TaskResultCreateEvent, TaskResultSizeCreatedEvent} +import com.webank.wedatasphere.linkis.engineconn.computation.executor.conf.ComputationExecutorConf +import com.webank.wedatasphere.linkis.engineconn.executor.listener.{EngineConnAsyncListenerBus, EngineConnSyncListenerBus, ExecutorListenerBusContext} +import com.webank.wedatasphere.linkis.governance.common.exception.engineconn.EngineConnExecutorErrorException +import com.webank.wedatasphere.linkis.manager.label.entity.Label +import com.webank.wedatasphere.linkis.protocol.engine.JobProgressInfo +import com.webank.wedatasphere.linkis.scheduler.executer.{AliasOutputExecuteResponse, OutputExecuteResponse} +import com.webank.wedatasphere.linkis.storage.resultset.table.TableResultSet +import com.webank.wedatasphere.linkis.storage.resultset.{ResultSetFactory, ResultSetWriter} +import com.webank.wedatasphere.linkis.storage.{LineMetaData, LineRecord} +import org.apache.commons.io.IOUtils +import org.apache.commons.lang.StringUtils +import org.apache.commons.lang.time.DateFormatUtils + +import scala.collection.mutable.ArrayBuffer + + +class EngineExecutionContext(executor: ComputationExecutor, executorUser: String = Utils.getJvmUser) extends Logging { + + private val resultSetFactory = ResultSetFactory.getInstance + + private val resultSetWriters = ArrayBuffer[ResultSetWriter[_ <: MetaData, _ <: Record]]() + + private var defaultResultSetWriter: ResultSetWriter[_ <: MetaData, _ <: Record] = _ + + private var resultSize = 0 + + private var interrupted = false + + private var jobId: Option[String] = None + private val aliasNum = new AtomicInteger(0) + protected var storePath: Option[String] = None + + private val properties: java.util.Map[String, Object] = new util.HashMap[String, Object]() + + private var labels: Array[Label[_]] = new Array[Label[_]](0) + + private var totalParagraph = 0 + private var currentParagraph = 0 + + def kill(): Unit = interrupted = true + + def isKilled: Boolean = interrupted + + def getTotalParagraph: Int = totalParagraph + + def setTotalParagraph(totalParagraph: Int): Unit = this.totalParagraph = totalParagraph + + def getCurrentParagraph: Int = currentParagraph + + def setCurrentParagraph(currentParagraph: Int): Unit = this.currentParagraph = currentParagraph + + def pushProgress(progress: Float, progressInfo: Array[JobProgressInfo]): Unit = { + val listenerBus = getEngineSyncListenerBus + jobId.foreach(jId => { + listenerBus.postToAll(TaskProgressUpdateEvent(jId, progress, progressInfo)) + }) + } + + def sendResultSet(resultSetWriter: ResultSetWriter[_ <: MetaData, _ <: Record]): Unit = { + info("Start to send res to entrance") + val fileName = new File(resultSetWriter.toFSPath.getPath).getName + val index = if (fileName.indexOf(".") < 0) fileName.length else fileName.indexOf(".") + val alias = if (fileName.startsWith("_")) fileName.substring(1, index) else fileName.substring(0, fileName.indexOf("_")) + Utils.tryFinally(sendResultSet(resultSetWriter.toString(), alias)) { + IOUtils.closeQuietly(resultSetWriter) + resultSetWriters synchronized resultSetWriters -= resultSetWriter + } + } + + def sendResultSet(output: String): Unit = sendResultSet(output, "_" + aliasNum.getAndIncrement()) + + def appendTextResultSet(output: String): Unit = { + if (defaultResultSetWriter == null) aliasNum synchronized { + if (defaultResultSetWriter == null) { + defaultResultSetWriter = createDefaultResultSetWriter(ResultSetFactory.TEXT_TYPE) + defaultResultSetWriter.addMetaData(new LineMetaData()) + resultSetWriters += defaultResultSetWriter + } + } + defaultResultSetWriter.addRecord(new LineRecord(output)) + } + + private def sendResultSet(output: String, alias: String): Unit = { + if (StringUtils.isEmpty(output)) return + if (resultSetFactory.isResultSetPath(output) || resultSetFactory.isResultSet(output)) { + val listenerBus = getEngineSyncListenerBus + jobId.foreach(jId => { + //TODO peacewong executor.getEngineServerContext().getEngineAsyncListenerBus().post(ResultSetCreatedEvent(jId, output, alias)) + listenerBus.postToAll(TaskResultCreateEvent(jId, output, alias)) + resultSize += 1 + }) + } else throw new EngineConnExecutorErrorException(50050, "unknown resultSet: " + output) + } + + def setJobId(jobId: String) = this.jobId = Option(jobId) + + def getJobId = jobId + + def setStorePath(storePath: String) = this.storePath = Option(storePath) + + def getLables: Array[Label[_]] = labels + + def setLabels(labels: Array[Label[_]]): Unit = this.labels = labels + + def sendResultSet(outputExecuteResponse: OutputExecuteResponse): Unit = outputExecuteResponse match { + case AliasOutputExecuteResponse(alias, output) => sendResultSet(output, alias) + case output: OutputExecuteResponse => sendResultSet(output.getOutput, "_" + aliasNum.getAndIncrement()) + } + + def getProperties: java.util.Map[String, Object] = properties + + def addProperty(key: String, value: String): Unit = properties.put(key, value) + + protected def getDefaultStorePath: String = { + val path = ComputationExecutorConf.ENGINECONN_RESULT_SET_STORE_PATH.getValue + (if (path.endsWith("/")) path else path + "/") + Utils.getJvmUser + "/" + + DateFormatUtils.format(System.currentTimeMillis(), "yyyyMMdd") + "/" + getJobId.get + "/" + System.nanoTime + } + + def createDefaultResultSetWriter(): ResultSetWriter[_ <: MetaData, _ <: Record] = { + // createResultSetWriter(resultSetFactory.getResultSetByType(engine.getDefaultResultSetType)) + createResultSetWriter(resultSetFactory.getResultSetByType(resultSetFactory.getResultSetType(0))) // todo check + } + + def createDefaultResultSetWriter(alias: String): ResultSetWriter[_ <: MetaData, _ <: Record] = + createResultSetWriter(resultSetFactory.getResultSetByType(resultSetFactory.getResultSetType(0)), alias) // todo check + + def createResultSetWriter(resultSetType: String): ResultSetWriter[_ <: MetaData, _ <: Record] = + createResultSetWriter(resultSetFactory.getResultSetByType(resultSetType), null) + + def createResultSetWriter(resultSet: ResultSet[_ <: MetaData, _ <: Record]): ResultSetWriter[_ <: MetaData, _ <: Record] = + createResultSetWriter(resultSet, null) + + def createResultSetWriter(resultSetType: String, alias: String): ResultSetWriter[_ <: MetaData, _ <: Record] = + createResultSetWriter(resultSetFactory.getResultSetByType(resultSetType), alias) + + def createResultSetWriter(resultSet: ResultSet[_ <: MetaData, _ <: Record], alias: String): ResultSetWriter[_ <: MetaData, _ <: Record] = { + val filePath = storePath.getOrElse(getDefaultStorePath) + val fileName = if (StringUtils.isEmpty(alias)) "_" + aliasNum.getAndIncrement() else alias + "_" + aliasNum.getAndIncrement() + val resultSetPath = resultSet.getResultSetPath(new FsPath(filePath), fileName) + //update by peaceWong 20200402 + val resultSetWriter = resultSet match { + case result: TableResultSet => + val contextIDStr = ContextServiceUtils.getContextIDStrByMap(getProperties) + val nodeName = ContextServiceUtils.getNodeNameStrByMap(getProperties) + if (StringUtils.isNotBlank(contextIDStr) && StringUtils.isNotBlank(nodeName)) { + val csWriter = new CSTableResultSetWriter(result, ComputationExecutorConf.ENGINE_RESULT_SET_MAX_CACHE.getValue.toLong, resultSetPath, contextIDStr, nodeName, alias) + csWriter.setProxyUser(executorUser) + csWriter + } else { + ResultSetWriter.getResultSetWriter(resultSet, ComputationExecutorConf.ENGINE_RESULT_SET_MAX_CACHE.getValue.toLong, resultSetPath, executorUser) + } + case _ => ResultSetWriter.getResultSetWriter(resultSet, ComputationExecutorConf.ENGINE_RESULT_SET_MAX_CACHE.getValue.toLong, resultSetPath, executorUser) + } + //update by peaceWong 20200402 end + resultSetWriters synchronized resultSetWriters += resultSetWriter + resultSetWriter + } + + def appendStdout(log: String): Unit = if (!executor.isEngineInitialized) { + executor.info(log) + } else { + val listenerBus = getEngineSyncListenerBus + // jobId.foreach(jId => listenerBus.post(TaskLogUpdateEvent(jId, log))) + jobId.foreach(jId => listenerBus.postToAll(TaskLogUpdateEvent(jId, log))) + } + + def sendProgress(progress: Float, progressInfos: Array[JobProgressInfo]): Unit = { + if (executor.isEngineInitialized) { + val listenerBus = getEngineSyncListenerBus + // jobId.foreach(jId => listenerBus.post(TaskProgressUpdateEvent(jId, progress, progressInfos))) + jobId.foreach(jId => listenerBus.postToAll(TaskProgressUpdateEvent(jId, progress, progressInfos))) + } + } + + def close(): Unit = { + resultSetWriters.toArray.foreach(sendResultSet) + val listenerBus = getEngineSyncListenerBus + jobId.foreach(jId => { + listenerBus.postToAll(TaskResultSizeCreatedEvent(jId, resultSize)) + }) + resultSetWriters.clear() + } + + private def getEngineAsyncListenerBus: EngineConnAsyncListenerBus = { + ExecutorListenerBusContext.getExecutorListenerBusContext.getEngineConnAsyncListenerBus + } + + private def getEngineSyncListenerBus: EngineConnSyncListenerBus = { + ExecutorListenerBusContext.getExecutorListenerBusContext().getEngineConnSyncListenerBus + } +} diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/hook/ComputationEngineConnHook.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/hook/ComputationEngineConnHook.scala new file mode 100644 index 000000000..6c594899e --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/hook/ComputationEngineConnHook.scala @@ -0,0 +1,74 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.engineconn.computation.executor.hook + +import com.webank.wedatasphere.linkis.DataWorkCloudApplication +import com.webank.wedatasphere.linkis.common.conf.DWCArgumentsParser +import com.webank.wedatasphere.linkis.common.utils.{Logging, Utils} +import com.webank.wedatasphere.linkis.engineconn.callback.service.{EngineConnAfterStartCallback, EngineConnPidCallback} +import com.webank.wedatasphere.linkis.engineconn.common.creation.EngineCreationContext +import com.webank.wedatasphere.linkis.engineconn.common.engineconn.EngineConn +import com.webank.wedatasphere.linkis.engineconn.common.hook.EngineConnHook +import com.webank.wedatasphere.linkis.engineconn.core.hook.ShutdownHook +import com.webank.wedatasphere.linkis.manager.common.entity.enumeration.NodeStatus +import com.webank.wedatasphere.linkis.manager.common.protocol.engine.EngineConnStatusCallback +import com.webank.wedatasphere.linkis.rpc.Sender +import com.webank.wedatasphere.linkis.server.conf.ServerConfiguration +import org.apache.commons.lang.StringUtils +import org.apache.commons.lang.exception.ExceptionUtils + + +class ComputationEngineConnHook extends EngineConnHook with Logging { + + override def beforeCreateEngineConn(engineCreationContext: EngineCreationContext): Unit = { + info("<----------Start Spring app---------->") + val parser = DWCArgumentsParser.parse(engineCreationContext.getArgs) + DWCArgumentsParser.setDWCOptionMap(parser.getDWCConfMap) + val existsExcludePackages = ServerConfiguration.BDP_SERVER_EXCLUDE_PACKAGES.getValue + if (!StringUtils.isEmpty(existsExcludePackages)) + DataWorkCloudApplication.setProperty(ServerConfiguration.BDP_SERVER_EXCLUDE_PACKAGES.key, existsExcludePackages) + // 加载spring类 + DataWorkCloudApplication.main(DWCArgumentsParser.formatSpringOptions(parser.getSpringConfMap)) + + val engineConnPidCallBack = new EngineConnPidCallback(engineCreationContext.getEMInstance) + Utils.tryAndError(engineConnPidCallBack.callback()) + info("<----------Spring app init success---------->") + } + + + override def beforeExecutionExecute(engineCreationContext: EngineCreationContext, engineConn: EngineConn): Unit = {} + + override def afterExecutionExecute(engineCreationContext: EngineCreationContext, engineConn: EngineConn): Unit = {} + + override def afterEngineServerStartFailed(engineCreationContext: EngineCreationContext, throwable: Throwable): Unit = { + + val engineConnAfterStartCallback = new EngineConnAfterStartCallback(engineCreationContext.getEMInstance) + engineConnAfterStartCallback.callback(EngineConnStatusCallback(Sender.getThisServiceInstance, + engineCreationContext.getTicketId, NodeStatus.ShuttingDown, ExceptionUtils.getRootCauseMessage(throwable))) + error("init engineConn failed! now exit", throwable) + ShutdownHook.getShutdownHook.notifyError(throwable) + } + + override def afterEngineServerStartSuccess(engineCreationContext: EngineCreationContext, engineConn: EngineConn): Unit = { + val engineConnAfterStartCallback = new EngineConnAfterStartCallback(engineCreationContext.getEMInstance) + engineConnAfterStartCallback.callback(EngineConnStatusCallback(Sender.getThisServiceInstance, + engineCreationContext.getTicketId, NodeStatus.Unlock, "success")) + warn("init engineConn success!") + } + + +} diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/hook/ComputationExecutorHook.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/hook/ComputationExecutorHook.scala new file mode 100644 index 000000000..90a47ceff --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/hook/ComputationExecutorHook.scala @@ -0,0 +1,58 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.engineconn.computation.executor.hook + +import com.webank.wedatasphere.linkis.common.utils.{Logging, Utils} +import com.webank.wedatasphere.linkis.engineconn.common.creation.EngineCreationContext +import com.webank.wedatasphere.linkis.engineconn.computation.executor.execute.EngineExecutionContext +import com.webank.wedatasphere.linkis.manager.engineplugin.common.creation.ExecutorFactory +import org.reflections.Reflections + +import scala.collection.JavaConverters.asScalaSetConverter +import scala.collection.mutable.ArrayBuffer + + +trait ComputationExecutorHook { + + def getHookName(): String + + def beforeExecutorExecute(engineExecutionContext: EngineExecutionContext, engineCreationContext: EngineCreationContext, codeBeforeHook: String): String = codeBeforeHook + +// def afterExecutorExecute(engineExecutionContext: EngineExecutionContext, code: String): Unit +} + +object ComputationExecutorHook extends Logging { + + private lazy val computationExecutorHooks: Array[ComputationExecutorHook] = initComputationExecutorHook + + private def initComputationExecutorHook: Array[ComputationExecutorHook] = { + val hooks = new ArrayBuffer[ComputationExecutorHook] + Utils.tryCatch { + val reflections = new Reflections("com.webank.wedatasphere.linkis.engineconn.computation", classOf[ComputationExecutorHook]) + val allSubClass = reflections.getSubTypesOf(classOf[ComputationExecutorHook]) + allSubClass.asScala.foreach(l => { + hooks += l.newInstance + }) + } { + t: Throwable => + error(t.getMessage) + } + hooks.toArray + } + + def getComputationExecutorHooks = computationExecutorHooks +} \ No newline at end of file diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/listener/ResultSetListener.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/listener/ResultSetListener.scala new file mode 100644 index 000000000..8bce49bf3 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/listener/ResultSetListener.scala @@ -0,0 +1,30 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.engineconn.computation.executor.listener + +import com.webank.wedatasphere.linkis.engineconn.acessible.executor.listener.event.{TaskResultCreateEvent, TaskResultSizeCreatedEvent} +import com.webank.wedatasphere.linkis.engineconn.executor.listener.EngineConnSyncListener + + +trait ResultSetListener extends EngineConnSyncListener { + + def onResultSetCreated(taskResultCreateEvent: TaskResultCreateEvent): Unit + + def onResultSizeCreated(taskResultSizeCreatedEvent: TaskResultSizeCreatedEvent): Unit + + +} diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/listener/TaskProgressListener.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/listener/TaskProgressListener.scala new file mode 100644 index 000000000..4c34719fb --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/listener/TaskProgressListener.scala @@ -0,0 +1,27 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.engineconn.computation.executor.listener + +import com.webank.wedatasphere.linkis.engineconn.acessible.executor.listener.event.TaskProgressUpdateEvent +import com.webank.wedatasphere.linkis.engineconn.executor.listener.EngineConnSyncListener + + +trait TaskProgressListener extends EngineConnSyncListener { + + def onProgressUpdate(taskProgressUpdateEvent: TaskProgressUpdateEvent) + +} diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/listener/TaskStatusListener.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/listener/TaskStatusListener.scala new file mode 100644 index 000000000..a2db53e4d --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/listener/TaskStatusListener.scala @@ -0,0 +1,27 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.engineconn.computation.executor.listener + +import com.webank.wedatasphere.linkis.engineconn.acessible.executor.listener.event.TaskStatusChangedEvent +import com.webank.wedatasphere.linkis.engineconn.executor.listener.EngineConnSyncListener + + +trait TaskStatusListener extends EngineConnSyncListener { + + def onTaskStatusChanged(taskStatusChangedEvent: TaskStatusChangedEvent): Unit + +} diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/parser/CodeParser.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/parser/CodeParser.scala new file mode 100644 index 000000000..2f9af2483 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/parser/CodeParser.scala @@ -0,0 +1,235 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.engineconn.computation.executor.parser + +import com.webank.wedatasphere.linkis.common.utils.Logging +import com.webank.wedatasphere.linkis.engineconn.computation.executor.conf.ComputationExecutorConf +import com.webank.wedatasphere.linkis.engineconn.computation.executor.execute.EngineExecutionContext +import com.webank.wedatasphere.linkis.engineconn.computation.executor.parser.CodeType.CodeType +import org.apache.commons.lang.StringUtils +import org.slf4j.{Logger, LoggerFactory} + +import scala.collection.mutable +import scala.collection.mutable.ArrayBuffer + + +trait CodeParser { + + def parse(code: String, engineExecutorContext: EngineExecutionContext): Array[String] + +} + +abstract class SingleCodeParser extends CodeParser { + val codeType: CodeType + + def canParse(codeType: String): Boolean = { + CodeType.getType(codeType) == this.codeType + } +} + +abstract class CombinedEngineCodeParser extends CodeParser { + val parsers: Array[SingleCodeParser] + + def getCodeType(code: String, engineExecutorContext: EngineExecutionContext): String + + override def parse(code: String, engineExecutorContext: EngineExecutionContext): Array[String] = { + val codeType = getCodeType(code, engineExecutorContext) + parsers.find(_.canParse(codeType)) match { + case Some(parser) => parser.parse(code, engineExecutorContext) + case None => Array(code) + } + } +} + +class ScalaCodeParser extends SingleCodeParser with Logging { + + override val codeType: CodeType = CodeType.Scala + + override def parse(code: String, engineExecutorContext: EngineExecutionContext): Array[String] = { + //val realCode = StringUtils.substringAfter(code, "\n") + val codeBuffer = new ArrayBuffer[String]() + val statementBuffer = new ArrayBuffer[String]() + code.split("\n").foreach { + case "" => + case l if l.startsWith(" ") || l.startsWith("\t") => if (!l.trim.startsWith("//")) statementBuffer.append(l) + case l if l.startsWith("@") => statementBuffer.append(l) + case l if StringUtils.isNotBlank(l) => + if (l.trim.startsWith("}")) { + statementBuffer.append(l) + } else { + if (statementBuffer.nonEmpty) codeBuffer.append(statementBuffer.mkString("\n")) + statementBuffer.clear() + //statementBuffer.append("%scala") + statementBuffer.append(l) + } + case _ => + } + if (statementBuffer.nonEmpty) codeBuffer.append(statementBuffer.mkString("\n")) + codeBuffer.toArray + } +} + +class PythonCodeParser extends SingleCodeParser { + + override val codeType: CodeType = CodeType.Python + val openBrackets = Array("{", "(", "[") + val closeBrackets = Array("}", ")", "]") + val LOG: Logger = LoggerFactory.getLogger(getClass) + + override def parse(code: String, engineExecutorContext: EngineExecutionContext): Array[String] = { + //val realCode = StringUtils.substringAfter(code, "\n") + val bracketStack = new mutable.Stack[String] + val codeBuffer = new ArrayBuffer[String]() + val statementBuffer = new ArrayBuffer[String]() + var notDoc = true + //quotationMarks is used to optimize the three quotes problem(quotationMarks用来优化三引号问题) + var quotationMarks: Boolean = false + code.split("\n").foreach { + case "" => + case l if l.trim.contains("\"\"\"") || l.trim.contains("""'''""") => quotationMarks = !quotationMarks + statementBuffer.append(l) + recordBrackets(bracketStack, l) + case l if quotationMarks => statementBuffer.append(l) + //shanhuang 用于修复python的引号问题 + //recordBrackets(bracketStack, l) + case l if notDoc && l.startsWith("#") => + case l if StringUtils.isNotBlank(statementBuffer.last) && statementBuffer.last.endsWith("""\""") => + statementBuffer.append(l) + case l if notDoc && l.startsWith(" ") => + statementBuffer.append(l) + recordBrackets(bracketStack, l.trim) + case l if notDoc && l.startsWith("\t") => + statementBuffer.append(l) + recordBrackets(bracketStack, l.trim) + case l if notDoc && l.startsWith("@") => + statementBuffer.append(l) + recordBrackets(bracketStack, l.trim) + case l if notDoc && l.startsWith("else") => //LOG.info("I am else") + statementBuffer.append(l) + recordBrackets(bracketStack, l.trim) + case l if notDoc && l.startsWith("elif") => //LOG.info("I am elif") + statementBuffer.append(l) + recordBrackets(bracketStack, l.trim) + case l if notDoc && StringUtils.isNotBlank(l) => + if (statementBuffer.nonEmpty && bracketStack.isEmpty) { + codeBuffer.append(statementBuffer.mkString("\n")) + statementBuffer.clear() + } + // statementBuffer.append("%python") + statementBuffer.append(l) + recordBrackets(bracketStack, l.trim) + case _ => + } + if (statementBuffer.nonEmpty) codeBuffer.append(statementBuffer.mkString("\n")) + codeBuffer.toArray + } + + def recordBrackets(bracketStack: mutable.Stack[String], l: String): Unit = { + val real = l.replace("\"\"\"", "").replace("'''", "").trim + if (StringUtils.endsWithAny(real, openBrackets)) { + for (i <- (0 to real.length - 1).reverse) { + val token = real.substring(i, i + 1) + if (openBrackets.contains(token)) { + bracketStack.push(token) + } + } + } + if (StringUtils.startsWithAny(real, closeBrackets)) { + for (i <- 0 to real.length - 1) { + val token = real.substring(i, i + 1) + if (closeBrackets.contains(token)) { + bracketStack.pop() + } + } + } + } + +} + + +object Main { + def main(args: Array[String]): Unit = { + val codeParser = new PythonCodeParser + val code = "if True: \n print 1 \nelif N=123: \n print 456 \nelse: \n print 789" + println(code) + val arrCodes = codeParser.parse(code, null) + print(arrCodes.mkString("||\n")) + } +} + +class SQLCodeParser extends SingleCodeParser { + + override val codeType: CodeType = CodeType.SQL + + val separator = ";" + + val defaultLimit: Int = ComputationExecutorConf.ENGINE_DEFAULT_LIMIT.getValue + + override def parse(code: String, engineExecutorContext: EngineExecutionContext): Array[String] = { + //val realCode = StringUtils.substringAfter(code, "\n") + val codeBuffer = new ArrayBuffer[String]() + + def appendStatement(sqlStatement: String): Unit = { + codeBuffer.append(sqlStatement) + } + + if (StringUtils.contains(code, separator)) { + StringUtils.split(code, ";").foreach { + case s if StringUtils.isBlank(s) => + case s if isSelectCmdNoLimit(s) => appendStatement(s); + case s => appendStatement(s); + } + } else { + code match { + case s if StringUtils.isBlank(s) => + case s if isSelectCmdNoLimit(s) => appendStatement(s); + case s => appendStatement(s); + } + } + codeBuffer.toArray + } + + def isSelectCmdNoLimit(cmd: String): Boolean = { + var code = cmd.trim + if (!cmd.split("\\s+")(0).equalsIgnoreCase("select")) return false + if (code.contains("limit")) code = code.substring(code.lastIndexOf("limit")).trim + else if (code.contains("LIMIT")) code = code.substring(code.lastIndexOf("LIMIT")).trim.toLowerCase + else return true + val hasLimit = code.matches("limit\\s+\\d+\\s*;?") + if (hasLimit) { + if (code.indexOf(";") > 0) code = code.substring(5, code.length - 1).trim + else code = code.substring(5).trim + val limitNum = code.toInt + if (limitNum > defaultLimit) throw new IllegalArgumentException("We at most allowed to limit " + defaultLimit + ", but your SQL has been over the max rows.") + } + !hasLimit + } +} + +object CodeType extends Enumeration { + type CodeType = Value + val Python, SQL, Scala, Shell, Other = Value + + def getType(codeType: String): CodeType = codeType.toLowerCase() match { + case "python" | "pyspark" | "py" => Python + case "sql" | "hql" => SQL + case "scala" => Scala + case "shell" => Shell + case _ => Other + } +} + diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/rs/RsOutputStream.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/rs/RsOutputStream.scala new file mode 100644 index 000000000..42d229ee9 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/rs/RsOutputStream.scala @@ -0,0 +1,68 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.engineconn.computation.executor.rs + +import java.io.OutputStream + +import com.webank.wedatasphere.linkis.common.io.resultset.ResultSetWriter +import com.webank.wedatasphere.linkis.common.io.{MetaData, Record} +import com.webank.wedatasphere.linkis.common.utils.Logging +import com.webank.wedatasphere.linkis.engineconn.computation.executor.execute.EngineExecutionContext +import com.webank.wedatasphere.linkis.storage.LineRecord + +import scala.collection.mutable.ArrayBuffer + + +class RsOutputStream extends OutputStream with Logging{ + private val line = ArrayBuffer[Byte]() + private var isReady = false + private var writer: ResultSetWriter[_ <: MetaData, _ <: Record] = _ + override def write(b: Int) = if(isReady) synchronized { + if(writer != null) { + if (b == '\n') { + val outStr = new String(line.toArray,"UTF-8") + writer.addRecord(new LineRecord(outStr)) + //info("output line:" + outStr) + line.clear() + } else line += b.toByte + }else{ + warn("writer is null") + } + } + + def reset(engineExecutionContext: EngineExecutionContext) = { + writer = engineExecutionContext.createDefaultResultSetWriter() + writer.addMetaData(null) + } + + def ready() = isReady = true + + override def flush(): Unit = if(writer != null && line.nonEmpty) { + val outStr = new String(line.toArray,"UTF-8") + writer.addRecord(new LineRecord(outStr)) + //info("flush line:" + outStr) + line.clear() + } + + override def toString = if(writer != null) writer.toString() else null + + override def close() = if(writer != null) { + flush() + writer.close() + writer = null + } +} diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/service/TaskExecutionService.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/service/TaskExecutionService.scala new file mode 100644 index 000000000..aa45ed2a4 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/service/TaskExecutionService.scala @@ -0,0 +1,50 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.engineconn.computation.executor.service + +import com.webank.wedatasphere.linkis.governance.common.protocol.task._ +import com.webank.wedatasphere.linkis.message.builder.ServiceMethodContext +import com.webank.wedatasphere.linkis.scheduler.executer.ExecuteResponse + + +trait TaskExecutionService { + + def execute(requestTask: RequestTask, smc: ServiceMethodContext): ExecuteResponse + +// def taskStatus(taskID: String): ResponseTaskStatus + + def taskProgress(taskID: String): ResponseTaskProgress + + def taskLog(taskID: String): ResponseTaskLog + + def killTask(taskID: String): Unit + + /*def pauseTask(taskID: String): Unit + + def resumeTask(taskID: String): Unit*/ + + + def dealRequestTaskStatus(requestTaskStatus: RequestTaskStatus): ResponseTaskStatus + + def dealRequestTaskPause(requestTaskPause: RequestTaskPause): Unit + + def dealRequestTaskKill(requestTaskKill: RequestTaskKill): Unit + + def dealRequestTaskResume(requestTaskResume: RequestTaskResume): Unit + + +} diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala new file mode 100644 index 000000000..1de9a7208 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala @@ -0,0 +1,349 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.engineconn.computation.executor.service + +import java.util.concurrent.atomic.AtomicInteger +import java.util.concurrent.{ExecutorService, Executors, Future, TimeUnit} + +import com.google.common.cache.{Cache, CacheBuilder} +import com.webank.wedatasphere.linkis.common.listener.Event +import com.webank.wedatasphere.linkis.common.utils.{Logging, Utils} +import com.webank.wedatasphere.linkis.engineconn.acessible.executor.listener.LogListener +import com.webank.wedatasphere.linkis.engineconn.acessible.executor.listener.event._ +import com.webank.wedatasphere.linkis.engineconn.acessible.executor.log.LogHelper +import com.webank.wedatasphere.linkis.engineconn.acessible.executor.service.LockService +import com.webank.wedatasphere.linkis.engineconn.common.conf.{EngineConnConf, EngineConnConstant} +import com.webank.wedatasphere.linkis.engineconn.computation.executor.entity.{CommonEngineConnTask, EngineConnTask} +import com.webank.wedatasphere.linkis.engineconn.computation.executor.execute.ComputationExecutor +import com.webank.wedatasphere.linkis.engineconn.computation.executor.listener.{ResultSetListener, TaskProgressListener, TaskStatusListener} +import com.webank.wedatasphere.linkis.engineconn.computation.executor.utlis.{ComputationEngineUtils, ComputaionEngineContant} +import com.webank.wedatasphere.linkis.engineconn.core.executor.ExecutorManager +import com.webank.wedatasphere.linkis.engineconn.executor.listener.ExecutorListenerBusContext +import com.webank.wedatasphere.linkis.engineconn.executor.listener.event.EngineConnSyncEvent +import com.webank.wedatasphere.linkis.governance.common.entity.ExecutionNodeStatus +import com.webank.wedatasphere.linkis.governance.common.exception.engineconn.{EngineConnExecutorErrorCode, EngineConnExecutorErrorException} +import com.webank.wedatasphere.linkis.governance.common.protocol.task._ +import com.webank.wedatasphere.linkis.message.annotation.Receiver +import com.webank.wedatasphere.linkis.message.builder.ServiceMethodContext +import com.webank.wedatasphere.linkis.protocol.message.RequestProtocol +import com.webank.wedatasphere.linkis.rpc.Sender +import com.webank.wedatasphere.linkis.rpc.utils.RPCUtils +import com.webank.wedatasphere.linkis.scheduler.executer.{ErrorExecuteResponse, ExecuteResponse, IncompleteExecuteResponse, SubmitResponse} +import com.webank.wedatasphere.linkis.server.BDPJettyServerHelper +import javax.annotation.PostConstruct +import org.apache.commons.lang.StringUtils +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.stereotype.Component + +import scala.collection.JavaConverters._ + + +@Component +class TaskExecutionServiceImpl extends TaskExecutionService with Logging with ResultSetListener with LogListener with TaskProgressListener with TaskStatusListener { + + private val executorManager = ExecutorManager.getInstance() + private val taskExecutedNum = new AtomicInteger(0) + private var lastTask: EngineConnTask = _ + private var executorService: ExecutorService = _ + private var lastTaskFuture: Future[_] = _ + + @Autowired + private var lockService: LockService = _ + private val asyncListenerBusContext = ExecutorListenerBusContext.getExecutorListenerBusContext.getEngineConnAsyncListenerBus + private val syncListenerBus = ExecutorListenerBusContext.getExecutorListenerBusContext.getEngineConnSyncListenerBus + private val taskIdCache: Cache[String, ComputationExecutor] = CacheBuilder.newBuilder().expireAfterAccess(EngineConnConf.ENGINE_TASK_EXPIRE_TIME.getValue, TimeUnit.MILLISECONDS) + .maximumSize(EngineConnConstant.MAX_TASK_NUM).build() + + @PostConstruct + def init(): Unit = { + LogHelper.setLogListener(this) + syncListenerBus.addListener(this) + executorService = Executors.newSingleThreadExecutor() + } + + private def sendToEntrance(task: EngineConnTask, msg: RequestProtocol): Unit = synchronized { + Utils.tryCatch { + var sender : Sender = null + if (null != task && null != task.getCallbackServiceInstance()) { + sender = Sender.getSender(task.getCallbackServiceInstance()) + sender.send(msg) + } else { + // todo + debug("SendtoEntrance error, cannot find entrance instance.") + } + }{ + t => + val errorMsg = s"SendToEntrance error. $msg" + t.getCause + error(errorMsg, t) + throw new EngineConnExecutorErrorException(EngineConnExecutorErrorCode.SEND_TO_ENTRANCE_ERROR, errorMsg) + } + } + + @Receiver + override def execute(requestTask: RequestTask, smc: ServiceMethodContext): ExecuteResponse = { + // smc // todo get sender + // check lock + if (StringUtils.isBlank(requestTask.getLock)) { + error(s"Invalid lock : ${requestTask.getLock} , requestTask : " + BDPJettyServerHelper.gson.toJson(requestTask)) + return ErrorExecuteResponse(s"Invalid lock : ${requestTask.getLock}.", new EngineConnExecutorErrorException(EngineConnExecutorErrorCode.INVALID_PARAMS, "Invalid lock or code(请获取到锁后再提交任务.)")) + } + if (!lockService.isLockExist(requestTask.getLock)) { + error(s"Lock ${requestTask.getLock} not exist, cannot execute.") + return ErrorExecuteResponse("Lock not exixt", new EngineConnExecutorErrorException(EngineConnExecutorErrorCode.INVALID_LOCK, "Lock : " + requestTask.getLock + " not exist(您的锁无效,请重新获取后再提交).")) + } + + if (StringUtils.isBlank(requestTask.getCode)) { + return IncompleteExecuteResponse("Your code is incomplete, it may be that only comments are selected for execution(您的代码不完整,可能是仅仅选中了注释进行执行)") + } + + // 获取任务类型和任务代码,运行任务 + val taskId: Int = taskExecutedNum.incrementAndGet() + val retryAble: Boolean = { + val retry = requestTask.getProperties.getOrDefault(ComputaionEngineContant.RETRYABLE_TYPE_NAME, null) + if (null != retry) retry.asInstanceOf[Boolean] + else false + } + val task = new CommonEngineConnTask(String.valueOf(taskId), retryAble) + task.setCode(requestTask.getCode) + task.setProperties(requestTask.getProperties) + task.data(ComputaionEngineContant.LOCK_TYPE_NAME, requestTask.getLock) + task.setStatus(ExecutionNodeStatus.Scheduled) + val labels = requestTask.getLabels.asScala.toArray + task.setLabels(labels) + val entranceServerInstance = RPCUtils.getServiceInstanceFromSender(smc.getSender) + task.setCallbackServiceInstance(entranceServerInstance) + val executor = executorManager.getExecutorByLabels(labels) + executor match { + case computationExecutor: ComputationExecutor => + taskIdCache.put(task.getTaskId, computationExecutor) + submitTask(task, computationExecutor) + case o => + val msg = "Invalid compuatitionExecutor : " + ComputationEngineUtils.GSON.toJson(o) + ", labels : " + ComputationEngineUtils.GSON.toJson(labels) + ", requestTask : " + ComputationEngineUtils.GSON.toJson(requestTask) + error(msg) + ErrorExecuteResponse("Invalid computationExecutor(生成无效的计算引擎,请联系管理员).", + new EngineConnExecutorErrorException(EngineConnExecutorErrorCode.INVALID_ENGINE_TYPE, msg)) + } + + } + + +// override def taskStatus(taskID: String): ResponseTaskStatus = { +// val task = taskIdCache.get(taskID) +// ResponseTaskStatus(taskID, task.getStatus.id) +// } + + private def submitTask(task: CommonEngineConnTask, computationExecutor: ComputationExecutor) = { + val runTask = new Runnable { + override def run(): Unit = Utils.tryAndWarn { + val response = computationExecutor.execute(task) + response match { + case ErrorExecuteResponse(message, throwable) => + sendToEntrance(task, ResponseTaskError(task.getTaskId, message)) + error(message, throwable) + computationExecutor.transformTaskStatus(task, ExecutionNodeStatus.Failed) + case _ => + } + } + } + lastTask = task + lastTaskFuture = executorService.submit(runTask) + info(s"Task ${task.getTaskId} was submited.") + SubmitResponse(task.getTaskId) + } + + override def taskProgress(taskID: String): ResponseTaskProgress = { + var response = ResponseTaskProgress(taskID, -1, null) + if (StringUtils.isBlank(taskID)) response + val executor = taskIdCache.getIfPresent(taskID) + if (null != executor) { + val task = executor.getTaskById(taskID) + if (null != task) { + if (ExecutionNodeStatus.isCompleted(task.getStatus)) { + response = ResponseTaskProgress(taskID, 1.0f, null) + } else { + response = ResponseTaskProgress(taskID, executor.progress(), executor.getProgressInfo) + } + } else { + response = ResponseTaskProgress(taskID, -1, null) + } + } else { + error(s"Executor of taskId : $taskID is not cached.") + } + response + } + + override def taskLog(taskID: String): ResponseTaskLog = { + // todo check + null + } + +// override def pauseTask(taskID: String): Unit = { +// val task = taskIdCache.get(taskID) +// // todo +// } + + override def killTask(taskID: String): Unit = { + val executor = taskIdCache.getIfPresent(taskID) + if (null != executor) { + executor.killTask(taskID) + } else { + error(s"Executor of taskId : $taskID is not cached.") + } + Utils.tryAndWarn (Thread.sleep(50)) + if (null != lastTask && lastTask.getTaskId.equalsIgnoreCase(taskID)) { + if (null != lastTaskFuture && !lastTaskFuture.isDone) { + Utils.tryAndWarn(lastTaskFuture.cancel(true)) + } + } + } + + /*override def resumeTask(taskID: String): Unit = { + // todo + }*/ + + @Receiver + override def dealRequestTaskStatus(requestTaskStatus: RequestTaskStatus): ResponseTaskStatus = { + val task = getTaskByTaskId(requestTaskStatus.execId) + if (null != task) { + ResponseTaskStatus(task.getTaskId, task.getStatus) + } else { + val msg = "Task null! requestTaskStatus: " + ComputationEngineUtils.GSON.toJson(requestTaskStatus) + error(msg) + ResponseTaskStatus(requestTaskStatus.execId, ExecutionNodeStatus.Cancelled) + } + } + + @Receiver + override def dealRequestTaskPause(requestTaskPause: RequestTaskPause): Unit = { + info(s"Pause is Not supported for task : " + requestTaskPause.execId ) + } + + @Receiver + override def dealRequestTaskKill(requestTaskKill: RequestTaskKill): Unit = { + val executor = taskIdCache.getIfPresent(requestTaskKill.execId) + if (null != executor) { + executor.killTask(requestTaskKill.execId) + info(s"TaskId : ${requestTaskKill.execId} was killed by user.") + } else { + error(s"Invalid executor : null for taskId : ${requestTaskKill.execId}") + } + } + + @Receiver + override def dealRequestTaskResume(requestTaskResume: RequestTaskResume): Unit = { + info(s"Resume is Not support for task : " + requestTaskResume.execId ) + } + + override def onEvent(event: EngineConnSyncEvent): Unit = event match { + case taskStatusChangedEvent: TaskStatusChangedEvent => onTaskStatusChanged(taskStatusChangedEvent) + case taskProgressUpdateEvent: TaskProgressUpdateEvent => onProgressUpdate(taskProgressUpdateEvent) + case logUpdateEvent: TaskLogUpdateEvent => onLogUpdate(logUpdateEvent) + case taskResultCreateEvent: TaskResultCreateEvent => onResultSetCreated(taskResultCreateEvent) + case taskResultSizeCreatedEvent: TaskResultSizeCreatedEvent => onResultSizeCreated(taskResultSizeCreatedEvent) + case _ => + warn("Unknown event : " + BDPJettyServerHelper.gson.toJson(event)) + } + + override def onLogUpdate(logUpdateEvent: TaskLogUpdateEvent): Unit = { + if (EngineConnConf.ENGINE_PUSH_LOG_TO_ENTRANCE.getValue) { + if (null != logUpdateEvent && StringUtils.isNotBlank(logUpdateEvent.taskId)) { + val task = getTaskByTaskId(logUpdateEvent.taskId) + if (null != task) { + sendToEntrance(task, ResponseTaskLog(logUpdateEvent.taskId, logUpdateEvent.log)) + } else { + error("Task cannot null! logupdateEvent: " + ComputationEngineUtils.GSON.toJson(logUpdateEvent)) + } + } else { + val executor = ExecutorManager.getInstance().getDefaultExecutor + executor match { + case computationExecutor: ComputationExecutor => + sendToEntrance(lastTask, ResponseTaskLog(lastTask.getTaskId, logUpdateEvent.log)) + case _ => + error("OnLogUpdate error. Invalid ComputationExecutor : " + ComputationEngineUtils.GSON.toJson(executor)) + } + } + + } + } + + override def onTaskStatusChanged(taskStatusChangedEvent: TaskStatusChangedEvent): Unit = { + val task = getTaskByTaskId(taskStatusChangedEvent.taskId) + if (null != task) { + if (ExecutionNodeStatus.isCompleted(taskStatusChangedEvent.toStatus)) { + lastTask = task + LogHelper.pushAllRemainLogs() + } + sendToEntrance(task, ResponseTaskStatus(taskStatusChangedEvent.taskId, taskStatusChangedEvent.toStatus)) + } else { + error("Task cannot null! taskStatusChangedEvent: " + ComputationEngineUtils.GSON.toJson(taskStatusChangedEvent)) + } + } + + override def onProgressUpdate(taskProgressUpdateEvent: TaskProgressUpdateEvent): Unit = { + if (EngineConnConf.ENGINE_PUSH_LOG_TO_ENTRANCE.getValue) { + val task = getTaskByTaskId(taskProgressUpdateEvent.taskId) + if (null != task) { + sendToEntrance(task, ResponseTaskProgress(taskProgressUpdateEvent.taskId, taskProgressUpdateEvent.progress, taskProgressUpdateEvent.progressInfo)) + } else { + error("Task cannot null! taskProgressUpdateEvent : " + ComputationEngineUtils.GSON.toJson(taskProgressUpdateEvent)) + } + } + } + + override def onResultSetCreated(taskResultCreateEvent: TaskResultCreateEvent): Unit = { + info(s"start to deal result event ${taskResultCreateEvent.taskId}") + val task = getTaskByTaskId(taskResultCreateEvent.taskId) + if (null != task) { + sendToEntrance(task, ResponseTaskResultSet( + taskResultCreateEvent.taskId, + taskResultCreateEvent.resStr, + taskResultCreateEvent.alias + )) + } else { + error("Task cannot null! taskResultCreateEvent: " + ComputationEngineUtils.GSON.toJson(taskResultCreateEvent)) + } + info(s"Finished to deal result event ${taskResultCreateEvent.taskId}") + } + + def getTaskByTaskId(taskId: String): EngineConnTask = { + if (StringUtils.isBlank(taskId)) return null + val executor = taskIdCache.getIfPresent(taskId) + if (null != executor) { + executor.getTaskById(taskId) + } else { + error(s"Executor of taskId : $taskId is not cached.") + null + } + } + + override def onResultSizeCreated(taskResultSizeCreatedEvent: TaskResultSizeCreatedEvent): Unit = { + val task = getTaskByTaskId(taskResultSizeCreatedEvent.taskId) + if (null != task) { + sendToEntrance(task, ResponseTaskResultSize( + taskResultSizeCreatedEvent.taskId, + taskResultSizeCreatedEvent.resultSize + )) + } else { + error("Task cannot null! taskResultSizeCreatedEvent: " + ComputationEngineUtils.GSON.toJson(taskResultSizeCreatedEvent)) + } + } + + override def onEventError(event: Event, t: Throwable): Unit = { + + } + +} diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/utlis/ComputaionEngineContant.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/utlis/ComputaionEngineContant.scala new file mode 100644 index 000000000..40eefeff1 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/utlis/ComputaionEngineContant.scala @@ -0,0 +1,25 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.engineconn.computation.executor.utlis + + +object ComputaionEngineContant { + + def RETRYABLE_TYPE_NAME = "taskRetryable" + + def LOCK_TYPE_NAME = "lock" +} diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/utlis/ComputationEngineUtils.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/utlis/ComputationEngineUtils.scala new file mode 100644 index 000000000..049bca958 --- /dev/null +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/com/webank/wedatasphere/linkis/engineconn/computation/executor/utlis/ComputationEngineUtils.scala @@ -0,0 +1,29 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.engineconn.computation.executor.utlis + +import com.google.gson.{Gson, GsonBuilder} +import com.webank.wedatasphere.linkis.server.BDPJettyServerHelper + + +object ComputationEngineUtils { + + def GSON: Gson = BDPJettyServerHelper.gson + + def GSON_PRETTY: Gson = new GsonBuilder().setPrettyPrinting().create() + +} -- Gitee From 97922da5290c74751701c5532f0f75c477851ba1 Mon Sep 17 00:00:00 2001 From: liaoyt Date: Tue, 9 Mar 2021 11:04:20 +0800 Subject: [PATCH 063/148] ShellEngine adapts to the Linkis1.0's new architecture, implete ShellEngineConn. #583 --- .../engineconn-plugins/shell/pom.xml | 149 +++++++++++++++ .../shell/src/main/assembly/distribution.xml | 70 +++++++ .../resources/linkis-engineconn.properties | 19 ++ .../src/main/resources/log4j2-engineconn.xml | 59 ++++++ .../shell/ShellEngineConnPlugin.scala | 75 ++++++++ .../ShellProcessEngineConnLaunchBuilder.scala | 23 +++ .../exception/NoCorrectUserException.scala | 24 +++ .../executor/ShellEngineConnExecutor.scala | 177 ++++++++++++++++++ .../factory/ShellEngineConnFactory.scala | 49 +++++ 9 files changed, 645 insertions(+) create mode 100755 linkis-engineconn-plugins/engineconn-plugins/shell/pom.xml create mode 100755 linkis-engineconn-plugins/engineconn-plugins/shell/src/main/assembly/distribution.xml create mode 100755 linkis-engineconn-plugins/engineconn-plugins/shell/src/main/resources/linkis-engineconn.properties create mode 100755 linkis-engineconn-plugins/engineconn-plugins/shell/src/main/resources/log4j2-engineconn.xml create mode 100755 linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/com/webank/wedatasphere/linkis/manager/engineplugin/shell/ShellEngineConnPlugin.scala create mode 100755 linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/com/webank/wedatasphere/linkis/manager/engineplugin/shell/builder/ShellProcessEngineConnLaunchBuilder.scala create mode 100755 linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/com/webank/wedatasphere/linkis/manager/engineplugin/shell/exception/NoCorrectUserException.scala create mode 100755 linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/com/webank/wedatasphere/linkis/manager/engineplugin/shell/executor/ShellEngineConnExecutor.scala create mode 100755 linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/com/webank/wedatasphere/linkis/manager/engineplugin/shell/factory/ShellEngineConnFactory.scala diff --git a/linkis-engineconn-plugins/engineconn-plugins/shell/pom.xml b/linkis-engineconn-plugins/engineconn-plugins/shell/pom.xml new file mode 100755 index 000000000..cabefc97d --- /dev/null +++ b/linkis-engineconn-plugins/engineconn-plugins/shell/pom.xml @@ -0,0 +1,149 @@ + + + + + + linkis + com.webank.wedatasphere.linkis + dev-1.0.0 + + 4.0.0 + + linkis-engineplugin-shell + + 1 + + + + + org.apache.commons + commons-exec + 1.3 + + + com.webank.wedatasphere.linkis + linkis-engineconn-plugin-core + ${linkis.version} + + + + com.webank.wedatasphere.linkis + linkis-computation-engineconn + ${linkis.version} + + + + com.webank.wedatasphere.linkis + linkis-storage + ${linkis.version} + provided + + + + com.webank.wedatasphere.linkis + linkis-message-scheduler + ${linkis.version} + provided + + + + com.webank.wedatasphere.linkis + linkis-common + ${linkis.version} + provided + + + + com.webank.wedatasphere.linkis + linkis-bml-engine-hook + ${linkis.version} + + + commons-logging + commons-logging + + + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + + + net.alchim31.maven + scala-maven-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + + org.apache.maven.plugins + maven-assembly-plugin + 2.3 + false + + + make-assembly + package + + single + + + + src/main/assembly/distribution.xml + + + + + + false + out + false + false + + src/main/assembly/distribution.xml + + + + + + + src/main/java + + **/*.xml + + + + src/main/resources + + **/*.properties + **/application.yml + **/bootstrap.yml + **/log4j2.xml + + + + + \ No newline at end of file diff --git a/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/assembly/distribution.xml new file mode 100755 index 000000000..f7be21fad --- /dev/null +++ b/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/assembly/distribution.xml @@ -0,0 +1,70 @@ + + + + linkis-enginePlugin-shell + + dir + zip + + true + shell + + + + + + /dist/v${shell.version}/lib + true + true + false + false + true + + + + + + + + ${basedir}/src/main/resources + + * + + 0777 + /dist/v${shell.version}/conf + unix + + + + ${basedir}/target + + *.jar + + + *doc.jar + + 0777 + /plugin/${shell.version} + + + + + diff --git a/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/resources/linkis-engineconn.properties b/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/resources/linkis-engineconn.properties new file mode 100755 index 000000000..0588a003c --- /dev/null +++ b/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/resources/linkis-engineconn.properties @@ -0,0 +1,19 @@ +# +# Copyright 2019 WeBank +# +# Licensed 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. +# + +wds.linkis.server.version=v1 + +wds.linkis.engineconn.plugin.default.clazz=com.webank.wedatasphere.linkis.manager.engineplugin.shell.ShellEngineConnPlugin diff --git a/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/resources/log4j2-engineconn.xml b/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/resources/log4j2-engineconn.xml new file mode 100755 index 000000000..0f5dd4547 --- /dev/null +++ b/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/resources/log4j2-engineconn.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/com/webank/wedatasphere/linkis/manager/engineplugin/shell/ShellEngineConnPlugin.scala b/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/com/webank/wedatasphere/linkis/manager/engineplugin/shell/ShellEngineConnPlugin.scala new file mode 100755 index 000000000..40cd2af61 --- /dev/null +++ b/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/com/webank/wedatasphere/linkis/manager/engineplugin/shell/ShellEngineConnPlugin.scala @@ -0,0 +1,75 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.manager.engineplugin.shell + +import java.util + +import com.webank.wedatasphere.linkis.manager.engineplugin.common.EngineConnPlugin +import com.webank.wedatasphere.linkis.manager.engineplugin.common.creation.EngineConnFactory +import com.webank.wedatasphere.linkis.manager.engineplugin.common.launch.EngineConnLaunchBuilder +import com.webank.wedatasphere.linkis.manager.engineplugin.common.resource.{EngineResourceFactory, GenericEngineResourceFactory} +import com.webank.wedatasphere.linkis.manager.engineplugin.shell.builder.ShellProcessEngineConnLaunchBuilder +import com.webank.wedatasphere.linkis.manager.engineplugin.shell.factory.ShellEngineConnFactory +import com.webank.wedatasphere.linkis.manager.label.entity.Label +import com.webank.wedatasphere.linkis.manager.label.entity.engine.EngineTypeLabel + +class ShellEngineConnPlugin extends EngineConnPlugin { + + private val EP_CONTEXT_CONSTRUCTOR_LOCK = new Object() + + private var engineResourceFactory: EngineResourceFactory = _ + + private var engineLaunchBuilder: EngineConnLaunchBuilder = _ + + private var engineFactory: EngineConnFactory = _ + + private val defaultLabels: util.List[Label[_]] = new util.ArrayList[Label[_]]() + + + override def init(params: util.Map[String, Any]): Unit = { + val typeMap = new util.HashMap[String,String]() + typeMap.put("type","shell") + typeMap.put("version","1") + val typeLabel =new EngineTypeLabel() + typeLabel.setValue(typeMap) + this.defaultLabels.add(typeLabel) + } + + override def getEngineResourceFactory: EngineResourceFactory = EP_CONTEXT_CONSTRUCTOR_LOCK.synchronized { + if (null == engineResourceFactory) { + engineResourceFactory = new GenericEngineResourceFactory + } + engineResourceFactory + } + + override def getEngineConnLaunchBuilder: EngineConnLaunchBuilder = EP_CONTEXT_CONSTRUCTOR_LOCK.synchronized { + if (null == engineLaunchBuilder) { + engineLaunchBuilder = new ShellProcessEngineConnLaunchBuilder + } + engineLaunchBuilder + } + + override def getEngineConnFactory: EngineConnFactory = EP_CONTEXT_CONSTRUCTOR_LOCK.synchronized { + if (null == engineFactory) { + engineFactory = new ShellEngineConnFactory + } + engineFactory + } + + override def getDefaultLabels: util.List[Label[_]] = this.defaultLabels + +} diff --git a/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/com/webank/wedatasphere/linkis/manager/engineplugin/shell/builder/ShellProcessEngineConnLaunchBuilder.scala b/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/com/webank/wedatasphere/linkis/manager/engineplugin/shell/builder/ShellProcessEngineConnLaunchBuilder.scala new file mode 100755 index 000000000..b34a2f3a4 --- /dev/null +++ b/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/com/webank/wedatasphere/linkis/manager/engineplugin/shell/builder/ShellProcessEngineConnLaunchBuilder.scala @@ -0,0 +1,23 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.manager.engineplugin.shell.builder + +import com.webank.wedatasphere.linkis.manager.engineplugin.common.launch.process.JavaProcessEngineConnLaunchBuilder + +class ShellProcessEngineConnLaunchBuilder extends JavaProcessEngineConnLaunchBuilder{ + +} diff --git a/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/com/webank/wedatasphere/linkis/manager/engineplugin/shell/exception/NoCorrectUserException.scala b/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/com/webank/wedatasphere/linkis/manager/engineplugin/shell/exception/NoCorrectUserException.scala new file mode 100755 index 000000000..07c4e479d --- /dev/null +++ b/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/com/webank/wedatasphere/linkis/manager/engineplugin/shell/exception/NoCorrectUserException.scala @@ -0,0 +1,24 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.manager.engineplugin.shell.exception + +import com.webank.wedatasphere.linkis.common.exception.ErrorException + +case class NoCorrectUserException() extends ErrorException(50036, "No illegal user holds this process") + + +case class ShellCodeErrorException() extends ErrorException(50037, "shell code is wrong") \ No newline at end of file diff --git a/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/com/webank/wedatasphere/linkis/manager/engineplugin/shell/executor/ShellEngineConnExecutor.scala b/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/com/webank/wedatasphere/linkis/manager/engineplugin/shell/executor/ShellEngineConnExecutor.scala new file mode 100755 index 000000000..a2356f3fe --- /dev/null +++ b/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/com/webank/wedatasphere/linkis/manager/engineplugin/shell/executor/ShellEngineConnExecutor.scala @@ -0,0 +1,177 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.manager.engineplugin.shell.executor + +import java.io.{BufferedReader, InputStreamReader} +import java.util + +import com.webank.wedatasphere.linkis.common.utils.Logging +import com.webank.wedatasphere.linkis.engineconn.computation.executor.execute.{ComputationExecutor, EngineExecutionContext} +import com.webank.wedatasphere.linkis.engineconn.core.EngineConnObject +import com.webank.wedatasphere.linkis.manager.common.entity.resource.{CommonNodeResource, LoadInstanceResource, NodeResource} +import com.webank.wedatasphere.linkis.manager.engineplugin.common.conf.EngineConnPluginConf +import com.webank.wedatasphere.linkis.manager.engineplugin.shell.exception.ShellCodeErrorException +import com.webank.wedatasphere.linkis.manager.label.entity.Label +import com.webank.wedatasphere.linkis.protocol.engine.JobProgressInfo +import com.webank.wedatasphere.linkis.rpc.Sender +import com.webank.wedatasphere.linkis.scheduler.executer.{ErrorExecuteResponse, ExecuteResponse, SuccessExecuteResponse} +import org.apache.commons.io.IOUtils +import org.apache.commons.lang.StringUtils + +import scala.collection.mutable.ArrayBuffer + +class ShellEngineConnExecutor(id: Int) extends ComputationExecutor with Logging { + + private var engineExecutionContext: EngineExecutionContext = _ + + private val executorLabels: util.List[Label[_]] = new util.ArrayList[Label[_]]() + + private var process: Process = _ + + override def init(): Unit = { + info(s"Ready to change engine state!") + super.init + } + + override def executeCompletely(engineExecutionContext: EngineExecutionContext, code: String, completedLine: String): ExecuteResponse = { + val newcode = completedLine + code + debug("newcode is " + newcode) + executeLine(engineExecutionContext, newcode) + } + + override def executeLine(engineExecutionContext: EngineExecutionContext, code: String): ExecuteResponse = { + + if (engineExecutionContext != this.engineExecutionContext) { + this.engineExecutionContext = engineExecutionContext + info("Python executor reset new engineExecutionContext!") + } + + var bufferedReader: BufferedReader = null + var errorsReader: BufferedReader = null + + try { + engineExecutionContext.appendStdout(s"$getId >> ${code.trim}") + val processBuilder: ProcessBuilder = new ProcessBuilder(generateRunCode(code): _*) + processBuilder.redirectErrorStream(true) + process = processBuilder.start() + bufferedReader = new BufferedReader(new InputStreamReader(process.getInputStream)) + errorsReader = new BufferedReader(new InputStreamReader(process.getErrorStream)) + var line: String = null + while ( { + line = bufferedReader.readLine(); line != null + }) { + info(line) + engineExecutionContext.appendTextResultSet(line) + } + val errorLog = Stream.continually(errorsReader.readLine).takeWhile(_ != null).mkString("\n") + val exitCode = process.waitFor() + if (StringUtils.isNotEmpty(errorLog) || exitCode != 0) { + error(s"exitCode is $exitCode") + error(errorLog) + engineExecutionContext.appendStdout("shell执行失败") + engineExecutionContext.appendStdout(errorLog) + ErrorExecuteResponse("run shell failed", ShellCodeErrorException()) + } else SuccessExecuteResponse() + } catch { + case e: Exception => { + error("Execute shell code failed, reason:", e) + ErrorExecuteResponse("run shell failed", e) + } + case t: Throwable => ErrorExecuteResponse("执行shell进程内部错误", t) + } finally { + + IOUtils.closeQuietly(bufferedReader) + + IOUtils.closeQuietly(errorsReader) + } + } + + private def generateRunCode(code: String): Array[String] = { + Array("sh", "-c", code) + } + + override def getId(): String = Sender.getThisServiceInstance.getInstance + "_" + id + + override def getProgressInfo: Array[JobProgressInfo] = { + val jobProgressInfo = new ArrayBuffer[JobProgressInfo]() + if (0.0f == progress()) { + jobProgressInfo += JobProgressInfo(engineExecutionContext.getJobId.getOrElse(""), 1, 1, 0, 0) + } else { + jobProgressInfo += JobProgressInfo(engineExecutionContext.getJobId.getOrElse(""), 1, 0, 0, 1) + } + jobProgressInfo.toArray + } + + override def progress(): Float = { + if (null != this.engineExecutionContext) { + this.engineExecutionContext.getCurrentParagraph / this.engineExecutionContext.getTotalParagraph.asInstanceOf[Float] + } else { + 0.0f + } + } + + override def supportCallBackLogs(): Boolean = { + // todo + true + } + + override def requestExpectedResource(expectedResource: NodeResource): NodeResource = { + null + } + + override def getCurrentNodeResource(): NodeResource = { + // todo refactor for duplicate + val properties = EngineConnObject.getEngineCreationContext.getOptions + if (properties.containsKey(EngineConnPluginConf.JAVA_ENGINE_REQUEST_MEMORY.key)) { + val settingClientMemory = properties.get(EngineConnPluginConf.JAVA_ENGINE_REQUEST_MEMORY.key) + if (!settingClientMemory.toLowerCase().endsWith("g")) { + properties.put(EngineConnPluginConf.JAVA_ENGINE_REQUEST_MEMORY.key, settingClientMemory + "g") + } + } + val actualUsedResource = new LoadInstanceResource(EngineConnPluginConf.JAVA_ENGINE_REQUEST_MEMORY.getValue(properties).toLong, + EngineConnPluginConf.JAVA_ENGINE_REQUEST_CORES.getValue(properties), EngineConnPluginConf.JAVA_ENGINE_REQUEST_INSTANCE.getValue) + val resource = new CommonNodeResource + resource.setUsedResource(actualUsedResource) + resource + } + + override def getExecutorLabels(): util.List[Label[_]] = executorLabels + + override def setExecutorLabels(labels: util.List[Label[_]]): Unit = { + if (null != labels) { + executorLabels.clear() + executorLabels.addAll(labels) + } + } + + + override def killTask(taskID: String): Unit = { + super.killTask(taskID) + } + + override def close(): Unit = { + try { + process.destroy() + } catch { + case e: Exception => + error(s"kill process ${process.toString} failed ", e) + case t: Throwable => + error(s"kill process ${process.toString} failed ", t) + } + super.close() + } +} diff --git a/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/com/webank/wedatasphere/linkis/manager/engineplugin/shell/factory/ShellEngineConnFactory.scala b/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/com/webank/wedatasphere/linkis/manager/engineplugin/shell/factory/ShellEngineConnFactory.scala new file mode 100755 index 000000000..439990a7e --- /dev/null +++ b/linkis-engineconn-plugins/engineconn-plugins/shell/src/main/scala/com/webank/wedatasphere/linkis/manager/engineplugin/shell/factory/ShellEngineConnFactory.scala @@ -0,0 +1,49 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.manager.engineplugin.shell.factory + +import com.webank.wedatasphere.linkis.engineconn.common.creation.EngineCreationContext +import com.webank.wedatasphere.linkis.engineconn.common.engineconn.{DefaultEngineConn, EngineConn} +import com.webank.wedatasphere.linkis.engineconn.core.executor.ExecutorManager +import com.webank.wedatasphere.linkis.engineconn.executor.entity.Executor +import com.webank.wedatasphere.linkis.manager.engineplugin.common.creation.SingleExecutorEngineConnFactory +import com.webank.wedatasphere.linkis.manager.engineplugin.shell.executor.ShellEngineConnExecutor +import com.webank.wedatasphere.linkis.manager.label.entity.engine.{EngineRunTypeLabel, EngineType, RunType} + +class ShellEngineConnFactory extends SingleExecutorEngineConnFactory { + + + override def createExecutor(engineCreationContext: EngineCreationContext, engineConn: EngineConn): Executor = { + val id = ExecutorManager.getInstance().generateId() + val executor = new ShellEngineConnExecutor(id) + val runTypeLabel = getDefaultEngineRunTypeLabel() + executor.getExecutorLabels().add(runTypeLabel) + executor + } + + override def createEngineConn(engineCreationContext: EngineCreationContext): EngineConn = { + val engineConn = new DefaultEngineConn(engineCreationContext) + engineConn.setEngineType(EngineType.SHELL.toString) + engineConn + } + + override def getDefaultEngineRunTypeLabel(): EngineRunTypeLabel = { + val runTypeLabel = new EngineRunTypeLabel + runTypeLabel.setRunType(RunType.SHELL.toString) + runTypeLabel + } +} -- Gitee From c117174f34b8dfe93a6423092de9b36fcda51c53 Mon Sep 17 00:00:00 2001 From: shanhuang Date: Wed, 10 Mar 2021 15:47:07 +0800 Subject: [PATCH 064/148] Enhance the ability of RM and integrate it into Linkis Manager --- .../linkis-resource-manager/pom.xml | 301 +++++++++++ .../src/main/assembly/distribution.xml | 274 ++++++++++ .../domain/RMLabelContainer.java | 166 +++++++ .../dao/ExternalResourceProviderDao.java | 27 + .../impl/ExternalResourceProviderDaoImpl.xml | 66 +++ .../external/domain/ExternalAppInfo.java | 20 + .../domain/ExternalResourceIdentifier.java | 23 + .../domain/ExternalResourceProvider.java | 83 ++++ .../ExternalResourceIdentifierParser.java | 28 ++ .../parser/YarnResourceIdentifierParser.java | 38 ++ .../request/ExternalResourceRequester.java | 31 ++ .../service/ExternalResourceService.java | 35 ++ .../impl/ExternalResourceServiceImpl.java | 125 +++++ .../external/yarn/YarnResourceIdentifier.java | 38 ++ .../restful/vo/ApplicationListVo.java | 63 +++ .../restful/vo/EngineInstanceVo.java | 88 ++++ .../linkis/resourcemanager/RMReceiver.scala | 49 ++ .../external/yarn/YarnAppInfo.scala | 23 + .../external/yarn/YarnResourceRequester.scala | 218 ++++++++ .../message/RMMessageService.scala | 94 ++++ .../restful/RMMonitorRest.scala | 356 +++++++++++++ .../service/LabelResourceService.scala | 46 ++ .../service/RequestResourceService.scala | 111 +++++ .../service/ResourceLockService.scala | 73 +++ .../service/ResourceManager.scala | 98 ++++ .../impl/DefaultReqResourceService.scala | 31 ++ .../service/impl/DefaultResourceManager.scala | 470 ++++++++++++++++++ .../DriverAndYarnReqResourceService.scala | 51 ++ .../impl/LabelResourceServiceImpl.scala | 87 ++++ .../resourcemanager/utils/RMUtils.scala | 94 ++++ .../utils/UserConfiguration.scala | 106 ++++ .../linkis/rpc/utils/SenderUtils.scala | 29 ++ .../test/scala/com/webank/test/TestMain.scala | 60 +++ .../scala/com/webank/test/TestResource.scala | 67 +++ 34 files changed, 3469 insertions(+) create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/pom.xml create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/assembly/distribution.xml create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/java/com/webank/wedatasphere/linkis/resourcemanager/domain/RMLabelContainer.java create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/java/com/webank/wedatasphere/linkis/resourcemanager/external/dao/ExternalResourceProviderDao.java create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/java/com/webank/wedatasphere/linkis/resourcemanager/external/dao/impl/ExternalResourceProviderDaoImpl.xml create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/java/com/webank/wedatasphere/linkis/resourcemanager/external/domain/ExternalAppInfo.java create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/java/com/webank/wedatasphere/linkis/resourcemanager/external/domain/ExternalResourceIdentifier.java create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/java/com/webank/wedatasphere/linkis/resourcemanager/external/domain/ExternalResourceProvider.java create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/java/com/webank/wedatasphere/linkis/resourcemanager/external/parser/ExternalResourceIdentifierParser.java create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/java/com/webank/wedatasphere/linkis/resourcemanager/external/parser/YarnResourceIdentifierParser.java create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/java/com/webank/wedatasphere/linkis/resourcemanager/external/request/ExternalResourceRequester.java create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/java/com/webank/wedatasphere/linkis/resourcemanager/external/service/ExternalResourceService.java create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/java/com/webank/wedatasphere/linkis/resourcemanager/external/service/impl/ExternalResourceServiceImpl.java create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/java/com/webank/wedatasphere/linkis/resourcemanager/external/yarn/YarnResourceIdentifier.java create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/java/com/webank/wedatasphere/linkis/resourcemanager/restful/vo/ApplicationListVo.java create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/java/com/webank/wedatasphere/linkis/resourcemanager/restful/vo/EngineInstanceVo.java create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/RMReceiver.scala create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/external/yarn/YarnAppInfo.scala create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/external/yarn/YarnResourceRequester.scala create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/message/RMMessageService.scala create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/restful/RMMonitorRest.scala create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/service/LabelResourceService.scala create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/service/RequestResourceService.scala create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/service/ResourceLockService.scala create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/service/ResourceManager.scala create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/service/impl/DefaultReqResourceService.scala create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/service/impl/DefaultResourceManager.scala create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/service/impl/DriverAndYarnReqResourceService.scala create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/service/impl/LabelResourceServiceImpl.scala create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/RMUtils.scala create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/com/webank/wedatasphere/linkis/resourcemanager/utils/UserConfiguration.scala create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/scala/com/webank/wedatasphere/linkis/rpc/utils/SenderUtils.scala create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/test/scala/com/webank/test/TestMain.scala create mode 100644 linkis-computation-governance/linkis-manager/linkis-resource-manager/src/test/scala/com/webank/test/TestResource.scala diff --git a/linkis-computation-governance/linkis-manager/linkis-resource-manager/pom.xml b/linkis-computation-governance/linkis-manager/linkis-resource-manager/pom.xml new file mode 100644 index 000000000..9c8977b3c --- /dev/null +++ b/linkis-computation-governance/linkis-manager/linkis-resource-manager/pom.xml @@ -0,0 +1,301 @@ + + + + + 4.0.0 + + + dev-1.0.0 + com.webank.wedatasphere.linkis + linkis + + + linkis-resource-manager + + + + com.webank.wedatasphere.linkis + linkis-label-manager + ${linkis.version} + + + com.webank.wedatasphere.linkis + linkis-message-scheduler + ${linkis.version} + provided + + + com.webank.wedatasphere.linkis + linkis-manager-persistence + ${linkis.version} + provided + + + com.webank.wedatasphere.linkis + linkis-manager-service-common + ${linkis.version} + provided + + + com.webank.wedatasphere.linkis + linkis-manager-common + ${linkis.version} + provided + + + + + com.webank.wedatasphere.linkis + linkis-resource-manager-common + ${linkis.version} + + + com.webank.wedatasphere.linkis + linkis-mybatis + + + org.springframework + spring-core + + + + + + org.apache.hadoop + hadoop-yarn-client + ${hadoop.version} + + + asm + asm + + + org.ow2.asm + asm + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-client + + + com.sun.jersey + jersey-server + + + com.sun.jersey + jersey-json + + + jsr311-api + javax.ws.rs + + + javax.servlet + servlet-api + + + org.mortbay.jetty + jetty-util + + + commons-logging + commons-logging + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + tomcat + jasper-compiler + + + tomcat + jasper-runtime + + + log4j + log4j + + + javax.activation + activation + + + org.apache.commons + commons-compress + + + + org.apache.commons + commons-compress + + + + + + + org.apache.hadoop + hadoop-common + ${hadoop.version} + + + log4j + log4j + + + org.mortbay.jetty + jetty + + + org.mortbay.jetty + jetty-util + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-server + + + com.sun.jersey + jersey-json + + + jsr311-api + javax.ws.rs + + + net.java.dev.jets3t + jets3t + + + com.jcraft + jsch + + + com.google.code.findbugs + jsr305 + + + xmlenc + xmlenc + + + net.java.dev.jets3t + jets3t + + + org.apache.avro + avro + + + org.apache.hadoop + hadoop-auth + + + com.jcraft + jsch + + + com.google.code.findbugs + jsr305 + + + servlet-api + javax.servlet + + + org.slf4j + slf4j-log4j12 + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + tomcat + jasper-compiler + + + tomcat + jasper-runtime + + + provided + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + + + net.alchim31.maven + scala-maven-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + + + + ${basedir}/src/main/resources + + **/*.properties + **/application.yml + **/bootstrap.yml + **/log4j2.xml + + + + src/main/java + + **/*.xml + + + + ${project.artifactId}-${project.version} + + + \ No newline at end of file diff --git a/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/assembly/distribution.xml b/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/assembly/distribution.xml new file mode 100644 index 000000000..2bb5070b7 --- /dev/null +++ b/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/assembly/distribution.xml @@ -0,0 +1,274 @@ + + + + linkis-resourcemanager + + zip + + true + linkis-resourcemanager + + + + + + lib + true + true + false + false + true + + + + aopalliance:aopalliance:jar + com.fasterxml.jackson.core:jackson-annotations:jar + com.fasterxml.jackson.core:jackson-core:jar + com.fasterxml.jackson.core:jackson-databind:jar + com.fasterxml.jackson.module:jackson-module-paranamer:jar + com.fasterxml.jackson.module:jackson-module-scala_2.11:jar + com.google.code.findbugs:jsr305:jar + com.google.code.gson:gson:jar + com.google.guava:guava:jar + com.google.protobuf:protobuf-java:jar + com.netflix.archaius:archaius-core:jar + com.netflix.hystrix:hystrix-core:jar + com.netflix.netflix-commons:netflix-commons-util:jar + com.netflix.netflix-commons:netflix-statistics:jar + com.netflix.ribbon:ribbon:jar + com.netflix.ribbon:ribbon-core:jar + com.netflix.ribbon:ribbon-httpclient:jar + com.netflix.ribbon:ribbon-loadbalancer:jar + com.netflix.ribbon:ribbon-transport:jar + com.netflix.servo:servo-core:jar + com.ning:async-http-client:jar + com.sun.jersey.contribs:jersey-apache-client4:jar + com.sun.jersey:jersey-client:jar + com.sun.jersey:jersey-core:jar + com.sun.jersey:jersey-json:jar + com.sun.jersey:jersey-server:jar + com.sun.xml.bind:jaxb-impl:jar + com.thoughtworks.paranamer:paranamer:jar + com.webank.wedatasphere.linkis:linkis-common:jar + commons-beanutils:commons-beanutils:jar + commons-beanutils:commons-beanutils-core:jar + commons-cli:commons-cli:jar + commons-collections:commons-collections:jar + commons-configuration:commons-configuration:jar + commons-daemon:commons-daemon:jar + commons-digester:commons-digester:jar + commons-httpclient:commons-httpclient:jar + commons-io:commons-io:jar + commons-lang:commons-lang:jar + commons-logging:commons-logging:jar + commons-net:commons-net:jar + + io.netty:netty-all:jar + io.netty:netty-buffer:jar + io.netty:netty-codec:jar + io.netty:netty-codec-http:jar + io.netty:netty-common:jar + io.netty:netty-handler:jar + io.netty:netty-transport:jar + io.netty:netty-transport-native-epoll:jar + io.reactivex:rxjava:jar + io.reactivex:rxnetty:jar + io.reactivex:rxnetty-contexts:jar + io.reactivex:rxnetty-servo:jar + javax.activation:activation:jar + javax.annotation:javax.annotation-api:jar + javax.inject:javax.inject:jar + javax.servlet:javax.servlet-api:jar + javax.servlet.jsp:jsp-api:jar + javax.xml.bind:jaxb-api:jar + javax.xml.stream:stax-api:jar + log4j:log4j:jar + net.databinder.dispatch:dispatch-core_2.11:jar + net.databinder.dispatch:dispatch-json4s-jackson_2.11:jar + org.apache.commons:commons-compress:jar + org.apache.commons:commons-math3:jar + org.apache.curator:curator-client:jar + org.apache.curator:curator-framework:jar + org.apache.curator:curator-recipes:jar + org.apache.directory.api:api-asn1-api:jar + org.apache.directory.api:api-util:jar + org.apache.directory.server:apacheds-i18n:jar + org.apache.directory.server:apacheds-kerberos-codec:jar + org.apache.hadoop:hadoop-annotations:jar + org.apache.hadoop:hadoop-auth:jar + org.apache.hadoop:hadoop-common:jar + org.apache.hadoop:hadoop-hdfs:jar + org.apache.htrace:htrace-core:jar + org.apache.httpcomponents:httpclient:jar + org.apache.httpcomponents:httpcore:jar + org.apache.logging.log4j:log4j-api:jar + org.apache.zookeeper:zookeeper:jar + org.aspectj:aspectjweaver:jar + org.bouncycastle:bcpkix-jdk15on:jar + org.bouncycastle:bcprov-jdk15on:jar + org.codehaus.jackson:jackson-jaxrs:jar + org.codehaus.jackson:jackson-xc:jar + org.codehaus.jettison:jettison:jar + org.eclipse.jetty:jetty-continuation:jar + org.eclipse.jetty:jetty-http:jar + org.eclipse.jetty:jetty-io:jar + org.eclipse.jetty:jetty-jndi:jar + org.eclipse.jetty:jetty-plus:jar + org.eclipse.jetty:jetty-security:jar + org.eclipse.jetty:jetty-server:jar + org.eclipse.jetty:jetty-servlet:jar + org.eclipse.jetty:jetty-util:jar + org.eclipse.jetty:jetty-webapp:jar + org.eclipse.jetty:jetty-xml:jar + org.fusesource.leveldbjni:leveldbjni-all:jar + org.hdrhistogram:HdrHistogram:jar + + + + org.jsoup:jsoup:jar + org.mortbay.jetty:jetty:jar + org.mortbay.jetty:jetty-util:jar + org.scala-lang.modules:scala-parser-combinators_2.11:jar + org.scala-lang.modules:scala-xml_2.11:jar + org.scala-lang:scala-compiler:jar + org.scala-lang:scala-library:jar + org.scala-lang:scala-reflect:jar + org.scala-lang:scalap:jar + org.slf4j:jul-to-slf4j:jar + org.slf4j:slf4j-api:jar + org.springframework.boot:spring-boot:jar + org.springframework.boot:spring-boot-autoconfigure:jar + org.springframework.boot:spring-boot-starter:jar + org.springframework.boot:spring-boot-starter-aop:jar + org.springframework.cloud:spring-cloud-commons:jar + org.springframework.cloud:spring-cloud-context:jar + org.springframework.cloud:spring-cloud-netflix-archaius:jar + org.springframework.cloud:spring-cloud-netflix-ribbon:jar + org.springframework.cloud:spring-cloud-starter:jar + org.springframework.cloud:spring-cloud-starter-netflix-archaius:jar + org.springframework.cloud:spring-cloud-starter-netflix-ribbon:jar + org.springframework.security:spring-security-crypto:jar + org.springframework.security:spring-security-rsa:jar + org.springframework:spring-aop:jar + org.springframework:spring-beans:jar + org.springframework:spring-context:jar + org.springframework:spring-expression:jar + org.springframework:spring-web:jar + org.tukaani:xz:jar + org.yaml:snakeyaml:jar + xerces:xercesImpl:jar + xml-apis:xml-apis:jar + xmlenc:xmlenc:jar + + + + + + + ${basedir}/src/main/resources + + * + + 0777 + conf + unix + + + ${basedir}/bin + + * + + 0777 + bin + unix + + + . + + */** + + logs + + + + + diff --git a/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/java/com/webank/wedatasphere/linkis/resourcemanager/domain/RMLabelContainer.java b/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/java/com/webank/wedatasphere/linkis/resourcemanager/domain/RMLabelContainer.java new file mode 100644 index 000000000..54f674297 --- /dev/null +++ b/linkis-computation-governance/linkis-manager/linkis-resource-manager/src/main/java/com/webank/wedatasphere/linkis/resourcemanager/domain/RMLabelContainer.java @@ -0,0 +1,166 @@ +/* + * Copyright 2019 WeBank + * + * Licensed 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 com.webank.wedatasphere.linkis.resourcemanager.domain; + +import com.google.common.collect.Lists; +import com.webank.wedatasphere.linkis.governance.common.conf.GovernanceCommonConf; +import com.webank.wedatasphere.linkis.manager.label.builder.CombinedLabelBuilder; +import com.webank.wedatasphere.linkis.manager.label.entity.CombinedLabel; +import com.webank.wedatasphere.linkis.manager.label.entity.Label; +import com.webank.wedatasphere.linkis.manager.label.entity.em.EMInstanceLabel; +import com.webank.wedatasphere.linkis.manager.label.entity.engine.EngineInstanceLabel; +import com.webank.wedatasphere.linkis.manager.label.entity.engine.EngineTypeLabel; +import com.webank.wedatasphere.linkis.manager.label.entity.engine.UserCreatorLabel; +import com.webank.wedatasphere.linkis.resourcemanager.exception.RMErrorException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; + +public class RMLabelContainer { + + private static final Logger logger = LoggerFactory.getLogger(RMLabelContainer.class); + private static CombinedLabelBuilder combinedLabelBuilder = new CombinedLabelBuilder(); + + List