This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/master by this push:
new ec9d7f537 Jdbc driver is compatible with multiple versions (#4930)
ec9d7f537 is described below
commit ec9d7f5378d7aa117740733208860029e4f25637
Author: sjgllgh <[email protected]>
AuthorDate: Mon Oct 23 14:16:55 2023 +0800
Jdbc driver is compatible with multiple versions (#4930)
* Jdbc driver is compatible with multiple versions
* code formatting
* Update reference method
---
.../org/apache/linkis/ujes/jdbc/LinkisSQLConnection.scala | 10 +++++++++-
.../linkis/manager/label/entity/engine/EngineTypeLabel.java | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git
a/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/LinkisSQLConnection.scala
b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/LinkisSQLConnection.scala
index 99bb24773..93956d653 100644
---
a/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/LinkisSQLConnection.scala
+++
b/linkis-computation-governance/linkis-jdbc-driver/src/main/scala/org/apache/linkis/ujes/jdbc/LinkisSQLConnection.scala
@@ -18,6 +18,7 @@
package org.apache.linkis.ujes.jdbc
import org.apache.linkis.common.utils.{Logging, Utils}
+import
org.apache.linkis.manager.label.builder.factory.LabelBuilderFactoryContext
import org.apache.linkis.manager.label.constant.LabelKeyConstant
import org.apache.linkis.manager.label.entity.engine.{EngineType,
EngineTypeLabel, RunType}
import org.apache.linkis.manager.label.utils.EngineTypeLabelCreator
@@ -126,7 +127,14 @@ class LinkisSQLConnection(private[jdbc] val ujesClient:
UJESClient, props: Prope
if (params != null & params.length() > 0) {
params.split(PARAM_SPLIT).map(_.split(KV_SPLIT)).foreach {
case Array(k, v) if k.equals(UJESSQLDriver.ENGINE_TYPE) =>
- return EngineTypeLabelCreator.createEngineTypeLabel(v)
+ if (v.contains('-')) {
+ val factory = LabelBuilderFactoryContext.getLabelBuilderFactory
+ val label = factory.createLabel(classOf[EngineTypeLabel])
+ label.setStringValue(v)
+ return label
+ } else {
+ return EngineTypeLabelCreator.createEngineTypeLabel(v)
+ }
case _ =>
}
}
diff --git
a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineTypeLabel.java
b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineTypeLabel.java
index 6e2715113..53145503e 100644
---
a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineTypeLabel.java
+++
b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineTypeLabel.java
@@ -79,7 +79,7 @@ public class EngineTypeLabel extends GenericLabel implements
EngineNodeLabel, EM
}
@Override
- protected void setStringValue(String stringValue) {
+ public void setStringValue(String stringValue) {
if (StringUtils.isNotBlank(stringValue)) {
try {
HashMap<String, String> valueMap =
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
