Skip to content

[branch-2.0] Picks "[Fix](schema change) Fix can't do reorder column schema change for MOW table and duplicate key table #37067" #37515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dataroaring merged 2 commits into from
Jul 13, 2024
Merged

[branch-2.0] Picks "[Fix](schema change) Fix can't do reorder column schema change for MOW table and duplicate key table #37067" #37515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
910d4b4
fix
bobhan1 Jul 1, 2024
5b6b31e
fix
bobhan1 Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand Down
3 changes: 2 additions & 1 deletion fe/fe-core/src/main/java/org/apache/doris/analysis/CreateTableStmt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
81 changes: 0 additions & 81 deletions regression-test/data/schema_change/test_schema_change_datev2_with_delete.out
View file
Open in desktop

This file was deleted.

70 changes: 0 additions & 70 deletions regression-test/data/schema_change_p0/datev2/test_dup_keys_schema_change_datev2.out
View file
Open in desktop

This file was deleted.

22 changes: 22 additions & 0 deletions regression-test/data/schema_change_p0/test_modify_reorder_column.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

120 changes: 0 additions & 120 deletions regression-test/suites/schema_change/test_schema_change_datev2_with_delete.groovy
View file
Open in desktop

This file was deleted.

Loading