Merge branch 'main' into feat/parse-emit

Author: mergify[bot]

Cargo.lock

@@ -874,7 +874,7 @@ description = "Run all streaming e2e tests"
 [tasks.slt-batch]
 category = "RiseDev - SQLLogicTest"
 extend = "slt"
-args = ["${@}", "./e2e_test/batch/**/*.slt"]
+args = ["${@}", "./e2e_test/batch/*.slt"]
 description = "Run all batch e2e tests"
 
 [tasks.slt-generated]

Makefile.toml

@@ -30,9 +30,12 @@ ENV PATH /root/.cargo/bin/:$PATH
 RUN rustup component add rustfmt llvm-tools-preview clippy
 
 # install build tools
-RUN cargo install cargo-llvm-cov cargo-nextest cargo-udeps cargo-hakari cargo-sort cargo-make cargo-cache \
+RUN cargo install cargo-llvm-cov cargo-nextest cargo-udeps cargo-hakari cargo-sort cargo-make cargo-cache sccache \
     && cargo install --git https://github.com/risinglightdb/sqllogictest-rs --rev dbadddb --bin sqllogictest --locked \
     && cargo cache -a \
     && rm -rf "/root/.cargo/registry/index" \
     && rm -rf "/root/.cargo/registry/cache" \
     && rm -rf "/root/.cargo/git/db"
+
+ENV RUSTC_WRAPPER=sccache
+ENV SCCACHE_BUCKET=ci-sccache-bucket

ci/Dockerfile

@@ -14,7 +14,7 @@ export RUST_TOOLCHAIN=$(cat ../rust-toolchain)
 # !!! CHANGE THIS WHEN YOU WANT TO BUMP CI IMAGE !!! #
 #          AND ALSO docker-compose.yml               #
 ######################################################
-export BUILD_ENV_VERSION=v20230207_02
+export BUILD_ENV_VERSION=v20230208_05
 
 export BUILD_TAG="public.ecr.aws/x5u3w5h6/rw-build-env:${BUILD_ENV_VERSION}"
 

ci/build-ci-image.sh

@@ -30,28 +30,28 @@ services:
       retries: 5
 
   source-test-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230207_02
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230208_05
     depends_on:
       - mysql
       - db
     volumes:
       - ..:/risingwave
 
   sink-test-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230207_02
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230208_05
     depends_on:
       - mysql
       - db
     volumes:
       - ..:/risingwave
 
   rw-build-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230207_02
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230208_05
     volumes:
       - ..:/risingwave
 
   regress-test-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230207_02
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230208_05
     depends_on:
       db:
         condition: service_healthy

ci/docker-compose.yml

@@ -19,3 +19,6 @@ mv target/sim/ci-sim/risingwave_simulation ./risingwave_simulation
 
 artifacts=(risingwave_simulation scale-test.tar.zst)
 echo -n "${artifacts[*]}" | parallel -d ' ' "buildkite-agent artifact upload ./{}"
+
+echo "--- Show sccache stats"
+sccache --show-stats

ci/scripts/build-simulation.sh

@@ -53,3 +53,6 @@ ldd target/"$target"/risingwave
 
 echo "--- Upload artifacts"
 echo -n "${artifacts[*]}" | parallel -d ' ' "mv target/$target/{} ./{}-$profile && buildkite-agent artifact upload ./{}-$profile"
+
+echo "--- Show sccache stats"
+sccache --show-stats

ci/scripts/build.sh

@@ -30,7 +30,7 @@ echo "--- deterministic simulation e2e, ci-3cn-2fe, batch"
 seq $TEST_NUM | parallel MADSIM_TEST_SEED={} './risingwave_simulation ./e2e_test/batch/\*\*/\*.slt 2> $LOGDIR/batch-{}.log && rm $LOGDIR/batch-{}.log'
 
 echo "--- deterministic simulation e2e, ci-3cn-2fe, kafka source"
-seq $TEST_NUM | parallel MADSIM_TEST_SEED={} './risingwave_simulation --kafka-datadir=./scripts/source/test_data ./e2e_test/source/kafka.slt 2> $LOGDIR/source-{}.log && rm $LOGDIR/source-{}.log'
+seq $TEST_NUM | parallel MADSIM_TEST_SEED={} './risingwave_simulation --kafka-datadir=./scripts/source/test_data ./e2e_test/source/basic/kafka\*.slt 2> $LOGDIR/source-{}.log && rm $LOGDIR/source-{}.log'
 
 echo "--- deterministic simulation e2e, ci-3cn-2fe, parallel, streaming"
 seq $TEST_NUM | parallel MADSIM_TEST_SEED={} './risingwave_simulation -j 16 ./e2e_test/streaming/\*\*/\*.slt 2> $LOGDIR/parallel-streaming-{}.log && rm $LOGDIR/parallel-streaming-{}.log'

ci/scripts/deterministic-e2e-test.sh

@@ -5,3 +5,6 @@ set -euo pipefail
 
 source ci/scripts/common.env.sh
 source ci/scripts/run-unit-test.sh
+
+echo "--- Show sccache stats"
+sccache --show-stats

ci/scripts/unit-test.sh

@@ -1,5 +1,6 @@
 disallowed-methods = [
-    { path = "std::iter::Iterator::zip", reason = "Please use Itertools::zip_eq instead." },
+    { path = "std::iter::Iterator::zip", reason = "Please use `zip_eq_fast` if it's available. Otherwise use `zip_eq_debug`" },
+    { path = "itertools::Itertools::zip_eq", reason = "Please use `zip_eq_fast` if it's available. Otherwise use `zip_eq_debug`" },
     { path = "futures::stream::select_all", reason = "Please use `risingwave_common::util::select_all` instead." },
 ]
 doc-valid-idents = [