Skip to content

D
dlink
Unverified Commit a70e0209 authored by aiwenmo's avatar aiwenmo Committed by GitHub
Browse files
Options

[Feature-996][*] Release v0.6.7 (#997) 

Co-authored-by: 's avatarwenmo <32723967+wenmo@users.noreply.github.com>
parent 3f2d8cd7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1943 additions and 197 deletions
dlink-admin/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-admin/src/main/resources/banner.txt
View file @ a70e0209
......@@ -9,6 +9,6 @@
\__.'
Version: 0.6.7-SNAPSHOT
Version: 0.6.7
Github: https://github.com/DataLinkDC/dlink
公众号: DataLink数据中台
公众号: Dinky 开源
dlink-alert/dlink-alert-base/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-alert</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-alert/dlink-alert-dingtalk/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-alert</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-alert/dlink-alert-email/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-alert</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>dlink-alert-email</artifactId>
......
dlink-alert/dlink-alert-feishu/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-alert</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>dlink-alert-feishu</artifactId>
......
dlink-alert/dlink-alert-wechat/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-alert</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-alert/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-app/dlink-app-1.11/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-app</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-app/dlink-app-1.12/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-app</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-app/dlink-app-1.13/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-app</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-app/dlink-app-1.14/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-app</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-app/dlink-app-1.15/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-app</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-app/dlink-app-base/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-app</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-app/pom.xml
View file @ a70e0209
......@@ -5,7 +5,7 @@
<parent>
<artifactId>dlink</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-assembly/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.13/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-catalog-mysql</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.14/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-catalog-mysql</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.15/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-catalog-mysql</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-catalog/dlink-catalog-mysql/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-catalog</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-catalog/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-client/dlink-client-1.11/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-client</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-client/dlink-client-1.12/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-client</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-client/dlink-client-1.13/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-client</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-client/dlink-client-1.14/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-client</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-client/dlink-client-1.15/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-client</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-client/dlink-client-base/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-client</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-client/dlink-client-base/src/main/java/com/dlink/model/FlinkCDCConfig.java
View file @ a70e0209
......@@ -180,6 +180,7 @@ public class FlinkCDCConfig {
case "table.upper":
case "table.lower":
case "column.replace.line-break":
case "timezone":
return true;
default:
return false;
......
dlink-client/dlink-client-hadoop/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-client</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-client/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-common/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-connectors/dlink-connector-doris-1.13/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-connectors</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-connectors/dlink-connector-jdbc-1.11/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-connectors</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-connectors/dlink-connector-jdbc-1.12/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-connectors</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-connectors/dlink-connector-jdbc-1.13/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-connectors</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-connectors/dlink-connector-jdbc-1.14/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-connectors</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-connectors/dlink-connector-phoenix-1.13/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-connectors</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-connectors/dlink-connector-phoenix-1.14/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-connectors</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-connectors/dlink-connector-pulsar-1.14/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-connectors</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......@@ -44,7 +44,7 @@
<dependency>
<groupId>com.dlink</groupId>
<artifactId>dlink-common</artifactId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
<scope>compile</scope>
</dependency>
......
dlink-connectors/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
......
dlink-core/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
......
dlink-daemon/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-doc/sql/dlink_history.sql
View file @ a70e0209
......@@ -692,7 +692,7 @@ CREATE TABLE `dlink_task_version` (
-- 0.7-SNAPSHOT 2022-08-02
-- 0.6.7-SNAPSHOT 2022-08-02
-- -----------------------
-- DROP TABLE IF EXISTS `dlink_fragment`;
CREATE TABLE `dlink_fragment` (
......
dlink-executor/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-extends/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-flink/dlink-flink-1.11/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-flink</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-flink/dlink-flink-1.12/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-flink</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-flink/dlink-flink-1.13/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-flink</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-flink/dlink-flink-1.14/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-flink</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-flink/dlink-flink-1.15/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-flink</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-flink/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-function/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-gateway/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-gateway/src/main/java/com/dlink/gateway/kubernetes/KubernetesApplicationGateway.java
View file @ a70e0209
......@@ -75,12 +75,21 @@ public class KubernetesApplicationGateway extends KubernetesGateway {
}
ApplicationConfiguration applicationConfiguration = new ApplicationConfiguration(userJarParas, appConfig.getUserJarMainAppClass());
KubernetesClusterDescriptor kubernetesClusterDescriptor = new KubernetesClusterDescriptor(configuration, client);
ClusterSpecification clusterSpecification = new ClusterSpecification.ClusterSpecificationBuilder()
.setMasterMemoryMB(configuration.get(JobManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes())
.setTaskManagerMemoryMB(configuration.get(TaskManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes())
.setSlotsPerTaskManager(configuration.get(TaskManagerOptions.NUM_TASK_SLOTS)).createClusterSpecification();
ClusterSpecification.ClusterSpecificationBuilder clusterSpecificationBuilder = new ClusterSpecification.ClusterSpecificationBuilder();
if (configuration.contains(JobManagerOptions.TOTAL_PROCESS_MEMORY)) {
clusterSpecificationBuilder.setMasterMemoryMB(configuration.get(JobManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes());
}
if (configuration.contains(TaskManagerOptions.TOTAL_PROCESS_MEMORY)) {
clusterSpecificationBuilder.setTaskManagerMemoryMB(configuration.get(TaskManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes());
}
if (configuration.contains(TaskManagerOptions.NUM_TASK_SLOTS)) {
clusterSpecificationBuilder.setSlotsPerTaskManager(configuration.get(TaskManagerOptions.NUM_TASK_SLOTS)).createClusterSpecification();
}
try {
ClusterClientProvider<String> clusterClientProvider = kubernetesClusterDescriptor.deployApplicationCluster(clusterSpecification, applicationConfiguration);
ClusterClientProvider<String> clusterClientProvider = kubernetesClusterDescriptor.deployApplicationCluster(
clusterSpecificationBuilder.createClusterSpecification(), applicationConfiguration);
ClusterClient<String> clusterClient = clusterClientProvider.getClusterClient();
Collection<JobStatusMessage> jobStatusMessages = clusterClient.listJobs().get();
int counts = SystemConfiguration.getInstances().getJobIdWait();
......
dlink-gateway/src/main/java/com/dlink/gateway/yarn/YarnApplicationGateway.java
View file @ a70e0209
......@@ -87,13 +87,21 @@ public class YarnApplicationGateway extends YarnGateway {
ApplicationConfiguration applicationConfiguration = new ApplicationConfiguration(userJarParas, appConfig.getUserJarMainAppClass());
YarnClusterDescriptor yarnClusterDescriptor = new YarnClusterDescriptor(
configuration, yarnConfiguration, yarnClient, YarnClientYarnClusterInformationRetriever.create(yarnClient), true);
ClusterSpecification clusterSpecification = new ClusterSpecification.ClusterSpecificationBuilder()
.setMasterMemoryMB(configuration.get(JobManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes())
.setTaskManagerMemoryMB(configuration.get(TaskManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes())
.setSlotsPerTaskManager(configuration.get(TaskManagerOptions.NUM_TASK_SLOTS)).createClusterSpecification();
ClusterSpecification.ClusterSpecificationBuilder clusterSpecificationBuilder = new ClusterSpecification.ClusterSpecificationBuilder();
if (configuration.contains(JobManagerOptions.TOTAL_PROCESS_MEMORY)) {
clusterSpecificationBuilder.setMasterMemoryMB(configuration.get(JobManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes());
}
if (configuration.contains(TaskManagerOptions.TOTAL_PROCESS_MEMORY)) {
clusterSpecificationBuilder.setTaskManagerMemoryMB(configuration.get(TaskManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes());
}
if (configuration.contains(TaskManagerOptions.NUM_TASK_SLOTS)) {
clusterSpecificationBuilder.setSlotsPerTaskManager(configuration.get(TaskManagerOptions.NUM_TASK_SLOTS)).createClusterSpecification();
}
try {
ClusterClientProvider<ApplicationId> clusterClientProvider = yarnClusterDescriptor.deployApplicationCluster(
clusterSpecification,
clusterSpecificationBuilder.createClusterSpecification(),
applicationConfiguration);
ClusterClient<ApplicationId> clusterClient = clusterClientProvider.getClusterClient();
Collection<JobStatusMessage> jobStatusMessages = clusterClient.listJobs().get();
......
dlink-gateway/src/main/java/com/dlink/gateway/yarn/YarnPerJobGateway.java
View file @ a70e0209
......@@ -70,13 +70,22 @@ public class YarnPerJobGateway extends YarnGateway {
}
YarnResult result = YarnResult.build(getType());
YarnClusterDescriptor yarnClusterDescriptor = new YarnClusterDescriptor(
configuration, yarnConfiguration, yarnClient, YarnClientYarnClusterInformationRetriever.create(yarnClient), true);
ClusterSpecification clusterSpecification = new ClusterSpecification.ClusterSpecificationBuilder()
.setMasterMemoryMB(configuration.get(JobManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes())
.setTaskManagerMemoryMB(configuration.get(TaskManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes())
.setSlotsPerTaskManager(configuration.get(TaskManagerOptions.NUM_TASK_SLOTS)).createClusterSpecification();
configuration, yarnConfiguration, yarnClient, YarnClientYarnClusterInformationRetriever.create(yarnClient), true);
ClusterSpecification.ClusterSpecificationBuilder clusterSpecificationBuilder = new ClusterSpecification.ClusterSpecificationBuilder();
if (configuration.contains(JobManagerOptions.TOTAL_PROCESS_MEMORY)) {
clusterSpecificationBuilder.setMasterMemoryMB(configuration.get(JobManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes());
}
if (configuration.contains(TaskManagerOptions.TOTAL_PROCESS_MEMORY)) {
clusterSpecificationBuilder.setTaskManagerMemoryMB(configuration.get(TaskManagerOptions.TOTAL_PROCESS_MEMORY).getMebiBytes());
}
if (configuration.contains(TaskManagerOptions.NUM_TASK_SLOTS)) {
clusterSpecificationBuilder.setSlotsPerTaskManager(configuration.get(TaskManagerOptions.NUM_TASK_SLOTS)).createClusterSpecification();
}
try {
ClusterClientProvider<ApplicationId> clusterClientProvider = yarnClusterDescriptor.deployJobCluster(clusterSpecification, jobGraph, true);
ClusterClientProvider<ApplicationId> clusterClientProvider = yarnClusterDescriptor.deployJobCluster(
clusterSpecificationBuilder.createClusterSpecification(), jobGraph, true);
ClusterClient<ApplicationId> clusterClient = clusterClientProvider.getClusterClient();
ApplicationId applicationId = clusterClient.getClusterId();
result.setAppId(applicationId.toString());
......
dlink-metadata/dlink-metadata-base/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-metadata</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-metadata/dlink-metadata-clickhouse/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-metadata</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-metadata/dlink-metadata-doris/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-metadata</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-metadata/dlink-metadata-hive/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-metadata</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-metadata/dlink-metadata-mysql/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-metadata</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-metadata/dlink-metadata-oracle/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-metadata</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-metadata/dlink-metadata-phoenix/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-metadata</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-metadata/dlink-metadata-postgresql/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-metadata</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-metadata/dlink-metadata-sqlserver/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-metadata</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-metadata/dlink-metadata-starrocks/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink-metadata</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-metadata/pom.xml
View file @ a70e0209
......@@ -22,7 +22,7 @@
<parent>
<artifactId>dlink</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
dlink-web/pom.xml
View file @ a70e0209
......@@ -5,7 +5,7 @@
<parent>
<artifactId>dlink</artifactId>
<groupId>com.dlink</groupId>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
......
dlink-web/public/dinky.svg
View file @ a70e0209
This source diff could not be displayed because it is too large. You can view the blob instead.
dlink-web/public/dinky2.svg 0 → 100644
View file @ a70e0209
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1641731904214" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10378" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M440.32 552.96c-30.72 0-51.2-20.48-76.8-30.72-76.8-40.96-143.36-92.16-204.8-153.6-20.48-25.6-46.08-46.08-61.44-76.8 20.48-10.24 46.08-5.12 66.56-10.24 5.12 0 10.24 5.12 10.24 5.12 81.92 102.4 174.08 184.32 266.24 266.24z" fill="#1296db" opacity=".29" p-id="10379"></path><path d="M936.96 353.28h-30.72c-40.96 0-81.92-5.12-117.76-35.84-40.96-35.84-92.16-25.6-128 5.12-15.36 15.36-30.72 30.72-40.96 46.08-10.24 5.12-15.36-10.24-20.48-15.36-30.72-35.84-66.56-76.8-102.4-112.64-40.96-35.84-92.16-66.56-143.36-81.92-51.2-10.24-102.4-25.6-148.48-40.96-5.12 0-10.24-5.12-20.48 0l30.72 76.8c0 5.12 0 10.24 5.12 10.24 5.12 25.6 15.36 46.08 25.6 66.56 10.24 25.6 25.6 56.32 40.96 81.92 40.96 71.68 92.16 138.24 148.48 199.68l5.12 5.12c15.36 5.12 10.24 15.36 0 25.6-71.68 102.4-133.12 209.92-184.32 332.8-15.36 25.6-25.6 56.32-35.84 87.04 10.24-10.24 15.36-20.48 20.48-30.72 71.68-117.76 143.36-235.52 271.36-296.96 35.84-15.36 66.56-30.72 102.4-51.2 30.72-15.36 61.44-35.84 81.92-61.44 25.6-20.48 35.84-51.2 46.08-81.92 10.24-35.84 30.72-66.56 61.44-87.04 51.2-25.6 107.52-25.6 163.84-30.72 10.24 0 25.6 5.12 35.84-5.12-25.6-5.12-46.08-5.12-66.56-5.12z" fill="#1296db" p-id="10380"></path><path d="M322.56 399.36c-25.6-40.96-51.2-87.04-76.8-128-5.12-20.48-15.36-40.96-25.6-66.56 0 0-5.12-5.12-5.12-10.24-25.6 0-51.2-5.12-76.8-5.12-5.12 0-10.24-5.12-15.36 0-5.12 5.12 0 10.24 0 15.36 15.36 25.6 30.72 51.2 40.96 76.8l10.24 10.24c51.2 66.56 112.64 122.88 174.08 184.32 30.72 25.6 61.44 56.32 92.16 76.8-40.96-51.2-81.92-97.28-117.76-153.6z" fill="#1296db" opacity=".54" p-id="10381"></path></svg>
\ No newline at end of file
dlink-web/src/components/Common/Version.ts 0 → 100644
View file @ a70e0209
/*
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
export const VERSION = '0.6.7';
dlink-web/src/components/Studio/StudioHome/index.tsx
View file @ a70e0209
......@@ -17,12 +17,12 @@
*
*/
import {Typography,Divider} from 'antd';
import React from 'react';
import {connect} from 'umi';
import {StateType} from '@/pages/DataStudio/model';
import {Scrollbars} from 'react-custom-scrollbars';
import {VERSION} from "@/components/Common/Version";
const {Title, Paragraph, Text} = Typography;
......@@ -32,7 +32,7 @@ const StudioHome = (props: any) => {
return (
<Scrollbars style={{height: toolHeight}}>
<Typography style={{padding:'15px'}}>
<Title level={4}>欢迎使用 Dinky v0.6.7-SNAPSHOT</Title>
<Title level={4}>欢迎使用 Dinky v{VERSION}</Title>
<Paragraph>
<blockquote>实时即未来，Dinky 为 Apache Flink 而生，让 Flink SQL 纵享丝滑，并致力于实时计算平台建设。</blockquote>
</Paragraph>
......@@ -81,8 +81,5 @@ const StudioHome = (props: any) => {
};
export default connect(({Studio}: { Studio: StateType }) => ({
current: Studio.current,
sql: Studio.sql,
tabs: Studio.tabs,
toolHeight: Studio.toolHeight,
}))(StudioHome);
dlink-web/src/locales/zh-CN/pages.ts
View file @ a70e0209
/*
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
export default {
'pages.layouts.userLayout.title': 'Dinky 一站式实时计算平台',
'pages.layouts.userLayout.title': 'Dinky 实时计算平台',
'pages.login.accountLogin.tab': '账户密码登录',
'pages.login.accountLogin.errorMessage': '错误的用户名和密码（admin/admin)',
'pages.login.failure': '登录失败，请重试！',
......@@ -29,7 +48,7 @@ export default {
'pages.welcome.link': '欢迎加入',
'pages.welcome.star': '欢迎 Star ',
'pages.welcome.advancedLayout': 'Github',
'pages.welcome.alertMessage': '实时计算平台 Dinky 即将发布，目前为体验版，版本号为 0.6.7-SNAPSHOT。',
'pages.welcome.alertMessage': '实时计算平台 Dinky 即将发布，目前为体验版，版本号为 ',
'pages.admin.subPage.title': ' 这个页面只有 admin 权限才能查看',
'pages.admin.subPage.alertMessage': 'umi ui 现已发布，欢迎使用 npm run ui 启动体验。',
'pages.searchTable.createForm.newRule': '新建规则',
......
dlink-web/src/pages/Welcome.tsx
View file @ a70e0209
This diff is collapsed.
dlink-web/src/pages/user/Login/index.less
View file @ a70e0209
......@@ -61,15 +61,15 @@
}
.header {
height: 44px;
line-height: 44px;
height: 144px;
line-height: 144px;
a {
text-decoration: none;
}
}
.logo {
height: 44px;
height: 144px;
margin-right: 16px;
vertical-align: top;
}
......@@ -79,7 +79,7 @@
top: 2px;
color: @heading-color;
font-weight: 600;
font-size: 33px;
font-size: 55px;
font-family: Avenir, 'Helvetica Neue', Arial, Helvetica, sans-serif;
}
......
pom.xml
View file @ a70e0209
......@@ -24,7 +24,7 @@
<groupId>com.dlink</groupId>
<artifactId>dlink</artifactId>
<packaging>pom</packaging>
<version>0.6.7-SNAPSHOT</version>
<version>0.6.7</version>
<modules>
<module>dlink-flink</module>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment