From 8c82acaa5c200e8712672b8e2df4bfa4d7091e9c Mon Sep 17 00:00:00 2001 From: Runji Wang Date: Fri, 26 Jan 2024 15:25:25 +0800 Subject: [PATCH] patch rquickjs-sys and remove clang dependency Signed-off-by: Runji Wang --- Cargo.lock | 57 +++--------------------------------------- Cargo.toml | 4 ++- ci/Dockerfile | 2 +- docker/Dockerfile | 2 +- docker/Dockerfile.hdfs | 2 +- 5 files changed, 9 insertions(+), 58 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1ebfc5c51617a..c3af1be34d497 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -630,7 +630,7 @@ dependencies = [ [[package]] name = "arrow-udf-js" version = "0.1.0" -source = "git+https://github.com/risingwavelabs/arrow-udf.git?rev=ea7664d#ea7664da1a130bdd04bc22bb5146f52b2aa89f03" +source = "git+https://github.com/risingwavelabs/arrow-udf.git?rev=7ba1c22#7ba1c226fa2f7418a217ee064a19b90efeb7143c" dependencies = [ "anyhow", "arrow-array 50.0.0", @@ -1573,29 +1573,6 @@ dependencies = [ "shlex", ] -[[package]] -name = "bindgen" -version = "0.66.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" -dependencies = [ - "bitflags 2.4.0", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "prettyplease 0.2.15", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.48", - "which", -] - [[package]] name = "bit-set" version = "0.5.3" @@ -6274,7 +6251,7 @@ checksum = "06f19e4cfa0ab5a76b627cec2d81331c49b034988eaf302c3bafeada684eadef" dependencies = [ "base64 0.21.4", "bigdecimal 0.4.2", - "bindgen 0.59.2", + "bindgen", "bitflags 2.4.0", "bitvec", "btoi", @@ -8352,12 +8329,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3cbb081b9784b07cceb8824c8583f86db4814d172ab043f3c23f7dc600bf83d" -[[package]] -name = "relative-path" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" - [[package]] name = "rend" version = "0.4.0" @@ -10118,7 +10089,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0db265d331ae1b1a9fdb68466a8359bc9dcc5e78a9c323f790322f8442e005ac" dependencies = [ "rquickjs-core", - "rquickjs-macro", ] [[package]] @@ -10127,35 +10097,14 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48e51f2fc99917699385bfa290b776e712e414b222d7c2a9b2cd67b8e93585f3" dependencies = [ - "relative-path", "rquickjs-sys", ] -[[package]] -name = "rquickjs-macro" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c508ce83e3f9daaa91e63ffcd0e2df71cbf46c52246cb45ce410a2d8fdc04df" -dependencies = [ - "convert_case", - "fnv", - "ident_case", - "indexmap 2.0.0", - "proc-macro-crate 1.3.1", - "proc-macro-error 1.0.4", - "proc-macro2", - "quote", - "rquickjs-core", - "syn 2.0.48", -] - [[package]] name = "rquickjs-sys" version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b6865056bc4154c49bc8b2babd9232a8ba55dee4860fc74c789633aecad3ca" +source = "git+https://github.com/DelSkayn/rquickjs.git?rev=60696e8#60696e88dfb903d8f5cd81b2667fb3f64f9e9f67" dependencies = [ - "bindgen 0.66.1", "cc", ] diff --git a/Cargo.toml b/Cargo.toml index d6fc352af369b..b887bb254da61 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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 = "ea7664d" } +arrow-udf-js = { git = "https://github.com/risingwavelabs/arrow-udf.git", rev = "7ba1c22" } 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" } @@ -282,6 +282,8 @@ tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = futures-timer = { git = "https://github.com/madsim-rs/futures-timer.git", rev = "05b33b4" } # patch: unlimit 4MB message size for grpc client etcd-client = { git = "https://github.com/risingwavelabs/etcd-client.git", rev = "4e84d40" } +# need binding on aarch64-unknown-linux-gnu, waiting for new release +rquickjs-sys = { git = "https://github.com/DelSkayn/rquickjs.git", rev = "60696e8" } [workspace.metadata.dylint] libraries = [{ path = "./lints" }] diff --git a/ci/Dockerfile b/ci/Dockerfile index 9706c575931ac..b45222bb20e66 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -13,7 +13,7 @@ RUN sed -i 's|http://archive.ubuntu.com/ubuntu|http://us-east-2.ec2.archive.ubun RUN apt-get update -yy && \ DEBIAN_FRONTEND=noninteractive apt-get -y install make build-essential cmake protobuf-compiler curl parallel python3 python3-pip \ openssl libssl-dev libsasl2-dev libcurl4-openssl-dev pkg-config bash openjdk-11-jdk wget unzip git tmux lld postgresql-client kafkacat netcat mysql-client \ - maven zstd libzstd-dev locales clang -yy \ + maven zstd libzstd-dev locales -yy \ && rm -rf /var/lib/{apt,dpkg,cache,log}/ SHELL ["/bin/bash", "-c"] diff --git a/docker/Dockerfile b/docker/Dockerfile index f6cf76576e18d..58e93de54bcef 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -19,7 +19,7 @@ RUN cd /risingwave/dashboard && npm i && npm run build-static && rm -rf node_mod FROM base AS rust-base -RUN apt-get update && apt-get -y install make cmake protobuf-compiler curl bash lld unzip clang +RUN apt-get update && apt-get -y install make cmake protobuf-compiler curl bash lld unzip SHELL ["/bin/bash", "-c"] diff --git a/docker/Dockerfile.hdfs b/docker/Dockerfile.hdfs index c516b7d6cf0a8..e8dd1988bd6fe 100644 --- a/docker/Dockerfile.hdfs +++ b/docker/Dockerfile.hdfs @@ -7,7 +7,7 @@ RUN apt-get update \ FROM base AS builder -RUN apt-get update && apt-get -y install make cmake protobuf-compiler curl bash lld maven unzip clang +RUN apt-get update && apt-get -y install make cmake protobuf-compiler curl bash lld maven unzip SHELL ["/bin/bash", "-c"]