(doris) 32/37: [fix](insert into) 'output_tuple_slot_num should be equal to output_expr_num' when insert into unique table with sequence column map (#30635)

[yiguolei]

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

yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git

commit eb2aafcd4949475cb2116feb3db493213ff250a1
Author: meiyi <myime...@gmail.com>
AuthorDate: Wed Jan 31 20:18:42 2024 +0800

    [fix](insert into) 'output_tuple_slot_num should be equal to 
output_expr_num' when insert into unique table with sequence column map (#30635)
---
 .../src/main/java/org/apache/doris/analysis/NativeInsertStmt.java    | 5 +++--
 .../src/main/java/org/apache/doris/datasource/InternalCatalog.java   | 2 +-
 .../suites/correctness_p0/test_sequence_col_default_value.groovy     | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/analysis/NativeInsertStmt.java 
b/fe/fe-core/src/main/java/org/apache/doris/analysis/NativeInsertStmt.java
index 96dbb2e0edf..f2a6ee607c0 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/NativeInsertStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/NativeInsertStmt.java
@@ -929,10 +929,11 @@ public class NativeInsertStmt extends InsertStmt {
                         && col.getName().equals(Column.SEQUENCE_COL)
                         && ((OlapTable) targetTable).getSequenceMapCol() != 
null) {
                     if (resultExprByName.stream().map(Pair::key)
-                            .anyMatch(key -> key.equals(((OlapTable) 
targetTable).getSequenceMapCol()))) {
+                            .anyMatch(key -> key.equalsIgnoreCase(((OlapTable) 
targetTable).getSequenceMapCol()))) {
                         resultExprByName.add(Pair.of(Column.SEQUENCE_COL,
                                 resultExprByName.stream()
-                                        .filter(p -> 
p.key().equals(((OlapTable) targetTable).getSequenceMapCol()))
+                                        .filter(p -> p.key()
+                                                .equalsIgnoreCase(((OlapTable) 
targetTable).getSequenceMapCol()))
                                         
.map(Pair::value).findFirst().orElse(null)));
                     }
                     continue;
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
index e0a10d4349e..485b5cdad7b 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java
@@ -2434,7 +2434,7 @@ public class InternalCatalog implements 
CatalogIf<Database> {
                 if (!col.getType().isFixedPointType() && 
!col.getType().isDateType()) {
                     throw new DdlException("Sequence type only support integer 
types and date types");
                 }
-                olapTable.setSequenceMapCol(sequenceMapCol);
+                olapTable.setSequenceMapCol(col.getName());
                 olapTable.setSequenceInfo(col.getType());
             }
         } catch (Exception e) {
diff --git 
a/regression-test/suites/correctness_p0/test_sequence_col_default_value.groovy 
b/regression-test/suites/correctness_p0/test_sequence_col_default_value.groovy
index eb30f3d8f6a..9c3f9828e2d 100644
--- 
a/regression-test/suites/correctness_p0/test_sequence_col_default_value.groovy
+++ 
b/regression-test/suites/correctness_p0/test_sequence_col_default_value.groovy
@@ -36,7 +36,7 @@ suite("test_sequence_col_default_value") {
         PROPERTIES (
             "replication_allocation" = "tag.location.default: 1",
             "enable_unique_key_merge_on_write" = "true",
-            "function_column.sequence_col" = 'write_time'
+            "function_column.sequence_col" = 'WRITE_TIME'
         );
     """
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org