diff --git a/ci/scripts/e2e-source-test.sh b/ci/scripts/e2e-source-test.sh index 477909c6b2ece..c1624230abc7e 100755 --- a/ci/scripts/e2e-source-test.sh +++ b/ci/scripts/e2e-source-test.sh @@ -72,8 +72,9 @@ sqllogictest -p 4566 -d dev './e2e_test/source/cdc/cdc.check.slt' # kill cluster cargo make kill -echo "cluster killed " +echo "> cluster killed " +echo "--- mysql & postgres recovery check" # insert into mytest database (cdc.share_stream.slt) mysql --protocol=tcp -u root mytest -e "INSERT INTO products VALUES (default,'RisingWave','Next generation Streaming Database'), @@ -95,7 +96,7 @@ export RUST_LOG="events::stream::message::chunk=trace,risingwave_stream=debug,ri cargo make dev ci-1cn-1fe-with-recovery echo "> wait for cluster recovery finish" -sleep 25 +sleep 20 echo "> check mviews after cluster recovery" # check results sqllogictest -p 4566 -d dev './e2e_test/source/cdc/cdc.check_new_rows.slt' diff --git a/e2e_test/source/cdc/cdc.check.slt b/e2e_test/source/cdc/cdc.check.slt index e61e52ada8b2b..b90137948be1e 100644 --- a/e2e_test/source/cdc/cdc.check.slt +++ b/e2e_test/source/cdc/cdc.check.slt @@ -42,12 +42,6 @@ select count(*) from t1_rw; ---- 1 -# 3 inserted in cdc.share_stream.slt and 3 inserted in postgres_cdc.sql -query I -select count(*) from person_rw; ----- -6 - query I select count(*) from tt3_rw; ---- diff --git a/e2e_test/source/cdc/cdc.check_new_rows.slt b/e2e_test/source/cdc/cdc.check_new_rows.slt index c95a444d7af1c..419dc0787b7b7 100644 --- a/e2e_test/source/cdc/cdc.check_new_rows.slt +++ b/e2e_test/source/cdc/cdc.check_new_rows.slt @@ -15,7 +15,7 @@ select cnt from shipments_cnt; 4 query ITTTT -select * from person_rw order by id; +select * from person_new order by id; ---- 1000 vicky noris yplkvgz@qbxfg.com 7878 5821 1864 2539 cheyenne 1001 peter white myckhsp@xpmpe.com 1781 2313 8157 6974 boise @@ -26,6 +26,11 @@ select * from person_rw order by id; 1101 white myc@xpmpe.com 8157 6974 se 1102 spencer wip@dkaap.com 9481 6270 angeles +# 2 rows inserted after cluster is stopped +query I +SELECT * from person_new_cnt +---- +8 query ITTTTT select order_id,order_date,customer_name,product_id,order_status from orders order by order_id; @@ -69,8 +74,3 @@ SELECT * FROM products_test order by id limit 3 102 RW 12V car battery 103 RW 12-pack of drill bits with sizes ranging from #40 to #3 -# 2 rows inserted after cluster is stopped -query I -SELECT * from person_new_cnt ----- -8 diff --git a/e2e_test/source/cdc/cdc.load.slt b/e2e_test/source/cdc/cdc.load.slt index ce0926339c963..b517dd3dd2de1 100644 --- a/e2e_test/source/cdc/cdc.load.slt +++ b/e2e_test/source/cdc/cdc.load.slt @@ -176,25 +176,6 @@ create table t1_rw ( publication.create.enable='false' ); -statement ok -create table person_rw ( - id int primary key, - name varchar, - email_address varchar, - credit_card varchar, - city varchar -) with ( - connector = 'postgres-cdc', - hostname = 'db', - port = '5432', - username = 'postgres', - password='postgres', - database.name='cdc_test', - table.name='person', - publication.name='my_publicaton', - publication.create.enable='false' -); - statement error create table person_rw ( id int primary key, @@ -211,6 +192,3 @@ create table person_rw ( publication.name='dumb_publicaton', publication.create.enable='false' ); - -statement ok -create materialized view person_cnt as select count(*) as cnt from person_rw;