Skip to content

Commit 6259716

Browse files
authored
Revert "[Feature] JobState component in launcher module"
1 parent 7123bcc commit 6259716

83 files changed

Lines changed: 192 additions & 1146 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

assembly/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<artifactId>streamis</artifactId>
2222
<groupId>com.webank.wedatasphere.streamis</groupId>
23-
<version>0.2.0</version>
23+
<version>0.1.0</version>
2424
</parent>
2525
<modelVersion>4.0.0</modelVersion>
2626

db/streamis_ddl.sql

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ SET FOREIGN_KEY_CHECKS = 0;
88
DROP TABLE IF EXISTS `linkis_stream_configuration_config_key`;
99
CREATE TABLE `linkis_stream_configuration_config_key` (
1010
`id` bigint(20) NOT NULL,
11-
`key` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
11+
`key` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
1212
`name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
1313
`description` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
1414
`default_value` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
@@ -31,13 +31,13 @@ CREATE TABLE `linkis_stream_configuration_config_key` (
3131
-- ----------------------------
3232
DROP TABLE IF EXISTS `linkis_stream_configuration_config_value`;
3333
CREATE TABLE `linkis_stream_configuration_config_value` (
34-
`id` bigint(20) NOT NULL AUTO_INCREMENT,
34+
`id` bigint(20) NOT NULL,
3535
`configkey_id` bigint(20) NULL DEFAULT NULL,
36-
`config_value` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
36+
`config_value` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
3737
`type` int(10) NULL DEFAULT NULL,
3838
`job_id` bigint(20) NULL DEFAULT NULL,
39-
`job_name` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
40-
`config_key` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
39+
`job_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
40+
`config_key` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
4141
PRIMARY KEY (`id`) USING BTREE,
4242
INDEX `key`(`config_key`) USING BTREE,
4343
INDEX `keyid`(`configkey_id`) USING BTREE
@@ -129,8 +129,8 @@ DROP TABLE IF EXISTS `linkis_stream_job`;
129129

130130
CREATE TABLE `linkis_stream_job` (
131131
`id` bigint(20) NOT NULL AUTO_INCREMENT,
132-
`project_name` varchar(100) DEFAULT NULL,
133-
`name` varchar(200) DEFAULT NULL,
132+
`project_name` varchar(50) DEFAULT NULL,
133+
`name` varchar(50) DEFAULT NULL,
134134
`status` tinyint(1) DEFAULT '0' COMMENT '1:已完成 ,2:等待重启 ,3:告警 ,4:慢任务 ,5:运行中 ,6:失败任务',
135135
`create_by` varchar(50) DEFAULT NULL,
136136
`create_time` datetime DEFAULT NULL,
@@ -182,7 +182,7 @@ DROP TABLE IF EXISTS `linkis_stream_project`;
182182
CREATE TABLE `linkis_stream_project` (
183183
`id` bigint(20) NOT NULL AUTO_INCREMENT,
184184
`workspace_id` bigint(20) DEFAULT NULL,
185-
`name` varchar(100) DEFAULT NULL,
185+
`name` varchar(50) DEFAULT NULL,
186186
`create_by` varchar(50) DEFAULT NULL,
187187
PRIMARY KEY (`id`) USING BTREE
188188
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='项目表';
@@ -211,14 +211,14 @@ DROP TABLE IF EXISTS `linkis_stream_task`;
211211
CREATE TABLE `linkis_stream_task` (
212212
`id` int(11) NOT NULL AUTO_INCREMENT,
213213
`job_version_id` bigint(20) NOT NULL,
214-
`job_id` varchar(200) DEFAULT NULL,
214+
`job_id` varchar(50) DEFAULT NULL,
215215
`version` varchar(50) DEFAULT NULL,
216216
`status` int(3) DEFAULT NULL,
217217
`start_time` datetime DEFAULT NULL,
218218
`last_update_time` datetime DEFAULT NULL,
219219
`err_desc` varchar(10240) DEFAULT NULL,
220220
`submit_user` varchar(50) DEFAULT NULL,
221-
`linkis_job_id` varchar(200) DEFAULT NULL,
221+
`linkis_job_id` varchar(50) DEFAULT NULL,
222222
`linkis_job_info` mediumtext,
223223
PRIMARY KEY (`id`) USING BTREE
224224
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='任务表';
@@ -239,15 +239,4 @@ CREATE TABLE `linkis_stream_alert_record` (
239239
PRIMARY KEY (`id`)
240240
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
241241

242-
DROP TABLE IF EXISTS `linkis_stream_project_privilege`;
243-
244-
CREATE TABLE `linkis_stream_project_privilege` (
245-
`id` bigint(20) NOT NULL AUTO_INCREMENT,
246-
`project_id` bigint(20) NOT NULL,
247-
`user_name` varchar(100) NOT NULL,
248-
`privilege` tinyint(1) DEFAULT '0' NOT NULL COMMENT '1:发布权限 ,2:编辑权限 ,3:查看权限 ,4:所有权限 ,5:发布编辑权限 ,6:发布查看权限 ,7:编辑查看权限 ',
249-
PRIMARY KEY (`id`) USING BTREE
250-
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='项目权限表';
251-
252-
253242
SET FOREIGN_KEY_CHECKS = 1;

pom.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<groupId>com.webank.wedatasphere.streamis</groupId>
2323
<artifactId>streamis</artifactId>
24-
<version>0.2.0</version>
24+
<version>0.1.0</version>
2525
<packaging>pom</packaging>
2626

2727
<name>Streamis Project Parent POM</name>
@@ -41,13 +41,11 @@
4141
<module>streamis-server</module>
4242
<module>streamis-project</module>
4343
<module>assembly</module>
44-
<module>streamis-appconn</module>
4544
</modules>
4645

4746
<properties>
48-
<linkis.version>1.1.1</linkis.version>
49-
<dss.version>1.1.0</dss.version>
50-
<streamis.version>0.2.0</streamis.version>
47+
<linkis.version>1.0.3</linkis.version>
48+
<streamis.version>0.1.0</streamis.version>
5149
<scala.version>2.11.12</scala.version>
5250
<jdk.compile.version>1.8</jdk.compile.version>
5351
<maven.version>3.3.3</maven.version>
@@ -69,7 +67,7 @@
6967
<jersey-bean-validation.version>2.21</jersey-bean-validation.version>
7068
<aspectj.version>1.9.5</aspectj.version>
7169
<xstream.version>1.4.19</xstream.version>
72-
<jobmanager.version>0.2.0</jobmanager.version>
70+
<jobmanager.version>0.1.0</jobmanager.version>
7371
<mysql.connector.version>5.1.47</mysql.connector.version>
7472
</properties>
7573

streamis-appconn/pom.xml

Lines changed: 0 additions & 105 deletions
This file was deleted.

streamis-appconn/src/main/assembly/distribution.xml

Lines changed: 0 additions & 62 deletions
This file was deleted.

streamis-appconn/src/main/java/com/webank/wedatasphere/streamis/dss/appconn/StreamisAppConn.java

Lines changed: 0 additions & 30 deletions
This file was deleted.

streamis-appconn/src/main/java/com/webank/wedatasphere/streamis/dss/appconn/structure/StreamisStructureIntegrationStandard.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

streamis-appconn/src/main/java/com/webank/wedatasphere/streamis/dss/appconn/structure/project/StreamisProjectCreationOperation.java

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)