Skip to content

Commit 9be69de

Browse files
peacewongpeacewong
authored
Upgrade version to 1.6.0 (#5142)
* add 1.6.0 update ddl sql * modify default python3 path * Fix build error * Upgrade version to 1.6.0
1 parent cac834d commit 9be69de

File tree

13 files changed

+109
-16
lines changed

13 files changed

+109
-16
lines changed

‎.github/workflows/integration-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
TAG: ${{ github.sha }}
4646
SKIP_TEST: true
4747
HUB: ghcr.io/apache/linkis
48-
LINKIS_VERSION: 1.5.0
48+
LINKIS_VERSION: 1.6.0
4949
steps:
5050
- name: Free up disk space
5151
run: |

‎.github/workflows/publish-docker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
TAG: ${{ github.sha }}
3535
SKIP_TEST: true
3636
HUB: ghcr.io/apache/linkis
37-
LINKIS_VERSION: 1.5.0
37+
LINKIS_VERSION: 1.6.0
3838
steps:
3939
- name: Checkout
4040
uses: actions/checkout@v2

‎.github/workflows/publish-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
branch:
32-
- dev-1.5.0
32+
- dev-1.6.0
3333
steps:
3434
- name: Checkout repository
3535
uses: actions/checkout@v2

‎linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/conf/Configuration.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ object Configuration extends Logging {
7070
// Only the specified token has permission to call some api
7171
val GOVERNANCE_STATION_ADMIN_TOKEN_STARTWITH = "ADMIN-"
7272

73-
val VARIABLE_OPERATION: Boolean = CommonVars("wds.linkis.variable.operation", false).getValue
73+
val VARIABLE_OPERATION: Boolean = CommonVars("wds.linkis.variable.operation", true).getValue
7474

7575
val ERROR_MSG_TIP =
7676
CommonVars(

‎linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/restful/EntranceRestfulApi.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public Message execute(HttpServletRequest req, @RequestBody Map<String, Object>
132132
+ jobReqId
133133
+ " in "
134134
+ Sender.getThisServiceInstance().toString()
135-
+ ". \n Please wait it to be scheduled(您的任务已经提交，进入排队中，如果一直没有更新日志，是任务并发达到了限制，可以在ITSM提Linkis参数修改单)"),
135+
+ ". \n Please wait it to be scheduled(您的任务已经提交，进入排队中，如果一直没有更新日志，是任务并发达到了限制，可以进行参数修改)"),
136136
job);
137137
message = Message.ok();
138138
message.setMethod("/api/entrance/execute");
@@ -186,7 +186,7 @@ public Message submit(HttpServletRequest req, @RequestBody Map<String, Object> j
186186
+ jobReqId
187187
+ " in "
188188
+ Sender.getThisServiceInstance().toString()
189-
+ ". \n Please wait it to be scheduled(您的任务已经提交，进入排队中，如果一直没有更新日志，是任务并发达到了限制，可以在ITSM提Linkis参数修改单)"),
189+
+ ". \n Please wait it to be scheduled(您的任务已经提交，进入排队中，如果一直没有更新日志，是任务并发达到了限制，可以进行参数修改)"),
190190
job);
191191
String execID =
192192
ZuulEntranceUtils.generateExecID(

‎linkis-dist/package/db/linkis_ddl.sql

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ CREATE TABLE `linkis_ps_configuration_config_key`(
3636
`name` varchar(50) DEFAULT NULL,
3737
`default_value` varchar(200) DEFAULT NULL COMMENT 'Adopted when user does not set key',
3838
`validate_type` varchar(50) DEFAULT NULL COMMENT 'Validate type, one of the following: None, NumInterval, FloatInterval, Include, Regex, OPF, Custom Rules',
39-
`validate_range` varchar(50) DEFAULT NULL COMMENT 'Validate range',
40-
`engine_conn_type` varchar(50) DEFAULT NULL COMMENT 'engine type,such as spark,hive etc',
39+
`validate_range` varchar(150) DEFAULT NULL COMMENT 'Validate range',
40+
`engine_conn_type` varchar(50) DEFAULT '' COMMENT 'engine type,such as spark,hive etc',
4141
`is_hidden` tinyint(1) DEFAULT NULL COMMENT 'Whether it is hidden from user. If set to 1(true), then user cannot modify, however, it could still be used in back-end',
4242
`is_advanced` tinyint(1) DEFAULT NULL COMMENT 'Whether it is an advanced parameter. If set to 1(true), parameters would be displayed only when user choose to do so',
4343
`level` tinyint(1) DEFAULT NULL COMMENT 'Basis for displaying sorting in the front-end. Higher the level is, higher the rank the parameter gets',
@@ -47,6 +47,7 @@ CREATE TABLE `linkis_ps_configuration_config_key`(
4747
`en_name` varchar(100) DEFAULT NULL COMMENT 'english name',
4848
`en_treeName` varchar(100) DEFAULT NULL COMMENT 'english treeName',
4949
`template_required` tinyint(1) DEFAULT 0 COMMENT 'template required 0 none / 1 must',
50+
UNIQUE KEY `uniq_key_ectype` (`key`,`engine_conn_type`),
5051
PRIMARY KEY (`id`)
5152
)ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
5253

@@ -629,6 +630,7 @@ CREATE TABLE if not exists `linkis_ps_bml_resources_task` (
629630
`start_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Starting time',
630631
`end_time` datetime DEFAULT NULL COMMENT 'End Time',
631632
`last_update_time` datetime NOT NULL COMMENT 'Last update time',
633+
unique key `uniq_rid_version` (resource_id, version),
632634
PRIMARY KEY (`id`)
633635
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
634636

@@ -856,7 +858,8 @@ CREATE TABLE `linkis_cg_ec_resource_info_record` (
856858
`create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT 'create time',
857859
PRIMARY KEY (`id`),
858860
KEY `idx_ticket_id` (`ticket_id`),
859-
UNIQUE KEY `uniq_tid_lv` (`ticket_id`,`label_value`)
861+
UNIQUE KEY `uniq_tid_lv` (`ticket_id`,`label_value`),
862+
UNIQUE KEY uniq_sinstance_status_cuser_ctime (service_instance, status, create_user, create_time)
860863
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
861864

862865
DROP TABLE IF EXISTS `linkis_cg_manager_label_service_instance`;
@@ -906,6 +909,7 @@ CREATE TABLE `linkis_cg_manager_service_instance_metrics` (
906909
`healthy_status` varchar(255) COLLATE utf8_bin DEFAULT NULL,
907910
`update_time` datetime DEFAULT CURRENT_TIMESTAMP,
908911
`create_time` datetime DEFAULT CURRENT_TIMESTAMP,
912+
description varchar(256) CHARSET utf8mb4 COLLATE utf8mb4_bin DEFAULT '',
909913
PRIMARY KEY (`instance`)
910914
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
911915

@@ -1064,6 +1068,7 @@ CREATE TABLE `linkis_cg_tenant_label_config` (
10641068
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
10651069
`desc` varchar(100) COLLATE utf8_bin NOT NULL,
10661070
`bussiness_user` varchar(50) COLLATE utf8_bin NOT NULL,
1071+
`is_valid` varchar(1) CHARSET utf8mb4 COLLATE utf8mb4_bin DEFAULT 'Y' COMMENT 'is valid',
10671072
PRIMARY KEY (`id`),
10681073
UNIQUE KEY `uniq_user_creator` (`user`,`creator`)
10691074
) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
@@ -1084,3 +1089,22 @@ CREATE TABLE `linkis_cg_user_ip_config` (
10841089
PRIMARY KEY (`id`),
10851090
UNIQUE KEY `uniq_user_creator` (`user`,`creator`)
10861091
) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
1092+
1093+
-- ----------------------------
1094+
-- Table structure for linkis_org_user
1095+
-- ----------------------------
1096+
DROP TABLE IF EXISTS `linkis_org_user`;
1097+
CREATE TABLE `linkis_org_user` (
1098+
`cluster_code` varchar(16) COMMENT 'cluster code',
1099+
`user_type` varchar(64) COMMENT 'user type',
1100+
`user_name` varchar(128) COMMENT 'username',
1101+
`org_id` varchar(16) COMMENT 'org id',
1102+
`org_name` varchar(64) COMMENT 'org name',
1103+
`queue_name` varchar(64) COMMENT 'yarn queue name',
1104+
`db_name` varchar(64) COMMENT 'default db name',
1105+
`interface_user` varchar(64) COMMENT 'interface user',
1106+
`is_union_analyse` varchar(64) COMMENT 'is union analyse',
1107+
`create_time` varchar(64) COMMENT 'create time',
1108+
`user_itsm_no` varchar(64) COMMENT 'user itsm no',
1109+
PRIMARY KEY (`user_name`)
1110+
) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE=utf8mb4_bin COMMENT ='user org info';

‎linkis-dist/package/db/linkis_ddl_pg.sql

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ DROP TABLE IF EXISTS "linkis_ps_configuration_config_value";
7878
CREATE TABLE linkis_ps_configuration_config_value (
7979
id bigserial NOT NULL,
8080
config_key_id int4 NULL,
81-
config_value varchar(200) NULL,
81+
config_value varchar(500) NULL,
8282
config_label_id int8 NULL,
8383
update_time timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
8484
create_time timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -996,6 +996,7 @@ CREATE TABLE linkis_cg_manager_service_instance_metrics (
996996
healthy_status varchar(255) NULL,
997997
update_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
998998
create_time timestamp(6) NULL DEFAULT CURRENT_TIMESTAMP,
999+
description varchar(256) NULL,
9991000
CONSTRAINT linkis_manager_service_instance_metrics_pkey PRIMARY KEY (instance)
10001001
);
10011002

@@ -1167,3 +1168,19 @@ CREATE TABLE "linkis_cg_user_ip_config" (
11671168
CONSTRAINT linkis_cg_user_ip_config_pkey PRIMARY KEY (id)
11681169
);
11691170
CREATE UNIQUE INDEX uniq_user_creator_uic ON linkis_cg_user_ip_config USING btree ("user",creator);
1171+
1172+
DROP TABLE IF EXISTS linkis_org_user;
1173+
1174+
CREATE TABLE linkis_org_user (
1175+
cluster_code varchar(16) COMMENT 'cluster code',
1176+
user_type varchar(64) COMMENT 'user type',
1177+
user_name varchar(128) PRIMARY KEY COMMENT 'username',
1178+
org_id varchar(16) COMMENT 'org id',
1179+
org_name varchar(64) COMMENT 'org name',
1180+
queue_name varchar(64) COMMENT 'yarn queue name',
1181+
db_name varchar(64) COMMENT 'default db name',
1182+
interface_user varchar(64) COMMENT 'interface user',
1183+
is_union_analyse varchar(64) COMMENT 'is union analyse',
1184+
create_time varchar(64) COMMENT 'create time',
1185+
user_itsm_no varchar(64) COMMENT 'user itsm no'
1186+
) COMMENT ON TABLE linkis_org_user IS 'user org info';

‎linkis-dist/package/db/linkis_dml.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ INSERT INTO `linkis_ps_configuration_config_key` (`key`, `description`, `name`,
169169
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.trino.ssl.truststore.password', 'Trino服务器SSL truststore密码', 'truststore密码', 'null', 'None', '', 'trino', 0, 0, 1, '数据源配置');
170170

171171
-- Configuration first level directory
172-
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());
172+
insert into `linkis_cg_manager_label` (`label_key`, `label_value`, `label_feature`, `label_value_size`, `update_time`, `create_time`) VALUES ('combined_userCreator_engineType','*-GlobalSettings,*-*', 'OPTIONAL', 2, now(), now());
173173
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());
174174
insert into `linkis_cg_manager_label` (`label_key`, `label_value`, `label_feature`, `label_value_size`, `update_time`, `create_time`) VALUES ('combined_userCreator_engineType','*-Visualis,*-*', 'OPTIONAL', 2, now(), now());
175175
insert into `linkis_cg_manager_label` (`label_key`, `label_value`, `label_feature`, `label_value_size`, `update_time`, `create_time`) VALUES ('combined_userCreator_engineType','*-nodeexecution,*-*', 'OPTIONAL', 2, now(), now());
@@ -269,7 +269,7 @@ insert into `linkis_cg_manager_label` (`label_key`, `label_value`, `label_featur
269269

270270

271271
-- Associate first-level and second-level directories
272-
select @label_id := id from linkis_cg_manager_label where `label_value` = '*-全局设置,*-*';
272+
select @label_id := id from linkis_cg_manager_label where `label_value` = '*-GlobalSettings,*-*';
273273
insert into linkis_ps_configuration_category (`label_id`, `level`) VALUES (@label_id, 1);
274274

275275
select @label_id := id from linkis_cg_manager_label where `label_value` = '*-IDE,*-*';

‎linkis-dist/package/db/upgrade/1.6.0_schema/mysql/linkis_ddl.sql

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
ALTER TABLE linkis_ps_bml_resources_task ADD CONSTRAINT uniq_rid_version UNIQUE (resource_id, version);
19+
ALTER TABLE linkis_cg_ec_resource_info_record ADD UNIQUE INDEX uniq_sinstance_status_cuser_ctime (service_instance, status, create_user, create_time);
20+
ALTER TABLE linkis_cg_manager_service_instance_metrics ADD COLUMN description varchar(256) CHARSET utf8mb4 COLLATE utf8mb4_bin DEFAULT '';
21+
ALTER TABLE linkis_ps_configuration_config_value modify COLUMN config_value varchar(500) CHARSET utf8mb4 COLLATE utf8mb4_bin;
22+
ALTER TABLE `linkis_ps_configuration_config_key` ADD UNIQUE `uniq_key_ectype` (`key`,`engine_conn_type`);
23+
ALTER TABLE `linkis_ps_configuration_config_key` modify column `engine_conn_type` varchar(50) DEFAULT '' COMMENT 'engine type,such as spark,hive etc';
24+
ALTER TABLE `linkis_ps_udf_version` ADD COLUMN `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'update_time';
25+
ALTER TABLE `linkis_ps_udf_tree` ADD CONSTRAINT `uniq_parent_name_uname_category` UNIQUE (`parent`,`name`, `user_name`, `category`);
26+
ALTER TABLE `linkis_cg_ec_resource_info_record` MODIFY COLUMN `metrics` text CHARACTER SET utf8 COLLATE utf8_bin NULL COMMENT 'ec metrics';
27+
ALTER TABLE `linkis_ps_configuration_config_key`
28+
CHANGE COLUMN `validate_range` `validate_range` VARCHAR(150) NULL DEFAULT NULL COMMENT 'Validate range' COLLATE 'utf8_bin' AFTER `validate_type`;
29+
ALTER TABLE linkis_cg_tenant_label_config ADD COLUMN is_valid varchar(1) CHARSET utf8mb4 COLLATE utf8mb4_bin DEFAULT 'Y' COMMENT '是否有效';
30+
31+
32+
-- ----------------------------
33+
-- Table structure for linkis_org_user
34+
-- ----------------------------
35+
DROP TABLE IF EXISTS `linkis_org_user`;
36+
CREATE TABLE `linkis_org_user` (
37+
`cluster_code` varchar(16) COMMENT 'cluster code',
38+
`user_type` varchar(64) COMMENT 'user type',
39+
`user_name` varchar(128) COMMENT 'username',
40+
`org_id` varchar(16) COMMENT 'org id',
41+
`org_name` varchar(64) COMMENT 'org name',
42+
`queue_name` varchar(64) COMMENT 'yarn queue name',
43+
`db_name` varchar(64) COMMENT 'default db name',
44+
`interface_user` varchar(64) COMMENT 'interface user',
45+
`is_union_analyse` varchar(64) COMMENT 'is union analyse',
46+
`create_time` varchar(64) COMMENT 'create time',
47+
`user_itsm_no` varchar(64) COMMENT 'user itsm no',
48+
PRIMARY KEY (`user_name`)
49+
) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE=utf8mb4_bin COMMENT ='user org info';
50+
51+
52+

‎linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/config/SparkConfiguration.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ object SparkConfiguration extends Logging {
153153
CommonVars("wds.linkis.spark.engineconn.fatal.log", "error writing class;OutOfMemoryError")
154154

155155
val PYSPARK_PYTHON3_PATH =
156-
CommonVars[String]("pyspark.python3.path", "/appcom/Install/anaconda3/bin/python")
156+
CommonVars[String]("pyspark.python3.path", "python3")
157157

158158
val ENABLE_REPLACE_PACKAGE_NAME =
159159
CommonVars("wds.linkis.spark.engine.scala.replace_package_header.enable", true)

‎linkis-web/.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ VUE_APP_HOST=
22
BACKEND_URL=http://127.0.0.1:9001
33
VUE_APP_MN_CONFIG_PREFIX=
44
VUE_APP_MN_CONFIG_SOCKET=/ws/api/entrance/connect
5-
VUE_APP_VERSION=1.5.0
5+
VUE_APP_VERSION=1.6.0

‎linkis-web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "linkis",
3-
"version": "1.5.0",
3+
"version": "1.6.0",
44
"private": true,
55
"scripts": {
66
"serve": "vue-cli-service serve",

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
</snapshotRepository>
103103
</distributionManagement>
104104
<properties>
105-
<revision>1.5.0</revision>
105+
<revision>1.6.0</revision>
106106

107107
<zookeeper.version>3.5.9</zookeeper.version>
108108
<curator.version>4.2.0</curator.version>

0 commit comments

Comments
 (0)