Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare for DataFusion 47 #80

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Prepare for DataFusion 47 #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,11 @@ pedantic = { level = "deny", priority = -1 }
[[bench]]
name = "main"
harness = false

[patch.crates-io]
datafusion = { git = "https://github.com/apache/datafusion.git", rev = "722ccb9" }
datafusion-common = { git = "https://github.com/apache/datafusion.git", rev = "722ccb9" }
datafusion-physical-expr = { git = "https://github.com/apache/datafusion.git", rev = "722ccb9" }
datafusion-functions-aggregate = { git = "https://github.com/apache/datafusion.git", rev = "722ccb9" }
datafusion-expr = { git = "https://github.com/apache/datafusion.git", rev = "722ccb9" }
datafusion-macros = { git = "https://github.com/apache/datafusion.git", rev = "722ccb9" }
25 changes: 21 additions & 4 deletions benches/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,29 @@
use codspeed_criterion_compat::{criterion_group, criterion_main, Bencher, Criterion};

use datafusion::common::ScalarValue;
use datafusion::arrow::datatypes::DataType;
use datafusion::logical_expr::ColumnarValue;
use datafusion::{common::ScalarValue, logical_expr::ScalarFunctionArgs};
use datafusion_functions_json::udfs::{json_contains_udf, json_get_str_udf};

fn bench_json_contains(b: &mut Bencher) {
let json_contains = json_contains_udf();
let args = &[
let args = vec![
ColumnarValue::Scalar(ScalarValue::Utf8(Some(
r#"{"a": {"aa": "x", "ab: "y"}, "b": []}"#.to_string(),
))),
ColumnarValue::Scalar(ScalarValue::Utf8(Some("a".to_string()))),
ColumnarValue::Scalar(ScalarValue::Utf8(Some("aa".to_string()))),
];

b.iter(|| json_contains.invoke_batch(args, 1).unwrap());
b.iter(|| {
json_contains
.invoke_with_args(ScalarFunctionArgs {
args: args.clone(),
number_rows: 1,
return_type: &DataType::Boolean,
})
.unwrap()
});
}

fn bench_json_get_str(b: &mut Bencher) {
Expand All @@ -27,7 +36,15 @@ fn bench_json_get_str(b: &mut Bencher) {
ColumnarValue::Scalar(ScalarValue::Utf8(Some("aa".to_string()))),
];

b.iter(|| json_get_str.invoke_batch(args, 1).unwrap());
b.iter(|| {
json_get_str
.invoke_with_args(ScalarFunctionArgs {
args: args.to_vec(),
number_rows: 1,
return_type: &DataType::Utf8,
})
.unwrap()
});
}

fn criterion_benchmark(c: &mut Criterion) {
Expand Down
6 changes: 3 additions & 3 deletions src/json_as_text.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::sync::Arc;
use datafusion::arrow::array::{ArrayRef, StringArray, StringBuilder};
use datafusion::arrow::datatypes::DataType;
use datafusion::common::{Result as DataFusionResult, ScalarValue};
use datafusion::logical_expr::{ColumnarValue, ScalarUDFImpl, Signature, Volatility};
use datafusion::logical_expr::{ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility};
use jiter::Peek;

use crate::common::{get_err, invoke, jiter_json_find, return_type_check, GetError, InvokeResult, JsonPath};
Expand Down Expand Up @@ -49,8 +49,8 @@ impl ScalarUDFImpl for JsonAsText {
return_type_check(arg_types, self.name(), DataType::Utf8)
}

fn invoke(&self, args: &[ColumnarValue]) -> DataFusionResult<ColumnarValue> {
invoke::<StringArray>(args, jiter_json_as_text)
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> DataFusionResult<ColumnarValue> {
invoke::<StringArray>(&args.args, jiter_json_as_text)
}

fn aliases(&self) -> &[String] {
Expand Down
6 changes: 3 additions & 3 deletions src/json_contains.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use datafusion::arrow::array::BooleanBuilder;
use datafusion::arrow::datatypes::DataType;
use datafusion::common::arrow::array::{ArrayRef, BooleanArray};
use datafusion::common::{plan_err, Result, ScalarValue};
use datafusion::logical_expr::{ColumnarValue, ScalarUDFImpl, Signature, Volatility};
use datafusion::logical_expr::{ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility};

use crate::common::{invoke, jiter_json_find, return_type_check, GetError, InvokeResult, JsonPath};
use crate::common_macros::make_udf_function;
Expand Down Expand Up @@ -53,8 +53,8 @@ impl ScalarUDFImpl for JsonContains {
}
}

fn invoke(&self, args: &[ColumnarValue]) -> Result<ColumnarValue> {
invoke::<BooleanArray>(args, jiter_json_contains)
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> Result<ColumnarValue> {
invoke::<BooleanArray>(&args.args, jiter_json_contains)
}

fn aliases(&self) -> &[String] {
Expand Down
6 changes: 3 additions & 3 deletions src/json_get.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use datafusion::arrow::array::ArrayRef;
use datafusion::arrow::array::UnionArray;
use datafusion::arrow::datatypes::DataType;
use datafusion::common::Result as DataFusionResult;
use datafusion::logical_expr::{ColumnarValue, ScalarUDFImpl, Signature, Volatility};
use datafusion::logical_expr::{ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility};
use datafusion::scalar::ScalarValue;
use jiter::{Jiter, NumberAny, NumberInt, Peek};

Expand Down Expand Up @@ -55,8 +55,8 @@ impl ScalarUDFImpl for JsonGet {
return_type_check(arg_types, self.name(), JsonUnion::data_type())
}

fn invoke(&self, args: &[ColumnarValue]) -> DataFusionResult<ColumnarValue> {
invoke::<JsonUnion>(args, jiter_json_get_union)
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> DataFusionResult<ColumnarValue> {
invoke::<JsonUnion>(&args.args, jiter_json_get_union)
}

fn aliases(&self) -> &[String] {
Expand Down
6 changes: 3 additions & 3 deletions src/json_get_bool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::any::Any;
use datafusion::arrow::array::BooleanArray;
use datafusion::arrow::datatypes::DataType;
use datafusion::common::Result as DataFusionResult;
use datafusion::logical_expr::{ColumnarValue, ScalarUDFImpl, Signature, Volatility};
use datafusion::logical_expr::{ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility};
use jiter::Peek;

use crate::common::{get_err, invoke, jiter_json_find, return_type_check, GetError, JsonPath};
Expand Down Expand Up @@ -48,8 +48,8 @@ impl ScalarUDFImpl for JsonGetBool {
return_type_check(arg_types, self.name(), DataType::Boolean).map(|_| DataType::Boolean)
}

fn invoke(&self, args: &[ColumnarValue]) -> DataFusionResult<ColumnarValue> {
invoke::<BooleanArray>(args, jiter_json_get_bool)
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> DataFusionResult<ColumnarValue> {
invoke::<BooleanArray>(&args.args, jiter_json_get_bool)
}

fn aliases(&self) -> &[String] {
Expand Down
6 changes: 3 additions & 3 deletions src/json_get_float.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::sync::Arc;
use datafusion::arrow::array::{ArrayRef, Float64Array, Float64Builder};
use datafusion::arrow::datatypes::DataType;
use datafusion::common::{Result as DataFusionResult, ScalarValue};
use datafusion::logical_expr::{ColumnarValue, ScalarUDFImpl, Signature, Volatility};
use datafusion::logical_expr::{ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility};
use jiter::{NumberAny, Peek};

use crate::common::{get_err, invoke, jiter_json_find, return_type_check, GetError, InvokeResult, JsonPath};
Expand Down Expand Up @@ -49,8 +49,8 @@ impl ScalarUDFImpl for JsonGetFloat {
return_type_check(arg_types, self.name(), DataType::Float64)
}

fn invoke(&self, args: &[ColumnarValue]) -> DataFusionResult<ColumnarValue> {
invoke::<Float64Array>(args, jiter_json_get_float)
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> DataFusionResult<ColumnarValue> {
invoke::<Float64Array>(&args.args, jiter_json_get_float)
}

fn aliases(&self) -> &[String] {
Expand Down
6 changes: 3 additions & 3 deletions src/json_get_int.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::sync::Arc;
use datafusion::arrow::array::{ArrayRef, Int64Array, Int64Builder};
use datafusion::arrow::datatypes::DataType;
use datafusion::common::{Result as DataFusionResult, ScalarValue};
use datafusion::logical_expr::{ColumnarValue, ScalarUDFImpl, Signature, Volatility};
use datafusion::logical_expr::{ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility};
use jiter::{NumberInt, Peek};

use crate::common::{get_err, invoke, jiter_json_find, return_type_check, GetError, InvokeResult, JsonPath};
Expand Down Expand Up @@ -49,8 +49,8 @@ impl ScalarUDFImpl for JsonGetInt {
return_type_check(arg_types, self.name(), DataType::Int64)
}

fn invoke(&self, args: &[ColumnarValue]) -> DataFusionResult<ColumnarValue> {
invoke::<Int64Array>(args, jiter_json_get_int)
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> DataFusionResult<ColumnarValue> {
invoke::<Int64Array>(&args.args, jiter_json_get_int)
}

fn aliases(&self) -> &[String] {
Expand Down
6 changes: 3 additions & 3 deletions src/json_get_json.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::any::Any;
use datafusion::arrow::array::StringArray;
use datafusion::arrow::datatypes::DataType;
use datafusion::common::Result as DataFusionResult;
use datafusion::logical_expr::{ColumnarValue, ScalarUDFImpl, Signature, Volatility};
use datafusion::logical_expr::{ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility};

use crate::common::{get_err, invoke, jiter_json_find, return_type_check, GetError, JsonPath};
use crate::common_macros::make_udf_function;
Expand Down Expand Up @@ -47,8 +47,8 @@ impl ScalarUDFImpl for JsonGetJson {
return_type_check(arg_types, self.name(), DataType::Utf8)
}

fn invoke(&self, args: &[ColumnarValue]) -> DataFusionResult<ColumnarValue> {
invoke::<StringArray>(args, jiter_json_get_json)
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> DataFusionResult<ColumnarValue> {
invoke::<StringArray>(&args.args, jiter_json_get_json)
}

fn aliases(&self) -> &[String] {
Expand Down
6 changes: 3 additions & 3 deletions src/json_get_str.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::any::Any;
use datafusion::arrow::array::StringArray;
use datafusion::arrow::datatypes::DataType;
use datafusion::common::Result as DataFusionResult;
use datafusion::logical_expr::{ColumnarValue, ScalarUDFImpl, Signature, Volatility};
use datafusion::logical_expr::{ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility};
use jiter::Peek;

use crate::common::{get_err, invoke, jiter_json_find, return_type_check, GetError, JsonPath};
Expand Down Expand Up @@ -48,8 +48,8 @@ impl ScalarUDFImpl for JsonGetStr {
return_type_check(arg_types, self.name(), DataType::Utf8)
}

fn invoke(&self, args: &[ColumnarValue]) -> DataFusionResult<ColumnarValue> {
invoke::<StringArray>(args, jiter_json_get_str)
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> DataFusionResult<ColumnarValue> {
invoke::<StringArray>(&args.args, jiter_json_get_str)
}

fn aliases(&self) -> &[String] {
Expand Down
6 changes: 3 additions & 3 deletions src/json_length.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::sync::Arc;
use datafusion::arrow::array::{ArrayRef, UInt64Array, UInt64Builder};
use datafusion::arrow::datatypes::DataType;
use datafusion::common::{Result as DataFusionResult, ScalarValue};
use datafusion::logical_expr::{ColumnarValue, ScalarUDFImpl, Signature, Volatility};
use datafusion::logical_expr::{ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility};
use jiter::Peek;

use crate::common::{get_err, invoke, jiter_json_find, return_type_check, GetError, InvokeResult, JsonPath};
Expand Down Expand Up @@ -49,8 +49,8 @@ impl ScalarUDFImpl for JsonLength {
return_type_check(arg_types, self.name(), DataType::UInt64)
}

fn invoke(&self, args: &[ColumnarValue]) -> DataFusionResult<ColumnarValue> {
invoke::<UInt64Array>(args, jiter_json_length)
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> DataFusionResult<ColumnarValue> {
invoke::<UInt64Array>(&args.args, jiter_json_length)
}

fn aliases(&self) -> &[String] {
Expand Down
6 changes: 3 additions & 3 deletions src/json_object_keys.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::sync::Arc;
use datafusion::arrow::array::{ArrayRef, ListBuilder, StringBuilder};
use datafusion::arrow::datatypes::{DataType, Field};
use datafusion::common::{Result as DataFusionResult, ScalarValue};
use datafusion::logical_expr::{ColumnarValue, ScalarUDFImpl, Signature, Volatility};
use datafusion::logical_expr::{ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, Volatility};
use jiter::Peek;

use crate::common::{get_err, invoke, jiter_json_find, return_type_check, GetError, InvokeResult, JsonPath};
Expand Down Expand Up @@ -53,8 +53,8 @@ impl ScalarUDFImpl for JsonObjectKeys {
)
}

fn invoke(&self, args: &[ColumnarValue]) -> DataFusionResult<ColumnarValue> {
invoke::<BuildListArray>(args, jiter_json_object_keys)
fn invoke_with_args(&self, args: ScalarFunctionArgs) -> DataFusionResult<ColumnarValue> {
invoke::<BuildListArray>(&args.args, jiter_json_object_keys)
}

fn aliases(&self) -> &[String] {
Expand Down
20 changes: 17 additions & 3 deletions tests/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use datafusion::arrow::datatypes::{Field, Int64Type, Int8Type, Schema};
use datafusion::arrow::{array::StringDictionaryBuilder, datatypes::DataType};
use datafusion::assert_batches_eq;
use datafusion::common::ScalarValue;
use datafusion::logical_expr::ColumnarValue;
use datafusion::logical_expr::{ColumnarValue, ScalarFunctionArgs};
use datafusion::prelude::SessionContext;
use datafusion_functions_json::udfs::json_get_str_udf;
use utils::{create_context, display_val, logical_plan, run_query, run_query_dict, run_query_large, run_query_params};
Expand Down Expand Up @@ -500,7 +500,14 @@ fn test_json_get_utf8() {
ColumnarValue::Scalar(ScalarValue::Utf8(Some("aa".to_string()))),
];

let ColumnarValue::Scalar(sv) = json_get_str.invoke_batch(args, 1).unwrap() else {
let ColumnarValue::Scalar(sv) = json_get_str
.invoke_with_args(ScalarFunctionArgs {
args: args.to_vec(),
number_rows: 1,
return_type: &DataType::Utf8,
})
.unwrap()
else {
panic!("expected scalar")
};

Expand All @@ -518,7 +525,14 @@ fn test_json_get_large_utf8() {
ColumnarValue::Scalar(ScalarValue::LargeUtf8(Some("aa".to_string()))),
];

let ColumnarValue::Scalar(sv) = json_get_str.invoke_batch(args, 1).unwrap() else {
let ColumnarValue::Scalar(sv) = json_get_str
.invoke_with_args(ScalarFunctionArgs {
args: args.to_vec(),
number_rows: 1,
return_type: &DataType::LargeUtf8,
})
.unwrap()
else {
panic!("expected scalar")
};

Expand Down
Loading