From 7fbdf7bf11b081218e255e02d8e8a637006e296b Mon Sep 17 00:00:00 2001 From: wangqi Date: Wed, 12 Jun 2024 18:32:47 +0800 Subject: [PATCH 1/6] fix: comment volumes --- tools/docker/build/flink-cdc/Dockerfile | 4 ++-- tools/docker/deploy/scaleph/docker-compose.yml | 6 ++++-- tools/docker/local/docker-compose.yml | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/docker/build/flink-cdc/Dockerfile b/tools/docker/build/flink-cdc/Dockerfile index daece4793..286c47483 100644 --- a/tools/docker/build/flink-cdc/Dockerfile +++ b/tools/docker/build/flink-cdc/Dockerfile @@ -18,12 +18,12 @@ ARG FLINK_VERSION=1.18 FROM flink:${FLINK_VERSION} -ARG FLINK_CDC_VERSION=3.0.0 +ARG FLINK_CDC_VERSION=3.1.0 ARG TAR_FILE=flink-cdc-${FLINK_CDC_VERSION}-bin.tar.gz ENV FLINK_CDC_HOME=/opt/flink-cdc RUN mkdir -p $FLINK_CDC_HOME -RUN wget https://github.com/ververica/flink-cdc-connectors/releases/download/release-${FLINK_CDC_VERSION}/$TAR_FILE ; \ +RUN wget https://dlcdn.apache.org/flink/flink-cdc-${FLINK_CDC_VERSION}/$TAR_FILE ; \ tar -zxf $TAR_FILE --strip 1 -C $FLINK_CDC_HOME ; \ rm $TAR_FILE \ No newline at end of file diff --git a/tools/docker/deploy/scaleph/docker-compose.yml b/tools/docker/deploy/scaleph/docker-compose.yml index e514d13a3..1d8ca289f 100644 --- a/tools/docker/deploy/scaleph/docker-compose.yml +++ b/tools/docker/deploy/scaleph/docker-compose.yml @@ -104,11 +104,13 @@ services: - scaleph gravitino: - image: datastrato/gravitino:0.5.0 + image: datastrato/gravitino:0.5.1 container_name: gravitino ports: - 8090:8090 - restart: unless-stopped +# volumes: +# - /path/to/mysql.jar:/root/gravitino/catalogs/jdbc-mysql/libs/mysql.jar +# - /path/to/mysql.jar:/root/gravitino/catalogs/jdbc-doris/libs/mysql.jar networks: - scaleph diff --git a/tools/docker/local/docker-compose.yml b/tools/docker/local/docker-compose.yml index 1bb29c63d..b1510311d 100644 --- a/tools/docker/local/docker-compose.yml +++ b/tools/docker/local/docker-compose.yml @@ -70,9 +70,9 @@ services: container_name: gravitino ports: - 8090:8090 - volumes: - - /path/to/mysql.jar:/root/gravitino/catalogs/jdbc-mysql/libs/mysql.jar - - /path/to/mysql.jar:/root/gravitino/catalogs/jdbc-doris/libs/mysql.jar +# volumes: +# - /path/to/mysql.jar:/root/gravitino/catalogs/jdbc-mysql/libs/mysql.jar +# - /path/to/mysql.jar:/root/gravitino/catalogs/jdbc-doris/libs/mysql.jar networks: - scaleph From 69dea16031fa221ddbf860820fc0b78d2a6b31ff Mon Sep 17 00:00:00 2001 From: wangqi Date: Wed, 12 Jun 2024 18:38:41 +0800 Subject: [PATCH 2/6] feature: add comment --- tools/docker/build/flink-cdc/Dockerfile | 3 ++- tools/docker/build/scaleph-seatunnel/Dockerfile | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/docker/build/flink-cdc/Dockerfile b/tools/docker/build/flink-cdc/Dockerfile index 286c47483..d312336e1 100644 --- a/tools/docker/build/flink-cdc/Dockerfile +++ b/tools/docker/build/flink-cdc/Dockerfile @@ -24,6 +24,7 @@ ARG TAR_FILE=flink-cdc-${FLINK_CDC_VERSION}-bin.tar.gz ENV FLINK_CDC_HOME=/opt/flink-cdc RUN mkdir -p $FLINK_CDC_HOME -RUN wget https://dlcdn.apache.org/flink/flink-cdc-${FLINK_CDC_VERSION}/$TAR_FILE ; \ +# 本地构建时，可以切换成国内镜像：https://mirrors.cloud.tencent.com/apache/flink/flink-cdc-${FLINK_CDC_VERSION}/$TAR_FILE +RUN wget https://archive.apache.org/dist/flink/flink-cdc-${FLINK_CDC_VERSION}/$TAR_FILE ; \ tar -zxf $TAR_FILE --strip 1 -C $FLINK_CDC_HOME ; \ rm $TAR_FILE \ No newline at end of file diff --git a/tools/docker/build/scaleph-seatunnel/Dockerfile b/tools/docker/build/scaleph-seatunnel/Dockerfile index b8cf75216..af043c33e 100644 --- a/tools/docker/build/scaleph-seatunnel/Dockerfile +++ b/tools/docker/build/scaleph-seatunnel/Dockerfile @@ -24,6 +24,7 @@ ARG TAR_FILE=apache-seatunnel-${SEATUNNEL_VERSION}-bin.tar.gz ENV SEATUNNEL_HOME=/opt/seatunnel RUN mkdir -p $SEATUNNEL_HOME +# 本地构建时，可以切换成国内镜像：https://mirrors.cloud.tencent.com/apache/seatunnel/${SEATUNNEL_VERSION}/$TAR_FILE RUN wget https://archive.apache.org/dist/seatunnel/${SEATUNNEL_VERSION}/$TAR_FILE ; \ tar -zxf $TAR_FILE --strip 1 -C $SEATUNNEL_HOME ; \ rm $TAR_FILE From f522cd607ae80dd546eb1e6628a0b4685097f1e5 Mon Sep 17 00:00:00 2001 From: wangqi Date: Thu, 13 Jun 2024 13:49:30 +0800 Subject: [PATCH 3/6] feature: disable gravitino --- scaleph-datasource/pom.xml | 2 + .../scaleph/ds/gravitino/GravitinoConfig.java | 102 ++++---- .../ds/gravitino/GravitinoInitializer.java | 236 +++++++++--------- tools/docker/deploy/doris/backup-2.yml | 30 +++ 4 files changed, 201 insertions(+), 169 deletions(-) create mode 100644 tools/docker/deploy/doris/backup-2.yml diff --git a/scaleph-datasource/pom.xml b/scaleph-datasource/pom.xml index 5926ae5c5..f1d9a3b07 100644 --- a/scaleph-datasource/pom.xml +++ b/scaleph-datasource/pom.xml @@ -40,10 +40,12 @@ com.datastrato.gravitino client-java-runtime + true com.datastrato.gravitino client-java + true diff --git a/scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/gravitino/GravitinoConfig.java b/scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/gravitino/GravitinoConfig.java index 90da3c7bd..eb090d1b3 100644 --- a/scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/gravitino/GravitinoConfig.java +++ b/scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/gravitino/GravitinoConfig.java @@ -1,51 +1,51 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package cn.sliew.scaleph.ds.gravitino; - -import cn.sliew.scaleph.common.util.NetUtils; -import com.datastrato.gravitino.client.GravitinoAdminClient; -import com.datastrato.gravitino.client.GravitinoClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -@EnableConfigurationProperties(GravitinoProperties.class) -public class GravitinoConfig { - - @Autowired - private GravitinoProperties properties; - - @Bean - public GravitinoAdminClient gravitinoAdminClient() { - return GravitinoAdminClient.builder(NetUtils.replaceLocalhost(properties.getUrl())) - .withSimpleAuth() - .build(); - } - - /** - * fixme 必须添加 metalakeName - */ - public GravitinoClient gravitinoClient() { - return GravitinoClient.builder(NetUtils.replaceLocalhost(properties.getUrl())) - .withSimpleAuth() - .build(); - } -} +///* +// * Licensed to the Apache Software Foundation (ASF) under one +// * or more contributor license agreements. See the NOTICE file +// * distributed with this work for additional information +// * regarding copyright ownership. The ASF licenses this file +// * to you under the Apache License, Version 2.0 (the +// * "License"); you may not use this file except in compliance +// * with the License. You may obtain a copy of the License at +// * +// * http://www.apache.org/licenses/LICENSE-2.0 +// * +// * Unless required by applicable law or agreed to in writing, software +// * distributed under the License is distributed on an "AS IS" BASIS, +// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// * See the License for the specific language governing permissions and +// * limitations under the License. +// */ +// +//package cn.sliew.scaleph.ds.gravitino; +// +//import cn.sliew.scaleph.common.util.NetUtils; +//import com.datastrato.gravitino.client.GravitinoAdminClient; +//import com.datastrato.gravitino.client.GravitinoClient; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.context.properties.EnableConfigurationProperties; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +// +//@Configuration +//@EnableConfigurationProperties(GravitinoProperties.class) +//public class GravitinoConfig { +// +// @Autowired +// private GravitinoProperties properties; +// +// @Bean +// public GravitinoAdminClient gravitinoAdminClient() { +// return GravitinoAdminClient.builder(NetUtils.replaceLocalhost(properties.getUrl())) +// .withSimpleAuth() +// .build(); +// } +// +// /** +// * fixme 必须添加 metalakeName +// */ +// public GravitinoClient gravitinoClient() { +// return GravitinoClient.builder(NetUtils.replaceLocalhost(properties.getUrl())) +// .withSimpleAuth() +// .build(); +// } +//} diff --git a/scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/gravitino/GravitinoInitializer.java b/scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/gravitino/GravitinoInitializer.java index 2e39a9bb3..c65c329a0 100644 --- a/scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/gravitino/GravitinoInitializer.java +++ b/scaleph-datasource/src/main/java/cn/sliew/scaleph/ds/gravitino/GravitinoInitializer.java @@ -1,118 +1,118 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - *nch - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package cn.sliew.scaleph.ds.gravitino; - -import cn.sliew.milky.common.util.JacksonUtil; -import cn.sliew.scaleph.common.dict.job.DataSourceType; -import cn.sliew.scaleph.ds.modal.AbstractDataSource; -import cn.sliew.scaleph.ds.modal.jdbc.JdbcDataSource; -import cn.sliew.scaleph.ds.service.DsInfoService; -import cn.sliew.scaleph.ds.service.dto.DsInfoDTO; -import com.datastrato.gravitino.Catalog; -import com.datastrato.gravitino.NameIdentifier; -import com.datastrato.gravitino.client.GravitinoAdminClient; -import com.datastrato.gravitino.client.GravitinoMetalake; -import com.fasterxml.jackson.databind.node.ObjectNode; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -@Component -public class GravitinoInitializer implements InitializingBean { - - @Autowired - private GravitinoProperties properties; - @Autowired - private GravitinoAdminClient adminClient; - @Autowired - private DsInfoService dsInfoService; - - @Override - public void afterPropertiesSet() throws Exception { - initialize(); - } - - private void initialize() { - NameIdentifier nameIdentifier = NameIdentifier.ofMetalake(properties.getMetalake()); - - // 初始化 metalake - initMetalake(nameIdentifier); - // 初始化 catalog - initDataSource(properties.getMetalake(), DataSourceType.MYSQL); - initDataSource(properties.getMetalake(), DataSourceType.POSTGRESQL); - initDataSource(properties.getMetalake(), DataSourceType.HIVE); - initDataSource(properties.getMetalake(), DataSourceType.ICEBERG); - initDataSource(properties.getMetalake(), DataSourceType.DORIS); - initDataSource(properties.getMetalake(), DataSourceType.KAFKA); - initDataSource(properties.getMetalake(), DataSourceType.HDFS); - } - - private void initMetalake(NameIdentifier nameIdentifier) { - if (adminClient.metalakeExists(nameIdentifier) == false) { - adminClient.createMetalake(nameIdentifier, "scaleph created", Collections.emptyMap()); - } - } - - private void initDataSource(String metalakeName, DataSourceType type) { - List dsInfoDTOS = dsInfoService.listByType(type); - for (DsInfoDTO dsInfoDTO : dsInfoDTOS) { - doInitDataSource(metalakeName, type, dsInfoDTO); - } - } - - private void doInitDataSource(String metalakeName, DataSourceType type, DsInfoDTO dsInfoDTO) { - GravitinoMetalake metalake = adminClient.loadMetalake(NameIdentifier.ofMetalake(metalakeName)); - NameIdentifier catalogName = NameIdentifier.ofCatalog(metalakeName, dsInfoDTO.getName()); - if (metalake.catalogExists(catalogName) == false) { - switch (type) { - case MYSQL: - initMySQL(metalake, catalogName, dsInfoDTO); - break; - case POSTGRESQL: - break; - case HIVE: - break; - case ICEBERG: - break; - case DORIS: - break; - case KAFKA: - break; - case HDFS: - break; - default: - } - } - } - - private void initMySQL(GravitinoMetalake metalake, NameIdentifier catalogName, DsInfoDTO dsInfoDTO) { - JdbcDataSource dataSource = (JdbcDataSource) AbstractDataSource.fromDsInfo((ObjectNode) JacksonUtil.toJsonNode(dsInfoDTO)); - Map properties = new HashMap<>(); - properties.put("jdbc-driver", dataSource.getDriverClassName()); - properties.put("jdbc-url", dataSource.getUrl()); - properties.put("jdbc-user", dataSource.getUser()); - properties.put("jdbc-password", dataSource.getPassword()); - metalake.createCatalog(catalogName, Catalog.Type.RELATIONAL, "jdbc-mysql", dataSource.getRemark(), properties); - } -} +///* +// * Licensed to the Apache Software Foundation (ASF) under one +// * or more contributor license agreements. See the NOTICE file +// * distributed with this work for additional information +// * regarding copyright ownership. The ASF licenses this file +// * to you under the Apache License, Version 2.0 (the +// * "License"); you may not use this file except in compliance +// * with the License. You may obtain a copy of the License at +// *nch +// * http://www.apache.org/licenses/LICENSE-2.0 +// * +// * Unless required by applicable law or agreed to in writing, software +// * distributed under the License is distributed on an "AS IS" BASIS, +// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// * See the License for the specific language governing permissions and +// * limitations under the License. +// */ +// +//package cn.sliew.scaleph.ds.gravitino; +// +//import cn.sliew.milky.common.util.JacksonUtil; +//import cn.sliew.scaleph.common.dict.job.DataSourceType; +//import cn.sliew.scaleph.ds.modal.AbstractDataSource; +//import cn.sliew.scaleph.ds.modal.jdbc.JdbcDataSource; +//import cn.sliew.scaleph.ds.service.DsInfoService; +//import cn.sliew.scaleph.ds.service.dto.DsInfoDTO; +//import com.datastrato.gravitino.Catalog; +//import com.datastrato.gravitino.NameIdentifier; +//import com.datastrato.gravitino.client.GravitinoAdminClient; +//import com.datastrato.gravitino.client.GravitinoMetalake; +//import com.fasterxml.jackson.databind.node.ObjectNode; +//import org.springframework.beans.factory.InitializingBean; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Component; +// +//import java.util.Collections; +//import java.util.HashMap; +//import java.util.List; +//import java.util.Map; +// +//@Component +//public class GravitinoInitializer implements InitializingBean { +// +// @Autowired +// private GravitinoProperties properties; +// @Autowired +// private GravitinoAdminClient adminClient; +// @Autowired +// private DsInfoService dsInfoService; +// +// @Override +// public void afterPropertiesSet() throws Exception { +// initialize(); +// } +// +// private void initialize() { +// NameIdentifier nameIdentifier = NameIdentifier.ofMetalake(properties.getMetalake()); +// +// // 初始化 metalake +// initMetalake(nameIdentifier); +// // 初始化 catalog +// initDataSource(properties.getMetalake(), DataSourceType.MYSQL); +// initDataSource(properties.getMetalake(), DataSourceType.POSTGRESQL); +// initDataSource(properties.getMetalake(), DataSourceType.HIVE); +// initDataSource(properties.getMetalake(), DataSourceType.ICEBERG); +// initDataSource(properties.getMetalake(), DataSourceType.DORIS); +// initDataSource(properties.getMetalake(), DataSourceType.KAFKA); +// initDataSource(properties.getMetalake(), DataSourceType.HDFS); +// } +// +// private void initMetalake(NameIdentifier nameIdentifier) { +// if (adminClient.metalakeExists(nameIdentifier) == false) { +// adminClient.createMetalake(nameIdentifier, "scaleph created", Collections.emptyMap()); +// } +// } +// +// private void initDataSource(String metalakeName, DataSourceType type) { +// List dsInfoDTOS = dsInfoService.listByType(type); +// for (DsInfoDTO dsInfoDTO : dsInfoDTOS) { +// doInitDataSource(metalakeName, type, dsInfoDTO); +// } +// } +// +// private void doInitDataSource(String metalakeName, DataSourceType type, DsInfoDTO dsInfoDTO) { +// GravitinoMetalake metalake = adminClient.loadMetalake(NameIdentifier.ofMetalake(metalakeName)); +// NameIdentifier catalogName = NameIdentifier.ofCatalog(metalakeName, dsInfoDTO.getName()); +// if (metalake.catalogExists(catalogName) == false) { +// switch (type) { +// case MYSQL: +// initMySQL(metalake, catalogName, dsInfoDTO); +// break; +// case POSTGRESQL: +// break; +// case HIVE: +// break; +// case ICEBERG: +// break; +// case DORIS: +// break; +// case KAFKA: +// break; +// case HDFS: +// break; +// default: +// } +// } +// } +// +// private void initMySQL(GravitinoMetalake metalake, NameIdentifier catalogName, DsInfoDTO dsInfoDTO) { +// JdbcDataSource dataSource = (JdbcDataSource) AbstractDataSource.fromDsInfo((ObjectNode) JacksonUtil.toJsonNode(dsInfoDTO)); +// Map properties = new HashMap<>(); +// properties.put("jdbc-driver", dataSource.getDriverClassName()); +// properties.put("jdbc-url", dataSource.getUrl()); +// properties.put("jdbc-user", dataSource.getUser()); +// properties.put("jdbc-password", dataSource.getPassword()); +// metalake.createCatalog(catalogName, Catalog.Type.RELATIONAL, "jdbc-mysql", dataSource.getRemark(), properties); +// } +//} diff --git a/tools/docker/deploy/doris/backup-2.yml b/tools/docker/deploy/doris/backup-2.yml new file mode 100644 index 000000000..f41f009b2 --- /dev/null +++ b/tools/docker/deploy/doris/backup-2.yml @@ -0,0 +1,30 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +services: + doris: + image: yagagagaga/doris-standalone:2.1.3 + container_name: doris + privileged: true + command: sysctl -w vm.max_map_count=2000000 + tty: true + environment: + - TZ=Asia/Shanghai +# ports: +# - 8030:8030 +# - 8040:8040 +# - 9030:9030 + network_mode: host \ No newline at end of file From 5a24a49b3e0dc95627da91b989296e3115b24d6e Mon Sep 17 00:00:00 2001 From: wangqi Date: Fri, 14 Jun 2024 13:15:34 +0800 Subject: [PATCH 4/6] feature: update flink-cdc mapper --- .../entity/master/ws/WsArtifactFlinkCDC.java | 25 ++- .../master/ws/WsArtifactFlinkCDCMapper.xml | 13 +- .../flink/cdc/dag/dnd/FlinkCDCDagDndDTO.java | 27 --- .../flink/cdc/dag/dnd/FlinkCDCDagDndMeta.java | 40 ----- .../flink/cdc/service/FlinkCDCDagService.java | 39 ----- .../service/WsArtifactFlinkCDCService.java | 2 - .../convert/WsArtifactFlinkCDCConvert.java | 26 +++ .../service/dto/WsArtifactFlinkCDCDTO.java | 30 +++- .../service/impl/FlinkCDCDagServiceImpl.java | 164 ------------------ .../impl/WsArtifactFlinkCDCServiceImpl.java | 25 +-- .../param/WsArtifactFlinkCDCGraphParam.java | 39 ----- .../docker/mysql/init.d/scaleph-ws-mysql.sql | 41 +++-- 12 files changed, 110 insertions(+), 361 deletions(-) delete mode 100644 scaleph-workspace/scaleph-workspace-flink-cdc/src/main/java/cn/sliew/scaleph/workspace/flink/cdc/dag/dnd/FlinkCDCDagDndDTO.java delete mode 100644 scaleph-workspace/scaleph-workspace-flink-cdc/src/main/java/cn/sliew/scaleph/workspace/flink/cdc/dag/dnd/FlinkCDCDagDndMeta.java delete mode 100644 scaleph-workspace/scaleph-workspace-flink-cdc/src/main/java/cn/sliew/scaleph/workspace/flink/cdc/service/FlinkCDCDagService.java delete mode 100644 scaleph-workspace/scaleph-workspace-flink-cdc/src/main/java/cn/sliew/scaleph/workspace/flink/cdc/service/impl/FlinkCDCDagServiceImpl.java delete mode 100644 scaleph-workspace/scaleph-workspace-flink-cdc/src/main/java/cn/sliew/scaleph/workspace/flink/cdc/service/param/WsArtifactFlinkCDCGraphParam.java diff --git a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifactFlinkCDC.java b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifactFlinkCDC.java index f7ae5fc9a..c6acd51cf 100644 --- a/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifactFlinkCDC.java +++ b/scaleph-dao/src/main/java/cn/sliew/scaleph/dao/entity/master/ws/WsArtifactFlinkCDC.java @@ -47,8 +47,29 @@ public class WsArtifactFlinkCDC extends BaseDO { @TableField("flink_cdc_version") private FlinkCDCVersion flinkCDCVersion; - @TableField("dag_id") - private Long dagId; + @TableField("parallelism") + private Integer parallelism; + + @TableField("local_time_zone") + private String localTimeZone; + + @TableField("from_ds_id") + private Long fromDsId; + + @TableField("from_ds_config") + private String fromDsConfig; + + @TableField("to_ds_id") + private Long toDsId; + + @TableField("to_ds_config") + private String toDsConfig; + + @TableField("transform") + private String transform; + + @TableField("route") + private String route; @TableField("`current`") private YesOrNo current; diff --git a/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/ws/WsArtifactFlinkCDCMapper.xml b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/ws/WsArtifactFlinkCDCMapper.xml index bd3cb18d5..261e3527a 100644 --- a/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/ws/WsArtifactFlinkCDCMapper.xml +++ b/scaleph-dao/src/main/resources/cn/sliew/scaleph/dao/mapper/master/ws/WsArtifactFlinkCDCMapper.xml @@ -28,7 +28,14 @@ - + + + + + + + + @@ -37,7 +44,9 @@ id, creator, create_time, editor, update_time, - artifact_id, flink_version, flink_cdc_version, dag_id, `current` + artifact_id, flink_version, flink_cdc_version, + parallelism, local_time_zone, from_ds_id, from_ds_config, + to_ds_id, to_ds_config, `transform`, route, `current`