[branch-2.0] Picks "[Fix](schema change) Fix can't do reorder column …

…schema change for MOW table and duplicate key table apache#37067" (apache#37515) ## Proposed changes picks apache#37067
mongo360 · Jul 26, 2024 · 36c7fa2 · 36c7fa2
1 parent b1968d6
commit 36c7fa2
Show file tree

Hide file tree

Showing 8 changed files with 157 additions and 441 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java b/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java
@@ -541,7 +541,7 @@ private boolean processModifyColumn(ModifyColumnClause alterClause, OlapTable ol
             }
             if (!modColumn.isKey()) {
                 if (olapTable.getEnableUniqueKeyMergeOnWrite()) {
-                    modColumn.setAggregationType(AggregateType.NONE, false);
+                    modColumn.setAggregationType(AggregateType.NONE, true);
                 } else {
                     modColumn.setAggregationType(AggregateType.REPLACE, true);
                 }
@@ -928,7 +928,7 @@ private boolean addColumnInternal(OlapTable olapTable, Column newColumn, ColumnP
             }
             if (!newColumn.isKey()) {
                 if (olapTable.getEnableUniqueKeyMergeOnWrite()) {
-                    newColumn.setAggregationType(AggregateType.NONE, false);
+                    newColumn.setAggregationType(AggregateType.NONE, true);
                 } else {
                     newColumn.setAggregationType(AggregateType.REPLACE, true);
                 }

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateTableStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateTableStmt.java
@@ -574,7 +574,8 @@ public void analyze(Analyzer analyzer) throws UserException, AnalysisException {
 
         for (ColumnDef columnDef : columnDefs) {
             Column col = columnDef.toColumn();
-            if (keysDesc != null && keysDesc.getKeysType() == KeysType.UNIQUE_KEYS) {
+            if (keysDesc != null && (keysDesc.getKeysType() == KeysType.UNIQUE_KEYS
+                    || keysDesc.getKeysType() == KeysType.DUP_KEYS)) {
                 if (!col.isKey()) {
                     col.setAggregationTypeImplicit(true);
                 }

diff --git a/regression-test/data/schema_change/test_schema_change_datev2_with_delete.out b/regression-test/data/schema_change/test_schema_change_datev2_with_delete.out
diff --git a/regression-test/data/schema_change_p0/datev2/test_dup_keys_schema_change_datev2.out b/regression-test/data/schema_change_p0/datev2/test_dup_keys_schema_change_datev2.out
diff --git a/regression-test/data/schema_change_p0/test_modify_reorder_column.out b/regression-test/data/schema_change_p0/test_modify_reorder_column.out
@@ -0,0 +1,22 @@
+-- This file is automatically generated. You should know what you did if you want to edit this
+-- !dup --
+1	{"f1": "A", "f2": "B", "f3": 10, "f4": 3.14}	{"f1": "C", "f2": "D", "f3": 20, "f4": 8.343}	10
+
+-- !dup --
+1	{"f1": "A", "f2": "B", "f3": 10, "f4": 3.14}	10	{"f1": "C", "f2": "D", "f3": 20, "f4": 8.343}
+2	{"f1": "E", "f2": "F", "f3": 30, "f4": 484.3234}	20	\N
+
+-- !mor --
+1	{"f1": "A", "f2": "B", "f3": 10, "f4": 3.14}	{"f1": "C", "f2": "D", "f3": 20, "f4": 8.343}	10
+
+-- !mor --
+1	{"f1": "A", "f2": "B", "f3": 10, "f4": 3.14}	10	{"f1": "C", "f2": "D", "f3": 20, "f4": 8.343}
+2	{"f1": "E", "f2": "F", "f3": 30, "f4": 484.3234}	20	\N
+
+-- !mow --
+1	{"f1": "A", "f2": "B", "f3": 10, "f4": 3.14}	{"f1": "C", "f2": "D", "f3": 20, "f4": 8.343}	10
+
+-- !mow --
+1	{"f1": "A", "f2": "B", "f3": 10, "f4": 3.14}	10	{"f1": "C", "f2": "D", "f3": 20, "f4": 8.343}
+2	{"f1": "E", "f2": "F", "f3": 30, "f4": 484.3234}	20	\N
+
diff --git a/regression-test/suites/schema_change/test_schema_change_datev2_with_delete.groovy b/regression-test/suites/schema_change/test_schema_change_datev2_with_delete.groovy