Skip to content

[feat-#1498][main] support run sql job with batch mode #1504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FlechazoW merged 1 commit into from
Feb 16, 2023
Merged

[feat-#1498][main] support run sql job with batch mode #1504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions ...nplum/src/main/java/com/dtstack/chunjun/connector/greenplum/dialect/GreenplumDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@

import java.util.Optional;

/**
* company www.dtstack.com
*
* @author jier
*/
public class GreenplumDialect extends PostgresqlDialect {

private static final String DIALECT_NAME = "Greenplum";
Expand Down
4 changes: 0 additions & 4 deletions ...lum/src/main/java/com/dtstack/chunjun/connector/greenplum/sink/GreenplumOutputFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@
import java.sql.Connection;
import java.sql.SQLException;

/**
* @program: flinkx
* @author: jier
*/
public class GreenplumOutputFormat extends JdbcOutputFormat {

// pg 字符串里含有\u0000 会报错 ERROR: invalid byte sequence for encoding "UTF8": 0x00
Expand Down
5 changes: 0 additions & 5 deletions ...plum/src/main/java/com/dtstack/chunjun/connector/greenplum/sink/GreenplumSinkFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@

import static com.dtstack.chunjun.connector.greenplum.sink.GreenplumOutputFormat.INSERT_SQL_MODE_TYPE;

/**
* company www.dtstack.com
*
* @author jier
*/
public class GreenplumSinkFactory extends JdbcSinkFactory {

public GreenplumSinkFactory(SyncConf syncConf) {
Expand Down
3 changes: 3 additions & 0 deletions chunjun-core/src/main/java/com/dtstack/chunjun/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import com.dtstack.chunjun.util.TableUtil;

import org.apache.flink.api.common.JobExecutionResult;
import org.apache.flink.api.common.RuntimeExecutionMode;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.core.execution.JobClient;
import org.apache.flink.runtime.jobgraph.SavepointConfigOptions;
Expand Down Expand Up @@ -143,6 +144,8 @@ private static void exeSqlJob(
try {
configStreamExecutionEnvironment(env, options, null);
List<URL> jarUrlList = ExecuteProcessHelper.getExternalJarUrls(options.getAddjar());
String runMode = options.getRunMode();
if ("batch".equalsIgnoreCase(runMode)) env.setRuntimeMode(RuntimeExecutionMode.BATCH);
StatementSet statementSet = SqlParser.parseSql(job, jarUrlList, tableEnv);
TableResult execute = statementSet.execute();
if (env instanceof MyLocalStreamEnvironment) {
Expand Down
13 changes: 13 additions & 0 deletions chunjun-core/src/main/java/com/dtstack/chunjun/options/Options.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ public class Options {
@OptionRequired(description = "file add to ship file")
private String addShipfile;

@OptionRequired(description = "flink run mode")
private String runMode;

private Configuration flinkConfiguration = null;

public Configuration loadFlinkConfiguration() {
Expand Down Expand Up @@ -235,6 +238,14 @@ public void setJobType(String jobType) {
this.jobType = jobType;
}

public String getRunMode() {
return runMode;
}

public void setRunMode(String runMode) {
this.runMode = runMode;
}

@Override
public String toString() {
return new StringJoiner(", ", Options.class.getSimpleName() + "[", "]")
Expand All @@ -248,10 +259,12 @@ public String toString() {
.add("flinkLibDir='" + flinkLibDir + "'")
.add("confProp='" + confProp + "'")
.add("p='" + p + "'")
.add("pj='" + pj + "'")
.add("pluginLoadMode='" + pluginLoadMode + "'")
.add("remoteChunJunDistDir='" + remoteChunJunDistDir + "'")
.add("addjar='" + addjar + "'")
.add("addShipfile='" + addShipfile + "'")
.add("runMode='" + runMode + "'")
.add("flinkConfiguration=" + flinkConfiguration)
.toString();
}
Expand Down