diff --git a/Cargo.lock b/Cargo.lock index ede9b26e810f0..2bc9ee69b557f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -682,16 +682,29 @@ dependencies = [ ] [[package]] -name = "arrow-udf-deno" +name = "arrow-udf-js" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "252b6355ad1e57eb6454b705c51652de55aa22eb018cdb95be0dbf62ee3ec78f" +dependencies = [ + "anyhow", + "arrow-array 50.0.0", + "arrow-buffer 50.0.0", + "arrow-schema 50.0.0", + "rquickjs", +] + +[[package]] +name = "arrow-udf-js-deno" version = "0.0.1" -source = "git+https://github.com/bakjos/arrow-udf.git?rev=3a00425#3a004252471c47d68211b050c614372c498ac5b3" +source = "git+https://github.com/risingwavelabs/arrow-udf.git?rev=1381842#13818424f07d4494509ae82dfb4fab9ef105b90e" dependencies = [ "anyhow", "arrow-array 50.0.0", "arrow-buffer 50.0.0", "arrow-data 50.0.0", "arrow-schema 50.0.0", - "arrow-udf-deno-runtime", + "arrow-udf-js-deno-runtime", "async-trait", "deno_core", "futures", @@ -704,9 +717,9 @@ dependencies = [ ] [[package]] -name = "arrow-udf-deno-runtime" +name = "arrow-udf-js-deno-runtime" version = "0.0.1" -source = "git+https://github.com/bakjos/arrow-udf.git?rev=3a00425#3a004252471c47d68211b050c614372c498ac5b3" +source = "git+https://github.com/risingwavelabs/arrow-udf.git?rev=1381842#13818424f07d4494509ae82dfb4fab9ef105b90e" dependencies = [ "anyhow", "deno_ast", @@ -716,7 +729,6 @@ dependencies = [ "deno_fetch", "deno_http", "deno_io", - "deno_napi", "deno_net", "deno_tls", "deno_url", @@ -732,19 +744,6 @@ dependencies = [ "v8", ] -[[package]] -name = "arrow-udf-js" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "252b6355ad1e57eb6454b705c51652de55aa22eb018cdb95be0dbf62ee3ec78f" -dependencies = [ - "anyhow", - "arrow-array 50.0.0", - "arrow-buffer 50.0.0", - "arrow-schema 50.0.0", - "rquickjs", -] - [[package]] name = "arrow-udf-python" version = "0.1.0" @@ -3665,16 +3664,6 @@ dependencies = [ "url", ] -[[package]] -name = "deno_napi" -version = "0.72.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13553afb6cc3292b96c989abd3ee9e9cdb58ba703c2b69941c1b9392839372f9" -dependencies = [ - "deno_core", - "libloading", -] - [[package]] name = "deno_native_certs" version = "0.2.0" @@ -10356,8 +10345,8 @@ dependencies = [ "anyhow", "arrow-array 50.0.0", "arrow-schema 50.0.0", - "arrow-udf-deno", "arrow-udf-js", + "arrow-udf-js-deno", "arrow-udf-python", "arrow-udf-wasm", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index f89fabce2b19e..3814b1a2bc799 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -136,9 +136,8 @@ arrow-flight = "50" arrow-select = "50" arrow-ord = "50" arrow-row = "50" -# FIXME: This should be changed to the official crate once it's published. -arrow-udf-deno = { git = "https://github.com/bakjos/arrow-udf.git", rev = "3a00425" } arrow-udf-js = "0.1" +arrow-udf-js-deno = { git = "https://github.com/risingwavelabs/arrow-udf.git", rev = "1381842" } arrow-udf-wasm = { version = "0.2", features = ["build"] } arrow-udf-python = { git = "https://github.com/risingwavelabs/arrow-udf.git", rev = "6c32f71" } arrow-array-deltalake = { package = "arrow-array", version = "48.0.1" } diff --git a/src/expr/core/Cargo.toml b/src/expr/core/Cargo.toml index a18439cb02f57..da4dc20106d85 100644 --- a/src/expr/core/Cargo.toml +++ b/src/expr/core/Cargo.toml @@ -16,15 +16,15 @@ ignored = ["workspace-hack", "ctor"] normal = ["workspace-hack", "ctor"] [features] -embedded-deno-udf = ["arrow-udf-deno"] +embedded-deno-udf = ["arrow-udf-js-deno"] embedded-python-udf = ["arrow-udf-python"] [dependencies] anyhow = "1" arrow-array = { workspace = true } arrow-schema = { workspace = true } -arrow-udf-deno = { workspace = true, optional = true } arrow-udf-js = { workspace = true } +arrow-udf-js-deno = { workspace = true, optional = true } arrow-udf-python = { workspace = true, optional = true } arrow-udf-wasm = { workspace = true } async-trait = "0.1" diff --git a/src/expr/core/src/expr/expr_udf.rs b/src/expr/core/src/expr/expr_udf.rs index 7985885c3e0cd..a65b7162ceb66 100644 --- a/src/expr/core/src/expr/expr_udf.rs +++ b/src/expr/core/src/expr/expr_udf.rs @@ -20,9 +20,9 @@ use std::time::Duration; use anyhow::{Context, Error}; use arrow_schema::{Field, Fields, Schema}; -#[cfg(feature = "embedded-deno-udf")] -use arrow_udf_deno::{CallMode as DenoCallMode, Runtime as DenoRuntime}; use arrow_udf_js::{CallMode as JsCallMode, Runtime as JsRuntime}; +#[cfg(feature = "embedded-deno-udf")] +use arrow_udf_js_deno::{CallMode as DenoCallMode, Runtime as DenoRuntime}; #[cfg(feature = "embedded-python-udf")] use arrow_udf_python::{CallMode as PythonCallMode, Runtime as PythonRuntime}; use arrow_udf_wasm::Runtime as WasmRuntime; diff --git a/src/expr/core/src/table_function/user_defined.rs b/src/expr/core/src/table_function/user_defined.rs index 7124c00662799..eb86255ebebe4 100644 --- a/src/expr/core/src/table_function/user_defined.rs +++ b/src/expr/core/src/table_function/user_defined.rs @@ -17,9 +17,9 @@ use std::sync::Arc; use anyhow::Context; use arrow_array::RecordBatch; use arrow_schema::{Field, Fields, Schema, SchemaRef}; -#[cfg(feature = "embedded-deno-udf")] -use arrow_udf_deno::{CallMode as DenoCallMode, Runtime as DenoRuntime}; use arrow_udf_js::{CallMode as JsCallMode, Runtime as JsRuntime}; +#[cfg(feature = "embedded-deno-udf")] +use arrow_udf_js_deno::{CallMode as DenoCallMode, Runtime as DenoRuntime}; #[cfg(feature = "embedded-python-udf")] use arrow_udf_python::{CallMode as PythonCallMode, Runtime as PythonRuntime}; use cfg_or_panic::cfg_or_panic;