fix and pass foreground mv cancellation tests

risingwavelabs · Sep 27, 2023 · 05d425b · 05d425b
1 parent bdab80e
commit 05d425b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/ci/scripts/run-backfill-tests.sh b/ci/scripts/run-backfill-tests.sh
@@ -151,7 +151,7 @@ test_foreground_ddl_cancel() {
   cancel_stream_jobs
   sqllogictest -d dev -h localhost -p 4566 "$TEST_DIR/background_ddl/foreground/validate_after_cancel.slt"
 
-  run_sql "CREATE MATERIALIZED VIEW m1 as select * FROM t;"
+  sqllogictest -d dev -h localhost -p 4566 "$TEST_DIR/background_ddl/foreground/create_mv_after_cancel.slt"
   sqllogictest -d dev -h localhost -p 4566 "$TEST_DIR/background_ddl/foreground/drop.slt"
 
   cargo make kill
@@ -187,9 +187,9 @@ main() {
   set -euo pipefail
   # test_snapshot_and_upstream_read
   # test_background_ddl_recovery
-  test_background_ddl_cancel
+  # test_background_ddl_cancel
   # test_foreground_ddl_no_recover
-  # test_foreground_ddl_cancel
+  test_foreground_ddl_cancel
 }
 
 main
diff --git a/e2e_test/background_ddl/foreground/create_mv_after_cancel.slt b/e2e_test/background_ddl/foreground/create_mv_after_cancel.slt
@@ -0,0 +1,2 @@
+statement ok
+CREATE MATERIALIZED VIEW m1 AS VALUES(1);
diff --git a/e2e_test/background_ddl/foreground/drop.slt b/e2e_test/background_ddl/foreground/drop.slt
@@ -1,2 +1,5 @@
+statement ok
+DROP MATERIALIZED VIEW m1;
+
 statement ok
 DROP TABLE t;
diff --git a/src/meta/src/barrier/progress.rs b/src/meta/src/barrier/progress.rs
@@ -340,8 +340,6 @@ impl CreateMviewProgressTracker {
             return Some(command);
         }
 
-        let ddl_epoch = command.context.curr_epoch.value();
-
         let (creating_mv_id, upstream_mv_count, upstream_total_key_count, definition) =
             if let Command::CreateStreamingJob {
                 table_fragments,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		statement ok
		CREATE MATERIALIZED VIEW m1 AS VALUES(1);