You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tw...@apache.org on 2024/04/30 08:51:44 UTC

(flink) branch master updated: [FLINK-34902][table] Fix IndexOutOfBoundsException for VALUES

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

twalthr 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 8a75f8f22b8 [FLINK-34902][table] Fix IndexOutOfBoundsException for VALUES
8a75f8f22b8 is described below

commit 8a75f8f22b8e08e45f1a6453b87718eab6db115a
Author: Jeyhun Karimov <je...@gmail.com>
AuthorDate: Tue Apr 30 10:51:37 2024 +0200

    [FLINK-34902][table] Fix IndexOutOfBoundsException for VALUES
    
    This closes #24724.
---
 .../planner/calcite/PreValidateReWriter.scala      |  8 ++-
 .../calcite/FlinkCalciteSqlValidatorTest.java      | 62 +++++++++++++++++++++-
 2 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/calcite/PreValidateReWriter.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/calcite/PreValidateReWriter.scala
index 985f252e406..5433733d140 100644
--- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/calcite/PreValidateReWriter.scala
+++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/calcite/PreValidateReWriter.scala
@@ -241,8 +241,12 @@ object PreValidateReWriter {
         }
         rewriteSelect(validator, sqlSelect, targetRowType, assignedFields, targetPosition)
       case SqlKind.VALUES =>
-        if (targetPosition.nonEmpty && call.operandCount() != targetPosition.size()) {
-          throw newValidationError(call, RESOURCE.columnCountMismatch())
+        call.getOperandList.toSeq.foreach {
+          case sqlCall: SqlCall => {
+            if (targetPosition.nonEmpty && sqlCall.getOperandList.size() != targetPosition.size()) {
+              throw newValidationError(call, RESOURCE.columnCountMismatch())
+            }
+          }
         }
         rewriteValues(call, targetRowType, assignedFields, targetPosition)
       case kind if SqlKind.SET_QUERY.contains(kind) =>
diff --git a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/calcite/FlinkCalciteSqlValidatorTest.java b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/calcite/FlinkCalciteSqlValidatorTest.java
index 6485217dc26..bca80828e5b 100644
--- a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/calcite/FlinkCalciteSqlValidatorTest.java
+++ b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/calcite/FlinkCalciteSqlValidatorTest.java
@@ -26,6 +26,7 @@ import org.apache.flink.table.planner.utils.PlannerMocks;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
 /** Test for {@link FlinkCalciteSqlValidator}. */
 class FlinkCalciteSqlValidatorTest {
@@ -50,19 +51,76 @@ class FlinkCalciteSqlValidatorTest {
     }
 
     @Test
-    void testInsertInto1() {
+    void testInsertIntoShouldColumnMismatchWithValues() {
         assertThatThrownBy(() -> plannerMocks.getParser().parse("INSERT INTO t2 (a,b) VALUES(1)"))
                 .isInstanceOf(ValidationException.class)
                 .hasMessageContaining(" Number of columns must match number of query columns");
     }
 
     @Test
-    void testInsertInto2() {
+    void testInsertIntoShouldColumnMismatchWithSelect() {
         assertThatThrownBy(() -> plannerMocks.getParser().parse("INSERT INTO t2 (a,b) SELECT 1"))
                 .isInstanceOf(ValidationException.class)
                 .hasMessageContaining(" Number of columns must match number of query columns");
     }
 
+    @Test
+    void testInsertIntoShouldColumnMismatchWithLastValue() {
+        assertThatThrownBy(
+                        () ->
+                                plannerMocks
+                                        .getParser()
+                                        .parse("INSERT INTO t2 (a,b) VALUES (1,2), (3)"))
+                .isInstanceOf(ValidationException.class)
+                .hasMessageContaining(" Number of columns must match number of query columns");
+    }
+
+    @Test
+    void testInsertIntoShouldColumnMismatchWithFirstValue() {
+        assertThatThrownBy(
+                        () ->
+                                plannerMocks
+                                        .getParser()
+                                        .parse("INSERT INTO t2 (a,b) VALUES (1), (2,3)"))
+                .isInstanceOf(ValidationException.class)
+                .hasMessageContaining(" Number of columns must match number of query columns");
+    }
+
+    @Test
+    void testInsertIntoShouldColumnMismatchWithMultiFieldValues() {
+        assertThatThrownBy(
+                        () ->
+                                plannerMocks
+                                        .getParser()
+                                        .parse("INSERT INTO t2 (a,b) VALUES (1,2), (3,4,5)"))
+                .isInstanceOf(ValidationException.class)
+                .hasMessageContaining(" Number of columns must match number of query columns");
+    }
+
+    @Test
+    void testInsertIntoShouldNotColumnMismatchWithValues() {
+        assertDoesNotThrow(
+                () -> {
+                    plannerMocks.getParser().parse("INSERT INTO t2 (a,b) VALUES (1,2), (3,4)");
+                });
+    }
+
+    @Test
+    void testInsertIntoShouldNotColumnMismatchWithSelect() {
+        assertDoesNotThrow(
+                () -> {
+                    plannerMocks.getParser().parse("INSERT INTO t2 (a,b) Select 1, 2");
+                });
+    }
+
+    @Test
+    void testInsertIntoShouldNotColumnMismatchWithSingleColValues() {
+        assertDoesNotThrow(
+                () -> {
+                    plannerMocks.getParser().parse("INSERT INTO t2 (a) VALUES (1), (3)");
+                });
+    }
+
     @Test
     void testExplainUpsertInto() {
         assertThatThrownBy(() -> plannerMocks.getParser().parse("EXPLAIN UPSERT INTO t1 VALUES(1)"))