From fe6361f4b543d5ea87a6b83c11efee2d659bd8bf Mon Sep 17 00:00:00 2001 From: Mingyu Chen Date: Fri, 10 Mar 2023 10:21:39 +0800 Subject: [PATCH] [regression-test](p0) fix some unstable p0 cases (#17518) drop database before create remove some large, unused debug log --- .../apache/doris/alter/MaterializedViewHandler.java | 3 --- .../java/org/apache/doris/catalog/OlapTable.java | 2 +- .../org/apache/doris/alter/BatchRollupJobTest.java | 13 ++++++++++++- .../unique/test_unique_table_like.groovy | 6 ++---- 4 files changed, 15 insertions(+), 9 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 5b1df46e6e..77285eb89a 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 @@ -1127,9 +1127,6 @@ public class MaterializedViewHandler extends AlterHandler { changeTableStatus(alterJob.getDbId(), alterJob.getTableId(), OlapTableState.NORMAL); LOG.info("set table's state to NORMAL, table id: {}, job id: {}", alterJob.getTableId(), alterJob.getJobId()); - } else { - LOG.debug("not set table's state, table id: {}, is job done: {}, job id: {}", alterJob.getTableId(), - alterJob.isDone(), alterJob.getJobId()); } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java index 093dbcdd63..c6c50d6168 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java @@ -339,7 +339,7 @@ public class OlapTable extends Table { } } } - LOG.debug("after rebuild full schema. table {}, schema: {}", id, fullSchema); + LOG.debug("after rebuild full schema. table {}, schema size: {}", id, fullSchema.size()); } public boolean deleteIndexInfo(String indexName) { diff --git a/fe/fe-core/src/test/java/org/apache/doris/alter/BatchRollupJobTest.java b/fe/fe-core/src/test/java/org/apache/doris/alter/BatchRollupJobTest.java index ac3522ad83..8080f54359 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/alter/BatchRollupJobTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/alter/BatchRollupJobTest.java @@ -135,6 +135,7 @@ public class BatchRollupJobTest { OlapTable tbl = (OlapTable) db.getTableNullable("tbl2"); Assert.assertNotNull(tbl); + for (AlterJobV2 alterJobV2 : alterJobs.values()) { if (alterJobV2.getType() != AlterJobV2.JobType.ROLLUP) { continue; @@ -163,8 +164,18 @@ public class BatchRollupJobTest { break; } + int finishedJobNum = 0; + for (AlterJobV2 alterJobV2 : alterJobs.values()) { + if (alterJobV2.getType() != AlterJobV2.JobType.ROLLUP) { + continue; + } + if (alterJobV2.getJobState() == AlterJobV2.JobState.FINISHED) { + ++finishedJobNum; + } + } + for (Partition partition : tbl.getPartitions()) { - Assert.assertEquals(2, partition.getMaterializedIndices(IndexExtState.VISIBLE).size()); + Assert.assertEquals(finishedJobNum + 1, partition.getMaterializedIndices(IndexExtState.VISIBLE).size()); } } } diff --git a/regression-test/suites/data_model_p0/unique/test_unique_table_like.groovy b/regression-test/suites/data_model_p0/unique/test_unique_table_like.groovy index 030081865a..15107d33b9 100644 --- a/regression-test/suites/data_model_p0/unique/test_unique_table_like.groovy +++ b/regression-test/suites/data_model_p0/unique/test_unique_table_like.groovy @@ -17,10 +17,8 @@ suite("test_unique_table_like") { def dbName = "test_unique_db" - List> db = sql "show databases like '${dbName}'" - if (db.size() == 0) { - sql "CREATE DATABASE ${dbName}" - } + sql "drop database if exists ${dbName}" + sql "CREATE DATABASE ${dbName}" sql "use ${dbName}" // test uniq table like