You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/05/05 02:45:30 UTC
[incubator-linkis] branch dev-1.1.1 updated: fix OpenLooKeng ddl
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.1.1 by this push:
new da42a747f fix OpenLooKeng ddl
da42a747f is described below
commit da42a747f128956ac333dcecb7c015aa3843a461
Author: casionone <ca...@gmail.com>
AuthorDate: Thu May 5 01:28:00 2022 +0800
fix OpenLooKeng ddl
---
db/linkis_dml.sql | 11 ++++++++++-
.../openlookeng/src/main/assembly/distribution.xml | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/db/linkis_dml.sql b/db/linkis_dml.sql
index 499aa9612..2c16736bc 100644
--- a/db/linkis_dml.sql
+++ b/db/linkis_dml.sql
@@ -25,7 +25,7 @@ SET @PIPELINE_LABEL="pipeline-1";
SET @JDBC_LABEL="jdbc-4";
SET @PRESTO_LABEL="presto-0.234";
SET @IO_FILE_LABEL="io_file-1.0";
-SET @OPENLOOKENG_LABEL="openlookend-1.5.0"
+SET @OPENLOOKENG_LABEL="openlookeng-1.5.0";
-- 衍生变量：
SET @SPARK_ALL=CONCAT('*-*,',@SPARK_LABEL);
SET @SPARK_IDE=CONCAT('*-IDE,',@SPARK_LABEL);
@@ -114,6 +114,12 @@ INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`,
INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `is_hidden`, `is_advanced`, `level`, `treeName`, `engine_conn_type`) VALUES ('wds.linkis.rm.client.memory.max', '取值范围：1-50，单位：G', 'io_file引擎最大内存', '20G', 'Regex', '^([1-9]\\d{0,1}|100)(G|g)$', '0', '0', '1', 'io_file引擎资源上限', 'io_file');
INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `is_hidden`, `is_advanced`, `level`, `treeName`, `engine_conn_type`) VALUES ('wds.linkis.rm.client.core.max', '取值范围：1-100，单位：个', 'io_file引擎最大核心数', '40', 'Regex', '^(?:[1-9]\\d?|[1234]\\d{2}|128)$', '0', '0', '1', 'io_file引擎资源上限', 'io_file');
+-- openlookeng
+INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('linkis.openlookeng.url', '例如:http://127.0.0.1:8080', '连接地址', 'http://127.0.0.1:8080', 'Regex', '^\\s*http://([^:]+)(:\\d+)(/[^\\?]+)?(\\?\\S*)?$', 'openlookeng', 0, 0, 1, '数据源配置');
+INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('linkis.openlookeng.catalog', 'catalog', 'catalog', 'system', 'None', '', 'openlookeng', 0, 0, 1, '数据源配置');
+INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`, `default_value`, `validate_type`, `validate_range`, `engine_conn_type`, `is_hidden`, `is_advanced`, `level`, `treeName`) VALUES ('linkis.openlookeng.source', 'source', 'source', 'global', 'None', '', 'openlookeng', 0, 0, 1, '数据源配置');
+
+
-- Configuration first level directory
insert into `linkis_cg_manager_label` (`label_key`, `label_value`, `label_feature`, `label_value_size`, `update_time`, `create_time`) VALUES ('combined_userCreator_engineType','*-全局设置,*-*', 'OPTIONAL', 2, now(), now());
insert into `linkis_cg_manager_label` (`label_key`, `label_value`, `label_feature`, `label_value_size`, `update_time`, `create_time`) VALUES ('combined_userCreator_engineType','*-IDE,*-*', 'OPTIONAL', 2, now(), now());
@@ -220,6 +226,9 @@ insert into linkis_ps_configuration_category (`label_id`, `level`) VALUES (@labe
select @label_id := id from linkis_cg_manager_label where `label_value` = @JDBC_IDE;
insert into linkis_ps_configuration_category (`label_id`, `level`) VALUES (@label_id, 2);
+select @label_id := id from linkis_cg_manager_label where `label_value` = @OPENLOOKENG_IDE;
+insert into linkis_ps_configuration_category (`label_id`, `level`) VALUES (@label_id, 2);
+
select @label_id := id from linkis_cg_manager_label where `label_value` = @SPARK_VISUALIS;
insert into linkis_ps_configuration_category (`label_id`, `level`) VALUES (@label_id, 2);
diff --git a/linkis-engineconn-plugins/engineconn-plugins/openlookeng/src/main/assembly/distribution.xml b/linkis-engineconn-plugins/engineconn-plugins/openlookeng/src/main/assembly/distribution.xml
index e6df37ab0..8ebe84d05 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/openlookeng/src/main/assembly/distribution.xml
+++ b/linkis-engineconn-plugins/engineconn-plugins/openlookeng/src/main/assembly/distribution.xml
@@ -47,7 +47,7 @@
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>linkis-engineconn.properties</include>
- <include>log4j2-engineconn.xml</include>
+ <include>log4j2.xml</include>
</includes>
<fileMode>0777</fileMode>
<outputDirectory>/dist/v${openlookeng.version}/conf</outputDirectory>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org