You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2021/07/26 01:42:50 UTC
[incubator-doris] branch master updated: [UT] Fix
MaterializedViewFunctionTest run failed (#6294)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new e3db773 [UT] Fix MaterializedViewFunctionTest run failed (#6294)
e3db773 is described below
commit e3db7731493a54b3a9ed1cc7791d691f67333abf
Author: caiconghui <55...@users.noreply.github.com>
AuthorDate: Mon Jul 26 09:42:39 2021 +0800
[UT] Fix MaterializedViewFunctionTest run failed (#6294)
Co-authored-by: caiconghui <ca...@xiaomi.com>
---
.../planner/MaterializedViewFunctionTest.java | 22 ++++++++++------------
.../java/org/apache/doris/utframe/DorisAssert.java | 6 +++++-
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/MaterializedViewFunctionTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/MaterializedViewFunctionTest.java
index c6ed638..790ff59 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/planner/MaterializedViewFunctionTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/planner/MaterializedViewFunctionTest.java
@@ -82,9 +82,9 @@ public class MaterializedViewFunctionTest {
@After
public void afterMethod() throws Exception {
- dorisAssert.dropTable(EMPS_TABLE_NAME);
- dorisAssert.dropTable(DEPTS_TABLE_NAME);
- dorisAssert.dropTable(USER_TAG_TABLE_NAME);
+ dorisAssert.dropTable(EMPS_TABLE_NAME, true);
+ dorisAssert.dropTable(DEPTS_TABLE_NAME, true);
+ dorisAssert.dropTable(USER_TAG_TABLE_NAME, true);
}
@AfterClass
@@ -607,7 +607,7 @@ public class MaterializedViewFunctionTest {
+ "k1,k2;";
String query = "select k1 from " + TEST_TABLE_NAME + " group by k1 having max(v1) > 10;";
dorisAssert.withMaterializedView(createK1K2MV).query(query).explainWithout("k1_k2");
- dorisAssert.dropTable(TEST_TABLE_NAME);
+ dorisAssert.dropTable(TEST_TABLE_NAME, true);
}
@Test
@@ -621,7 +621,7 @@ public class MaterializedViewFunctionTest {
+ "k1,k2;";
String query = "select k1 from " + TEST_TABLE_NAME + " group by k1 order by max(v1);";
dorisAssert.withMaterializedView(createK1K2MV).query(query).explainWithout("k1_k2");
- dorisAssert.dropTable(TEST_TABLE_NAME);
+ dorisAssert.dropTable(TEST_TABLE_NAME, true);
}
@Test
@@ -635,7 +635,7 @@ public class MaterializedViewFunctionTest {
+ "k1,k2;";
String query = "select k1 , sum(k2) over (partition by v1 ) from " + TEST_TABLE_NAME + ";";
dorisAssert.withMaterializedView(createK1K2MV).query(query).explainWithout("k1_k2");
- dorisAssert.dropTable(TEST_TABLE_NAME);
+ dorisAssert.dropTable(TEST_TABLE_NAME, true);
}
@Test
@@ -647,9 +647,7 @@ public class MaterializedViewFunctionTest {
+ "k1;";
String query = "select * from " + TEST_TABLE_NAME + ";";
dorisAssert.withMaterializedView(createK1K2MV).query(query).explainContains(TEST_TABLE_NAME);
- dorisAssert.dropTable(TEST_TABLE_NAME);
-
-
+ dorisAssert.dropTable(TEST_TABLE_NAME, true);
}
@Test
@@ -717,7 +715,7 @@ public class MaterializedViewFunctionTest {
dorisAssert.withTable(aggTable);
String query = "select k1, count(distinct v1) from " + TEST_TABLE_NAME + " group by k1;";
dorisAssert.query(query).explainContains(TEST_TABLE_NAME, "bitmap_union_count");
- dorisAssert.dropTable(TEST_TABLE_NAME);
+ dorisAssert.dropTable(TEST_TABLE_NAME, true);
}
@Test
@@ -727,7 +725,7 @@ public class MaterializedViewFunctionTest {
dorisAssert.withTable(aggTable);
String query = "select k1, count(distinct v1) from " + TEST_TABLE_NAME + " group by k1;";
dorisAssert.query(query).explainContains(TEST_TABLE_NAME, "hll_union_agg");
- dorisAssert.dropTable(TEST_TABLE_NAME);
+ dorisAssert.dropTable(TEST_TABLE_NAME, true);
}
@Test
@@ -831,6 +829,6 @@ public class MaterializedViewFunctionTest {
dorisAssert.withMaterializedView(createMVSQL);
String query = "select count(distinct salary) from agg_table;";
dorisAssert.query(query).explainContains("mv");
- dorisAssert.dropTable("agg_table");
+ dorisAssert.dropTable("agg_table", true);
}
}
diff --git a/fe/fe-core/src/test/java/org/apache/doris/utframe/DorisAssert.java b/fe/fe-core/src/test/java/org/apache/doris/utframe/DorisAssert.java
index 758a81e..df7d23a 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/utframe/DorisAssert.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/utframe/DorisAssert.java
@@ -88,8 +88,12 @@ public class DorisAssert {
}
public DorisAssert dropTable(String tableName) throws Exception {
+ return dropTable(tableName, false);
+ }
+
+ public DorisAssert dropTable(String tableName, boolean isForce) throws Exception {
DropTableStmt dropTableStmt =
- (DropTableStmt) UtFrameUtils.parseAndAnalyzeStmt("drop table " + tableName + ";", ctx);
+ (DropTableStmt) UtFrameUtils.parseAndAnalyzeStmt("drop table " + tableName + (isForce ? " force" : "") + ";", ctx);
Catalog.getCurrentCatalog().dropTable(dropTableStmt);
return this;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org