This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new c212233c1 fix updateEnginePluginBML api bug (#4059)
c212233c1 is described below
commit c212233c18e9b0258ef565a353dc48e2d0973d0f
Author: Casion <[email protected]>
AuthorDate: Sat Dec 24 15:39:26 2022 +0800
fix updateEnginePluginBML api bug (#4059)
* fix updateEnginePluginBML api bug
* fix ddl
* update dml
---
.../engineplugin/server/restful/EnginePluginRestful.java | 4 ++--
linkis-dist/package/db/linkis_dml.sql | 13 +++++++------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/restful/EnginePluginRestful.java
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/restful/EnginePluginRestful.java
index 77b16281e..1a8a52d3d 100644
---
a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/restful/EnginePluginRestful.java
+++
b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-plugin-server/src/main/java/org/apache/linkis/engineplugin/server/restful/EnginePluginRestful.java
@@ -162,9 +162,9 @@ public class EnginePluginRestful {
@RequestParam(value = "force", required = false, defaultValue = "false")
Boolean force,
HttpServletRequest req) {
- if (StringUtils.isNotBlank(ecType)) {
+ if (StringUtils.isBlank(ecType)) {
return Message.error("ecType cannot be null");
- } else if (StringUtils.isNotBlank(version)) {
+ } else if (StringUtils.isBlank(version)) {
return Message.error("version cannot be null");
}
if (file.getOriginalFilename().toLowerCase().endsWith(".zip")) {
diff --git a/linkis-dist/package/db/linkis_dml.sql
b/linkis-dist/package/db/linkis_dml.sql
index c2b1f3550..aef1c66e6 100644
--- a/linkis-dist/package/db/linkis_dml.sql
+++ b/linkis-dist/package/db/linkis_dml.sql
@@ -24,8 +24,11 @@ SET @PYTHON_LABEL="python-python2";
SET @PIPELINE_LABEL="pipeline-1";
SET @JDBC_LABEL="jdbc-4";
SET @PRESTO_LABEL="presto-0.234";
+SET @TRINO_LABEL="trino-371";
SET @IO_FILE_LABEL="io_file-1.0";
SET @OPENLOOKENG_LABEL="openlookeng-1.5.0";
+SET @ELASTICSEARCH_LABEL="elasticsearch-7.6.2";
+
-- 衍生变量：
SET @SPARK_ALL=CONCAT('*-*,',@SPARK_LABEL);
SET @SPARK_IDE=CONCAT('*-IDE,',@SPARK_LABEL);
@@ -61,6 +64,9 @@ SET @TRINO_IDE=CONCAT('*-IDE,',@TRINO_LABEL);
SET @IO_FILE_ALL=CONCAT('*-*,',@IO_FILE_LABEL);
SET @IO_FILE_IDE=CONCAT('*-IDE,',@IO_FILE_LABEL);
+SET @ELASTICSEARCH_ALL=CONCAT('*-*,',@ELASTICSEARCH_LABEL);
+SET @ELASTICSEARCH_IDE=CONCAT('*-IDE,',@ELASTICSEARCH_LABEL);
+
-- Global Settings
INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`,
`name`, `default_value`, `validate_type`, `validate_range`, `is_hidden`,
`is_advanced`, `level`, `treeName`) VALUES ('wds.linkis.rm.yarnqueue',
'yarn队列名', 'yarn队列名', 'default', 'None', NULL, '0', '0', '1', '队列资源');
INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`,
`name`, `default_value`, `validate_type`, `validate_range`, `is_hidden`,
`is_advanced`, `level`, `treeName`) VALUES
('wds.linkis.rm.yarnqueue.instance.max', '取值范围：1-128，单位：个', '队列实例最大个数', '30',
'Regex', '^(?:[1-9]\\d?|[1234]\\d{2}|128)$', '0', '0', '1', '队列资源');
@@ -295,10 +301,6 @@ insert into linkis_ps_configuration_category (`label_id`,
`level`) VALUES (@labe
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);
-insert into `linkis_cg_manager_label` (`label_key`, `label_value`,
`label_feature`, `label_value_size`, `update_time`, `create_time`) VALUES
('combined_userCreator_engineType', @ELASTICSEARCH_IDE, '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', @PRESTO_IDE, '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', @TRINO_IDE, 'OPTIONAL', 2, now(), now());
-
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);
@@ -538,8 +540,7 @@ INSERT INTO `linkis_ps_dm_datasource_type` (`name`,
`description`, `option`, `cl
INSERT INTO `linkis_ps_dm_datasource_type` (`name`, `description`, `option`,
`classifier`, `icon`, `layers`) VALUES ('hive', 'hive数据库', 'hive', '大数据存储', '',
3);
INSERT INTO `linkis_ps_dm_datasource_type` (`name`, `description`, `option`,
`classifier`, `icon`, `layers`) VALUES
('elasticsearch','elasticsearch数据源','es无结构化存储','分布式全文索引','',3);
-
---jdbc
+-- jdbc
INSERT INTO `linkis_ps_dm_datasource_type` (`name`, `description`, `option`,
`classifier`, `icon`, `layers`) VALUES ('mysql', 'mysql数据库', 'mysql数据库',
'关系型数据库', '', 3);
INSERT INTO `linkis_ps_dm_datasource_type` (`name`, `description`, `option`,
`classifier`, `icon`, `layers`) VALUES
('oracle','oracle数据库','oracle','关系型数据库','',3);
INSERT INTO `linkis_ps_dm_datasource_type` (`name`, `description`, `option`,
`classifier`, `icon`, `layers`) VALUES ('dm','达梦数据库','dm','关系型数据库','',3);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
