Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "[Feature] JobState component in launcher module" #27

Merged
merged 1 commit into from
Jun 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>streamis</artifactId>
<groupId>com.webank.wedatasphere.streamis</groupId>
<version>0.2.0</version>
<version>0.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
31 changes: 10 additions & 21 deletions db/streamis_ddl.sql
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SET FOREIGN_KEY_CHECKS = 0;
DROP TABLE IF EXISTS `linkis_stream_configuration_config_key`;
CREATE TABLE `linkis_stream_configuration_config_key` (
`id` bigint(20) NOT NULL,
`key` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`key` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`description` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`default_value` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
Expand All @@ -31,13 +31,13 @@ CREATE TABLE `linkis_stream_configuration_config_key` (
-- ----------------------------
DROP TABLE IF EXISTS `linkis_stream_configuration_config_value`;
CREATE TABLE `linkis_stream_configuration_config_value` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`id` bigint(20) NOT NULL,
`configkey_id` bigint(20) NULL DEFAULT NULL,
`config_value` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`config_value` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`type` int(10) NULL DEFAULT NULL,
`job_id` bigint(20) NULL DEFAULT NULL,
`job_name` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`config_key` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`job_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
`config_key` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE,
INDEX `key`(`config_key`) USING BTREE,
INDEX `keyid`(`configkey_id`) USING BTREE
Expand Down Expand Up @@ -129,8 +129,8 @@ DROP TABLE IF EXISTS `linkis_stream_job`;

CREATE TABLE `linkis_stream_job` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`project_name` varchar(100) DEFAULT NULL,
`name` varchar(200) DEFAULT NULL,
`project_name` varchar(50) DEFAULT NULL,
`name` varchar(50) DEFAULT NULL,
`status` tinyint(1) DEFAULT '0' COMMENT '1:已完成 ,2:等待重启 ,3:告警 ,4:慢任务 ,5:运行中 ,6:失败任务',
`create_by` varchar(50) DEFAULT NULL,
`create_time` datetime DEFAULT NULL,
Expand Down Expand Up @@ -182,7 +182,7 @@ DROP TABLE IF EXISTS `linkis_stream_project`;
CREATE TABLE `linkis_stream_project` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`workspace_id` bigint(20) DEFAULT NULL,
`name` varchar(100) DEFAULT NULL,
`name` varchar(50) DEFAULT NULL,
`create_by` varchar(50) DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='项目表';
Expand Down Expand Up @@ -211,14 +211,14 @@ DROP TABLE IF EXISTS `linkis_stream_task`;
CREATE TABLE `linkis_stream_task` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`job_version_id` bigint(20) NOT NULL,
`job_id` varchar(200) DEFAULT NULL,
`job_id` varchar(50) DEFAULT NULL,
`version` varchar(50) DEFAULT NULL,
`status` int(3) DEFAULT NULL,
`start_time` datetime DEFAULT NULL,
`last_update_time` datetime DEFAULT NULL,
`err_desc` varchar(10240) DEFAULT NULL,
`submit_user` varchar(50) DEFAULT NULL,
`linkis_job_id` varchar(200) DEFAULT NULL,
`linkis_job_id` varchar(50) DEFAULT NULL,
`linkis_job_info` mediumtext,
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='任务表';
Expand All @@ -239,15 +239,4 @@ CREATE TABLE `linkis_stream_alert_record` (
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;

DROP TABLE IF EXISTS `linkis_stream_project_privilege`;

CREATE TABLE `linkis_stream_project_privilege` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`project_id` bigint(20) NOT NULL,
`user_name` varchar(100) NOT NULL,
`privilege` tinyint(1) DEFAULT '0' NOT NULL COMMENT '1:发布权限 ,2:编辑权限 ,3:查看权限 ,4:所有权限 ,5:发布编辑权限 ,6:发布查看权限 ,7:编辑查看权限 ',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='项目权限表';


SET FOREIGN_KEY_CHECKS = 1;
10 changes: 4 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<groupId>com.webank.wedatasphere.streamis</groupId>
<artifactId>streamis</artifactId>
<version>0.2.0</version>
<version>0.1.0</version>
<packaging>pom</packaging>

<name>Streamis Project Parent POM</name>
Expand All @@ -41,13 +41,11 @@
<module>streamis-server</module>
<module>streamis-project</module>
<module>assembly</module>
<module>streamis-appconn</module>
</modules>

<properties>
<linkis.version>1.1.1</linkis.version>
<dss.version>1.1.0</dss.version>
<streamis.version>0.2.0</streamis.version>
<linkis.version>1.0.3</linkis.version>
<streamis.version>0.1.0</streamis.version>
<scala.version>2.11.12</scala.version>
<jdk.compile.version>1.8</jdk.compile.version>
<maven.version>3.3.3</maven.version>
Expand All @@ -69,7 +67,7 @@
<jersey-bean-validation.version>2.21</jersey-bean-validation.version>
<aspectj.version>1.9.5</aspectj.version>
<xstream.version>1.4.19</xstream.version>
<jobmanager.version>0.2.0</jobmanager.version>
<jobmanager.version>0.1.0</jobmanager.version>
<mysql.connector.version>5.1.47</mysql.connector.version>
</properties>

Expand Down
105 changes: 0 additions & 105 deletions streamis-appconn/pom.xml

This file was deleted.

62 changes: 0 additions & 62 deletions streamis-appconn/src/main/assembly/distribution.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading