You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/08/17 10:46:00 UTC

[incubator-linkis] branch dev-1.2.0 updated: add ES version conf (#2846)

This is an automated email from the ASF dual-hosted git repository.

casion pushed a commit to branch dev-1.2.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git


The following commit(s) were added to refs/heads/dev-1.2.0 by this push:
     new 3d5dda8e1 add ES version conf (#2846)
3d5dda8e1 is described below

commit 3d5dda8e10dff1ce659a74ecb530b72fc0c5f8a7
Author: aiceflower <ki...@sina.com>
AuthorDate: Wed Aug 17 18:45:53 2022 +0800

    add ES version conf (#2846)
    
    * add ES version conf
    
    Co-authored-by: casionone <ca...@gmail.com>
---
 .../java/org/apache/linkis/manager/label/conf/LabelCommonConfig.java  | 3 +++
 .../org/apache/linkis/manager/label/utils/EngineTypeLabelCreator.java | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/conf/LabelCommonConfig.java b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/conf/LabelCommonConfig.java
index fa24f2a24..98ae83b4e 100644
--- a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/conf/LabelCommonConfig.java
+++ b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/conf/LabelCommonConfig.java
@@ -86,4 +86,7 @@ public class LabelCommonConfig {
 
     public static final CommonVars<String> TRINO_ENGINE_CONN_VERSION =
             CommonVars.apply("wds.linkis.trino.engineconn.version", "371");
+
+    public static final CommonVars<String> ELASTICSEARCH_ENGINE_VERSION =
+            CommonVars.apply("wds.linkis.elasticsearch.engine.version", "7.6.2");
 }
diff --git a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/utils/EngineTypeLabelCreator.java b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/utils/EngineTypeLabelCreator.java
index 5cf98e7d4..ab88c6054 100644
--- a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/utils/EngineTypeLabelCreator.java
+++ b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/utils/EngineTypeLabelCreator.java
@@ -89,6 +89,10 @@ public class EngineTypeLabelCreator {
                     defaultVersion.put(
                             EngineType.TRINO().toString(),
                             LabelCommonConfig.TRINO_ENGINE_CONN_VERSION.getValue());
+                    defaultVersion.put(
+                            EngineType.ELASTICSEARCH().toString(),
+                            LabelCommonConfig.ELASTICSEARCH_ENGINE_VERSION.getValue());
+
                     defaultVersion.put("*", "*");
                 }
             }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org