From ace42f2266917cfae790160fc746fa5e27bcf73a Mon Sep 17 00:00:00 2001 From: Zenglin Luo Date: Sun, 4 Dec 2022 21:22:04 +0800 Subject: [PATCH 1/5] [fix](schemachange) fix the schema change that causes the be core dump. Forbid schema change to add or modify the key column of the agg model as double or float. --- .../doris/alter/SchemaChangeHandler.java | 5 ++--- .../doris/analysis/AddColumnClause.java | 4 ++++ .../doris/analysis/AlterTableClause.java | 7 ++++++ .../apache/doris/analysis/AlterTableStmt.java | 5 +++++ .../doris/analysis/ModifyColumnClause.java | 4 ++++ .../test_agg_keys_schema_change.groovy | 22 +++++++++++++++++++ 6 files changed, 44 insertions(+), 3 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 index 39395d00398ebf..a14b03aa311d50 100644 --- 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 @@ -492,9 +492,8 @@ private void processModifyColumn(ModifyColumnClause alterClause, OlapTable olapT if (KeysType.AGG_KEYS == olapTable.getKeysType()) { if (modColumn.isKey() && null != modColumn.getAggregationType()) { throw new DdlException("Can not assign aggregation method on key column: " + modColumn.getName()); - } else if (null == modColumn.getAggregationType()) { - // in aggregate key table, no aggregation method indicate key column - modColumn.setIsKey(true); + } else if (!modColumn.isKey() && null == modColumn.getAggregationType()) { + throw new DdlException("Aggregate method must be specified for value column: " + modColumn.getName()); } } else if (KeysType.UNIQUE_KEYS == olapTable.getKeysType()) { if (null != modColumn.getAggregationType()) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AddColumnClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AddColumnClause.java index 03afe36ed5144d..c41aa1ef9181d4 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AddColumnClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AddColumnClause.java @@ -19,6 +19,7 @@ import org.apache.doris.alter.AlterOpType; import org.apache.doris.catalog.Column; +import org.apache.doris.catalog.KeysType; import org.apache.doris.common.AnalysisException; import org.apache.doris.common.ErrorCode; import org.apache.doris.common.ErrorReport; @@ -68,6 +69,9 @@ public void analyze(Analyzer analyzer) throws AnalysisException { if (columnDef == null) { throw new AnalysisException("No column definition in add column clause."); } + if (table != null && table.getKeysType() == KeysType.AGG_KEYS && columnDef.getAggregateType() == null) { + columnDef.setIsKey(true); + } columnDef.analyze(true); if (colPos != null) { colPos.analyze(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableClause.java index 7a223beb6fa5d6..363e50b32b0142 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableClause.java @@ -18,6 +18,7 @@ package org.apache.doris.analysis; import org.apache.doris.alter.AlterOpType; +import org.apache.doris.catalog.OlapTable; // alter table clause public abstract class AlterTableClause extends AlterClause { @@ -29,7 +30,13 @@ public AlterTableClause(AlterOpType opType) { // if set to true, the corresponding table should be stable before processing this operation on it. protected boolean needTableStable = true; + protected OlapTable table; + public boolean isNeedTableStable() { return needTableStable; } + + public void setTableName(OlapTable table) { + this.table = table; + } } 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 4435b7e6085f9b..0c58c529fa0dc3 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 @@ -77,7 +77,12 @@ public void analyze(Analyzer analyzer) throws UserException { if (ops == null || ops.isEmpty()) { ErrorReport.reportAnalysisException(ErrorCode.ERR_NO_ALTER_OPERATION); } + Table table = + Env.getCurrentInternalCatalog().getDbOrDdlException(tbl.getDb()).getTableOrDdlException(tbl.getTbl()); for (AlterClause op : ops) { + if (op instanceof AlterTableClause && table instanceof OlapTable) { + ((AlterTableClause) op).setTableName((OlapTable) table); + } op.analyze(analyzer); } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyColumnClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyColumnClause.java index afa369f089ca2a..b10da8ce56163b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyColumnClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyColumnClause.java @@ -19,6 +19,7 @@ import org.apache.doris.alter.AlterOpType; import org.apache.doris.catalog.Column; +import org.apache.doris.catalog.KeysType; import org.apache.doris.common.AnalysisException; import com.google.common.base.Strings; @@ -63,6 +64,9 @@ public void analyze(Analyzer analyzer) throws AnalysisException { if (columnDef == null) { throw new AnalysisException("No column definition in modify column clause."); } + if (table != null && table.getKeysType() == KeysType.AGG_KEYS && columnDef.getAggregateType() == null) { + columnDef.setIsKey(true); + } columnDef.analyze(true); if (colPos != null) { colPos.analyze(); diff --git a/regression-test/suites/schema_change_p0/test_agg_keys_schema_change.groovy b/regression-test/suites/schema_change_p0/test_agg_keys_schema_change.groovy index 20691b3f63864c..5cf7fd59b5893e 100644 --- a/regression-test/suites/schema_change_p0/test_agg_keys_schema_change.groovy +++ b/regression-test/suites/schema_change_p0/test_agg_keys_schema_change.groovy @@ -122,6 +122,28 @@ suite ("test_agg_keys_schema_change") { qt_sc """ select count(*) from ${tableName} """ + // test add double or float key column + test { + sql "ALTER table ${tableName} ADD COLUMN new_key_column_double DOUBLE" + exception "Float or double can not used as a key, use decimal instead." + } + + test { + sql "ALTER table ${tableName} ADD COLUMN new_key_column_float FLOAT" + exception "Float or double can not used as a key, use decimal instead." + } + + // test modify key column type to double or float + test { + sql "ALTER table ${tableName} MODIFY COLUMN age FLOAT" + exception "Float or double can not used as a key, use decimal instead." + } + + test { + sql "ALTER table ${tableName} MODIFY COLUMN age DOUBLE" + exception "Float or double can not used as a key, use decimal instead." + } + // drop key column, not light schema change sql """ ALTER TABLE ${tableName} DROP COLUMN new_key_column From 51b9c76e1fb396f250418d0999b62443b918e30d Mon Sep 17 00:00:00 2001 From: Zenglin Luo Date: Tue, 6 Dec 2022 20:21:18 +0800 Subject: [PATCH 2/5] update --- .../main/java/org/apache/doris/analysis/AlterTableClause.java | 2 +- .../src/main/java/org/apache/doris/analysis/AlterTableStmt.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableClause.java index 363e50b32b0142..a91aef7753fe6a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableClause.java @@ -36,7 +36,7 @@ public boolean isNeedTableStable() { return needTableStable; } - public void setTableName(OlapTable table) { + public void setOlapTable(OlapTable table) { this.table = table; } } 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 0c58c529fa0dc3..7a7ec875294d2a 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 @@ -81,7 +81,7 @@ public void analyze(Analyzer analyzer) throws UserException { Env.getCurrentInternalCatalog().getDbOrDdlException(tbl.getDb()).getTableOrDdlException(tbl.getTbl()); for (AlterClause op : ops) { if (op instanceof AlterTableClause && table instanceof OlapTable) { - ((AlterTableClause) op).setTableName((OlapTable) table); + ((AlterTableClause) op).setOlapTable((OlapTable) table); } op.analyze(analyzer); } From 7bd07bba718cf2c416f289f22d34817729e4eb9e Mon Sep 17 00:00:00 2001 From: Zenglin Luo Date: Wed, 7 Dec 2022 12:08:52 +0800 Subject: [PATCH 3/5] update --- .../java/org/apache/doris/analysis/AlterTableStmt.java | 8 ++++++-- .../org/apache/doris/analysis/AlterTableStmtTest.java | 7 +++++++ 2 files changed, 13 insertions(+), 2 deletions(-) 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 7a7ec875294d2a..e7de0f05cd80c8 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 @@ -26,6 +26,7 @@ import org.apache.doris.common.AnalysisException; import org.apache.doris.common.ErrorCode; import org.apache.doris.common.ErrorReport; +import org.apache.doris.common.FeConstants; import org.apache.doris.common.UserException; import org.apache.doris.common.util.PropertyAnalyzer; import org.apache.doris.common.util.Util; @@ -77,8 +78,11 @@ public void analyze(Analyzer analyzer) throws UserException { if (ops == null || ops.isEmpty()) { ErrorReport.reportAnalysisException(ErrorCode.ERR_NO_ALTER_OPERATION); } - Table table = - Env.getCurrentInternalCatalog().getDbOrDdlException(tbl.getDb()).getTableOrDdlException(tbl.getTbl()); + Table table = null; + if (!FeConstants.runningUnitTest) { + table = Env.getCurrentInternalCatalog().getDbOrDdlException(tbl.getDb()) + .getTableOrDdlException(tbl.getTbl()); + } for (AlterClause op : ops) { if (op instanceof AlterTableClause && table instanceof OlapTable) { ((AlterTableClause) op).setOlapTable((OlapTable) table); diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterTableStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterTableStmtTest.java index 8bfa801760c938..9a4380be4095d6 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterTableStmtTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterTableStmtTest.java @@ -18,6 +18,7 @@ package org.apache.doris.analysis; import org.apache.doris.common.AnalysisException; +import org.apache.doris.common.FeConstants; import org.apache.doris.common.UserException; import org.apache.doris.datasource.InternalCatalog; import org.apache.doris.mysql.privilege.PaloAuth; @@ -30,6 +31,7 @@ import mockit.Mocked; import org.junit.Assert; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import java.util.List; @@ -42,6 +44,11 @@ public class AlterTableStmtTest { @Mocked private PaloAuth auth; + @BeforeClass + public static void beforeClass() throws Exception { + FeConstants.runningUnitTest = true; + } + @Before public void setUp() { analyzer = AccessTestUtil.fetchAdminAnalyzer(false); From 26193bb08f22e6dc2ba2b743643808637575850e Mon Sep 17 00:00:00 2001 From: Zenglin Luo Date: Wed, 7 Dec 2022 16:51:38 +0800 Subject: [PATCH 4/5] update --- .../apache/doris/analysis/AddColumnClause.java | 15 ++++++++++++--- .../apache/doris/analysis/AlterTableClause.java | 7 +++---- .../org/apache/doris/analysis/AlterTableStmt.java | 10 ++-------- .../apache/doris/analysis/ModifyColumnClause.java | 15 ++++++++++++--- .../apache/doris/alter/SchemaChangeJobV2Test.java | 5 +++-- .../doris/analysis/AddColumnClauseTest.java | 11 ++++++----- .../doris/analysis/ModifyColumnClauseTest.java | 5 +++-- 7 files changed, 41 insertions(+), 27 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AddColumnClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AddColumnClause.java index c41aa1ef9181d4..2d472cd54953e4 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AddColumnClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AddColumnClause.java @@ -19,8 +19,12 @@ import org.apache.doris.alter.AlterOpType; import org.apache.doris.catalog.Column; +import org.apache.doris.catalog.Env; import org.apache.doris.catalog.KeysType; +import org.apache.doris.catalog.OlapTable; +import org.apache.doris.catalog.Table; import org.apache.doris.common.AnalysisException; +import org.apache.doris.common.DdlException; import org.apache.doris.common.ErrorCode; import org.apache.doris.common.ErrorReport; @@ -65,12 +69,17 @@ public AddColumnClause(ColumnDef columnDef, ColumnPosition colPos, String rollup } @Override - public void analyze(Analyzer analyzer) throws AnalysisException { + public void analyze(Analyzer analyzer) throws AnalysisException, DdlException { if (columnDef == null) { throw new AnalysisException("No column definition in add column clause."); } - if (table != null && table.getKeysType() == KeysType.AGG_KEYS && columnDef.getAggregateType() == null) { - columnDef.setIsKey(true); + if (tableName != null) { + Table table = Env.getCurrentInternalCatalog().getDbOrDdlException(tableName.getDb()) + .getTableOrDdlException(tableName.getTbl()); + if (table instanceof OlapTable && ((OlapTable) table).getKeysType() == KeysType.AGG_KEYS + && columnDef.getAggregateType() == null) { + columnDef.setIsKey(true); + } } columnDef.analyze(true); if (colPos != null) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableClause.java index a91aef7753fe6a..ad611bb95adbcd 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterTableClause.java @@ -18,7 +18,6 @@ package org.apache.doris.analysis; import org.apache.doris.alter.AlterOpType; -import org.apache.doris.catalog.OlapTable; // alter table clause public abstract class AlterTableClause extends AlterClause { @@ -30,13 +29,13 @@ public AlterTableClause(AlterOpType opType) { // if set to true, the corresponding table should be stable before processing this operation on it. protected boolean needTableStable = true; - protected OlapTable table; + protected TableName tableName; public boolean isNeedTableStable() { return needTableStable; } - public void setOlapTable(OlapTable table) { - this.table = table; + public void setTableName(TableName tableName) { + this.tableName = tableName; } } 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 e7de0f05cd80c8..4c5bf46e9b81f3 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 @@ -26,7 +26,6 @@ import org.apache.doris.common.AnalysisException; import org.apache.doris.common.ErrorCode; import org.apache.doris.common.ErrorReport; -import org.apache.doris.common.FeConstants; import org.apache.doris.common.UserException; import org.apache.doris.common.util.PropertyAnalyzer; import org.apache.doris.common.util.Util; @@ -78,14 +77,9 @@ public void analyze(Analyzer analyzer) throws UserException { if (ops == null || ops.isEmpty()) { ErrorReport.reportAnalysisException(ErrorCode.ERR_NO_ALTER_OPERATION); } - Table table = null; - if (!FeConstants.runningUnitTest) { - table = Env.getCurrentInternalCatalog().getDbOrDdlException(tbl.getDb()) - .getTableOrDdlException(tbl.getTbl()); - } for (AlterClause op : ops) { - if (op instanceof AlterTableClause && table instanceof OlapTable) { - ((AlterTableClause) op).setOlapTable((OlapTable) table); + if (op instanceof AlterTableClause) { + ((AlterTableClause) op).setTableName(tbl); } op.analyze(analyzer); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyColumnClause.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyColumnClause.java index b10da8ce56163b..5477614006b7ef 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyColumnClause.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/ModifyColumnClause.java @@ -19,8 +19,12 @@ import org.apache.doris.alter.AlterOpType; import org.apache.doris.catalog.Column; +import org.apache.doris.catalog.Env; import org.apache.doris.catalog.KeysType; +import org.apache.doris.catalog.OlapTable; +import org.apache.doris.catalog.Table; import org.apache.doris.common.AnalysisException; +import org.apache.doris.common.DdlException; import com.google.common.base.Strings; @@ -60,12 +64,17 @@ public ModifyColumnClause(ColumnDef columnDef, ColumnPosition colPos, String rol } @Override - public void analyze(Analyzer analyzer) throws AnalysisException { + public void analyze(Analyzer analyzer) throws AnalysisException, DdlException { if (columnDef == null) { throw new AnalysisException("No column definition in modify column clause."); } - if (table != null && table.getKeysType() == KeysType.AGG_KEYS && columnDef.getAggregateType() == null) { - columnDef.setIsKey(true); + if (tableName != null) { + Table table = Env.getCurrentInternalCatalog().getDbOrDdlException(tableName.getDb()) + .getTableOrDdlException(tableName.getTbl()); + if (table instanceof OlapTable && ((OlapTable) table).getKeysType() == KeysType.AGG_KEYS + && columnDef.getAggregateType() == null) { + columnDef.setIsKey(true); + } } columnDef.analyze(true); if (colPos != null) { diff --git a/fe/fe-core/src/test/java/org/apache/doris/alter/SchemaChangeJobV2Test.java b/fe/fe-core/src/test/java/org/apache/doris/alter/SchemaChangeJobV2Test.java index 323547b49480e2..954bc637063ff4 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/alter/SchemaChangeJobV2Test.java +++ b/fe/fe-core/src/test/java/org/apache/doris/alter/SchemaChangeJobV2Test.java @@ -108,8 +108,9 @@ public class SchemaChangeJobV2Test { public ExpectedException expectedEx = ExpectedException.none(); @Before - public void setUp() throws InstantiationException, IllegalAccessException, IllegalArgumentException, - InvocationTargetException, NoSuchMethodException, SecurityException, AnalysisException { + public void setUp() + throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, + NoSuchMethodException, SecurityException, AnalysisException, DdlException { FakeEnv.setMetaVersion(FeMetaVersion.VERSION_CURRENT); fakeEditLog = new FakeEditLog(); fakeEnv = new FakeEnv(); diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/AddColumnClauseTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/AddColumnClauseTest.java index 8fabe62850aff0..7a97d702fd1a7b 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/analysis/AddColumnClauseTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/AddColumnClauseTest.java @@ -22,6 +22,7 @@ import org.apache.doris.catalog.PrimitiveType; import org.apache.doris.catalog.ScalarType; import org.apache.doris.common.AnalysisException; +import org.apache.doris.common.DdlException; import mockit.Expectations; import mockit.Mocked; @@ -41,7 +42,7 @@ public static void setUp() { } @Test - public void testNormal() throws AnalysisException { + public void testNormal() throws AnalysisException, DdlException { Column column = new Column("testCol", ScalarType.createType(PrimitiveType.INT)); new Expectations() { { @@ -91,14 +92,14 @@ public void testNormal() throws AnalysisException { } @Test(expected = AnalysisException.class) - public void testNoColDef() throws AnalysisException { + public void testNoColDef() throws AnalysisException, DdlException { AddColumnClause clause = new AddColumnClause(null, null, null, null); clause.analyze(analyzer); Assert.fail("No exception throws."); } @Test(expected = AnalysisException.class) - public void testNoDefault() throws AnalysisException { + public void testNoDefault() throws AnalysisException, DdlException { new Expectations() { { definition.analyze(true); @@ -131,7 +132,7 @@ public void testNoDefault() throws AnalysisException { } @Test(expected = AnalysisException.class) - public void testAggPos() throws AnalysisException { + public void testAggPos() throws AnalysisException, DdlException { new Expectations() { { definition.analyze(true); @@ -164,7 +165,7 @@ public void testAggPos() throws AnalysisException { } @Test(expected = AnalysisException.class) - public void testAddValueToFirst() throws AnalysisException { + public void testAddValueToFirst() throws AnalysisException, DdlException { new Expectations() { { definition.analyze(true); diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ModifyColumnClauseTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ModifyColumnClauseTest.java index cf184d8e80995b..93119403c3a86c 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ModifyColumnClauseTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ModifyColumnClauseTest.java @@ -20,6 +20,7 @@ import org.apache.doris.catalog.Column; import org.apache.doris.catalog.PrimitiveType; import org.apache.doris.common.AnalysisException; +import org.apache.doris.common.DdlException; import mockit.Expectations; import mockit.Mocked; @@ -36,7 +37,7 @@ public static void setUp() { } @Test - public void testNormal(@Mocked ColumnDef definition) throws AnalysisException { + public void testNormal(@Mocked ColumnDef definition) throws AnalysisException, DdlException { Column column = new Column("tsetCol", PrimitiveType.INT); new Expectations() { { @@ -76,7 +77,7 @@ public void testNormal(@Mocked ColumnDef definition) throws AnalysisException { } @Test(expected = AnalysisException.class) - public void testNoColDef() throws AnalysisException { + public void testNoColDef() throws AnalysisException, DdlException { ModifyColumnClause clause = new ModifyColumnClause(null, null, null, null); clause.analyze(analyzer); Assert.fail("No exception throws."); From 903f0e7fe0a43a33d1aeaea4085bce3d1c1e15f4 Mon Sep 17 00:00:00 2001 From: Zenglin Luo Date: Wed, 7 Dec 2022 16:54:37 +0800 Subject: [PATCH 5/5] update --- .../java/org/apache/doris/analysis/AlterTableStmtTest.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterTableStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterTableStmtTest.java index 9a4380be4095d6..8bfa801760c938 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterTableStmtTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/AlterTableStmtTest.java @@ -18,7 +18,6 @@ package org.apache.doris.analysis; import org.apache.doris.common.AnalysisException; -import org.apache.doris.common.FeConstants; import org.apache.doris.common.UserException; import org.apache.doris.datasource.InternalCatalog; import org.apache.doris.mysql.privilege.PaloAuth; @@ -31,7 +30,6 @@ import mockit.Mocked; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import java.util.List; @@ -44,11 +42,6 @@ public class AlterTableStmtTest { @Mocked private PaloAuth auth; - @BeforeClass - public static void beforeClass() throws Exception { - FeConstants.runningUnitTest = true; - } - @Before public void setUp() { analyzer = AccessTestUtil.fetchAdminAnalyzer(false);