Skip to content

Commit c432ba0

Browse files
committed
revert pom
1 parent d7726d4 commit c432ba0

4 files changed

Lines changed: 36 additions & 30 deletions

File tree

launcher/src/main/java/com/dtstack/flink/sql/launcher/executor/StandaloneExecutor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ public void exec() throws Exception {
6868

6969

7070
JobExecutionResult jobExecutionResult = ClientUtils.submitJob(clusterClient, jobGraph);
71-
String jobID = jobExecutionResult.getJobID().toString();
72-
System.out.println("jobID:" + jobID);
71+
String jobId = jobExecutionResult.getJobID().toString();
72+
System.out.println("jobID:" + jobId);
7373

7474
}
7575

launcher/src/main/java/com/dtstack/flink/sql/launcher/executor/YarnSessionClusterExecutor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public void exec() throws Exception {
7575
}
7676

7777
JobExecutionResult jobExecutionResult = ClientUtils.submitJob(clusterClient, jobGraph);
78-
String jobID = jobExecutionResult.getJobID().toString();
79-
System.out.println("jobID:" + jobID);
78+
String jobId = jobExecutionResult.getJobID().toString();
79+
System.out.println("jobID:" + jobId);
8080

8181
}
8282

launcher/src/main/java/com/dtstack/flink/sql/launcher/factory/AbstractClusterClientFactory.java

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ public abstract class AbstractClusterClientFactory {
3838
public ClusterSpecification getClusterSpecification(Configuration configuration) {
3939
checkNotNull(configuration);
4040

41-
final int jobManagerMemoryMB = ConfigurationUtils
41+
final int jobManagerMemoryMb = ConfigurationUtils
4242
.getJobManagerHeapMemory(configuration)
4343
.getMebiBytes();
4444

45-
final int taskManagerMemoryMB = TaskExecutorProcessUtils
45+
final int taskManagerMemoryMb = TaskExecutorProcessUtils
4646
.processSpecFromConfig(TaskExecutorProcessUtils.getConfigurationMapLegacyTaskManagerHeapSizeToConfigOption(
4747
configuration, TaskManagerOptions.TOTAL_PROCESS_MEMORY))
4848
.getTotalProcessMemorySize()
@@ -51,12 +51,18 @@ public ClusterSpecification getClusterSpecification(Configuration configuration)
5151
int slotsPerTaskManager = configuration.getInteger(TaskManagerOptions.NUM_TASK_SLOTS);
5252

5353
return new ClusterSpecification.ClusterSpecificationBuilder()
54-
.setMasterMemoryMB(jobManagerMemoryMB)
55-
.setTaskManagerMemoryMB(taskManagerMemoryMB)
54+
.setMasterMemoryMB(jobManagerMemoryMb)
55+
.setTaskManagerMemoryMB(taskManagerMemoryMb)
5656
.setSlotsPerTaskManager(slotsPerTaskManager)
5757
.createClusterSpecification();
5858
}
5959

60-
abstract ClusterDescriptor createClusterDescriptor(String clusterConfPath,Configuration flinkConfig);
60+
/**
61+
* create ClusterDescriptor
62+
* @param clusterConfPath cluster configuration path , E.g. yarn conf dir
63+
* @param flinkConfig
64+
* @return
65+
*/
66+
abstract ClusterDescriptor createClusterDescriptor(String clusterConfPath, Configuration flinkConfig);
6167

6268
}

pom.xml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,28 @@
1010
<url>http://maven.apache.org</url>
1111
<modules>
1212
<module>core</module>
13-
<!--<module>kafka09</module>-->
14-
<!--<module>kafka10</module>-->
15-
<!--<module>kafka11</module>-->
16-
<!--<module>kafka</module>-->
17-
<!--<module>mysql</module>-->
18-
<!--<module>hbase</module>-->
19-
<!--<module>elasticsearch5</module>-->
20-
<!--<module>mongo</module>-->
21-
<!--<module>redis5</module>-->
13+
<module>kafka09</module>
14+
<module>kafka10</module>
15+
<module>kafka11</module>
16+
<module>kafka</module>
17+
<module>mysql</module>
18+
<module>hbase</module>
19+
<module>elasticsearch5</module>
20+
<module>mongo</module>
21+
<module>redis5</module>
2222
<module>launcher</module>
23-
<!--<module>rdb</module>-->
24-
<!--<module>sqlserver</module>-->
25-
<!--<module>oracle</module>-->
26-
<!--<module>cassandra</module>-->
27-
<!--<module>kudu</module>-->
28-
<!--<module>postgresql</module>-->
29-
<!--<module>serversocket</module>-->
30-
<!--<module>console</module>-->
31-
<!--<module>clickhouse</module>-->
32-
<!--<module>impala</module>-->
33-
<!--<module>db2</module>-->
34-
<!--<module>polardb</module>-->
23+
<module>rdb</module>
24+
<module>sqlserver</module>
25+
<module>oracle</module>
26+
<module>cassandra</module>
27+
<module>kudu</module>
28+
<module>postgresql</module>
29+
<module>serversocket</module>
30+
<module>console</module>
31+
<module>clickhouse</module>
32+
<module>impala</module>
33+
<module>db2</module>
34+
<module>polardb</module>
3535

3636
</modules>
3737

0 commit comments

Comments
 (0)