Skip to content

[refactor][COM][common] revert community code changes to maintain internal compatibility #1032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
casionone merged 1 commit into from
May 19, 2026
Merged

[refactor][COM][common] revert community code changes to maintain internal compatibility #1032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions ...mmons/linkis-common/src/main/scala/org/apache/linkis/common/conf/DWCArgumentsParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
}
Expand Down
40 changes: 0 additions & 40 deletions ...-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/ParameterUtils.scala
View file
Open in desktop

This file was deleted.

30 changes: 23 additions & 7 deletions ...common/src/main/scala/org/apache/linkis/governance/common/utils/EngineConnArguments.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
}

Expand Down
2 changes: 0 additions & 2 deletions ...nager-core/src/main/scala/org/apache/linkis/ecm/core/launch/ProcessEngineConnLaunch.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}
Expand Down
Loading