[flink] branch master updated: [FLINK-22064][sql-client] Don't submit STATEMENT SET when no INSERT is added in the sql client

[jark]

This is an automated email from the ASF dual-hosted git repository.

jark pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/master by this push:
     new 1591484  [FLINK-22064][sql-client] Don't submit STATEMENT SET when no 
INSERT is added in the sql client
1591484 is described below

commit 15914848373c8579bb9bf881d873e6a6edd809c7
Author: jinfeng <jinfeng1...@gmail.com>
AuthorDate: Wed Mar 31 22:50:43 2021 +0800

    [FLINK-22064][sql-client] Don't submit STATEMENT SET when no INSERT is 
added in the sql client
    
    This closes #15458
---
 .../main/java/org/apache/flink/table/client/cli/CliClient.java    | 6 +++++-
 .../main/java/org/apache/flink/table/client/cli/CliStrings.java   | 3 +++
 .../flink-sql-client/src/test/resources/sql/statement_set.q       | 8 ++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git 
a/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliClient.java
 
b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliClient.java
index d1d2ed6..a738c97 100644
--- 
a/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliClient.java
+++ 
b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliClient.java
@@ -544,7 +544,11 @@ public class CliClient implements AutoCloseable {
     private void callEndStatementSet() {
         if (isStatementSetMode) {
             isStatementSetMode = false;
-            callInserts(statementSetOperations);
+            if (!statementSetOperations.isEmpty()) {
+                callInserts(statementSetOperations);
+            } else {
+                printInfo(CliStrings.MESSAGE_NO_STATEMENT_IN_STATEMENT_SET);
+            }
             statementSetOperations = null;
         } else {
             throw new 
SqlExecutionException(MESSAGE_STATEMENT_SET_END_CALL_ERROR);
diff --git 
a/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliStrings.java
 
b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliStrings.java
index 02b2a4a..6ade6c9 100644
--- 
a/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliStrings.java
+++ 
b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliStrings.java
@@ -212,6 +212,9 @@ public final class CliStrings {
 
     public static final String MESSAGE_BEGIN_STATEMENT_SET = "Begin a 
statement set.";
 
+    public static final String MESSAGE_NO_STATEMENT_IN_STATEMENT_SET =
+            "No statement in the statement set, skip submit.";
+
     public static final String MESSAGE_ADD_STATEMENT_TO_STATEMENT_SET =
             "Add SQL update statement to the statement set.";
 
diff --git 
a/flink-table/flink-sql-client/src/test/resources/sql/statement_set.q 
b/flink-table/flink-sql-client/src/test/resources/sql/statement_set.q
index 41e2c17..60fd6e7 100644
--- a/flink-table/flink-sql-client/src/test/resources/sql/statement_set.q
+++ b/flink-table/flink-sql-client/src/test/resources/sql/statement_set.q
@@ -157,3 +157,11 @@ SELECT * FROM BatchTable;
 +-------------+----------------------+
 Received a total of 7 rows
 !ok
+
+BEGIN STATEMENT SET;
+[INFO] Begin a statement set.
+!info
+
+END;
+[INFO] No statement in the statement set, skip submit.
+!info