diff --git a/Cargo.lock b/Cargo.lock index 78822c3c64d56..dda05d663b4c7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,12 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "Inflector" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" + [[package]] name = "addr2line" version = "0.17.0" @@ -43,6 +49,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "aliasable" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -3951,6 +3963,29 @@ version = "6.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b5bf27447411e9ee3ff51186bf7a08e16c341efdde93f4d823e8844429bed7e" +[[package]] +name = "ouroboros" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfbb50b356159620db6ac971c6d5c9ab788c9cc38a6f49619fca2a27acb062ca" +dependencies = [ + "aliasable", + "ouroboros_macro", +] + +[[package]] +name = "ouroboros_macro" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a0d9d1a6191c4f391f87219d1ea42b23f09ee84d64763cd05ee6ea88d9f384d" +dependencies = [ + "Inflector", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "output_vt100" version = "0.1.3" @@ -5360,6 +5395,7 @@ dependencies = [ "futures-async-stream", "hyper", "itertools", + "lru 0.7.6", "madsim-tokio", "madsim-tonic", "maplit", @@ -5389,6 +5425,7 @@ dependencies = [ "sysinfo", "tempfile", "thiserror", + "tikv-jemalloc-ctl", "tokio-stream", "tower", "tower-http", @@ -5519,6 +5556,7 @@ dependencies = [ "madsim-tonic", "md5", "num-traits", + "ouroboros", "parse-display", "paste", "postgres-types", diff --git a/ci/scripts/build-other.sh b/ci/scripts/build-other.sh index 140955f746908..ec22b6161c096 100755 --- a/ci/scripts/build-other.sh +++ b/ci/scripts/build-other.sh @@ -6,7 +6,7 @@ set -euo pipefail source ci/scripts/common.env.sh # Should set a stable version of connector node -STABLE_VERSION=9d2e1331680335661fd3e55ee234532358683201 +STABLE_VERSION=bd12fb55c75f09b234d1b75b8671b7582ca533f3 echo "--- Build Java connector node" git clone https://"$GITHUB_TOKEN"@github.com/risingwavelabs/risingwave-connector-node.git diff --git a/ci/scripts/deterministic-e2e-test.sh b/ci/scripts/deterministic-e2e-test.sh index 72dc63c7db273..5d53cb91f08c6 100755 --- a/ci/scripts/deterministic-e2e-test.sh +++ b/ci/scripts/deterministic-e2e-test.sh @@ -9,6 +9,12 @@ echo "--- Download artifacts" buildkite-agent artifact download risingwave_simulation . chmod +x ./risingwave_simulation +echo "--- Extract data for Kafka" +cd ./scripts/source/ +mkdir -p ./test_data +unzip -o test_data.zip -d . +cd ../../ + export RUST_LOG=info export LOGDIR=.risingwave/log diff --git a/ci/scripts/e2e-source-test.sh b/ci/scripts/e2e-source-test.sh index 0865cb0340c49..547665dae7568 100755 --- a/ci/scripts/e2e-source-test.sh +++ b/ci/scripts/e2e-source-test.sh @@ -66,6 +66,12 @@ nohup java -jar ./connector-service.jar --port 60061 > .risingwave/log/connector # start risingwave cluster cargo make ci-start ci-1cn-1fe-with-recovery sleep 2 + +echo "---- mysql & postgres cdc validate test" +sqllogictest -p 4566 -d dev './e2e_test/source/cdc/cdc.validate.mysql.slt' +sqllogictest -p 4566 -d dev './e2e_test/source/cdc/cdc.validate.postgres.slt' + +echo "---- mysql & postgres load and check" sqllogictest -p 4566 -d dev './e2e_test/source/cdc/cdc.load.slt' # wait for cdc loading sleep 10 diff --git a/ci/scripts/run-e2e-test.sh b/ci/scripts/run-e2e-test.sh index 4783d5566f1a0..bb5c8ba904007 100755 --- a/ci/scripts/run-e2e-test.sh +++ b/ci/scripts/run-e2e-test.sh @@ -134,7 +134,7 @@ if [[ "$RUN_COMPACTION" -eq "1" ]]; then chmod +x ./target/debug/compaction-test # Use the config of ci-compaction-test for replay. config_path=".risingwave/config/risingwave.toml" - ./target/debug/compaction-test --ci-mode true --state-store hummock+minio://hummockadmin:hummockadmin@127.0.0.1:9301/hummock001 --config-path "${config_path}" + RUST_LOG="info,risingwave_stream=info,risingwave_batch=info,risingwave_storage=info" ./target/debug/compaction-test --ci-mode true --state-store hummock+minio://hummockadmin:hummockadmin@127.0.0.1:9301/hummock001 --config-path "${config_path}" echo "--- Kill cluster" cargo make ci-kill diff --git a/dashboard/pages/data_sources.tsx b/dashboard/pages/data_sources.tsx index 365760a6c5cc5..fc08bb8698ef3 100644 --- a/dashboard/pages/data_sources.tsx +++ b/dashboard/pages/data_sources.tsx @@ -84,7 +84,7 @@ export default function DataSources() { {source.id} {source.name} {source.owner} - {source.info?.$case} + {source.info}