Skip to content

Commit

Permalink
Merge branch 'main' into yiming/remove-separate-mutation-subscriber
Browse files Browse the repository at this point in the history
  • Loading branch information
wenym1 committed Sep 18, 2024
2 parents fc05157 + 06d5cde commit bd499c6
Show file tree
Hide file tree
Showing 270 changed files with 8,216 additions and 6,320 deletions.
123 changes: 93 additions & 30 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ aws-smithy-types = { version = "1", default-features = false, features = [
aws-endpoint = "0.60"
aws-types = "1"
axum = "=0.7.4" # TODO: 0.7.5+ does not work with current toolchain
axum-extra = "0.9"
etcd-client = { package = "madsim-etcd-client", version = "0.6" }
futures-async-stream = "0.2.9"
hytra = "0.1"
Expand All @@ -143,9 +144,10 @@ arrow-array-iceberg = { package = "arrow-array", version = "52" }
arrow-schema-iceberg = { package = "arrow-schema", version = "52" }
arrow-buffer-iceberg = { package = "arrow-buffer", version = "52" }
arrow-cast-iceberg = { package = "arrow-cast", version = "52" }
iceberg = "0.3.0"
iceberg-catalog-rest = "0.3.0"
iceberg-catalog-glue = "0.3.0"
# branch dev
iceberg = { git = "https://github.com/risingwavelabs/iceberg-rust.git", rev = "84bf51c9d0d5886e4ee306ca4f383f029e1767a4" }
iceberg-catalog-rest = { git = "https://github.com/risingwavelabs/iceberg-rust.git", rev = "84bf51c9d0d5886e4ee306ca4f383f029e1767a4" }
iceberg-catalog-glue = { git = "https://github.com/risingwavelabs/iceberg-rust.git", rev = "84bf51c9d0d5886e4ee306ca4f383f029e1767a4" }
opendal = "0.47"
arrow-array = "50"
arrow-arith = "50"
Expand Down
6 changes: 6 additions & 0 deletions ci/scripts/backwards-compat-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ ENABLE_BUILD_RUST=$ENABLE_BUILD
# Use target/debug for simplicity.
ENABLE_RELEASE_PROFILE=false
ENABLE_PYTHON_UDF=true
ENABLE_JS_UDF=true
EOF

# See https://github.com/risingwavelabs/risingwave/pull/15448
Expand All @@ -100,6 +102,10 @@ setup_old_cluster() {
set -e
echo "Failed to download ${OLD_VERSION} from github releases, build from source later during \`risedev d\`"
configure_rw "$OLD_VERSION" true
elif [[ $OLD_VERSION = '1.10.1' || $OLD_VERSION = '1.10.0' ]]; then
set -e
echo "1.10.x has older openssl version, build from source later during \`risedev d\`"
configure_rw "$OLD_VERSION" true
else
set -e
tar -xvf risingwave-v"${OLD_VERSION}"-x86_64-unknown-linux.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ cargo build \
--timings


artifacts=(risingwave sqlsmith compaction-test risingwave_regress_test risingwave_e2e_extended_mode_test risedev-dev delete-range-test)
artifacts=(risingwave sqlsmith compaction-test risingwave_regress_test risingwave_e2e_extended_mode_test risedev-dev)

echo "--- Show link info"
ldd target/"$profile"/risingwave
Expand Down
Loading

0 comments on commit bd499c6

Please sign in to comment.