This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 275849daded [fix](insert into) 'output_tuple_slot_num should be equal
to output_expr_num' when insert into unique table with sequence column map
(#30635) (#30739)
275849daded is described below
commit 275849daded73464b9df7c19f83fbf1ed7ac7283
Author: meiyi <[email protected]>
AuthorDate: Sat Feb 3 20:17:48 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) (#30739)
---
.../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 3eca1b7449e..c016d7bd213 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
@@ -850,10 +850,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 618b96f4aee..b366f5857df 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
@@ -2391,7 +2391,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: [email protected]
For additional commands, e-mail: [email protected]
