diff --git a/bin/build-all.sh b/bin/build-all.sh old mode 100644 new mode 100755 index 48202e0..9e454de --- a/bin/build-all.sh +++ b/bin/build-all.sh @@ -1,22 +1,39 @@ #!/bin/bash -mvn -pl service-dependencies,service-configuration,service-forest,service-executor,service-executor/service-executor-core,service-cli,service-cli/service-cli-core clean source:jar deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-gateway,service-queue,service-cli/service-cli-runner clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml -mvn -pl service-api,service-cloud-query,service-flink-query,service-info-query,service-loki-query,service-pulsar-query,service-yarn-query,service-zookeeper-query,service-web clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml -P b2b12 -mvn -pl service-hudi-query,service-executor/service-executor-manager,service-executor/service-executor-task clean package -D skipTests -s ~/.m2/settings-development.xml -P b2b12 +current_path=$(dirname $(cd `dirname $0`;pwd)) -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-api/target/service-api-1.0.0-SNAPSHOT.jar -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-cli/service-cli-runner/target/service-cli-runner-1.0.0-SNAPSHOT.jar -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-cloud-query/target/service-cloud-query-1.0.0-SNAPSHOT.jar -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-executor/service-executor-manager/target/service-executor-manager-1.0.0-SNAPSHOT.jar -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-executor/service-executor-task/target/service-executor-task-1.0.0-SNAPSHOT.jar -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-flink-query/target/service-flink-query-1.0.0-SNAPSHOT.jar -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-gateway/target/service-gateway-1.0.0-SNAPSHOT.jar -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-hudi-query/target/service-hudi-query-1.0.0-SNAPSHOT.jar -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-info-query/target/service-info-query-1.0.0-SNAPSHOT.jar -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-loki-query/target/service-loki-query-1.0.0-SNAPSHOT.jar -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-pulsar-query/target/service-pulsar-query-1.0.0-SNAPSHOT.jar -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-queue/target/service-queue-1.0.0-SNAPSHOT.jar -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-web/target/service-web-1.0.0-SNAPSHOT.jar -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-yarn-query/target/service-yarn-query-1.0.0-SNAPSHOT.jar -ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-zookeeper-query/target/service-zookeeper-query-1.0.0-SNAPSHOT.jar +mvn deploy -N -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl service-common,service-dependencies,service-configuration,service-forest,service-cli,service-cli/service-cli-core,service-executor,service-executor/service-executor-core,utils/executor clean source:jar deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl service-api,service-check,service-cli/service-cli-runner,service-cloud-query,service-command,service-exporter,service-flink-query,service-gateway,service-info-query,service-loki-query,service-pulsar-query,service-queue,service-scheduler,service-web,service-yarn-query,service-zookeeper-query clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml -P b2b12 +mvn -pl service-executor/service-executor-manager,service-executor/service-executor-task,service-hudi-query,utils/sync clean package -D skipTests -s ~/.m2/settings-development.xml -P b2b12 + +mvn -pl service-launcher clean package -D skipTests -s ~/.m2/settings-development.xml -P b2a4 +${current_path}/bin/upload-rm.sh ${current_path}/service-launcher/target/service-launcher-b2a4-1.0.0-SNAPSHOT.jar + +mvn -pl service-launcher clean package -D skipTests -s ~/.m2/settings-development.xml -P b2b1 +${current_path}/bin/upload-rm.sh ${current_path}/service-launcher/target/service-launcher-b2b1-1.0.0-SNAPSHOT.jar + +mvn -pl service-launcher clean package -D skipTests -s ~/.m2/settings-development.xml -P b2b5 +${current_path}/bin/upload-rm.sh ${current_path}/service-launcher/target/service-launcher-b2b5-1.0.0-SNAPSHOT.jar + +mvn -pl service-launcher clean package -D skipTests -s ~/.m2/settings-development.xml -P b2b12 +${current_path}/bin/upload-rm.sh ${current_path}/service-launcher/target/service-launcher-b2b12-1.0.0-SNAPSHOT.jar + +${current_path}/bin/upload-rm.sh ${current_path}/service-api/target/service-api-1.0.0-SNAPSHOT.jar +${current_path}/bin/upload-rm.sh ${current_path}/service-check/target/service-check-1.0.0-SNAPSHOT.jar +${current_path}/bin/upload-rm.sh ${current_path}/service-cli/service-cli-runner/target/service-cli-runner-1.0.0-SNAPSHOT.jar +${current_path}/bin/upload-rm.sh ${current_path}/service-cloud-query/target/service-cloud-query-1.0.0-SNAPSHOT.jar +${current_path}/bin/upload-rm.sh ${current_path}/service-command/target/service-command-1.0.0-SNAPSHOT.jar +${current_path}/bin/upload-rm.sh ${current_path}/service-executor/service-executor-manager/target/service-executor-manager-1.0.0-SNAPSHOT.jar +${current_path}/bin/upload-rm.sh ${current_path}/service-executor/service-executor-task/target/service-executor-task-1.0.0-SNAPSHOT.jar +${current_path}/bin/upload-rm.sh ${current_path}/service-flink-query/target/service-flink-query-1.0.0-SNAPSHOT.jar +${current_path}/bin/upload-rm.sh ${current_path}/service-gateway/target/service-gateway-1.0.0-SNAPSHOT.jar +${current_path}/bin/upload-rm.sh ${current_path}/service-hudi-query/target/service-hudi-query-1.0.0-SNAPSHOT.jar +${current_path}/bin/upload-rm.sh ${current_path}/service-info-query/target/service-info-query-1.0.0-SNAPSHOT.jar +${current_path}/bin/upload-rm.sh ${current_path}/service-loki-query/target/service-loki-query-1.0.0-SNAPSHOT.jar +${current_path}/bin/upload-rm.sh ${current_path}/service-pulsar-query/target/service-pulsar-query-1.0.0-SNAPSHOT.jar +${current_path}/bin/upload-rm.sh ${current_path}/service-queue/target/service-queue-1.0.0-SNAPSHOT.jar +${current_path}/bin/upload-rm.sh ${current_path}/service-scheduler/target/service-scheduler-1.0.0-SNAPSHOT.jar +${current_path}/bin/upload-rm.sh ${current_path}/service-web/target/service-web-1.0.0-SNAPSHOT.jar +${current_path}/bin/upload-rm.sh ${current_path}/service-yarn-query/target/service-yarn-query-1.0.0-SNAPSHOT.jar +${current_path}/bin/upload-rm.sh ${current_path}/service-zookeeper-query/target/service-zookeeper-query-1.0.0-SNAPSHOT.jar diff --git a/bin/build-api.sh b/bin/build-api.sh index fa658ce..2c81a10 100755 --- a/bin/build-api.sh +++ b/bin/build-api.sh @@ -1,5 +1,5 @@ #!/bin/bash -mvn -pl service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml mvn -pl service-api clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml file_path=/Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-api/target/service-api-1.0.0-SNAPSHOT.jar ytp-transfer2 $file_path diff --git a/bin/build-check.sh b/bin/build-check.sh index f756e82..c5dfcfc 100755 --- a/bin/build-check.sh +++ b/bin/build-check.sh @@ -1,4 +1,4 @@ #!/bin/bash -mvn -pl service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml -mvn -pl service-check clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml -P b9b9 +mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl service-check clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml -P b2b12 ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-check/target/service-check-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-cloud-query.sh b/bin/build-cloud-query.sh index 0739d83..ac5751e 100755 --- a/bin/build-cloud-query.sh +++ b/bin/build-cloud-query.sh @@ -1,4 +1,4 @@ #!/bin/bash -mvn -pl service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml mvn -pl service-cloud-query clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-cloud-query/target/service-cloud-query-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-command.sh b/bin/build-command.sh index 5969316..5bbf9a0 100755 --- a/bin/build-command.sh +++ b/bin/build-command.sh @@ -1,4 +1,4 @@ #!/bin/bash -mvn -pl service-dependencies,service-configuration,service-forest clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl service-common,service-dependencies,service-configuration,service-forest clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml mvn -pl service-command clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-command/target/service-command-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-executor-manager.sh b/bin/build-executor-manager.sh index 8d4d232..54a9fb5 100755 --- a/bin/build-executor-manager.sh +++ b/bin/build-executor-manager.sh @@ -1,4 +1,4 @@ #!/bin/bash -mvn -pl service-dependencies,service-configuration,service-forest,service-executor,service-executor/service-executor-core clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl service-common,service-dependencies,service-configuration,service-forest,service-executor,service-executor/service-executor-core clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml mvn -pl service-executor/service-executor-manager clean package -D skipTests -s ~/.m2/settings-development.xml -P b2b12 ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-executor/service-executor-manager/target/service-executor-manager-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-executor-task.sh b/bin/build-executor-task.sh index e1f61de..d01eaa6 100755 --- a/bin/build-executor-task.sh +++ b/bin/build-executor-task.sh @@ -1,4 +1,4 @@ #!/bin/bash -mvn -pl service-dependencies,service-configuration,service-forest,service-executor,service-executor/service-executor-core clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl service-common,service-dependencies,service-configuration,service-forest,service-executor,service-executor/service-executor-core clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml mvn -pl service-executor/service-executor-task clean package -D skipTests -s ~/.m2/settings-development.xml ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-executor/service-executor-task/target/service-executor-task-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-exporter.sh b/bin/build-exporter.sh index 4cf87c7..6be3015 100755 --- a/bin/build-exporter.sh +++ b/bin/build-exporter.sh @@ -1,4 +1,4 @@ #!/bin/bash -mvn -pl service-dependencies,service-configuration,service-forest clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl service-common,service-dependencies,service-configuration,service-forest clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml mvn -pl service-exporter clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-exporter/target/service-exporter-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-flink-query.sh b/bin/build-flink-query.sh index 66270d0..9a40246 100755 --- a/bin/build-flink-query.sh +++ b/bin/build-flink-query.sh @@ -1,4 +1,4 @@ #!/bin/bash -mvn -pl service-dependencies,service-configuration,service-forest clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl service-common,service-dependencies,service-configuration,service-forest clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml mvn -pl service-flink-query clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-flink-query/target/service-flink-query-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-gateway.sh b/bin/build-gateway.sh index 2b51efc..86a5050 100755 --- a/bin/build-gateway.sh +++ b/bin/build-gateway.sh @@ -1,4 +1,4 @@ #!/bin/bash -mvn -pl service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml mvn -pl service-gateway clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-gateway/target/service-gateway-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-hudi-query.sh b/bin/build-hudi-query.sh index 1077501..c0930e7 100755 --- a/bin/build-hudi-query.sh +++ b/bin/build-hudi-query.sh @@ -1,4 +1,4 @@ #!/bin/bash -mvn -pl service-dependencies,service-configuration,service-forest clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl service-common,service-dependencies,service-configuration,service-forest clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml mvn -pl service-hudi-query clean package -D skipTests -s ~/.m2/settings-development.xml -P b2b12 ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-hudi-query/target/service-hudi-query-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-info-query.sh b/bin/build-info-query.sh index 4a6c561..d2a04e0 100755 --- a/bin/build-info-query.sh +++ b/bin/build-info-query.sh @@ -1,4 +1,4 @@ #!/bin/bash -mvn -pl service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml mvn -pl service-info-query clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-info-query/target/service-info-query-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-launcher.sh b/bin/build-launcher.sh index 0f7fd92..cce5d65 100755 --- a/bin/build-launcher.sh +++ b/bin/build-launcher.sh @@ -1,4 +1,6 @@ #!/bin/bash +mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml + echo 'Build b2a4' mvn -pl service-launcher clean package -D skipTests -s ~/.m2/settings-development.xml -P b2a4 ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-launcher/target/service-launcher-b2a4-1.0.0-SNAPSHOT.jar diff --git a/bin/build-loki-query.sh b/bin/build-loki-query.sh index c265554..63e734e 100755 --- a/bin/build-loki-query.sh +++ b/bin/build-loki-query.sh @@ -1,4 +1,4 @@ #!/bin/bash -mvn -pl service-dependencies,service-configuration,service-forest clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl service-common,service-dependencies,service-configuration,service-forest clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml mvn -pl service-loki-query clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-loki-query/target/service-loki-query-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-pulsar-query.sh b/bin/build-pulsar-query.sh index e63bf67..a176c18 100755 --- a/bin/build-pulsar-query.sh +++ b/bin/build-pulsar-query.sh @@ -1,4 +1,4 @@ #!/bin/bash -mvn -pl service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml mvn -pl service-pulsar-query clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-pulsar-query/target/service-pulsar-query-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-queue.sh b/bin/build-queue.sh index a81f7f4..2203a29 100755 --- a/bin/build-queue.sh +++ b/bin/build-queue.sh @@ -1,4 +1,4 @@ #!/bin/bash -mvn -pl service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml mvn -pl service-queue clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-queue/target/service-queue-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-scheduler.sh b/bin/build-scheduler.sh index 05631eb..62da9fe 100755 --- a/bin/build-scheduler.sh +++ b/bin/build-scheduler.sh @@ -1,4 +1,4 @@ #!/bin/bash -mvn -pl service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml mvn -pl service-scheduler clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-scheduler/target/service-scheduler-1.0.0-SNAPSHOT.jar diff --git a/bin/build-web.sh b/bin/build-web.sh index 0e1acda..ca1757c 100755 --- a/bin/build-web.sh +++ b/bin/build-web.sh @@ -1,4 +1,4 @@ #!/bin/bash -mvn -pl service-dependencies,service-configuration,service-forest clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl service-common,service-dependencies,service-configuration,service-forest clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml mvn -pl service-web clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-web/target/service-web-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-yarn-query.sh b/bin/build-yarn-query.sh index 4ec5f9c..d389eb4 100755 --- a/bin/build-yarn-query.sh +++ b/bin/build-yarn-query.sh @@ -1,4 +1,4 @@ #!/bin/bash -mvn -pl service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml mvn -pl service-yarn-query clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-yarn-query/target/service-yarn-query-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/build-zookeeper-query.sh b/bin/build-zookeeper-query.sh index e648a71..d44ef14 100755 --- a/bin/build-zookeeper-query.sh +++ b/bin/build-zookeeper-query.sh @@ -1,4 +1,4 @@ #!/bin/bash -mvn -pl service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml +mvn -pl service-common,service-dependencies,service-configuration clean deploy -D skipTests -P local -s ~/.m2/settings-development.xml mvn -pl service-zookeeper-query clean package spring-boot:repackage -D skipTests -s ~/.m2/settings-development.xml ytp-transfer2 /Users/lanyuanxiaoyao/Project/IdeaProjects/hudi-service/service-zookeeper-query/target/service-zookeeper-query-1.0.0-SNAPSHOT.jar \ No newline at end of file diff --git a/bin/upload-all.sh b/bin/upload-all.sh old mode 100644 new mode 100755 diff --git a/bin/upload-rm.sh b/bin/upload-rm.sh new file mode 100755 index 0000000..f11f3a5 --- /dev/null +++ b/bin/upload-rm.sh @@ -0,0 +1,4 @@ +#!/bin/bash +file_path=$1 +ytp-transfer2 $file_path +rm -rf $file_path \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3391879..14acd47 100644 --- a/pom.xml +++ b/pom.xml @@ -9,30 +9,30 @@ 1.0.0-SNAPSHOT pom + service-api + service-check + service-cli + service-cloud-query + service-command service-common service-configuration + service-dependencies + service-executor + service-exporter + service-flink-query + service-forest service-gateway - service-queue service-hudi-query service-info-query - service-pulsar-query - service-yarn-query - service-flink-query - service-web - service-forest - service-zookeeper-query - service-dependencies - service-cli - service-loki-query - service-uploader - service-executor - service-cloud-query - service-exporter - service-check - service-api - service-scheduler service-launcher - service-command + service-loki-query + service-pulsar-query + service-queue + service-scheduler + service-uploader + service-web + service-yarn-query + service-zookeeper-query utils/executor utils/sync @@ -51,6 +51,7 @@ 0.12.0-eshore-SNAPSHOT 1.13.3 1.13.3 + 10.4.0 @@ -82,6 +83,44 @@ + + + com.lanyuanxiaoyao + service-common + ${project.version} + + + com.lanyuanxiaoyao + service-configuration + ${project.version} + + + com.lanyuanxiaoyao + service-dependencies + ${project.version} + + + com.lanyuanxiaoyao + service-forest + ${project.version} + + + com.lanyuanxiaoyao + service-cli-core + ${project.version} + + + com.lanyuanxiaoyao + service-executor-core + ${project.version} + + + com.lanyuanxiaoyao + executor + ${project.version} + + + org.springframework.boot spring-boot-dependencies @@ -96,6 +135,40 @@ pom import + + com.dtflys.forest + forest-spring-boot-starter + 1.5.30 + + + com.alibaba + druid-spring-boot-starter + 1.2.17 + + + com.fasterxml.jackson.datatype + jackson-datatype-eclipse-collections + 2.13.5 + + + com.github.ulisesbocchio + jasypt-spring-boot-starter + 3.0.4 + + + + + org.springframework.shell + spring-shell-starter + 2.1.0-M3 + + + me.tongfei + progressbar + 0.9.3 + + + pl.tkowalcz.tjahzi logback-appender @@ -111,6 +184,13 @@ httpclient 4.5.13 + + + + io.github.dragons96 + sql-builder + 0.0.5.3 + dev.failsafe failsafe @@ -119,29 +199,19 @@ org.eclipse.collections eclipse-collections - 10.4.0 + ${eclipse-collections.version} runtime org.eclipse.collections eclipse-collections-api - 10.4.0 - - - com.fasterxml.jackson.datatype - jackson-datatype-eclipse-collections - 2.13.5 + ${eclipse-collections.version} cn.hutool hutool-all 5.7.16 - - com.github.ulisesbocchio - jasypt-spring-boot-starter - 3.0.4 - org.apache.pulsar pulsar-client @@ -157,6 +227,88 @@ hadoop-client 3.1.2 + + io.juicefs + juicefs-hadoop + 2.0.1 + + + com.cronutils + cron-utils + 9.2.0 + + + com.sun.jersey + jersey-client + 1.19.4 + + + com.sun.jersey + jersey-core + 1.19.4 + + + com.sun.jersey.contribs + jersey-apache-client4 + 1.19.4 + + + + + org.apache.flink + flink-java + ${flink.version} + + + org.apache.flink + flink-streaming-java_${scala.major.version} + ${flink.version} + + + org.apache.flink + flink-clients_${scala.major.version} + ${flink.version} + + + org.apache.flink + flink-table-common + ${flink.version} + + + org.apache.flink + flink-table-runtime-blink_${scala.major.version} + ${flink.version} + + + org.apache.flink + flink-table-planner-blink_${scala.major.version} + ${flink.version} + + + org.apache.hudi + hudi-flink${flink.major.version}-bundle + ${hudi.version} + + + org.apache.flink + flink-metrics-prometheus_${scala.major.version} + ${flink.version} + + + org.apache.flink + flink-shaded-guava + 30.1.1-jre-15.0 + + + org.apache.curator + curator-recipes + 5.1.0 + + + org.apache.curator + curator-framework + 5.1.0 + diff --git a/service-api/pom.xml b/service-api/pom.xml index 7b266d5..058823f 100644 --- a/service-api/pom.xml +++ b/service-api/pom.xml @@ -15,7 +15,6 @@ com.lanyuanxiaoyao service-configuration - 1.0.0-SNAPSHOT org.springframework.boot @@ -28,7 +27,6 @@ com.alibaba druid-spring-boot-starter - 1.2.17 diff --git a/service-api/src/main/java/com/lanyuanxiaoyao/service/api/controller/ApiController.java b/service-api/src/main/java/com/lanyuanxiaoyao/service/api/controller/ApiController.java index 2f2d323..cc10ebc 100644 --- a/service-api/src/main/java/com/lanyuanxiaoyao/service/api/controller/ApiController.java +++ b/service-api/src/main/java/com/lanyuanxiaoyao/service/api/controller/ApiController.java @@ -1,11 +1,11 @@ package com.lanyuanxiaoyao.service.api.controller; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.Constants; import com.github.loki4j.slf4j.marker.LabelMarker; import com.lanyuanxiaoyao.service.api.entity.HoodieCommitMetadata; import com.lanyuanxiaoyao.service.api.service.SyncStateService; import com.lanyuanxiaoyao.service.api.service.VersionUpdateService; +import com.lanyuanxiaoyao.service.common.Constants; import javax.annotation.Resource; import org.eclipse.collections.api.factory.Maps; import org.slf4j.Logger; diff --git a/service-api/src/main/java/com/lanyuanxiaoyao/service/api/service/SyncStateService.java b/service-api/src/main/java/com/lanyuanxiaoyao/service/api/service/SyncStateService.java index ddd6a87..9840661 100644 --- a/service-api/src/main/java/com/lanyuanxiaoyao/service/api/service/SyncStateService.java +++ b/service-api/src/main/java/com/lanyuanxiaoyao/service/api/service/SyncStateService.java @@ -3,7 +3,7 @@ package com.lanyuanxiaoyao.service.api.service; import club.kingon.sql.builder.SqlBuilder; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import com.eshore.odcp.hudi.connector.Constants; +import com.lanyuanxiaoyao.service.common.Constants; import java.time.Instant; import java.util.Date; import java.util.List; @@ -12,8 +12,8 @@ import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; -import static com.eshore.odcp.hudi.connector.SQLConstants.HudiCollectBuild.TbAppHudiCompactionMetrics; -import static com.eshore.odcp.hudi.connector.SQLConstants.HudiCollectBuild.TbAppHudiSyncState; +import static com.lanyuanxiaoyao.service.common.SQLConstants.HudiCollectBuild.TbAppHudiCompactionMetrics; +import static com.lanyuanxiaoyao.service.common.SQLConstants.HudiCollectBuild.TbAppHudiSyncState; /** * 服务 diff --git a/service-api/src/main/java/com/lanyuanxiaoyao/service/api/service/VersionUpdateService.java b/service-api/src/main/java/com/lanyuanxiaoyao/service/api/service/VersionUpdateService.java index 46fc4be..d577616 100644 --- a/service-api/src/main/java/com/lanyuanxiaoyao/service/api/service/VersionUpdateService.java +++ b/service-api/src/main/java/com/lanyuanxiaoyao/service/api/service/VersionUpdateService.java @@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; -import static com.eshore.odcp.hudi.connector.SQLConstants.HudiCollectBuild.TbAppCollectTableVersion; +import static com.lanyuanxiaoyao.service.common.SQLConstants.HudiCollectBuild.TbAppCollectTableVersion; /** * 跨天版本更新 diff --git a/service-check/pom.xml b/service-check/pom.xml index a95c850..76450d1 100644 --- a/service-check/pom.xml +++ b/service-check/pom.xml @@ -63,12 +63,10 @@ io.juicefs juicefs-hadoop - 2.0.1 com.lanyuanxiaoyao service-configuration - 1.0.0-SNAPSHOT com.lanyuanxiaoyao diff --git a/service-cli/service-cli-core/pom.xml b/service-cli/service-cli-core/pom.xml index da01a92..99464f2 100644 --- a/service-cli/service-cli-core/pom.xml +++ b/service-cli/service-cli-core/pom.xml @@ -15,7 +15,6 @@ cn.hutool hutool-all - 5.7.16 diff --git a/service-cli/service-cli-runner/pom.xml b/service-cli/service-cli-runner/pom.xml index 77c59a3..231071b 100644 --- a/service-cli/service-cli-runner/pom.xml +++ b/service-cli/service-cli-runner/pom.xml @@ -15,7 +15,6 @@ com.lanyuanxiaoyao service-cli-core - 1.0.0-SNAPSHOT org.springframework.boot @@ -43,11 +42,6 @@ org.freemarker freemarker - diff --git a/service-cloud-query/pom.xml b/service-cloud-query/pom.xml index 75a5fb1..e06bd7c 100644 --- a/service-cloud-query/pom.xml +++ b/service-cloud-query/pom.xml @@ -15,12 +15,10 @@ com.lanyuanxiaoyao service-dependencies - 1.0.0-SNAPSHOT com.lanyuanxiaoyao service-configuration - 1.0.0-SNAPSHOT diff --git a/service-command/pom.xml b/service-command/pom.xml index e183cf4..8375551 100644 --- a/service-command/pom.xml +++ b/service-command/pom.xml @@ -15,7 +15,6 @@ com.lanyuanxiaoyao service-forest - 1.0.0-SNAPSHOT org.springframework.cloud @@ -30,12 +29,10 @@ org.springframework.shell spring-shell-starter - 2.1.0-M3 me.tongfei progressbar - 0.9.3 diff --git a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/CheckCommand.java b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/CheckCommand.java index 9ddf9ee..2c3ab71 100644 --- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/CheckCommand.java +++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/CheckCommand.java @@ -1,7 +1,7 @@ package com.lanyuanxiaoyao.service.command.commands; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.entity.TableMeta; +import com.lanyuanxiaoyao.service.common.entity.TableMeta; import com.lanyuanxiaoyao.service.configuration.ExecutorProvider; import com.lanyuanxiaoyao.service.forest.service.InfoService; import com.lanyuanxiaoyao.service.forest.service.PulsarService; diff --git a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/JobCommand.java b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/JobCommand.java index 853c02c..9a121e5 100644 --- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/JobCommand.java +++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/JobCommand.java @@ -3,11 +3,11 @@ package com.lanyuanxiaoyao.service.command.commands; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.entity.FlinkJob; -import com.eshore.odcp.hudi.connector.entity.TableMeta; import com.lanyuanxiaoyao.service.command.commands.jobs.*; import com.lanyuanxiaoyao.service.command.provider.SearchTypeValueProvider; import com.lanyuanxiaoyao.service.command.utils.SearchUtils; +import com.lanyuanxiaoyao.service.common.entity.FlinkJob; +import com.lanyuanxiaoyao.service.common.entity.TableMeta; import com.lanyuanxiaoyao.service.configuration.entity.info.JobAndMetas; import com.lanyuanxiaoyao.service.forest.service.InfoService; import java.io.IOException; diff --git a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/YarnCommand.java b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/YarnCommand.java index 7eaeb31..54ed29c 100644 --- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/YarnCommand.java +++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/YarnCommand.java @@ -3,12 +3,12 @@ package com.lanyuanxiaoyao.service.command.commands; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.Constants; -import com.eshore.odcp.hudi.connector.entity.RunMeta; -import com.eshore.odcp.hudi.connector.utils.NameHelper; import com.lanyuanxiaoyao.service.command.entity.TableMetaJob; import com.lanyuanxiaoyao.service.command.utils.CommandLineUtils; import com.lanyuanxiaoyao.service.command.utils.ShellTableUtils; +import com.lanyuanxiaoyao.service.common.Constants; +import com.lanyuanxiaoyao.service.common.entity.RunMeta; +import com.lanyuanxiaoyao.service.common.utils.NameHelper; import com.lanyuanxiaoyao.service.configuration.ExecutorProvider; import com.lanyuanxiaoyao.service.configuration.entity.yarn.YarnApplication; import com.lanyuanxiaoyao.service.configuration.entity.yarn.YarnClusters; diff --git a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AbstractAdder.java b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AbstractAdder.java index d9dc2f5..f9fa15d 100644 --- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AbstractAdder.java +++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AbstractAdder.java @@ -1,7 +1,7 @@ package com.lanyuanxiaoyao.service.command.commands.jobs; import cn.hutool.core.lang.Snowflake; -import com.eshore.odcp.hudi.connector.entity.FlinkJob; +import com.lanyuanxiaoyao.service.common.entity.FlinkJob; import com.lanyuanxiaoyao.service.configuration.entity.info.TableMetaAdd; import com.lanyuanxiaoyao.service.forest.service.InfoService; import org.eclipse.collections.api.list.ImmutableList; diff --git a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AcctBigTableAdder.java b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AcctBigTableAdder.java index f7ea974..f0c90fc 100644 --- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AcctBigTableAdder.java +++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AcctBigTableAdder.java @@ -1,7 +1,7 @@ package com.lanyuanxiaoyao.service.command.commands.jobs; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.entity.FlinkJob; +import com.lanyuanxiaoyao.service.common.entity.FlinkJob; import com.lanyuanxiaoyao.service.forest.service.InfoService; import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.list.ImmutableList; diff --git a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AcctItemTableAdder.java b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AcctItemTableAdder.java index 07d8b85..354a1f0 100644 --- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AcctItemTableAdder.java +++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AcctItemTableAdder.java @@ -2,7 +2,7 @@ package com.lanyuanxiaoyao.service.command.commands.jobs; import cn.hutool.core.lang.Tuple; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.entity.FlinkJob; +import com.lanyuanxiaoyao.service.common.entity.FlinkJob; import com.lanyuanxiaoyao.service.forest.service.InfoService; import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.list.ImmutableList; diff --git a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AcctSmallTableAdder.java b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AcctSmallTableAdder.java index 9079296..e09793d 100644 --- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AcctSmallTableAdder.java +++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/AcctSmallTableAdder.java @@ -1,7 +1,7 @@ package com.lanyuanxiaoyao.service.command.commands.jobs; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.entity.FlinkJob; +import com.lanyuanxiaoyao.service.common.entity.FlinkJob; import com.lanyuanxiaoyao.service.forest.service.InfoService; import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.list.ImmutableList; diff --git a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/BigTableAdder.java b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/BigTableAdder.java index 3b08847..473122a 100644 --- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/BigTableAdder.java +++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/BigTableAdder.java @@ -1,8 +1,8 @@ package com.lanyuanxiaoyao.service.command.commands.jobs; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.entity.FlinkJob; import com.lanyuanxiaoyao.service.command.commands.jobs.AbstractAdder; +import com.lanyuanxiaoyao.service.common.entity.FlinkJob; import com.lanyuanxiaoyao.service.forest.service.InfoService; import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.list.ImmutableList; diff --git a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/SmallTableAdder.java b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/SmallTableAdder.java index 05ea5a1..ae5d4f1 100644 --- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/SmallTableAdder.java +++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/commands/jobs/SmallTableAdder.java @@ -1,7 +1,7 @@ package com.lanyuanxiaoyao.service.command.commands.jobs; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.entity.FlinkJob; +import com.lanyuanxiaoyao.service.common.entity.FlinkJob; import com.lanyuanxiaoyao.service.forest.service.InfoService; import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.list.ImmutableList; diff --git a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/configuration/SpringCloudDiscoveryInterceptor.java b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/configuration/SpringCloudDiscoveryInterceptor.java index 7d152bc..19d32a5 100644 --- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/configuration/SpringCloudDiscoveryInterceptor.java +++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/configuration/SpringCloudDiscoveryInterceptor.java @@ -4,26 +4,17 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; -import cn.hutool.http.HttpResponse; -import cn.hutool.http.HttpUtil; -import cn.hutool.json.JSONArray; -import cn.hutool.json.JSONUtil; import com.dtflys.forest.auth.BasicAuth; import com.dtflys.forest.http.ForestAddress; import com.dtflys.forest.http.ForestRequest; import com.dtflys.forest.interceptor.Interceptor; -import com.eshore.odcp.hudi.connector.Constants; -import com.github.benmanes.caffeine.cache.Caffeine; -import com.github.benmanes.caffeine.cache.LoadingCache; +import com.lanyuanxiaoyao.service.common.Constants; import java.net.URI; import java.net.URL; -import java.util.List; -import java.util.concurrent.TimeUnit; import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.list.ImmutableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.stereotype.Component; diff --git a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/entity/TableMetaJob.java b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/entity/TableMetaJob.java index 796c125..c30d099 100644 --- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/entity/TableMetaJob.java +++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/entity/TableMetaJob.java @@ -1,7 +1,7 @@ package com.lanyuanxiaoyao.service.command.entity; import cn.hutool.core.util.ObjectUtil; -import com.eshore.odcp.hudi.connector.entity.TableMeta; +import com.lanyuanxiaoyao.service.common.entity.TableMeta; import com.lanyuanxiaoyao.service.configuration.entity.yarn.YarnApplication; /** diff --git a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/utils/TableUtils.java b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/utils/TableUtils.java index f588a16..2570d2e 100644 --- a/service-command/src/main/java/com/lanyuanxiaoyao/service/command/utils/TableUtils.java +++ b/service-command/src/main/java/com/lanyuanxiaoyao/service/command/utils/TableUtils.java @@ -1,6 +1,6 @@ package com.lanyuanxiaoyao.service.command.utils; -import com.eshore.odcp.hudi.connector.entity.TableMeta; +import com.lanyuanxiaoyao.service.common.entity.TableMeta; import java.util.Comparator; import java.util.List; import java.util.function.Function; diff --git a/service-common/pom.xml b/service-common/pom.xml index cbe5fd1..37fdbe0 100644 --- a/service-common/pom.xml +++ b/service-common/pom.xml @@ -22,7 +22,6 @@ io.github.dragons96 sql-builder - 0.0.5.3 @@ -32,10 +31,6 @@ org.apache.maven.plugins maven-source-plugin - - org.apache.maven.plugins - maven-deploy-plugin - \ No newline at end of file diff --git a/service-configuration/pom.xml b/service-configuration/pom.xml index 63cf991..723968b 100644 --- a/service-configuration/pom.xml +++ b/service-configuration/pom.xml @@ -15,7 +15,6 @@ com.lanyuanxiaoyao service-dependencies - 1.0.0-SNAPSHOT diff --git a/service-configuration/src/main/java/com/lanyuanxiaoyao/service/configuration/SecurityConfig.java b/service-configuration/src/main/java/com/lanyuanxiaoyao/service/configuration/SecurityConfig.java index 0e62490..2af3253 100644 --- a/service-configuration/src/main/java/com/lanyuanxiaoyao/service/configuration/SecurityConfig.java +++ b/service-configuration/src/main/java/com/lanyuanxiaoyao/service/configuration/SecurityConfig.java @@ -1,6 +1,5 @@ package com.lanyuanxiaoyao.service.configuration; -import com.eshore.odcp.hudi.connector.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Configuration; diff --git a/service-configuration/src/main/java/com/lanyuanxiaoyao/service/configuration/entity/info/JobAndMetas.java b/service-configuration/src/main/java/com/lanyuanxiaoyao/service/configuration/entity/info/JobAndMetas.java index 30e8ce3..929f241 100644 --- a/service-configuration/src/main/java/com/lanyuanxiaoyao/service/configuration/entity/info/JobAndMetas.java +++ b/service-configuration/src/main/java/com/lanyuanxiaoyao/service/configuration/entity/info/JobAndMetas.java @@ -1,7 +1,7 @@ package com.lanyuanxiaoyao.service.configuration.entity.info; -import com.eshore.odcp.hudi.connector.entity.FlinkJob; -import com.eshore.odcp.hudi.connector.entity.TableMeta; +import com.lanyuanxiaoyao.service.common.entity.FlinkJob; +import com.lanyuanxiaoyao.service.common.entity.TableMeta; import java.util.List; import org.eclipse.collections.api.list.ImmutableList; diff --git a/service-configuration/src/main/java/com/lanyuanxiaoyao/service/configuration/utils/QueueUtil.java b/service-configuration/src/main/java/com/lanyuanxiaoyao/service/configuration/utils/QueueUtil.java index 0868fcb..f351045 100644 --- a/service-configuration/src/main/java/com/lanyuanxiaoyao/service/configuration/utils/QueueUtil.java +++ b/service-configuration/src/main/java/com/lanyuanxiaoyao/service/configuration/utils/QueueUtil.java @@ -5,10 +5,10 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.URLUtil; import cn.hutool.http.HttpResponse; import cn.hutool.http.HttpUtil; -import com.eshore.odcp.hudi.connector.Constants; -import com.eshore.odcp.hudi.connector.entity.compaction.ScheduleJob; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import com.lanyuanxiaoyao.service.common.Constants; +import com.lanyuanxiaoyao.service.common.entity.compaction.ScheduleJob; import com.lanyuanxiaoyao.service.configuration.entity.queue.QueueItem; import dev.failsafe.Failsafe; import dev.failsafe.RetryPolicy; diff --git a/service-dependencies/pom.xml b/service-dependencies/pom.xml index 78f1c0b..bbc7c6d 100644 --- a/service-dependencies/pom.xml +++ b/service-dependencies/pom.xml @@ -13,9 +13,8 @@ - com.eshore.odcp.hudi.connector - common - 1.0.0-SNAPSHOT + com.lanyuanxiaoyao + service-common org.springframework.cloud diff --git a/service-executor/pom.xml b/service-executor/pom.xml index b160e2f..2e7ed57 100644 --- a/service-executor/pom.xml +++ b/service-executor/pom.xml @@ -16,59 +16,4 @@ service-executor-manager service-executor-task - - - - - org.apache.flink - flink-java - ${flink.version} - - - org.apache.flink - flink-streaming-java_${scala.major.version} - ${flink.version} - - - org.apache.flink - flink-clients_${scala.major.version} - ${flink.version} - - - org.apache.flink - flink-table-common - ${flink.version} - - - org.apache.flink - flink-table-runtime-blink_${scala.major.version} - ${flink.version} - - - org.apache.flink - flink-table-planner-blink_${scala.major.version} - ${flink.version} - - - org.apache.pulsar - pulsar-client - ${pulsar.version} - - - org.apache.pulsar - pulsar-client-admin - ${pulsar.version} - - - org.apache.hudi - hudi-flink${flink.major.version}-bundle - ${hudi.version} - - - org.apache.flink - flink-metrics-prometheus_${scala.major.version} - ${flink.version} - - - \ No newline at end of file diff --git a/service-executor/service-executor-manager/pom.xml b/service-executor/service-executor-manager/pom.xml index 687d9d6..6508946 100644 --- a/service-executor/service-executor-manager/pom.xml +++ b/service-executor/service-executor-manager/pom.xml @@ -15,22 +15,18 @@ com.lanyuanxiaoyao service-executor-core - 1.0.0-SNAPSHOT com.lanyuanxiaoyao service-dependencies - 1.0.0-SNAPSHOT com.lanyuanxiaoyao service-configuration - 1.0.0-SNAPSHOT com.lanyuanxiaoyao service-forest - 1.0.0-SNAPSHOT org.springframework.boot @@ -45,27 +41,22 @@ com.sun.jersey jersey-client - 1.19.4 com.sun.jersey jersey-core - 1.19.4 com.sun.jersey.contribs jersey-apache-client4 - 1.19.4 org.apache.hudi hudi-flink${flink.major.version}-bundle - ${hudi.version} - com.eshore.odcp.hudi.connector + com.lanyuanxiaoyao executor - 1.0.0-SNAPSHOT org.apache.hadoop @@ -101,7 +92,6 @@ org.apache.pulsar pulsar-client - 2.8.0 diff --git a/service-executor/service-executor-manager/src/main/java/com/lanyuanxiaoyao/service/executor/manager/configuration/ExecutorConfiguration.java b/service-executor/service-executor-manager/src/main/java/com/lanyuanxiaoyao/service/executor/manager/configuration/ExecutorConfiguration.java index a20a034..c0d3484 100644 --- a/service-executor/service-executor-manager/src/main/java/com/lanyuanxiaoyao/service/executor/manager/configuration/ExecutorConfiguration.java +++ b/service-executor/service-executor-manager/src/main/java/com/lanyuanxiaoyao/service/executor/manager/configuration/ExecutorConfiguration.java @@ -1,6 +1,5 @@ package com.lanyuanxiaoyao.service.executor.manager.configuration; -import javax.annotation.PostConstruct; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/service-executor/service-executor-manager/src/main/java/com/lanyuanxiaoyao/service/executor/manager/service/ExecutorTaskService.java b/service-executor/service-executor-manager/src/main/java/com/lanyuanxiaoyao/service/executor/manager/service/ExecutorTaskService.java index 1acb713..4c30f4c 100644 --- a/service-executor/service-executor-manager/src/main/java/com/lanyuanxiaoyao/service/executor/manager/service/ExecutorTaskService.java +++ b/service-executor/service-executor-manager/src/main/java/com/lanyuanxiaoyao/service/executor/manager/service/ExecutorTaskService.java @@ -5,8 +5,8 @@ import cn.hutool.core.map.MapBuilder; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.utils.executor.Runner; import com.fasterxml.jackson.databind.ObjectMapper; +import com.lanyuanxiaoyao.service.executor.Runner; import com.lanyuanxiaoyao.service.executor.core.TaskConstants; import com.lanyuanxiaoyao.service.executor.core.TaskContext; import com.lanyuanxiaoyao.service.executor.manager.configuration.ExecutorConfiguration; @@ -38,8 +38,8 @@ import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; import org.springframework.retry.annotation.Retryable; import org.springframework.stereotype.Service; -import static com.eshore.odcp.hudi.connector.Constants.HALF_HOUR; -import static com.eshore.odcp.hudi.connector.Constants.MINUTE; +import static com.lanyuanxiaoyao.service.common.Constants.HALF_HOUR; +import static com.lanyuanxiaoyao.service.common.Constants.MINUTE; /** * @author lanyuanxiaoyao diff --git a/service-executor/service-executor-task/pom.xml b/service-executor/service-executor-task/pom.xml index d0500ea..a795118 100644 --- a/service-executor/service-executor-task/pom.xml +++ b/service-executor/service-executor-task/pom.xml @@ -15,13 +15,11 @@ com.lanyuanxiaoyao service-executor-core - 1.0.0-SNAPSHOT provided com.lanyuanxiaoyao service-configuration - 1.0.0-SNAPSHOT provided @@ -62,25 +60,21 @@ org.apache.flink flink-shaded-guava - 30.1.1-jre-15.0 provided org.apache.hadoop hadoop-client - 3.1.2 provided org.eclipse.collections eclipse-collections-api - 10.4.0 provided org.apache.pulsar pulsar-client - 2.8.0 provided diff --git a/service-executor/service-executor-task/src/main/java/com/lanyuanxiaoyao/service/executor/task/LatestOperationTimeScan.java b/service-executor/service-executor-task/src/main/java/com/lanyuanxiaoyao/service/executor/task/LatestOperationTimeScan.java index 70f2b69..b306ba1 100644 --- a/service-executor/service-executor-task/src/main/java/com/lanyuanxiaoyao/service/executor/task/LatestOperationTimeScan.java +++ b/service-executor/service-executor-task/src/main/java/com/lanyuanxiaoyao/service/executor/task/LatestOperationTimeScan.java @@ -2,7 +2,7 @@ package com.lanyuanxiaoyao.service.executor.task; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.Constants; +import com.lanyuanxiaoyao.service.common.Constants; import com.lanyuanxiaoyao.service.executor.core.TaskContext; import com.lanyuanxiaoyao.service.executor.task.functions.ReadHudiFile; import com.lanyuanxiaoyao.service.executor.task.helper.ArgumentsHelper; diff --git a/service-executor/service-executor-task/src/main/java/com/lanyuanxiaoyao/service/executor/task/functions/ReadHudiFile.java b/service-executor/service-executor-task/src/main/java/com/lanyuanxiaoyao/service/executor/task/functions/ReadHudiFile.java index 223332e..3dd6fd4 100644 --- a/service-executor/service-executor-task/src/main/java/com/lanyuanxiaoyao/service/executor/task/functions/ReadHudiFile.java +++ b/service-executor/service-executor-task/src/main/java/com/lanyuanxiaoyao/service/executor/task/functions/ReadHudiFile.java @@ -2,7 +2,7 @@ package com.lanyuanxiaoyao.service.executor.task.functions; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.Constants; +import com.lanyuanxiaoyao.service.common.Constants; import com.lanyuanxiaoyao.service.executor.task.entity.RecordView; import java.io.IOException; import java.util.Arrays; diff --git a/service-exporter/pom.xml b/service-exporter/pom.xml index 4e5c4a0..f9df1dd 100644 --- a/service-exporter/pom.xml +++ b/service-exporter/pom.xml @@ -16,17 +16,14 @@ com.lanyuanxiaoyao service-dependencies - 1.0.0-SNAPSHOT com.lanyuanxiaoyao service-configuration - 1.0.0-SNAPSHOT com.lanyuanxiaoyao service-forest - 1.0.0-SNAPSHOT diff --git a/service-exporter/src/main/java/com/lanyuanxiaoyao/service/exporter/controller/ExporterController.java b/service-exporter/src/main/java/com/lanyuanxiaoyao/service/exporter/controller/ExporterController.java index 08886f3..c594a6c 100644 --- a/service-exporter/src/main/java/com/lanyuanxiaoyao/service/exporter/controller/ExporterController.java +++ b/service-exporter/src/main/java/com/lanyuanxiaoyao/service/exporter/controller/ExporterController.java @@ -1,6 +1,6 @@ package com.lanyuanxiaoyao.service.exporter.controller; -import com.eshore.odcp.hudi.connector.utils.NameHelper; +import com.lanyuanxiaoyao.service.common.utils.NameHelper; import com.lanyuanxiaoyao.service.configuration.entity.zookeeper.ZookeeperNode; import com.lanyuanxiaoyao.service.exporter.entity.FlinkJobIdAndName; import com.lanyuanxiaoyao.service.forest.service.InfoService; diff --git a/service-flink-query/pom.xml b/service-flink-query/pom.xml index cc23cbd..ea0ae2c 100644 --- a/service-flink-query/pom.xml +++ b/service-flink-query/pom.xml @@ -15,12 +15,10 @@ com.lanyuanxiaoyao service-dependencies - 1.0.0-SNAPSHOT com.lanyuanxiaoyao service-configuration - 1.0.0-SNAPSHOT diff --git a/service-forest/pom.xml b/service-forest/pom.xml index a84f296..08c3bf4 100644 --- a/service-forest/pom.xml +++ b/service-forest/pom.xml @@ -15,17 +15,14 @@ com.lanyuanxiaoyao service-dependencies - 1.0.0-SNAPSHOT com.lanyuanxiaoyao service-configuration - 1.0.0-SNAPSHOT com.dtflys.forest forest-spring-boot-starter - 1.5.30 org.springframework.cloud diff --git a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/configuration/SpringCloudDiscoveryInterceptor.java b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/configuration/SpringCloudDiscoveryInterceptor.java index 69ccd88..3e17b2f 100644 --- a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/configuration/SpringCloudDiscoveryInterceptor.java +++ b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/configuration/SpringCloudDiscoveryInterceptor.java @@ -7,7 +7,7 @@ import com.dtflys.forest.auth.BasicAuth; import com.dtflys.forest.http.ForestAddress; import com.dtflys.forest.http.ForestRequest; import com.dtflys.forest.interceptor.Interceptor; -import com.eshore.odcp.hudi.connector.Constants; +import com.lanyuanxiaoyao.service.common.Constants; import java.net.URL; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/DequeService.java b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/DequeService.java index 73e2d01..f1b9b7e 100644 --- a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/DequeService.java +++ b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/DequeService.java @@ -3,7 +3,7 @@ package com.lanyuanxiaoyao.service.forest.service; import com.dtflys.forest.annotation.BaseRequest; import com.dtflys.forest.annotation.Get; import com.dtflys.forest.annotation.Var; -import com.eshore.odcp.hudi.connector.entity.compaction.ScheduleJob; +import com.lanyuanxiaoyao.service.common.entity.compaction.ScheduleJob; import com.lanyuanxiaoyao.service.configuration.entity.queue.QueueItem; import org.eclipse.collections.api.list.ImmutableList; diff --git a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/InfoService.java b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/InfoService.java index 6ed552e..886c2d5 100644 --- a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/InfoService.java +++ b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/InfoService.java @@ -1,9 +1,9 @@ package com.lanyuanxiaoyao.service.forest.service; import com.dtflys.forest.annotation.*; -import com.eshore.odcp.hudi.connector.entity.FlinkJob; -import com.eshore.odcp.hudi.connector.entity.SyncState; -import com.eshore.odcp.hudi.connector.entity.TableMeta; +import com.lanyuanxiaoyao.service.common.entity.FlinkJob; +import com.lanyuanxiaoyao.service.common.entity.SyncState; +import com.lanyuanxiaoyao.service.common.entity.TableMeta; import com.lanyuanxiaoyao.service.configuration.entity.PageResponse; import com.lanyuanxiaoyao.service.configuration.entity.info.*; import java.util.Map; diff --git a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/QueueService.java b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/QueueService.java index 8956c52..4f65a3f 100644 --- a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/QueueService.java +++ b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/QueueService.java @@ -3,7 +3,7 @@ package com.lanyuanxiaoyao.service.forest.service; import com.dtflys.forest.annotation.BaseRequest; import com.dtflys.forest.annotation.Get; import com.dtflys.forest.annotation.Query; -import com.eshore.odcp.hudi.connector.entity.compaction.ScheduleJob; +import com.lanyuanxiaoyao.service.common.entity.compaction.ScheduleJob; import com.lanyuanxiaoyao.service.configuration.entity.queue.QueueItem; import org.eclipse.collections.api.list.ImmutableList; diff --git a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/ZookeeperService.java b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/ZookeeperService.java index 6fad5ce..414cb09 100644 --- a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/ZookeeperService.java +++ b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/ZookeeperService.java @@ -3,7 +3,7 @@ package com.lanyuanxiaoyao.service.forest.service; import com.dtflys.forest.annotation.BaseRequest; import com.dtflys.forest.annotation.Get; import com.dtflys.forest.annotation.Query; -import com.eshore.odcp.hudi.connector.entity.RunMeta; +import com.lanyuanxiaoyao.service.common.entity.RunMeta; import com.lanyuanxiaoyao.service.configuration.entity.zookeeper.ZookeeperNode; import org.eclipse.collections.api.list.ImmutableList; diff --git a/service-gateway/pom.xml b/service-gateway/pom.xml index d7a1412..5b1ef1a 100644 --- a/service-gateway/pom.xml +++ b/service-gateway/pom.xml @@ -15,7 +15,6 @@ com.lanyuanxiaoyao service-dependencies - 1.0.0-SNAPSHOT org.springframework.boot @@ -26,7 +25,6 @@ com.lanyuanxiaoyao service-configuration - 1.0.0-SNAPSHOT org.springframework.cloud diff --git a/service-hudi-query/pom.xml b/service-hudi-query/pom.xml index a3ef41f..e82f11d 100644 --- a/service-hudi-query/pom.xml +++ b/service-hudi-query/pom.xml @@ -15,17 +15,14 @@ com.lanyuanxiaoyao service-dependencies - 1.0.0-SNAPSHOT com.lanyuanxiaoyao service-configuration - 1.0.0-SNAPSHOT com.lanyuanxiaoyao service-forest - 1.0.0-SNAPSHOT com.google.protobuf @@ -36,22 +33,18 @@ com.sun.jersey jersey-client - 1.19.1 com.sun.jersey jersey-core - 1.19.1 com.sun.jersey.contribs jersey-apache-client4 - 1.19.1 org.apache.hadoop hadoop-client - 3.1.2 com.squareup.okio @@ -77,13 +70,11 @@ org.apache.hudi - hudi-flink1.13-bundle - 0.12.0-eshore-SNAPSHOT + hudi-flink${flink.major.version}-bundle org.apache.curator curator-framework - 5.1.0 log4j diff --git a/service-hudi-query/src/main/java/com/lanyuanxiaoyao/service/hudi/service/HdfsService.java b/service-hudi-query/src/main/java/com/lanyuanxiaoyao/service/hudi/service/HdfsService.java index 9d358b7..b4fa5ab 100644 --- a/service-hudi-query/src/main/java/com/lanyuanxiaoyao/service/hudi/service/HdfsService.java +++ b/service-hudi-query/src/main/java/com/lanyuanxiaoyao/service/hudi/service/HdfsService.java @@ -1,7 +1,7 @@ package com.lanyuanxiaoyao.service.hudi.service; import cn.hutool.core.util.ObjectUtil; -import com.eshore.odcp.hudi.connector.entity.TableMeta; +import com.lanyuanxiaoyao.service.common.entity.TableMeta; import com.lanyuanxiaoyao.service.forest.service.InfoService; import java.io.IOException; import org.apache.hadoop.conf.Configuration; diff --git a/service-hudi-query/src/main/java/com/lanyuanxiaoyao/service/hudi/service/TableService.java b/service-hudi-query/src/main/java/com/lanyuanxiaoyao/service/hudi/service/TableService.java index 8c77beb..6d833a1 100644 --- a/service-hudi-query/src/main/java/com/lanyuanxiaoyao/service/hudi/service/TableService.java +++ b/service-hudi-query/src/main/java/com/lanyuanxiaoyao/service/hudi/service/TableService.java @@ -1,8 +1,8 @@ package com.lanyuanxiaoyao.service.hudi.service; -import com.eshore.odcp.hudi.connector.entity.TableMeta; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import com.lanyuanxiaoyao.service.common.entity.TableMeta; import com.lanyuanxiaoyao.service.forest.service.InfoService; import com.lanyuanxiaoyao.service.hudi.utils.HoodieUtils; import org.apache.hudi.org.apache.avro.Schema; diff --git a/service-hudi-query/src/main/java/com/lanyuanxiaoyao/service/hudi/service/TimelineService.java b/service-hudi-query/src/main/java/com/lanyuanxiaoyao/service/hudi/service/TimelineService.java index 97ec564..02d44f2 100644 --- a/service-hudi-query/src/main/java/com/lanyuanxiaoyao/service/hudi/service/TimelineService.java +++ b/service-hudi-query/src/main/java/com/lanyuanxiaoyao/service/hudi/service/TimelineService.java @@ -2,7 +2,7 @@ package com.lanyuanxiaoyao.service.hudi.service; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.entity.TableMeta; +import com.lanyuanxiaoyao.service.common.entity.TableMeta; import com.lanyuanxiaoyao.service.configuration.ExecutorProvider; import com.lanyuanxiaoyao.service.configuration.entity.PageResponse; import com.lanyuanxiaoyao.service.configuration.entity.hudi.HudiCleanerPlan; diff --git a/service-info-query/pom.xml b/service-info-query/pom.xml index 1df0330..ea1a815 100644 --- a/service-info-query/pom.xml +++ b/service-info-query/pom.xml @@ -15,12 +15,10 @@ com.lanyuanxiaoyao service-dependencies - 1.0.0-SNAPSHOT com.lanyuanxiaoyao service-configuration - 1.0.0-SNAPSHOT org.springframework.boot @@ -37,12 +35,10 @@ com.alibaba druid-spring-boot-starter - 1.2.17 io.github.dragons96 sql-builder - 0.0.5.3 diff --git a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/controller/FlinkJobController.java b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/controller/FlinkJobController.java index b9b3547..3d48e1d 100644 --- a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/controller/FlinkJobController.java +++ b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/controller/FlinkJobController.java @@ -1,6 +1,6 @@ package com.lanyuanxiaoyao.service.info.controller; -import com.eshore.odcp.hudi.connector.entity.FlinkJob; +import com.lanyuanxiaoyao.service.common.entity.FlinkJob; import com.lanyuanxiaoyao.service.info.service.FlinkJobService; import org.eclipse.collections.api.list.ImmutableList; import org.slf4j.Logger; diff --git a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/controller/SyncStateController.java b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/controller/SyncStateController.java index e29358c..90869b6 100644 --- a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/controller/SyncStateController.java +++ b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/controller/SyncStateController.java @@ -1,6 +1,6 @@ package com.lanyuanxiaoyao.service.info.controller; -import com.eshore.odcp.hudi.connector.entity.SyncState; +import com.lanyuanxiaoyao.service.common.entity.SyncState; import com.lanyuanxiaoyao.service.info.service.SyncStateService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/controller/TableMetaController.java b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/controller/TableMetaController.java index 2ddfe75..2007758 100644 --- a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/controller/TableMetaController.java +++ b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/controller/TableMetaController.java @@ -1,7 +1,7 @@ package com.lanyuanxiaoyao.service.info.controller; import cn.hutool.core.util.ObjectUtil; -import com.eshore.odcp.hudi.connector.entity.TableMeta; +import com.lanyuanxiaoyao.service.common.entity.TableMeta; import com.lanyuanxiaoyao.service.configuration.entity.info.SimpleTableMeta; import com.lanyuanxiaoyao.service.configuration.entity.info.TableMetaAdd; import com.lanyuanxiaoyao.service.info.service.TableMetaService; diff --git a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/CompactionService.java b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/CompactionService.java index 9c83c9e..1cbfb97 100644 --- a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/CompactionService.java +++ b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/CompactionService.java @@ -6,7 +6,7 @@ import club.kingon.sql.builder.entry.Alias; import club.kingon.sql.builder.entry.Column; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.SQLConstants; +import com.lanyuanxiaoyao.service.common.SQLConstants; import com.lanyuanxiaoyao.service.configuration.entity.PageResponse; import com.lanyuanxiaoyao.service.configuration.entity.info.CompactionMetrics; import java.sql.Timestamp; diff --git a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/FlinkJobService.java b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/FlinkJobService.java index 50452eb..7644db4 100644 --- a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/FlinkJobService.java +++ b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/FlinkJobService.java @@ -3,9 +3,9 @@ package com.lanyuanxiaoyao.service.info.service; import club.kingon.sql.builder.SqlBuilder; import club.kingon.sql.builder.entry.Column; import cn.hutool.core.util.ObjectUtil; -import com.eshore.odcp.hudi.connector.entity.FlinkJob; -import com.eshore.odcp.hudi.connector.entity.TableMeta; -import com.eshore.odcp.hudi.connector.exception.FlinkJobNotFoundException; +import com.lanyuanxiaoyao.service.common.entity.FlinkJob; +import com.lanyuanxiaoyao.service.common.entity.TableMeta; +import com.lanyuanxiaoyao.service.common.exception.FlinkJobNotFoundException; import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.list.ImmutableList; import org.slf4j.Logger; @@ -16,8 +16,8 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.retry.annotation.Retryable; import org.springframework.stereotype.Service; -import static com.eshore.odcp.hudi.connector.SQLConstants.HudiCollectBuild.TbAppFlinkJobConfig; -import static com.eshore.odcp.hudi.connector.SQLConstants.HudiCollectBuild.TbAppYarnJobConfig; +import static com.lanyuanxiaoyao.service.common.SQLConstants.HudiCollectBuild.TbAppFlinkJobConfig; +import static com.lanyuanxiaoyao.service.common.SQLConstants.HudiCollectBuild.TbAppYarnJobConfig; /** * Flink Job diff --git a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/InfoService.java b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/InfoService.java index 66a6a82..c5b12e6 100644 --- a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/InfoService.java +++ b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/InfoService.java @@ -2,15 +2,12 @@ package com.lanyuanxiaoyao.service.info.service; import club.kingon.sql.builder.SelectSqlBuilder; import club.kingon.sql.builder.SqlBuilder; -import club.kingon.sql.builder.entry.Column; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.lanyuanxiaoyao.service.configuration.entity.PageResponse; import com.lanyuanxiaoyao.service.configuration.entity.info.JobAndMetas; import com.lanyuanxiaoyao.service.configuration.entity.info.JobIdAndAlias; -import com.lanyuanxiaoyao.service.configuration.entity.info.TableInfoSearchCache; import java.util.List; -import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.list.ImmutableList; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,7 +18,7 @@ import org.springframework.retry.annotation.Retryable; import org.springframework.stereotype.Service; import org.springframework.transaction.support.TransactionTemplate; -import static com.eshore.odcp.hudi.connector.SQLConstants.HudiCollectBuild.*; +import static com.lanyuanxiaoyao.service.common.SQLConstants.HudiCollectBuild.*; /** * @author lanyuanxiaoyao diff --git a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/SyncStateService.java b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/SyncStateService.java index 0da7f0a..01e1443 100644 --- a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/SyncStateService.java +++ b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/SyncStateService.java @@ -4,8 +4,8 @@ import club.kingon.sql.builder.SqlBuilder; import club.kingon.sql.builder.entry.Column; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.entity.SyncState; -import com.eshore.odcp.hudi.connector.exception.SyncStateNotFoundException; +import com.lanyuanxiaoyao.service.common.entity.SyncState; +import com.lanyuanxiaoyao.service.common.exception.SyncStateNotFoundException; import java.sql.Timestamp; import java.util.function.Function; import org.eclipse.collections.api.factory.Lists; @@ -17,7 +17,7 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.retry.annotation.Retryable; import org.springframework.stereotype.Service; -import static com.eshore.odcp.hudi.connector.SQLConstants.HudiCollectBuild.*; +import static com.lanyuanxiaoyao.service.common.SQLConstants.HudiCollectBuild.*; /** * Sync State diff --git a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/TableMetaService.java b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/TableMetaService.java index 0afd8d2..e80fd9d 100644 --- a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/TableMetaService.java +++ b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/TableMetaService.java @@ -11,9 +11,9 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; -import com.eshore.odcp.hudi.connector.entity.TableMeta; -import com.eshore.odcp.hudi.connector.exception.ConfigException; -import com.eshore.odcp.hudi.connector.exception.TableMetaNotFoundException; +import com.lanyuanxiaoyao.service.common.entity.TableMeta; +import com.lanyuanxiaoyao.service.common.exception.ConfigException; +import com.lanyuanxiaoyao.service.common.exception.TableMetaNotFoundException; import com.lanyuanxiaoyao.service.configuration.ExecutorProvider; import com.lanyuanxiaoyao.service.configuration.entity.info.SimpleTableMeta; import com.lanyuanxiaoyao.service.configuration.entity.info.TableInfoSearchCache; @@ -30,8 +30,8 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.retry.annotation.Retryable; import org.springframework.stereotype.Service; -import static com.eshore.odcp.hudi.connector.SQLConstants.HudiCollectBuild.*; -import static com.eshore.odcp.hudi.connector.SQLConstants.IapDatahub.*; +import static com.lanyuanxiaoyao.service.common.SQLConstants.HudiCollectBuild.*; +import static com.lanyuanxiaoyao.service.common.SQLConstants.IapDatahub.*; /** * Table Meta diff --git a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/VersionService.java b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/VersionService.java index 84e1467..7d8f28f 100644 --- a/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/VersionService.java +++ b/service-info-query/src/main/java/com/lanyuanxiaoyao/service/info/service/VersionService.java @@ -24,7 +24,7 @@ import org.springframework.retry.annotation.Retryable; import org.springframework.stereotype.Service; import org.springframework.transaction.support.TransactionTemplate; -import static com.eshore.odcp.hudi.connector.SQLConstants.HudiCollectBuild.*; +import static com.lanyuanxiaoyao.service.common.SQLConstants.HudiCollectBuild.*; /** * Version diff --git a/service-info-query/src/test/java/com/test/SqlBuilderTests.java b/service-info-query/src/test/java/com/test/SqlBuilderTests.java index 4ef8c9a..97033d3 100644 --- a/service-info-query/src/test/java/com/test/SqlBuilderTests.java +++ b/service-info-query/src/test/java/com/test/SqlBuilderTests.java @@ -7,9 +7,9 @@ import club.kingon.sql.builder.entry.Column; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.db.sql.SqlUtil; -import com.eshore.odcp.hudi.connector.SQLConstants; +import com.lanyuanxiaoyao.service.common.SQLConstants; -import static com.eshore.odcp.hudi.connector.SQLConstants.HudiCollectBuild.*; +import static com.lanyuanxiaoyao.service.common.SQLConstants.HudiCollectBuild.*; /** * @author lanyuanxiaoyao diff --git a/service-launcher/pom.xml b/service-launcher/pom.xml index 08ff946..962a8a5 100644 --- a/service-launcher/pom.xml +++ b/service-launcher/pom.xml @@ -15,7 +15,6 @@ com.lanyuanxiaoyao service-configuration - 1.0.0-SNAPSHOT org.apache.logging.log4j @@ -26,17 +25,14 @@ org.apache.curator curator-recipes - 5.1.0 org.apache.hudi hudi-flink${flink.major.version}-bundle - ${hudi.version} com.lanyuanxiaoyao service-forest - 1.0.0-SNAPSHOT @@ -54,24 +50,20 @@ spring-boot-starter-tomcat - com.eshore.odcp.hudi.connector + com.lanyuanxiaoyao executor - 1.0.0-SNAPSHOT com.sun.jersey jersey-client - 1.19.4 com.sun.jersey jersey-core - 1.19.4 com.sun.jersey.contribs jersey-apache-client4 - 1.19.4 org.apache.pulsar @@ -81,7 +73,7 @@ - ${artifactId}-${build-tag}-${version} + ${project.artifactId}-${build-tag}-${project.version} org.apache.maven.plugins diff --git a/service-launcher/src/main/java/com/lanyuanxiaoyao/service/launcher/ExecutorService.java b/service-launcher/src/main/java/com/lanyuanxiaoyao/service/launcher/ExecutorService.java index 9e457bc..7aa22c0 100644 --- a/service-launcher/src/main/java/com/lanyuanxiaoyao/service/launcher/ExecutorService.java +++ b/service-launcher/src/main/java/com/lanyuanxiaoyao/service/launcher/ExecutorService.java @@ -4,12 +4,12 @@ import cn.hutool.core.lang.Tuple; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ReUtil; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.Constants; -import com.eshore.odcp.hudi.connector.entity.FlinkJob; -import com.eshore.odcp.hudi.connector.entity.TableMeta; -import com.eshore.odcp.hudi.connector.exception.CheckpointRootPathNotFoundException; -import com.eshore.odcp.hudi.connector.utils.NameHelper; -import com.eshore.odcp.hudi.connector.utils.executor.Runner; +import com.lanyuanxiaoyao.service.common.Constants; +import com.lanyuanxiaoyao.service.common.entity.FlinkJob; +import com.lanyuanxiaoyao.service.common.entity.TableMeta; +import com.lanyuanxiaoyao.service.common.exception.CheckpointRootPathNotFoundException; +import com.lanyuanxiaoyao.service.common.utils.NameHelper; +import com.lanyuanxiaoyao.service.executor.Runner; import com.lanyuanxiaoyao.service.forest.service.InfoService; import com.lanyuanxiaoyao.service.launcher.configuration.HadoopConfiguration; import com.lanyuanxiaoyao.service.launcher.configuration.HudiConfiguration; @@ -39,8 +39,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import static com.eshore.odcp.hudi.connector.Constants.HALF_HOUR; -import static com.eshore.odcp.hudi.connector.Constants.MINUTE; +import static com.lanyuanxiaoyao.service.common.Constants.HALF_HOUR; +import static com.lanyuanxiaoyao.service.common.Constants.MINUTE; /** * 执行器 diff --git a/service-launcher/src/main/java/com/lanyuanxiaoyao/service/launcher/compaction/controller/CompactionController.java b/service-launcher/src/main/java/com/lanyuanxiaoyao/service/launcher/compaction/controller/CompactionController.java index 8e961c5..1a7546b 100644 --- a/service-launcher/src/main/java/com/lanyuanxiaoyao/service/launcher/compaction/controller/CompactionController.java +++ b/service-launcher/src/main/java/com/lanyuanxiaoyao/service/launcher/compaction/controller/CompactionController.java @@ -2,9 +2,9 @@ package com.lanyuanxiaoyao.service.launcher.compaction.controller; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.Constants; -import com.eshore.odcp.hudi.connector.entity.RunMeta; -import com.eshore.odcp.hudi.connector.entity.SyncState; +import com.lanyuanxiaoyao.service.common.Constants; +import com.lanyuanxiaoyao.service.common.entity.RunMeta; +import com.lanyuanxiaoyao.service.common.entity.SyncState; import com.lanyuanxiaoyao.service.configuration.utils.QueueUtil; import com.lanyuanxiaoyao.service.forest.service.InfoService; import com.lanyuanxiaoyao.service.forest.service.ZookeeperService; diff --git a/service-launcher/src/main/java/com/lanyuanxiaoyao/service/launcher/compaction/service/CompactionService.java b/service-launcher/src/main/java/com/lanyuanxiaoyao/service/launcher/compaction/service/CompactionService.java index 781632b..d3fbe5e 100644 --- a/service-launcher/src/main/java/com/lanyuanxiaoyao/service/launcher/compaction/service/CompactionService.java +++ b/service-launcher/src/main/java/com/lanyuanxiaoyao/service/launcher/compaction/service/CompactionService.java @@ -3,15 +3,15 @@ package com.lanyuanxiaoyao.service.launcher.compaction.service; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.Constants; -import com.eshore.odcp.hudi.connector.entity.FlinkJob; -import com.eshore.odcp.hudi.connector.entity.TableMeta; -import com.eshore.odcp.hudi.connector.entity.compaction.ScheduleJob; -import com.eshore.odcp.hudi.connector.utils.LogHelper; -import com.eshore.odcp.hudi.connector.utils.NameHelper; -import com.eshore.odcp.hudi.connector.utils.TableMetaHelper; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import com.lanyuanxiaoyao.service.common.Constants; +import com.lanyuanxiaoyao.service.common.entity.FlinkJob; +import com.lanyuanxiaoyao.service.common.entity.TableMeta; +import com.lanyuanxiaoyao.service.common.entity.compaction.ScheduleJob; +import com.lanyuanxiaoyao.service.common.utils.LogHelper; +import com.lanyuanxiaoyao.service.common.utils.NameHelper; +import com.lanyuanxiaoyao.service.common.utils.TableMetaHelper; import com.lanyuanxiaoyao.service.configuration.entity.hudi.HudiCompactionPlan; import com.lanyuanxiaoyao.service.configuration.entity.hudi.HudiInstant; import com.lanyuanxiaoyao.service.configuration.entity.queue.QueueItem; diff --git a/service-launcher/src/main/java/com/lanyuanxiaoyao/service/launcher/synchronizer/service/SynchronizerService.java b/service-launcher/src/main/java/com/lanyuanxiaoyao/service/launcher/synchronizer/service/SynchronizerService.java index c81f4b4..75fdc9d 100644 --- a/service-launcher/src/main/java/com/lanyuanxiaoyao/service/launcher/synchronizer/service/SynchronizerService.java +++ b/service-launcher/src/main/java/com/lanyuanxiaoyao/service/launcher/synchronizer/service/SynchronizerService.java @@ -2,10 +2,10 @@ package com.lanyuanxiaoyao.service.launcher.synchronizer.service; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.Constants; -import com.eshore.odcp.hudi.connector.entity.RunMeta; -import com.eshore.odcp.hudi.connector.utils.NameHelper; import com.fasterxml.jackson.databind.ObjectMapper; +import com.lanyuanxiaoyao.service.common.Constants; +import com.lanyuanxiaoyao.service.common.entity.RunMeta; +import com.lanyuanxiaoyao.service.common.utils.NameHelper; import com.lanyuanxiaoyao.service.launcher.ExecutorService; import com.lanyuanxiaoyao.service.launcher.configuration.ClusterConfiguration; import com.lanyuanxiaoyao.service.launcher.configuration.HadoopConfiguration; diff --git a/service-loki-query/pom.xml b/service-loki-query/pom.xml index b6e9ab4..177f2f9 100644 --- a/service-loki-query/pom.xml +++ b/service-loki-query/pom.xml @@ -15,12 +15,10 @@ com.lanyuanxiaoyao service-dependencies - 1.0.0-SNAPSHOT com.lanyuanxiaoyao service-configuration - 1.0.0-SNAPSHOT diff --git a/service-pulsar-query/pom.xml b/service-pulsar-query/pom.xml index 6711137..32bb428 100644 --- a/service-pulsar-query/pom.xml +++ b/service-pulsar-query/pom.xml @@ -15,12 +15,10 @@ com.lanyuanxiaoyao service-dependencies - 1.0.0-SNAPSHOT com.lanyuanxiaoyao service-configuration - 1.0.0-SNAPSHOT org.apache.pulsar diff --git a/service-pulsar-query/src/main/java/com/lanyuanxiaoyao/service/pulsar/PulsarQueryApplication.java b/service-pulsar-query/src/main/java/com/lanyuanxiaoyao/service/pulsar/PulsarQueryApplication.java index 43bd703..33c6a99 100644 --- a/service-pulsar-query/src/main/java/com/lanyuanxiaoyao/service/pulsar/PulsarQueryApplication.java +++ b/service-pulsar-query/src/main/java/com/lanyuanxiaoyao/service/pulsar/PulsarQueryApplication.java @@ -3,7 +3,7 @@ package com.lanyuanxiaoyao.service.pulsar; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.exception.PulsarInfoNotFoundException; +import com.lanyuanxiaoyao.service.common.exception.PulsarInfoNotFoundException; import com.lanyuanxiaoyao.service.configuration.entity.pulsar.PulsarInfo; import com.lanyuanxiaoyao.service.configuration.entity.pulsar.PulsarNamespace; import com.lanyuanxiaoyao.service.configuration.entity.pulsar.PulsarTenant; diff --git a/service-queue/pom.xml b/service-queue/pom.xml index ae58387..30b927d 100644 --- a/service-queue/pom.xml +++ b/service-queue/pom.xml @@ -15,12 +15,10 @@ com.lanyuanxiaoyao service-dependencies - 1.0.0-SNAPSHOT com.lanyuanxiaoyao service-configuration - 1.0.0-SNAPSHOT diff --git a/service-scheduler/pom.xml b/service-scheduler/pom.xml index fa1e251..c94d3b4 100644 --- a/service-scheduler/pom.xml +++ b/service-scheduler/pom.xml @@ -19,12 +19,10 @@ com.lanyuanxiaoyao service-forest - 1.0.0-SNAPSHOT com.cronutils cron-utils - 9.2.0 diff --git a/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/controller/ScheduleController.java b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/controller/ScheduleController.java index c09cd76..d3153bb 100644 --- a/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/controller/ScheduleController.java +++ b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/controller/ScheduleController.java @@ -7,10 +7,10 @@ import com.cronutils.model.CronType; import com.cronutils.model.definition.CronDefinitionBuilder; import com.cronutils.model.time.ExecutionTime; import com.cronutils.parser.CronParser; -import com.eshore.odcp.hudi.connector.Constants; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; +import com.lanyuanxiaoyao.service.common.Constants; import com.lanyuanxiaoyao.service.configuration.utils.QueueUtil; import com.lanyuanxiaoyao.service.forest.service.HudiService; import com.lanyuanxiaoyao.service.forest.service.InfoService; diff --git a/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/compaction/DistributeScheduleJob.java b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/compaction/DistributeScheduleJob.java index c5ab626..0861c96 100644 --- a/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/compaction/DistributeScheduleJob.java +++ b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/compaction/DistributeScheduleJob.java @@ -3,10 +3,10 @@ package com.lanyuanxiaoyao.service.scheduler.quartz.compaction; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.Constants; -import com.eshore.odcp.hudi.connector.entity.compaction.ScheduleJob; -import com.eshore.odcp.hudi.connector.utils.LogHelper; import com.fasterxml.jackson.databind.ObjectMapper; +import com.lanyuanxiaoyao.service.common.Constants; +import com.lanyuanxiaoyao.service.common.entity.compaction.ScheduleJob; +import com.lanyuanxiaoyao.service.common.utils.LogHelper; import com.lanyuanxiaoyao.service.configuration.entity.queue.QueueItem; import com.lanyuanxiaoyao.service.configuration.entity.yarn.YarnClusters; import com.lanyuanxiaoyao.service.configuration.utils.QueueUtil; diff --git a/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/compaction/OdsFocusScheduleJob.java b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/compaction/OdsFocusScheduleJob.java index 7040855..f976a88 100644 --- a/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/compaction/OdsFocusScheduleJob.java +++ b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/compaction/OdsFocusScheduleJob.java @@ -1,8 +1,8 @@ package com.lanyuanxiaoyao.service.scheduler.quartz.compaction; -import com.eshore.odcp.hudi.connector.Constants; -import com.eshore.odcp.hudi.connector.utils.TableMetaHelper; import com.fasterxml.jackson.databind.ObjectMapper; +import com.lanyuanxiaoyao.service.common.Constants; +import com.lanyuanxiaoyao.service.common.utils.TableMetaHelper; import com.lanyuanxiaoyao.service.forest.service.HudiService; import com.lanyuanxiaoyao.service.forest.service.InfoService; import com.lanyuanxiaoyao.service.scheduler.utils.ScheduleHelper; diff --git a/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/compaction/RemoveScheduledJob.java b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/compaction/RemoveScheduledJob.java index 39ae686..0b15e03 100644 --- a/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/compaction/RemoveScheduledJob.java +++ b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/compaction/RemoveScheduledJob.java @@ -1,7 +1,7 @@ package com.lanyuanxiaoyao.service.scheduler.quartz.compaction; -import com.eshore.odcp.hudi.connector.Constants; import com.fasterxml.jackson.databind.ObjectMapper; +import com.lanyuanxiaoyao.service.common.Constants; import com.lanyuanxiaoyao.service.configuration.utils.QueueUtil; import com.lanyuanxiaoyao.service.forest.service.InfoService; import org.quartz.DisallowConcurrentExecution; diff --git a/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/distribute/cluster/A4Cluster.java b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/distribute/cluster/A4Cluster.java index 81c2940..0cd717d 100644 --- a/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/distribute/cluster/A4Cluster.java +++ b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/distribute/cluster/A4Cluster.java @@ -1,6 +1,6 @@ package com.lanyuanxiaoyao.service.scheduler.quartz.distribute.cluster; -import com.eshore.odcp.hudi.connector.Constants; +import com.lanyuanxiaoyao.service.common.Constants; import com.lanyuanxiaoyao.service.forest.service.YarnService; import com.lanyuanxiaoyao.service.scheduler.quartz.distribute.strategy.AvailableStrategy; import com.lanyuanxiaoyao.service.scheduler.quartz.distribute.strategy.QueueSizeLimit; diff --git a/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/distribute/cluster/B12Cluster.java b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/distribute/cluster/B12Cluster.java index 3fbd8b5..cfe7501 100644 --- a/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/distribute/cluster/B12Cluster.java +++ b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/distribute/cluster/B12Cluster.java @@ -1,6 +1,6 @@ package com.lanyuanxiaoyao.service.scheduler.quartz.distribute.cluster; -import com.eshore.odcp.hudi.connector.Constants; +import com.lanyuanxiaoyao.service.common.Constants; import com.lanyuanxiaoyao.service.forest.service.YarnService; import com.lanyuanxiaoyao.service.scheduler.quartz.distribute.strategy.AvailableStrategy; import com.lanyuanxiaoyao.service.scheduler.quartz.distribute.strategy.QueueSizeLimit; diff --git a/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/distribute/cluster/B1Cluster.java b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/distribute/cluster/B1Cluster.java index 9b486b1..a101f82 100644 --- a/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/distribute/cluster/B1Cluster.java +++ b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/distribute/cluster/B1Cluster.java @@ -1,6 +1,6 @@ package com.lanyuanxiaoyao.service.scheduler.quartz.distribute.cluster; -import com.eshore.odcp.hudi.connector.Constants; +import com.lanyuanxiaoyao.service.common.Constants; import com.lanyuanxiaoyao.service.forest.service.YarnService; import com.lanyuanxiaoyao.service.scheduler.quartz.distribute.strategy.AvailableStrategy; import com.lanyuanxiaoyao.service.scheduler.quartz.distribute.strategy.QueueSizeLimit; diff --git a/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/distribute/cluster/B5Cluster.java b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/distribute/cluster/B5Cluster.java index 5151ea2..595c6be 100644 --- a/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/distribute/cluster/B5Cluster.java +++ b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/distribute/cluster/B5Cluster.java @@ -1,6 +1,6 @@ package com.lanyuanxiaoyao.service.scheduler.quartz.distribute.cluster; -import com.eshore.odcp.hudi.connector.Constants; +import com.lanyuanxiaoyao.service.common.Constants; import com.lanyuanxiaoyao.service.forest.service.YarnService; import com.lanyuanxiaoyao.service.scheduler.quartz.distribute.strategy.AvailableStrategy; import com.lanyuanxiaoyao.service.scheduler.quartz.distribute.strategy.QueueSizeLimit; diff --git a/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/strategy/ScheduleStrategyImpl.java b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/strategy/ScheduleStrategyImpl.java index ecd3c12..dba5697 100644 --- a/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/strategy/ScheduleStrategyImpl.java +++ b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/strategy/ScheduleStrategyImpl.java @@ -1,11 +1,12 @@ package com.lanyuanxiaoyao.service.scheduler.strategy; import cn.hutool.core.util.RandomUtil; +import com.lanyuanxiaoyao.service.common.Constants; import java.time.Instant; import java.util.Date; import org.quartz.*; -import static com.eshore.odcp.hudi.connector.Constants.SECOND; +import static com.lanyuanxiaoyao.service.common.Constants.SECOND; /** * @author ZhangJiacheng diff --git a/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/utils/ScheduleHelper.java b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/utils/ScheduleHelper.java index a48f58f..5394748 100644 --- a/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/utils/ScheduleHelper.java +++ b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/utils/ScheduleHelper.java @@ -3,13 +3,13 @@ package com.lanyuanxiaoyao.service.scheduler.utils; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.Constants; -import com.eshore.odcp.hudi.connector.entity.SyncState; -import com.eshore.odcp.hudi.connector.entity.TableMeta; -import com.eshore.odcp.hudi.connector.entity.compaction.ScheduleJob; -import com.eshore.odcp.hudi.connector.utils.TableMetaHelper; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.loki4j.slf4j.marker.LabelMarker; +import com.lanyuanxiaoyao.service.common.Constants; +import com.lanyuanxiaoyao.service.common.entity.SyncState; +import com.lanyuanxiaoyao.service.common.entity.TableMeta; +import com.lanyuanxiaoyao.service.common.entity.compaction.ScheduleJob; +import com.lanyuanxiaoyao.service.common.utils.TableMetaHelper; import com.lanyuanxiaoyao.service.configuration.ExecutorProvider; import com.lanyuanxiaoyao.service.configuration.entity.queue.QueueItem; import com.lanyuanxiaoyao.service.configuration.utils.QueueUtil; diff --git a/service-uploader/pom.xml b/service-uploader/pom.xml index 0e55bdf..44d15f2 100644 --- a/service-uploader/pom.xml +++ b/service-uploader/pom.xml @@ -15,23 +15,15 @@ com.lanyuanxiaoyao service-dependencies - 1.0.0-SNAPSHOT com.lanyuanxiaoyao service-configuration - 1.0.0-SNAPSHOT org.apache.hadoop hadoop-client - 3.1.2 - diff --git a/service-uploader/src/main/java/com/lanyuanxiaoyao/service/uploader/service/filesystem/UploadAndDownloadService.java b/service-uploader/src/main/java/com/lanyuanxiaoyao/service/uploader/service/filesystem/UploadAndDownloadService.java index 8685c10..aad6936 100644 --- a/service-uploader/src/main/java/com/lanyuanxiaoyao/service/uploader/service/filesystem/UploadAndDownloadService.java +++ b/service-uploader/src/main/java/com/lanyuanxiaoyao/service/uploader/service/filesystem/UploadAndDownloadService.java @@ -1,7 +1,5 @@ package com.lanyuanxiaoyao.service.uploader.service.filesystem; -import java.io.IOException; - /** * 上传和下载 * diff --git a/service-web/pom.xml b/service-web/pom.xml index 25948d9..504e37e 100644 --- a/service-web/pom.xml +++ b/service-web/pom.xml @@ -15,17 +15,14 @@ com.lanyuanxiaoyao service-dependencies - 1.0.0-SNAPSHOT com.lanyuanxiaoyao service-configuration - 1.0.0-SNAPSHOT com.lanyuanxiaoyao service-forest - 1.0.0-SNAPSHOT diff --git a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/OverviewController.java b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/OverviewController.java index a90d2a4..a4e669e 100644 --- a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/OverviewController.java +++ b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/OverviewController.java @@ -2,8 +2,8 @@ package com.lanyuanxiaoyao.service.web.controller; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.entity.FlinkJob; -import com.eshore.odcp.hudi.connector.utils.NameHelper; +import com.lanyuanxiaoyao.service.common.entity.FlinkJob; +import com.lanyuanxiaoyao.service.common.utils.NameHelper; import com.lanyuanxiaoyao.service.configuration.ExecutorProvider; import com.lanyuanxiaoyao.service.configuration.entity.info.JobIdAndAlias; import com.lanyuanxiaoyao.service.configuration.entity.yarn.YarnApplication; diff --git a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/RunningController.java b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/RunningController.java index 3615352..eafe734 100644 --- a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/RunningController.java +++ b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/RunningController.java @@ -1,9 +1,9 @@ package com.lanyuanxiaoyao.service.web.controller; -import com.eshore.odcp.hudi.connector.entity.RunMeta; -import com.eshore.odcp.hudi.connector.utils.NameHelper; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.lanyuanxiaoyao.service.common.entity.RunMeta; +import com.lanyuanxiaoyao.service.common.utils.NameHelper; import com.lanyuanxiaoyao.service.configuration.ExecutorProvider; import com.lanyuanxiaoyao.service.configuration.entity.zookeeper.ZookeeperNode; import com.lanyuanxiaoyao.service.forest.service.ZookeeperService; diff --git a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/TableController.java b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/TableController.java index 6b7c0eb..04efeea 100644 --- a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/TableController.java +++ b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/TableController.java @@ -2,12 +2,12 @@ package com.lanyuanxiaoyao.service.web.controller; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.entity.FlinkJob; -import com.eshore.odcp.hudi.connector.entity.RunMeta; -import com.eshore.odcp.hudi.connector.entity.SyncState; -import com.eshore.odcp.hudi.connector.entity.TableMeta; -import com.eshore.odcp.hudi.connector.utils.NameHelper; import com.fasterxml.jackson.databind.ObjectMapper; +import com.lanyuanxiaoyao.service.common.entity.FlinkJob; +import com.lanyuanxiaoyao.service.common.entity.RunMeta; +import com.lanyuanxiaoyao.service.common.entity.SyncState; +import com.lanyuanxiaoyao.service.common.entity.TableMeta; +import com.lanyuanxiaoyao.service.common.utils.NameHelper; import com.lanyuanxiaoyao.service.configuration.ExecutorProvider; import com.lanyuanxiaoyao.service.configuration.entity.Item; import com.lanyuanxiaoyao.service.configuration.entity.PageResponse; diff --git a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/VersionController.java b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/VersionController.java index d9885d9..c41bc48 100644 --- a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/VersionController.java +++ b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/VersionController.java @@ -2,8 +2,8 @@ package com.lanyuanxiaoyao.service.web.controller; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.entity.FlinkJob; -import com.eshore.odcp.hudi.connector.entity.TableMeta; +import com.lanyuanxiaoyao.service.common.entity.FlinkJob; +import com.lanyuanxiaoyao.service.common.entity.TableMeta; import com.lanyuanxiaoyao.service.configuration.ExecutorProvider; import com.lanyuanxiaoyao.service.configuration.entity.PageResponse; import com.lanyuanxiaoyao.service.configuration.entity.info.VersionUpdated; diff --git a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/FlinkJobVO.java b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/FlinkJobVO.java index 481b328..3a86cf9 100644 --- a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/FlinkJobVO.java +++ b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/FlinkJobVO.java @@ -1,8 +1,8 @@ package com.lanyuanxiaoyao.service.web.entity; -import com.eshore.odcp.hudi.connector.entity.FlinkJob; -import com.eshore.odcp.hudi.connector.entity.TableMeta; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.lanyuanxiaoyao.service.common.entity.FlinkJob; +import com.lanyuanxiaoyao.service.common.entity.TableMeta; /** * 避免前段不支持java long类型的精度 diff --git a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/SyncStateVO.java b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/SyncStateVO.java index eff6eab..202c8c7 100644 --- a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/SyncStateVO.java +++ b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/SyncStateVO.java @@ -1,7 +1,7 @@ package com.lanyuanxiaoyao.service.web.entity; -import com.eshore.odcp.hudi.connector.entity.SyncState; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.lanyuanxiaoyao.service.common.entity.SyncState; import com.lanyuanxiaoyao.service.configuration.utils.DatetimeUtil; import java.time.Instant; diff --git a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/TableVO.java b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/TableVO.java index e529177..33d0d1e 100644 --- a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/TableVO.java +++ b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/TableVO.java @@ -1,10 +1,10 @@ package com.lanyuanxiaoyao.service.web.entity; import cn.hutool.core.util.ObjectUtil; -import com.eshore.odcp.hudi.connector.entity.FlinkJob; -import com.eshore.odcp.hudi.connector.entity.RunMeta; -import com.eshore.odcp.hudi.connector.entity.TableMeta; -import com.eshore.odcp.hudi.connector.utils.NameHelper; +import com.lanyuanxiaoyao.service.common.entity.FlinkJob; +import com.lanyuanxiaoyao.service.common.entity.RunMeta; +import com.lanyuanxiaoyao.service.common.entity.TableMeta; +import com.lanyuanxiaoyao.service.common.utils.NameHelper; /** * 表展示 diff --git a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/VersionUpdateVO.java b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/VersionUpdateVO.java index 8c386e0..b5eb806 100644 --- a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/VersionUpdateVO.java +++ b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/VersionUpdateVO.java @@ -1,7 +1,7 @@ package com.lanyuanxiaoyao.service.web.entity; -import com.eshore.odcp.hudi.connector.entity.FlinkJob; -import com.eshore.odcp.hudi.connector.entity.TableMeta; +import com.lanyuanxiaoyao.service.common.entity.FlinkJob; +import com.lanyuanxiaoyao.service.common.entity.TableMeta; /** * @author lanyuanxiaoyao diff --git a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/YarnApplicationVO.java b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/YarnApplicationVO.java index a741d07..ad182cd 100644 --- a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/YarnApplicationVO.java +++ b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/YarnApplicationVO.java @@ -3,8 +3,8 @@ package com.lanyuanxiaoyao.service.web.entity; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ReUtil; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.utils.NameHelper; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.lanyuanxiaoyao.service.common.utils.NameHelper; import com.lanyuanxiaoyao.service.configuration.entity.yarn.YarnApplication; import com.lanyuanxiaoyao.service.configuration.utils.DatetimeUtil; import java.time.Instant; diff --git a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/ZookeeperNodeVO.java b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/ZookeeperNodeVO.java index 417c913..605d4a6 100644 --- a/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/ZookeeperNodeVO.java +++ b/service-web/src/main/java/com/lanyuanxiaoyao/service/web/entity/ZookeeperNodeVO.java @@ -1,8 +1,8 @@ package com.lanyuanxiaoyao.service.web.entity; import cn.hutool.core.util.ObjectUtil; -import com.eshore.odcp.hudi.connector.entity.RunMeta; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.lanyuanxiaoyao.service.common.entity.RunMeta; import com.lanyuanxiaoyao.service.configuration.entity.zookeeper.ZookeeperNode; import com.lanyuanxiaoyao.service.configuration.utils.DatetimeUtil; diff --git a/service-yarn-query/pom.xml b/service-yarn-query/pom.xml index 4325ad1..f95faa8 100644 --- a/service-yarn-query/pom.xml +++ b/service-yarn-query/pom.xml @@ -15,23 +15,11 @@ com.lanyuanxiaoyao service-dependencies - 1.0.0-SNAPSHOT com.lanyuanxiaoyao service-configuration - 1.0.0-SNAPSHOT - diff --git a/service-zookeeper-query/pom.xml b/service-zookeeper-query/pom.xml index e6f1b21..effb0e5 100644 --- a/service-zookeeper-query/pom.xml +++ b/service-zookeeper-query/pom.xml @@ -15,12 +15,10 @@ com.lanyuanxiaoyao service-dependencies - 1.0.0-SNAPSHOT com.lanyuanxiaoyao service-configuration - 1.0.0-SNAPSHOT diff --git a/service-zookeeper-query/src/main/java/com/lanyuanxiaoyao/service/zookeeper/ZookeeperController.java b/service-zookeeper-query/src/main/java/com/lanyuanxiaoyao/service/zookeeper/ZookeeperController.java index 5b7040b..48569b1 100644 --- a/service-zookeeper-query/src/main/java/com/lanyuanxiaoyao/service/zookeeper/ZookeeperController.java +++ b/service-zookeeper-query/src/main/java/com/lanyuanxiaoyao/service/zookeeper/ZookeeperController.java @@ -2,10 +2,10 @@ package com.lanyuanxiaoyao.service.zookeeper; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.eshore.odcp.hudi.connector.Constants; -import com.eshore.odcp.hudi.connector.entity.RunMeta; -import com.eshore.odcp.hudi.connector.utils.NameHelper; import com.fasterxml.jackson.databind.ObjectMapper; +import com.lanyuanxiaoyao.service.common.Constants; +import com.lanyuanxiaoyao.service.common.entity.RunMeta; +import com.lanyuanxiaoyao.service.common.utils.NameHelper; import com.lanyuanxiaoyao.service.configuration.entity.zookeeper.ZookeeperNode; import java.util.concurrent.TimeUnit; import javax.annotation.PreDestroy;