text

risingwavelabs · May 6, 2024 · 221ef44 · 221ef44
1 parent 92fd979
commit 221ef44
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git 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/src/frontend/src/handler/declare_cursor.rs b/src/frontend/src/handler/declare_cursor.rs
@@ -70,6 +70,10 @@ async fn handle_declare_subscription_cursor(
             let min_unix_millis =
                 Epoch::now().as_unix_millis() - subscription.retention_seconds * 1000;
             let subscription_build_millis = subscription.created_at_epoch.unwrap().as_unix_millis();
+            println!(
+                "min_unix_millis{},subscription_build_millis{}",
+                min_unix_millis, subscription_build_millis
+            );
             let min_unix_millis = std::cmp::max(min_unix_millis, subscription_build_millis);
             Some(convert_unix_millis_to_logstore_u64(min_unix_millis))
         }

diff --git a/src/frontend/src/session/cursor_manager.rs b/src/frontend/src/session/cursor_manager.rs
@@ -341,7 +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())
         {