Skip to content

Commit

Permalink
feat: remove deno UDF (#17875)
Browse files Browse the repository at this point in the history
Signed-off-by: xxchan <[email protected]>
  • Loading branch information
xxchan authored Jul 31, 2024
1 parent 892d86f commit 74702d5
Show file tree
Hide file tree
Showing 10 changed files with 147 additions and 1,892 deletions.
1,650 changes: 146 additions & 1,504 deletions Cargo.lock

Large diffs are not rendered by default.

10 changes: 0 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ arrow-select = "50"
arrow-ord = "50"
arrow-row = "50"
arrow-udf-js = "0.3.1"
arrow-udf-js-deno = { git = "https://github.com/risingwavelabs/arrow-udf.git", rev = "fa36365" }
arrow-udf-wasm = { version = "0.2.2", features = ["build"] }
arrow-udf-python = "0.2"
arrow-udf-flight = "0.1"
Expand Down Expand Up @@ -335,15 +334,6 @@ tokio-retry = { git = "https://github.com/madsim-rs/rust-tokio-retry.git", rev =
tokio-postgres = { git = "https://github.com/madsim-rs/rust-postgres.git", rev = "ac00d88" }
futures-timer = { git = "https://github.com/madsim-rs/futures-timer.git", rev = "05b33b4" }
# patch to remove preserve_order from serde_json
deno_core = { git = "https://github.com/bakjos/deno_core", rev = "9b241c6" }
# patch to user reqwest 0.12.2
deno_fetch = { git = "https://github.com/bakjos/deno", rev = "787a232" }
deno_http = { git = "https://github.com/bakjos/deno", rev = "787a232" }
deno_net = { git = "https://github.com/bakjos/deno", rev = "787a232" }
deno_tls = { git = "https://github.com/bakjos/deno", rev = "787a232" }
deno_web = { git = "https://github.com/bakjos/deno", rev = "787a232" }
deno_websocket = { git = "https://github.com/bakjos/deno", rev = "787a232" }
# patch to remove preserve_order from serde_json
bson = { git = "https://github.com/risingwavelabs/bson-rust", rev = "e5175ec" }

[workspace.metadata.dylint]
Expand Down
6 changes: 0 additions & 6 deletions Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ env_scripts = [
is_external_udf_enabled = get_env ENABLE_EXTERNAL_UDF
is_wasm_udf_enabled = get_env ENABLE_WASM_UDF
is_js_udf_enabled = get_env ENABLE_JS_UDF
is_deno_udf_enabled = get_env ENABLE_DENO_UDF
is_python_udf_enabled = get_env ENABLE_PYTHON_UDF
if ${is_sanitizer_enabled}
Expand Down Expand Up @@ -79,11 +78,6 @@ env_scripts = [
set_env RISINGWAVE_FEATURE_FLAGS "${flags} --features js-udf"
end
if ${is_deno_udf_enabled}
flags = get_env RISINGWAVE_FEATURE_FLAGS
set_env RISINGWAVE_FEATURE_FLAGS "${flags} --features deno-udf"
end
if ${is_python_udf_enabled}
flags = get_env RISINGWAVE_FEATURE_FLAGS
set_env RISINGWAVE_FEATURE_FLAGS "${flags} --features python-udf"
Expand Down
1 change: 0 additions & 1 deletion ci/scripts/run-e2e-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ sqllogictest -p 4566 -d dev './e2e_test/udf/wasm_udf.slt'
sqllogictest -p 4566 -d dev './e2e_test/udf/rust_udf.slt'
sqllogictest -p 4566 -d dev './e2e_test/udf/js_udf.slt'
sqllogictest -p 4566 -d dev './e2e_test/udf/python_udf.slt'
sqllogictest -p 4566 -d dev './e2e_test/udf/deno_udf.slt'

echo "--- Kill cluster"
cluster_stop
Expand Down
233 changes: 0 additions & 233 deletions e2e_test/udf/deno_udf.slt

This file was deleted.

3 changes: 1 addition & 2 deletions src/cmd_all/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ repository = { workspace = true }
default = ["rw-static-link"]
rw-static-link = ["workspace-config/rw-static-link"]
rw-dynamic-link = ["workspace-config/rw-dynamic-link"]
all-udf = ["external-udf", "wasm-udf", "js-udf", "deno-udf", "python-udf"]
all-udf = ["external-udf", "wasm-udf", "js-udf", "python-udf"]
external-udf = ["risingwave_expr_impl/external-udf"]
wasm-udf = ["risingwave_expr_impl/wasm-udf"]
js-udf = ["risingwave_expr_impl/js-udf"]
deno-udf = ["risingwave_expr_impl/deno-udf"]
python-udf = ["risingwave_expr_impl/python-udf"]

[package.metadata.cargo-machete]
Expand Down
2 changes: 0 additions & 2 deletions src/expr/impl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ normal = ["workspace-hack", "ctor"]
[features]
external-udf = ["arrow-udf-flight", "arrow-flight", "tonic"]
js-udf = ["arrow-udf-js"]
deno-udf = ["arrow-udf-js-deno", "zstd"]
python-udf = ["arrow-udf-python"]
wasm-udf = ["arrow-udf-wasm", "zstd"]

Expand All @@ -31,7 +30,6 @@ arrow-schema = { workspace = true }
arrow-schema-iceberg = { workspace = true }
arrow-udf-flight = { workspace = true, optional = true }
arrow-udf-js = { workspace = true, optional = true }
arrow-udf-js-deno = { workspace = true, optional = true }
arrow-udf-python = { workspace = true, optional = true }
arrow-udf-wasm = { workspace = true, optional = true }
async-trait = "0.1"
Expand Down
Loading

0 comments on commit 74702d5

Please sign in to comment.