From 90360149547c2cc54eea4ad6d39e2b4e9ec3e4e2 Mon Sep 17 00:00:00 2001 From: kangkaisen Date: Fri, 20 Sep 2019 22:33:08 +0800 Subject: [PATCH] Add schema change check for DUPLICATE KEY table (#1844) --- .../doris/alter/SchemaChangeHandler.java | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/fe/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java b/fe/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java index 55d92c05cb..f48e3d244d 100644 --- a/fe/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java +++ b/fe/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java @@ -923,20 +923,17 @@ public class SchemaChangeHandler extends AlterHandler { throw new DdlException("No key column left. index[" + olapTable.getIndexNameById(alterIndexId) + "]"); } - if (KeysType.AGG_KEYS == olapTable.getKeysType() - || KeysType.UNIQUE_KEYS == olapTable.getKeysType()) { - // 2. check compatible - for (Column alterColumn : alterSchema) { - for (Column oriColumn : originSchema) { - if (alterColumn.nameEquals(oriColumn.getName(), true /* ignore prefix */)) { - if (!alterColumn.equals(oriColumn)) { - // 3.1 check type - oriColumn.checkSchemaChangeAllowed(alterColumn); - } + // 2. check compatible + for (Column alterColumn : alterSchema) { + for (Column oriColumn : originSchema) { + if (alterColumn.nameEquals(oriColumn.getName(), true /* ignore prefix */)) { + if (!alterColumn.equals(oriColumn)) { + // 3.1 check type + oriColumn.checkSchemaChangeAllowed(alterColumn); } - } // end for ori - } // end for alter - } + } + } // end for ori + } // end for alter // 3. check partition key PartitionInfo partitionInfo = olapTable.getPartitionInfo();