flink sql client support dynamic params

Author: zhangbin

flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/SqlClient.java

@@ -19,6 +19,7 @@
 package org.apache.flink.table.client;
 
 import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.configuration.Configuration;
 import org.apache.flink.table.client.cli.CliClient;
 import org.apache.flink.table.client.cli.CliOptions;
 import org.apache.flink.table.client.cli.CliOptionsParser;
@@ -82,6 +83,8 @@ private void start() {
 
             DefaultContext defaultContext = LocalContextUtils.buildDefaultContext(options);
             final Executor executor = new LocalExecutor(defaultContext);
+            Configuration flinkConfig = defaultContext.getFlinkConfig();
+            options.getDynamicConfMap().forEach(flinkConfig::setString);
             executor.start();
 
             // Open an new session

flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliOptions.java

@@ -24,6 +24,7 @@
 
 import java.net.URL;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Command line options to configure the SQL client. Arguments that have not been specified by the
@@ -40,6 +41,7 @@ public class CliOptions {
     private final String updateStatement;
     private final String historyFilePath;
     private final Configuration pythonConfiguration;
+    private final Map<String, String> dynamicConfMap;
 
     public CliOptions(
             boolean isPrintHelp,
@@ -50,7 +52,8 @@ public CliOptions(
             List<URL> libraryDirs,
             String updateStatement,
             String historyFilePath,
-            Configuration pythonConfiguration) {
+            Configuration pythonConfiguration,
+            Map<String, String> dynamicConfMap) {
         this.isPrintHelp = isPrintHelp;
         this.sessionId = sessionId;
         this.initFile = initFile;
@@ -60,6 +63,7 @@ public CliOptions(
         this.updateStatement = updateStatement;
         this.historyFilePath = historyFilePath;
         this.pythonConfiguration = pythonConfiguration;
+        this.dynamicConfMap = dynamicConfMap;
     }
 
     public boolean isPrintHelp() {
@@ -97,4 +101,8 @@ public String getHistoryFilePath() {
     public Configuration getPythonConfiguration() {
         return pythonConfiguration;
     }
+
+    public Map<String, String> getDynamicConfMap() {
+        return dynamicConfMap;
+    }
 }

flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliOptionsParser.java

@@ -34,7 +34,9 @@
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import static org.apache.flink.client.cli.CliFrontendParser.PYARCHIVE_OPTION;
@@ -137,6 +139,15 @@ public class CliOptionsParser {
                                     + "auto-generate one under your user's home directory.")
                     .build();
 
+    public static final Option OPTION_CONF = Option
+            .builder("c")
+            .required(false)
+            .longOpt("conf")
+            .numberOfArgs(1)
+            .argName("dynamic configuration")
+            .desc("The dynamic configuration that the specified key and value are separated by `=`.")
+            .build();
+
     private static final Options EMBEDDED_MODE_CLIENT_OPTIONS =
             getEmbeddedModeClientOptions(new Options());
     private static final Options GATEWAY_MODE_CLIENT_OPTIONS =
@@ -162,6 +173,7 @@ public static Options getEmbeddedModeClientOptions(Options options) {
         options.addOption(PYARCHIVE_OPTION);
         options.addOption(PYEXEC_OPTION);
         options.addOption(PYCLIENTEXEC_OPTION);
+        options.addOption(OPTION_CONF);
         return options;
     }
 
@@ -260,6 +272,30 @@ public static void printHelpGatewayModeGateway() {
     //  Line Parsing
     // --------------------------------------------------------------------------------------------
 
+    private static Map<String, String> getDynamicConfiguration(CommandLine line) {
+        String[] optionValues = line.getOptionValues(CliOptionsParser.OPTION_CONF.getOpt());
+        Map<String, String> dynamicConfMap = new HashMap<>();
+        if (optionValues != null && optionValues.length > 0) {
+            for (String conf:  optionValues) {
+                String[] kv = conf.split("=", 2);
+                if (kv.length == 1) {
+                    continue;
+                }
+
+                String key = kv[0].trim();
+                String value = kv[1].trim();
+
+                // sanity check
+                if (key.length() == 0 || value.length() == 0) {
+                    continue;
+                }
+
+                dynamicConfMap.put(key, value);
+            }
+        }
+        return dynamicConfMap;
+    }
+
     public static CliOptions parseEmbeddedModeClient(String[] args) {
         try {
             DefaultParser parser = new DefaultParser();
@@ -273,7 +309,8 @@ public static CliOptions parseEmbeddedModeClient(String[] args) {
                     checkUrls(line, CliOptionsParser.OPTION_LIBRARY),
                     line.getOptionValue(CliOptionsParser.OPTION_UPDATE.getOpt()),
                     line.getOptionValue(CliOptionsParser.OPTION_HISTORY.getOpt()),
-                    getPythonConfiguration(line));
+                    getPythonConfiguration(line),
+                    getDynamicConfiguration(line));
         } catch (ParseException e) {
             throw new SqlClientException(e.getMessage());
         }
@@ -292,7 +329,8 @@ public static CliOptions parseGatewayModeClient(String[] args) {
                     checkUrls(line, CliOptionsParser.OPTION_LIBRARY),
                     line.getOptionValue(CliOptionsParser.OPTION_UPDATE.getOpt()),
                     line.getOptionValue(CliOptionsParser.OPTION_HISTORY.getOpt()),
-                    getPythonConfiguration(line));
+                    getPythonConfiguration(line),
+                    getDynamicConfiguration(line));
         } catch (ParseException e) {
             throw new SqlClientException(e.getMessage());
         }
@@ -311,7 +349,8 @@ public static CliOptions parseGatewayModeGateway(String[] args) {
                     checkUrls(line, CliOptionsParser.OPTION_LIBRARY),
                     null,
                     null,
-                    getPythonConfiguration(line));
+                    getPythonConfiguration(line),
+                    getDynamicConfiguration(line));
         } catch (ParseException e) {
             throw new SqlClientException(e.getMessage());
         }