Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/cargo/serde_with-3.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
fuyufjh authored Jan 24, 2024
2 parents 62dcd75 + d563f1e commit b0df294
Show file tree
Hide file tree
Showing 186 changed files with 2,107 additions and 920 deletions.
121 changes: 87 additions & 34 deletions Cargo.lock

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

9 changes: 5 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ members = [
"src/connector",
"src/connector/with_options",
"src/ctl",
"src/dml",
"src/error",
"src/expr/core",
"src/expr/impl",
Expand All @@ -33,7 +34,6 @@ members = [
"src/risedevtool",
"src/risedevtool/config",
"src/rpc_client",
"src/source",
"src/sqlparser",
"src/sqlparser/test_runner",
"src/storage",
Expand Down Expand Up @@ -133,7 +133,7 @@ arrow-flight = "50"
arrow-select = "50"
arrow-ord = "50"
arrow-row = "50"
arrow-udf-js = { git = "https://github.com/risingwavelabs/arrow-udf.git", rev = "7ba1c22" }
arrow-udf-js = { git = "https://github.com/risingwavelabs/arrow-udf.git", rev = "ea7664d" }
arrow-udf-wasm = "0.1"
arrow-array-deltalake = { package = "arrow-array", version = "48.0.1" }
arrow-buffer-deltalake = { package = "arrow-buffer", version = "48.0.1" }
Expand All @@ -144,13 +144,15 @@ arrow-schema-deltalake = { package = "arrow-schema", version = "48.0.1" }
deltalake = { git = "https://github.com/risingwavelabs/delta-rs", rev = "5c2dccd4640490202ffe98adbd13b09cef8e007b", features = [
"s3-no-concurrent-write",
] }
lru = { git = "https://github.com/risingwavelabs/lru-rs.git", rev = "95f347b" }
parquet = "50"
thiserror-ext = "0.0.11"
tikv-jemalloc-ctl = { git = "https://github.com/risingwavelabs/jemallocator.git", rev = "64a2d9" }
tikv-jemallocator = { git = "https://github.com/risingwavelabs/jemallocator.git", features = [
"profiling",
"stats",
], rev = "64a2d9" }
tokio-util = "0.7"

risingwave_backup = { path = "./src/storage/backup" }
risingwave_batch = { path = "./src/batch" }
Expand All @@ -162,6 +164,7 @@ risingwave_compactor = { path = "./src/storage/compactor" }
risingwave_compute = { path = "./src/compute" }
risingwave_ctl = { path = "./src/ctl" }
risingwave_connector = { path = "./src/connector" }
risingwave_dml = { path = "./src/dml" }
risingwave_error = { path = "./src/error" }
risingwave_expr = { path = "./src/expr/core" }
risingwave_expr_impl = { path = "./src/expr/impl" }
Expand All @@ -179,7 +182,6 @@ risingwave_object_store = { path = "./src/object_store" }
risingwave_pb = { path = "./src/prost" }
risingwave_rpc_client = { path = "./src/rpc_client" }
risingwave_rt = { path = "./src/utils/runtime" }
risingwave_source = { path = "./src/source" }
risingwave_sqlparser = { path = "./src/sqlparser" }
risingwave_sqlsmith = { path = "./src/tests/sqlsmith" }
risingwave_storage = { path = "./src/storage" }
Expand All @@ -190,7 +192,6 @@ risingwave_variables = { path = "./src/utils/variables" }
risingwave_java_binding = { path = "./src/java_binding" }
risingwave_jni_core = { path = "src/jni_core" }
rw_futures_util = { path = "src/utils/futures_util" }
tokio-util = "0.7"

[workspace.lints.rust]
# `forbid` will also prevent the misuse of `#[allow(unused)]`
Expand Down
11 changes: 8 additions & 3 deletions Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -919,10 +919,10 @@ cargo build \
-p risingwave_common \
-p risingwave_compute \
-p risingwave_connector \
-p risingwave_dml \
-p risingwave_frontend \
-p risingwave_meta \
-p risingwave_object_store \
-p risingwave_source \
-p risingwave_storage \
-p risingwave_stream \
-p pgwire \
Expand All @@ -944,10 +944,10 @@ cargo nextest run \
-p risingwave_common \
-p risingwave_compute \
-p risingwave_connector \
-p risingwave_dml \
-p risingwave_frontend \
-p risingwave_meta \
-p risingwave_object_store \
-p risingwave_source \
-p risingwave_storage \
-p risingwave_stream \
-p pgwire \
Expand Down Expand Up @@ -1000,10 +1000,10 @@ cargo check \
-p risingwave_common \
-p risingwave_compute \
-p risingwave_connector \
-p risingwave_dml \
-p risingwave_frontend \
-p risingwave_meta \
-p risingwave_object_store \
-p risingwave_source \
-p risingwave_storage \
-p risingwave_stream \
-p pgwire \
Expand Down Expand Up @@ -1305,6 +1305,11 @@ command = "target/${BUILD_MODE_DIR}/risedev-dev"
args = ["${@}"]
description = "Clean data and start a full RisingWave dev cluster using risedev-dev"

[tasks.ci-kill-no-dump-logs]
category = "RiseDev - CI"
dependencies = ["k", "check-logs", "wait-processes-exit"]
description = "Kill cluster and check logs, do not dump logs"

[tasks.ci-kill]
category = "RiseDev - CI"
dependencies = ["k", "l", "check-logs", "wait-processes-exit"]
Expand Down
Loading

0 comments on commit b0df294

Please sign in to comment.