diff --git a/ci/scripts/run-e2e-test.sh b/ci/scripts/run-e2e-test.sh index 5ce0b55f27e9e..db5e7c3ed4639 100755 --- a/ci/scripts/run-e2e-test.sh +++ b/ci/scripts/run-e2e-test.sh @@ -75,26 +75,26 @@ mv target/debug/risingwave_e2e_extended_mode_test-"$profile" target/debug/rising chmod +x ./target/debug/risingwave_e2e_extended_mode_test -echo "--- e2e, $mode, streaming" -RUST_LOG="info,risingwave_stream=info,risingwave_batch=info,risingwave_storage=info" \ -cluster_start -# Please make sure the regression is expected before increasing the timeout. -sqllogictest -p 4566 -d dev './e2e_test/streaming/**/*.slt' --junit "streaming-${profile}" +# echo "--- e2e, $mode, streaming" +# RUST_LOG="info,risingwave_stream=info,risingwave_batch=info,risingwave_storage=info" \ +# cluster_start +# # Please make sure the regression is expected before increasing the timeout. +# sqllogictest -p 4566 -d dev './e2e_test/streaming/**/*.slt' --junit "streaming-${profile}" -echo "--- Kill cluster" -cluster_stop +# echo "--- Kill cluster" +# cluster_stop echo "--- e2e, $mode, batch" RUST_LOG="info,risingwave_stream=info,risingwave_batch=info,risingwave_storage=info" \ cluster_start -sqllogictest -p 4566 -d dev './e2e_test/ddl/**/*.slt' --junit "batch-ddl-${profile}" -if [[ "$mode" != "single-node" ]]; then - sqllogictest -p 4566 -d dev './e2e_test/background_ddl/basic.slt' --junit "batch-ddl-${profile}" -fi -sqllogictest -p 4566 -d dev './e2e_test/visibility_mode/*.slt' --junit "batch-${profile}" -sqllogictest -p 4566 -d dev './e2e_test/ttl/ttl.slt' -sqllogictest -p 4566 -d dev './e2e_test/database/prepare.slt' -sqllogictest -p 4566 -d test './e2e_test/database/test.slt' +# sqllogictest -p 4566 -d dev './e2e_test/ddl/**/*.slt' --junit "batch-ddl-${profile}" +# if [[ "$mode" != "single-node" ]]; then +# sqllogictest -p 4566 -d dev './e2e_test/background_ddl/basic.slt' --junit "batch-ddl-${profile}" +# fi +# sqllogictest -p 4566 -d dev './e2e_test/visibility_mode/*.slt' --junit "batch-${profile}" +# sqllogictest -p 4566 -d dev './e2e_test/ttl/ttl.slt' +# sqllogictest -p 4566 -d dev './e2e_test/database/prepare.slt' +# sqllogictest -p 4566 -d test './e2e_test/database/test.slt' echo "--- e2e, $mode, subscription" python3 -m pip install --break-system-packages psycopg2-binary diff --git a/ci/workflows/main-cron.yml b/ci/workflows/main-cron.yml index 7e5a386d498a8..fffa37064e532 100644 --- a/ci/workflows/main-cron.yml +++ b/ci/workflows/main-cron.yml @@ -132,7 +132,7 @@ steps: files: "*-junit.xml" format: "junit" - ./ci/plugins/upload-failure-logs - timeout_in_minutes: 10 + timeout_in_minutes: 12 retry: *auto-retry - label: "end-to-end test (parallel, in-memory) (release)" diff --git a/ci/workflows/pull-request.yml b/ci/workflows/pull-request.yml index c19b9a774fc12..8ccaddf9fa6cc 100644 --- a/ci/workflows/pull-request.yml +++ b/ci/workflows/pull-request.yml @@ -115,7 +115,7 @@ steps: config: ci/docker-compose.yml mount-buildkite-agent: true - ./ci/plugins/upload-failure-logs - timeout_in_minutes: 15 + timeout_in_minutes: 17 retry: *auto-retry - label: "end-to-end test for opendal (parallel)" diff --git a/e2e_test/subscription/create_table_and_subscription.slt b/e2e_test/subscription/create_table_and_subscription.slt index fd43567bc52de..94039f98b11cc 100644 --- a/e2e_test/subscription/create_table_and_subscription.slt +++ b/e2e_test/subscription/create_table_and_subscription.slt @@ -4,8 +4,5 @@ create table t1 (v1 int, v2 int); statement ok insert into t1 values (1,2); -statement ok -flush; - statement ok create subscription sub from t1 with(retention = '1D'); \ No newline at end of file diff --git a/src/frontend/src/session/cursor_manager.rs b/src/frontend/src/session/cursor_manager.rs index 13eaec03b1663..8f7c696383dc0 100644 --- a/src/frontend/src/session/cursor_manager.rs +++ b/src/frontend/src/session/cursor_manager.rs @@ -341,6 +341,10 @@ impl SubscriptionCursor { .catalog_writer()? .list_change_log_epochs(table_id, seek_timestamp, 2) .await?; + println!( + "expected_timestamp{:?},{:?},{:?}", + expected_timestamp, seek_timestamp, new_epochs + ); if let Some(expected_timestamp) = expected_timestamp && (new_epochs.is_empty() || &expected_timestamp != new_epochs.first().unwrap()) { diff --git a/src/storage/hummock_sdk/src/change_log.rs b/src/storage/hummock_sdk/src/change_log.rs index af694c3373e10..c7f5f1adf4980 100644 --- a/src/storage/hummock_sdk/src/change_log.rs +++ b/src/storage/hummock_sdk/src/change_log.rs @@ -42,6 +42,7 @@ impl TableChangeLog { .filter(|a| a >= &min_epoch) .clone() .collect(); + println!("epochs: {:?},min{:?},all{:?}", epochs,min_epoch,self.0); let end = min(max_count, epochs.len()); epochs[..end].into() }