fix test

Signed-off-by: Murphy <mofei@starrocks.com>
StarRocks · Jul 11, 2023 · 83d45c4 · 83d45c4
1 parent 7c35c45
commit 83d45c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 30 deletions.
diff --git a/test/sql/test_materialized_view/R/test_create b/test/sql/test_materialized_view/R/test_create
@@ -70,13 +70,8 @@ from t_hash t0 join t_random t1 on t0.k1 = t1.k1;
 -- !result
 SHOW CREATE MATERIALIZED VIEW mv1;
 -- result:
-<<<<<<< HEAD
 mv1	CREATE MATERIALIZED VIEW `mv1` (`k1`, `v1`)
-DISTRIBUTED BY RANDOM BUCKETS 64
-=======
-mv1	CREATE MATERIALIZED VIEW `mv1` (k1, v1)
 DISTRIBUTED BY RANDOM
->>>>>>> 96ef16ce40 (fix test)
 REFRESH ASYNC
 PROPERTIES (
 "replication_num" = "1",
@@ -94,13 +89,8 @@ select k1, count(v1)  from t_random group by k1;
 -- !result
 SHOW CREATE MATERIALIZED VIEW mv2;
 -- result:
-<<<<<<< HEAD
 mv2	CREATE MATERIALIZED VIEW `mv2` (`k1`, `count(v1)`)
-DISTRIBUTED BY RANDOM BUCKETS 64
-=======
-mv2	CREATE MATERIALIZED VIEW `mv2` (k1, count(v1))
 DISTRIBUTED BY RANDOM
->>>>>>> 96ef16ce40 (fix test)
 REFRESH ASYNC
 PROPERTIES (
 "replication_num" = "1",
@@ -120,13 +110,8 @@ from t_hash t0 join t1 on t0.k1 = t1.k1;
 -- !result
 SHOW CREATE MATERIALIZED VIEW mv3;
 -- result:
-<<<<<<< HEAD
 mv3	CREATE MATERIALIZED VIEW `mv3` (`k1`, `v1`)
-DISTRIBUTED BY RANDOM BUCKETS 64
-=======
-mv3	CREATE MATERIALIZED VIEW `mv3` (k1, v1)
 DISTRIBUTED BY RANDOM
->>>>>>> 96ef16ce40 (fix test)
 REFRESH ASYNC
 PROPERTIES (
 "replication_num" = "1",
@@ -145,13 +130,8 @@ from t_random t0 join t1 on t0.k1 = t1.k1;
 -- !result
 SHOW CREATE MATERIALIZED VIEW mv4;
 -- result:
-<<<<<<< HEAD
 mv4	CREATE MATERIALIZED VIEW `mv4` (`k1`, `v1`)
-DISTRIBUTED BY RANDOM BUCKETS 64
-=======
-mv4	CREATE MATERIALIZED VIEW `mv4` (k1, v1)
 DISTRIBUTED BY RANDOM
->>>>>>> 96ef16ce40 (fix test)
 REFRESH ASYNC
 PROPERTIES (
 "replication_num" = "1",
@@ -170,13 +150,8 @@ from t1 join t2 on t1.k1 = t2.k1;
 -- !result
 SHOW CREATE MATERIALIZED VIEW mv_part1;
 -- result:
-<<<<<<< HEAD
 mv_part1	CREATE MATERIALIZED VIEW `mv_part1` (`k1`, `v1`)
-DISTRIBUTED BY RANDOM BUCKETS 2
-=======
-mv_part1	CREATE MATERIALIZED VIEW `mv_part1` (k1, v1)
 DISTRIBUTED BY RANDOM
->>>>>>> 96ef16ce40 (fix test)
 REFRESH ASYNC
 PROPERTIES (
 "replication_num" = "1",

diff --git a/test/sql/test_materialized_view/R/test_show_materialized_view b/test/sql/test_materialized_view/R/test_show_materialized_view
@@ -14,7 +14,7 @@ create materialized view user_tags_mv1  distributed by hash(user_id) as select u
 show create materialized view user_tags_mv1;
 -- result:
 user_tags_mv1	CREATE MATERIALIZED VIEW `user_tags_mv1` (`user_id`, `bitmap_union(to_bitmap(tag_id))`)
-DISTRIBUTED BY HASH(`user_id`) BUCKETS 3 
+DISTRIBUTED BY HASH(`user_id`)
 REFRESH MANUAL
 PROPERTIES (
 "replication_num" = "1",
@@ -28,7 +28,7 @@ GROUP BY `user_tags`.`user_id`;
 show create table user_tags_mv1;
 -- result:
 user_tags_mv1	CREATE MATERIALIZED VIEW `user_tags_mv1` (`user_id`, `bitmap_union(to_bitmap(tag_id))`)
-DISTRIBUTED BY HASH(`user_id`) BUCKETS 3 
+DISTRIBUTED BY HASH(`user_id`)
 REFRESH MANUAL
 PROPERTIES (
 "replication_num" = "1",
@@ -48,7 +48,7 @@ alter materialized view user_tags_mv1 set ("mv_rewrite_staleness_second" = "3600
 show create materialized view user_tags_mv1;
 -- result:
 user_tags_mv1	CREATE MATERIALIZED VIEW `user_tags_mv1` (`user_id`, `bitmap_union(to_bitmap(tag_id))`)
-DISTRIBUTED BY HASH(`user_id`) BUCKETS 3 
+DISTRIBUTED BY HASH(`user_id`)
 REFRESH MANUAL
 PROPERTIES (
 "replication_num" = "1",
@@ -64,7 +64,7 @@ GROUP BY `user_tags`.`user_id`;
 show create table user_tags_mv1;
 -- result:
 user_tags_mv1	CREATE MATERIALIZED VIEW `user_tags_mv1` (`user_id`, `bitmap_union(to_bitmap(tag_id))`)
-DISTRIBUTED BY HASH(`user_id`) BUCKETS 3 
+DISTRIBUTED BY HASH(`user_id`)
 REFRESH MANUAL
 PROPERTIES (
 "replication_num" = "1",
@@ -79,4 +79,4 @@ GROUP BY `user_tags`.`user_id`;
 -- !result
 drop database test_show_materialized_view;
 -- result:
--- !result
+-- !result