Merge branch 'main' into include-sst

risingwavelabs · Aug 11, 2023 · 8116342 · 8116342
2 parents 6fe63c9 + cfa7a52
commit 8116342
Show file tree

Hide file tree

Showing 25 changed files with 1,060 additions and 928 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ci/Dockerfile b/ci/Dockerfile
@@ -40,7 +40,7 @@ RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/ca
 RUN cargo binstall -y --no-symlinks cargo-llvm-cov cargo-nextest cargo-hakari cargo-sort cargo-cache cargo-audit \
     [email protected] \
     && cargo install sccache --locked \
-    && cargo install [email protected].1 --locked \
+    && cargo install [email protected].2 --locked \
     && cargo cache -a \
     && rm -rf "/root/.cargo/registry/index" \
     && rm -rf "/root/.cargo/registry/cache" \

diff --git a/ci/build-ci-image.sh b/ci/build-ci-image.sh
@@ -13,7 +13,7 @@ cat ../rust-toolchain
 # !!! CHANGE THIS WHEN YOU WANT TO BUMP CI IMAGE !!! #
 #          AND ALSO docker-compose.yml               #
 ######################################################
-export BUILD_ENV_VERSION=v20230727
+export BUILD_ENV_VERSION=v20230810
 
 export BUILD_TAG="public.ecr.aws/x5u3w5h6/rw-build-env:${BUILD_ENV_VERSION}"
 

diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml
@@ -71,7 +71,7 @@ services:
       retries: 5
 
   source-test-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230727
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230810
     depends_on:
       - mysql
       - db
@@ -80,7 +80,7 @@ services:
       - ..:/risingwave
 
   sink-test-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230727
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230810
     depends_on:
       - mysql
       - db
@@ -89,12 +89,12 @@ services:
       - ..:/risingwave
 
   rw-build-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230727
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230810
     volumes:
       - ..:/risingwave
 
   ci-flamegraph-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230727
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230810
     # NOTE(kwannoel): This is used in order to permit
     # syscalls for `nperf` (perf_event_open),
     # so it can do CPU profiling.
@@ -105,7 +105,7 @@ services:
       - ..:/risingwave
 
   regress-test-env:
-    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230727
+    image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230810
     depends_on:
       db:
         condition: service_healthy

diff --git a/ci/scripts/check.sh b/ci/scripts/check.sh
@@ -23,15 +23,31 @@ scripts/check/check-trailing-spaces.sh
 echo "--- Run clippy check (dev, all features)"
 cargo clippy --all-targets --all-features --locked -- -D warnings
 
+echo "--- Show sccache stats"
+sccache --show-stats
+sccache --zero-stats
+
 echo "--- Run clippy check (release)"
 cargo clippy --release --all-targets --features "rw-static-link" --locked -- -D warnings
 
+echo "--- Show sccache stats"
+sccache --show-stats
+sccache --zero-stats
+
 echo "--- Build documentation"
 cargo doc --document-private-items --no-deps
 
+echo "--- Show sccache stats"
+sccache --show-stats
+sccache --zero-stats
+
 echo "--- Run doctest"
 cargo test --doc
 
+echo "--- Show sccache stats"
+sccache --show-stats
+sccache --zero-stats
+
 echo "--- Run audit check"
 cargo audit
 
diff --git a/src/batch/Cargo.toml b/src/batch/Cargo.toml
@@ -17,7 +17,7 @@ normal = ["workspace-hack"]
 anyhow = "1"
 assert_matches = "1"
 async-recursion = "1"
-async-stream = "0.3.4"
+async-stream = "0.3.5"
 async-trait = "0.1"
 either = "1"
 futures = { version = "0.3", default-features = false, features = ["alloc"] }

diff --git a/src/bench/Cargo.toml b/src/bench/Cargo.toml
@@ -40,7 +40,7 @@ tokio = { version = "0.2", package = "madsim-tokio", features = [
 tokio-stream = "0.1"
 toml = "0.7"
 tracing = "0.1"
-tracing-subscriber = "0.3.16"
+tracing-subscriber = "0.3.17"
 
 [target.'cfg(not(madsim))'.dependencies]
 workspace-hack = { path = "../workspace-hack" }

diff --git a/src/common/Cargo.toml b/src/common/Cargo.toml
@@ -38,6 +38,7 @@ either = "1"
 enum-as-inner = "0.6"
 ethnum = { version = "1", features = ["serde"] }
 fixedbitset = { version = "0.4", features = ["std"] }
+fs-err = "2"
 futures = { version = "0.3", default-features = false, features = ["alloc"] }
 hex = "0.4.3"
 http = "0.2"
@@ -93,7 +94,7 @@ toml = "0.7"
 tonic = { workspace = true }
 tracing = "0.1"
 tracing-opentelemetry = "0.20"
-tracing-subscriber = "0.3.16"
+tracing-subscriber = "0.3.17"
 twox-hash = "1"
 url = "2"
 uuid = "1.4.1"