[FLINK-20320][sql-client] Support init sql file in sql client

This closes apache#15437
alec-brooks · Apr 1, 2021 · c36bce8 · c36bce8
1 parent 39354f3
commit c36bce8
Show file tree

Hide file tree

Showing 13 changed files with 345 additions and 183 deletions.
diff --git a/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/SqlClient.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/SqlClient.java
@@ -123,13 +123,27 @@ private void openCli(String sessionId, Executor executor) {
                             CliOptionsParser.OPTION_FILE.getOpt()));
         }
 
-        boolean isInteractiveMode = !hasSqlFile && !hasUpdateStatement;
-
         try (CliClient cli = new CliClient(sessionId, executor, historyFilePath)) {
-            if (isInteractiveMode) {
-                cli.open();
+            if (options.getInitFile() != null) {
+                boolean success = cli.executeInitialization(readFromURL(options.getInitFile()));
+                if (!success) {
+                    System.out.println(
+                            String.format(
+                                    "Failed to initialize from sql script: %s. Please refer to the LOG for detailed error messages.",
+                                    options.getInitFile()));
+                    return;
+                } else {
+                    System.out.println(
+                            String.format(
+                                    "Successfully initialized from sql script: %s",
+                                    options.getInitFile()));
+                }
+            }
+
+            if (!hasSqlFile && !hasUpdateStatement) {
+                cli.executeInInteractiveMode();
             } else {
-                cli.executeSqlFile(readExecutionContent());
+                cli.executeInNonInteractiveMode(readExecutionContent());
             }
         }
     }