From b78da70d94e4394e9ad8861aa10875c97c038f91 Mon Sep 17 00:00:00 2001 From: v-kkhuang <420895376@qq.com> Date: Tue, 19 May 2026 11:42:46 +0800 Subject: [PATCH] =?UTF-8?q?#AI=20commit#=20=E5=BC=80=E5=8F=91=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=EF=BC=9ARevert=20community=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/conf/DWCArgumentsParser.scala | 23 +++++++---- .../linkis/common/utils/ParameterUtils.scala | 40 ------------------- .../common/utils/EngineConnArguments.scala | 30 ++++++++++---- .../core/launch/ProcessEngineConnLaunch.scala | 2 - 4 files changed, 39 insertions(+), 56 deletions(-) delete mode 100644 linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/ParameterUtils.scala diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/DWCArgumentsParser.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/DWCArgumentsParser.scala index 2a5efbf0d09..998db145e45 100644 --- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/DWCArgumentsParser.scala +++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/DWCArgumentsParser.scala @@ -17,8 +17,6 @@ package org.apache.linkis.common.conf -import org.apache.linkis.common.utils.{Logging, ParameterUtils} - import org.apache.commons.lang3.StringUtils import scala.collection.JavaConverters.mapAsJavaMapConverter @@ -36,13 +34,24 @@ object DWCArgumentsParser { def getDWCOptionMap: Map[String, String] = dwcOptionMap def parse(args: Array[String]): DWCArgumentsParser = { + val keyValueRegex = "([^=]+)=(.+)".r + var i = 0 val optionParser = new DWCArgumentsParser - ParameterUtils.parseStartupParams( - args, - (prefix, key, value) => { - optionParser.setConf(s"--$prefix-conf", key, value) + while (i < args.length - 1) { + args(i) match { + case DWC_CONF | SPRING_CONF => + args(i + 1) match { + case keyValueRegex(key, value) => + optionParser.setConf(args(i), key, value) + i += 1 + case _ => + throw new IllegalArgumentException("illegal commond line, format: --conf key=value.") + } + case _ => + throw new IllegalArgumentException(s"illegal commond line, ${args(i)} cannot recognize.") } - ) + i += 1 + } optionParser.validate() optionParser } diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/ParameterUtils.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/ParameterUtils.scala deleted file mode 100644 index 100529a771e..00000000000 --- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/ParameterUtils.scala +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.common.utils - -object ParameterUtils { - - private val startupConfRegex = - """--([a-z]+)-conf\s+(\S+)=([^=]+?)(?=\s*(?:--engineconn-conf|--spring-conf|$))""".r - - def parseStartupParams(args: Array[String], handler: (String, String, String) => Unit): Unit = { - val argString = args.mkString(" ") - startupConfRegex.findAllMatchIn(argString).foreach { m => - val prefix = m.group(1).trim - val key = m.group(2).trim - val value = m.group(3).trim - prefix match { - case "engineconn" | "spring" => - handler(prefix, key, value) - case _ => - throw new IllegalArgumentException(s"illegal command line, $prefix cannot recognize.") - } - } - } - -} diff --git a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/EngineConnArguments.scala b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/EngineConnArguments.scala index 77b0d0f44aa..31d9b1e9b2c 100644 --- a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/EngineConnArguments.scala +++ b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/EngineConnArguments.scala @@ -17,8 +17,6 @@ package org.apache.linkis.governance.common.utils -import org.apache.linkis.common.utils.{Logging, ParameterUtils} - import org.apache.commons.lang3.StringUtils import scala.collection.mutable @@ -107,13 +105,31 @@ class DefaultEngineConnArgumentsParser extends EngineConnArgumentsParser { protected val keyValueRegex = "([^=]+)=(.+)".r override def parseToObj(args: Array[String]): EngineConnArguments = { + var i = 0 val argumentsBuilder = new DefaultEngineConnArgumentsBuilder - ParameterUtils.parseStartupParams( - args, - (prefix, key, value) => { - argumentsBuilder.addEngineConnConf(key, value) + while (i < args.length) { + args(i) match { + case ENGINE_CONN_CONF => + addKeyValue( + args(i + 1), + (key, value) => { + argumentsBuilder.addEngineConnConf(key, value) + i += 1 + } + ) + case SPRING_CONF => + addKeyValue( + args(i + 1), + (key, value) => { + argumentsBuilder.addSpringConf(key, value) + i += 1 + } + ) + case _ => + throw new IllegalArgumentException(s"illegal command line, ${args(i)} cannot recognize.") } - ) + i += 1 + } argumentsBuilder.build() } diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/org/apache/linkis/ecm/core/launch/ProcessEngineConnLaunch.scala b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/org/apache/linkis/ecm/core/launch/ProcessEngineConnLaunch.scala index 9b0a2fb8f61..39ed92cf932 100644 --- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/org/apache/linkis/ecm/core/launch/ProcessEngineConnLaunch.scala +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-core/src/main/scala/org/apache/linkis/ecm/core/launch/ProcessEngineConnLaunch.scala @@ -234,8 +234,6 @@ trait ProcessEngineConnLaunch extends EngineConnLaunch with Logging { engineConnConf += (ENGINE_CONN_CONTAINERIZATION_MAPPING_PORTS.key -> mappingPorts) engineConnConf += (ENGINE_CONN_CONTAINERIZATION_MAPPING_HOST.key -> mappingHost) - - engineConnConf = engineConnConf.map(m => (m._1, s""""${m._2}"""")) arguments.addEngineConnConf(engineConnConf) EngineConnArgumentsParser.getEngineConnArgumentsParser.parseToArgs(arguments.build()) }