This is an automated email from the ASF dual-hosted git repository. benjobs pushed a commit to branch resource in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
commit dc4601f34ea0a15499affa6ffcd02384c466fcc2 Merge: 5694fe187 b2ec2cd8d Author: benjobs <[email protected]> AuthorDate: Sun Aug 6 12:55:44 2023 +0800 Merge branch 'dev' into resource .scalafmt-fp.conf | 88 + dist-material/release-docs/LICENSE | 10 + pom.xml | 39 +- streampark-common/pom.xml | 29 + .../org/apache/streampark/common/tuple/Tuple.java | 63 + .../org/apache/streampark/common/tuple/Tuple1.java | 114 + .../org/apache/streampark/common/tuple/Tuple2.java | 164 + .../org/apache/streampark/common/tuple/Tuple3.java | 172 + .../org/apache/streampark/common/tuple/Tuple4.java | 188 + .../streampark/common/conf/ConfigConst.scala | 2 + .../streampark/common/conf/K8sFlinkConfig.scala | 3 +- .../apache/streampark/common/conf/Workspace.scala | 2 +- .../streampark/common/util/CURLBuilder.scala | 2 +- .../apache/streampark/common/util/YarnUtils.scala | 4 +- .../common/zio/ZIOContainerSubscription.scala | 159 + .../org/apache/streampark/common/zio/ZIOExt.scala | 97 + .../apache/streampark/common/zio/ZIOLogger.scala | 80 + .../org/apache/streampark/common/zio/package.scala | 26 +- .../streampark-console-service/pom.xml | 122 +- .../console/core/entity/FlinkCluster.java | 49 +- .../console/core/enums/FlinkAppState.java | 8 +- .../console/core/runner/EnvInitializer.java | 4 + .../core/service/impl/ApplicationServiceImpl.java | 5 +- .../core/service/impl/FlinkClusterServiceImpl.java | 9 +- .../console/core/task/FlinkClusterWatcher.java | 46 +- .../console/core/task/FlinkHttpWatcher.java | 4 +- .../src/main/resources/db/data-h2.sql | 2 +- .../core/utils/FlinkAppStateConverter.scala | 21 +- .../src/assets/icons/alarm.svg | 2 +- .../src/assets/icons/auth.svg | 2 +- .../src/assets/icons/code.svg | 2 +- .../src/assets/icons/connector.svg | 2 +- .../src/assets/icons/copy.svg | 2 +- .../src/assets/icons/deploy.svg | 2 +- .../src/assets/icons/dingtalk.svg | 2 +- .../src/assets/icons/docker.svg | 2 +- .../src/assets/icons/edit.svg | 2 +- .../src/assets/icons/flame.svg | 2 +- .../src/assets/icons/flink2.svg | 2 +- .../src/assets/icons/flink3.svg | 11 + .../src/assets/icons/flinksql.svg | 2 +- .../src/assets/icons/format.svg | 2 +- .../src/assets/icons/fql.svg | 2 +- .../src/assets/icons/fx.svg | 2 +- .../src/assets/icons/github.svg | 2 +- .../src/assets/icons/group.svg | 2 +- .../src/assets/icons/host.svg | 2 +- .../src/assets/icons/http.svg | 2 +- .../src/assets/icons/keys.svg | 2 +- .../src/assets/icons/mail.svg | 2 +- .../src/assets/icons/management.svg | 12 + .../src/assets/icons/mapping.svg | 2 +- .../src/assets/icons/message.svg | 2 +- .../src/assets/icons/mvnpass.svg | 2 +- .../src/assets/icons/namespace.svg | 2 +- .../src/assets/icons/password.svg | 2 +- .../src/assets/icons/pause.svg | 2 +- .../src/assets/icons/play.svg | 2 +- .../src/assets/icons/plus.svg | 2 +- .../src/assets/icons/port.svg | 2 +- .../src/assets/icons/question.svg | 2 +- .../src/assets/icons/remove.svg | 2 +- .../src/assets/icons/resetpass.svg | 2 +- .../src/assets/icons/rollback.svg | 2 +- .../src/assets/icons/see.svg | 2 +- .../src/assets/icons/settings.svg | 10 +- .../src/assets/icons/shutdown.svg | 2 +- .../src/assets/icons/sms.svg | 2 +- .../src/assets/icons/spark.svg | 13 +- .../src/assets/icons/ssl.svg | 2 +- .../src/assets/icons/stream.svg | 2 +- .../src/assets/icons/swap.svg | 2 +- .../src/assets/icons/theme.svg | 2 +- .../src/assets/icons/threshold.svg | 2 +- .../src/assets/icons/thunderbolt.svg | 2 +- .../src/assets/icons/user.svg | 2 +- .../src/assets/icons/wecom.svg | 2 +- .../src/assets/icons/workspace.svg | 2 +- .../components/SimpleMenu/src/SimpleSubMenu.vue | 14 +- .../components/SimpleMenu/src/components/Menu.vue | 2 +- .../src/components/SimpleMenu/src/index.less | 1 + .../src/router/helper/routeHelper.ts | 2 +- .../src/settings/designSetting.ts | 2 +- .../src/views/flink/app/components/State.tsx | 2 +- .../src/views/flink/app/styles/Add.less | 2 +- .../src/views/flink/app/styles/View.less | 4 +- .../src/views/setting/FlinkCluster/EditCluster.vue | 13 +- .../setting/FlinkCluster/useClusterSetting.ts | 20 + streampark-flink/pom.xml | 1 + .../streampark-flink-client-api/pom.xml | 2 +- .../flink/client/bean/SubmitRequest.scala | 2 +- .../flink/client/impl/RemoteClient.scala | 2 +- .../flink/client/impl/YarnSessionClient.scala | 6 +- .../flink/client/trait/FlinkClientTrait.scala | 16 +- .../flink/client/trait/YarnClientTrait.scala | 20 +- .../streampark-flink-connector-base/pom.xml | 2 +- streampark-flink/streampark-flink-core/pom.xml | 2 +- .../streampark-flink-kubernetes-v2/pom.xml | 67 + .../streampark-flink-kubernetes-core/pom.xml | 133 + .../flink/kubernetes/v2/FlinkK8sConfig.scala | 86 + .../kubernetes/v2/FlinkMemorySizeParser.scala | 58 + .../flink/kubernetes/v2/FlinkRestRequest.scala | 226 + .../streampark/flink/kubernetes/v2/K8sTools.scala | 152 + .../kubernetes/v2/fs/EmbeddedFileServer.scala | 47 + .../flink/kubernetes/v2/fs/FileMirror.scala | 70 + .../kubernetes/v2/fs/FileServerPeerAddress.scala | 111 + .../flink/kubernetes/v2/fs/package.scala} | 17 +- .../kubernetes/v2/model/ClusterMetrics.scala} | 29 +- .../flink/kubernetes/v2/model/FlinkCRStatus.scala | 146 + .../kubernetes/v2/model/FlinkDeploymentDef.scala | 221 + .../kubernetes/v2/model/FlinkSessionJobDef.scala | 62 + .../flink/kubernetes/v2/model/JobDef.scala | 132 + .../kubernetes/v2/model/JobSavepointDef.scala} | 28 +- .../kubernetes/v2/model/JobSavepointStatus.scala | 43 + .../flink/kubernetes/v2/model/JobSnapshot.scala | 84 + .../flink/kubernetes/v2/model/JobState.scala | 55 + .../flink/kubernetes/v2/model/JobStatus.scala | 81 + .../kubernetes/v2/model/RestSvcEndpoint.scala | 51 + .../flink/kubernetes/v2/model/TrackKey.scala | 96 + .../kubernetes/v2/observer/DeployCRObserver.scala | 81 + .../kubernetes/v2/observer/FlinkK8sObserver.scala | 283 + .../v2/observer/RawClusterObserver.scala | 142 + .../v2/observer/RestSvcEndpointObserver.scala | 85 + .../v2/observer/SessionJobCRObserver.scala | 73 + .../flink/kubernetes/v2/observer/package.scala | 57 + .../flink/kubernetes/v2/operator/CROperator.scala | 252 + .../kubernetes/v2/operator/FlinkK8sOperator.scala | 210 + .../flink/kubernetes/v2/operator/OprError.scala} | 20 +- .../flink/kubernetes/v2/operator/package.scala} | 19 +- .../streampark/flink/kubernetes/v2/package.scala} | 28 +- .../kubernetes/v2/FlinkMemorySizeParserSpec.scala | 72 + .../v2/example/UsingEmbeddedFileServer.scala | 68 + .../kubernetes/v2/example/UsingObserver.scala | 92 + .../kubernetes/v2/example/UsingOperator.scala | 242 + .../flink/kubernetes/v2/example/package.scala | 48 + .../streampark-flink-kubernetes-crd}/pom.xml | 64 +- .../crd/flinkdeployments.flink.apache.org-v1.yml | 9441 ++++++++++++++++++++ .../crd/flinksessionjobs.flink.apache.org-v1.yml | 205 + .../streampark-flink-kubernetes/pom.xml | 3 +- .../flink/kubernetes/enums/FlinkJobState.scala | 1 + .../flink/kubernetes/model/ClusterKey.scala | 3 +- .../flink/kubernetes/model/FlinkMetricCV.scala | 1 + .../flink/kubernetes/model/TrackId.scala | 3 +- .../watcher/FlinkCheckpointWatcher.scala | 3 +- .../kubernetes/watcher/FlinkJobStatusWatcher.scala | 3 +- .../kubernetes/watcher/FlinkMetricsWatcher.scala | 3 +- streampark-flink/streampark-flink-packer/pom.xml | 2 +- streampark-flink/streampark-flink-proxy/pom.xml | 1 - .../streampark-flink-shims-base/pom.xml | 1 - .../streampark/flink/core/SqlCommandParser.scala | 7 +- .../flink/core/test/FlinkSqlExecuteFunSuite.scala | 4 +- streampark-flink/streampark-flink-udf/pom.xml | 2 +- .../org/apache/streampark/spark/core/Spark.scala | 2 +- 153 files changed, 14913 insertions(+), 368 deletions(-) diff --cc streampark-common/pom.xml index cf3415335,64694d942..32babf65c --- a/streampark-common/pom.xml +++ b/streampark-common/pom.xml @@@ -128,6 -127,33 +128,34 @@@ <artifactId>streampark-shaded-jackson</artifactId> <version>${streampark.shaded.version}</version> </dependency> + ++ + <!-- ZIO --> + <dependency> + <groupId>dev.zio</groupId> + <artifactId>zio-logging_${scala.binary.version}</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>dev.zio</groupId> + <artifactId>zio-streams_${scala.binary.version}</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>dev.zio</groupId> + <artifactId>zio-concurrent_${scala.binary.version}</artifactId> + <optional>true</optional> + </dependency> + + <!-- pprint --> + <dependency> + <groupId>com.lihaoyi</groupId> + <artifactId>pprint_${scala.binary.version}</artifactId> + <optional>true</optional> + </dependency> + </dependencies> <build> diff --cc streampark-console/streampark-console-service/pom.xml index b3f9bb908,f88f57aa3..4202d7c96 --- a/streampark-console/streampark-console-service/pom.xml +++ b/streampark-console/streampark-console-service/pom.xml @@@ -452,12 -436,21 +437,27 @@@ <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>flink-table-common</artifactId> + <version>${flink.version}</version> + </dependency> + + <dependency> + <groupId>dev.zio</groupId> + <artifactId>zio-logging_${scala.binary.version}</artifactId> + </dependency> - ++ + <dependency> + <groupId>dev.zio</groupId> + <artifactId>zio-streams_${scala.binary.version}</artifactId> + </dependency> + + <dependency> + <groupId>dev.zio</groupId> + <artifactId>zio-concurrent_${scala.binary.version}</artifactId> + </dependency> + </dependencies> <build>
