From 8a7462a429141b3bfdcc17f298104af44ca16b80 Mon Sep 17 00:00:00 2001 From: yangzhg Date: Wed, 28 Oct 2020 11:56:10 +0800 Subject: [PATCH 1/2] fix add hidden column twice --- .../doris/alter/MaterializedViewHandler.java | 2 ++ .../apache/doris/analysis/AlterTableStmt.java | 18 ------------------ 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/MaterializedViewHandler.java b/fe/fe-core/src/main/java/org/apache/doris/alter/MaterializedViewHandler.java index 7a537c10bcf681..1e0c14f99e4ee7 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/alter/MaterializedViewHandler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/alter/MaterializedViewHandler.java @@ -555,6 +555,8 @@ public List checkAndPrepareMaterializedView(AddRollupClause addRollupCla throw new DdlException("Rollup should contains all keys if there is a REPLACE value"); } } + // add hidden column to rollup table + if (KeysType.UNIQUE_KEYS == olapTable.getKeysType() && olapTable.hasDeleteSign()) { rollupSchema.add(new Column(olapTable.getDeleteSignColumn())); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableStmt.java index 0433d3c2000994..558fbcf9b7101f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableStmt.java @@ -143,24 +143,6 @@ public void rewriteAlterClause(OlapTable table) throws UserException { clauses.add(addColumnClause); } // add hidden column to rollup table - } else if (alterClause instanceof AddRollupClause && table.getKeysType() == KeysType.UNIQUE_KEYS - && table.hasHiddenColumn()) { - if (table.getColumn(Column.DELETE_SIGN) != null) { - if (!((AddRollupClause) alterClause).getColumnNames() - .stream() - .anyMatch(x -> x.equalsIgnoreCase(Column.DELETE_SIGN))) { - ((AddRollupClause) alterClause).getColumnNames().add(Column.DELETE_SIGN); - } - } - if (table.getColumn(Column.SEQUENCE_COL) != null) { - if (!((AddRollupClause) alterClause).getColumnNames() - .stream() - .anyMatch(x -> x.equalsIgnoreCase(Column.SEQUENCE_COL))) { - ((AddRollupClause) alterClause).getColumnNames().add(Column.SEQUENCE_COL); - } - } - alterClause.analyze(analyzer); - clauses.add(alterClause); } else { clauses.add(alterClause); } From d88cbc3bb62e89340d1b337ae1442038205c8ec2 Mon Sep 17 00:00:00 2001 From: yangzhg Date: Wed, 28 Oct 2020 14:28:54 +0800 Subject: [PATCH 2/2] fix add hidden column twice --- .../src/main/java/org/apache/doris/analysis/AlterTableStmt.java | 1 - 1 file changed, 1 deletion(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableStmt.java index 558fbcf9b7101f..ca19188fbe4b3f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableStmt.java @@ -18,7 +18,6 @@ package org.apache.doris.analysis; import org.apache.doris.catalog.Catalog; -import org.apache.doris.catalog.Column; import org.apache.doris.catalog.KeysType; import org.apache.doris.catalog.MaterializedIndex; import org.apache.doris.catalog.OlapTable;