Skip to content

Commit a330761

Browse files
davidhewittdavidhewitt
committed
replace FromIterator with builder trait
1 parent 73c8da2 commit a330761

File tree

12 files changed

+301
-188
lines changed

12 files changed

+301
-188
lines changed

‎src/common.rs‎

Lines changed: 110 additions & 81 deletions
Large diffs are not rendered by default.

‎src/common_union.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ pub(crate) struct JsonUnion {
6161
}
6262

6363
impl JsonUnion {
64-
fn new(length: usize) -> Self {
64+
pub fn new(length: usize) -> Self {
6565
Self {
6666
bools: vec![None; length],
6767
ints: vec![None; length],
@@ -79,7 +79,7 @@ impl JsonUnion {
7979
DataType::Union(union_fields(), UnionMode::Sparse)
8080
}
8181

82-
fn push(&mut self, field: JsonUnionField) {
82+
pub fn push(&mut self, field: JsonUnionField) {
8383
self.type_ids[self.index] = field.type_id();
8484
match field {
8585
JsonUnionField::JsonNull => (),
@@ -94,7 +94,7 @@ impl JsonUnion {
9494
debug_assert!(self.index <= self.length);
9595
}
9696

97-
fn push_none(&mut self) {
97+
pub fn push_none(&mut self) {
9898
self.index += 1;
9999
debug_assert!(self.index <= self.length);
100100
}

‎src/json_as_text.rs‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
use std::any::Any;
22
use std::sync::Arc;
33

4-
use datafusion::arrow::array::{ArrayRef, StringArray};
4+
use datafusion::arrow::array::{ArrayRef, StringArray, StringBuilder};
55
use datafusion::arrow::datatypes::DataType;
66
use datafusion::common::{Result as DataFusionResult, ScalarValue};
77
use datafusion::logical_expr::{ColumnarValue, ScalarUDFImpl, Signature, Volatility};
88
use jiter::Peek;
99

10-
use crate::common::{get_err, invoke, jiter_json_find, return_type_check, GetError, JsonPath};
10+
use crate::common::{get_err, invoke, jiter_json_find, return_type_check, GetError, InvokeResult, JsonPath};
1111
use crate::common_macros::make_udf_function;
1212

1313
make_udf_function!(
@@ -50,20 +50,36 @@ impl ScalarUDFImpl for JsonAsText {
5050
}
5151

5252
fn invoke(&self, args: &[ColumnarValue]) -> DataFusionResult<ColumnarValue> {
53-
invoke::<StringArray, String>(
54-
args,
55-
jiter_json_as_text,
56-
|c| Ok(Arc::new(c) as ArrayRef),
57-
ScalarValue::Utf8,
58-
true,
59-
)
53+
invoke::<StringArray>(args, jiter_json_as_text, true)
6054
}
6155

6256
fn aliases(&self) -> &[String] {
6357
&self.aliases
6458
}
6559
}
6660

61+
impl InvokeResult for StringArray {
62+
type Item = String;
63+
64+
type Builder = StringBuilder;
65+
66+
fn builder(capacity: usize) -> Self::Builder {
67+
StringBuilder::with_capacity(capacity, 0)
68+
}
69+
70+
fn append_value(builder: &mut Self::Builder, value: Option<Self::Item>) {
71+
builder.append_option(value)
72+
}
73+
74+
fn finish(mut builder: Self::Builder) -> DataFusionResult<ArrayRef> {
75+
Ok(Arc::new(builder.finish()))
76+
}
77+
78+
fn scalar(value: Option<Self::Item>) -> ScalarValue {
79+
ScalarValue::Utf8(value)
80+
}
81+
}
82+
6783
fn jiter_json_as_text(opt_json: Option<&str>, path: &[JsonPath]) -> Result<String, GetError> {
6884
if let Some((mut jiter, peek)) = jiter_json_find(opt_json, path) {
6985
match peek {

‎src/json_contains.rs‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
use std::any::Any;
22
use std::sync::Arc;
33

4+
use datafusion::arrow::array::BooleanBuilder;
45
use datafusion::arrow::datatypes::DataType;
56
use datafusion::common::arrow::array::{ArrayRef, BooleanArray};
67
use datafusion::common::{plan_err, Result, ScalarValue};
78
use datafusion::logical_expr::{ColumnarValue, ScalarUDFImpl, Signature, Volatility};
89

9-
use crate::common::{invoke, jiter_json_find, return_type_check, GetError, JsonPath};
10+
use crate::common::{invoke, jiter_json_find, return_type_check, GetError, InvokeResult, JsonPath};
1011
use crate::common_macros::make_udf_function;
1112

1213
make_udf_function!(
@@ -53,20 +54,36 @@ impl ScalarUDFImpl for JsonContains {
5354
}
5455

5556
fn invoke(&self, args: &[ColumnarValue]) -> Result<ColumnarValue> {
56-
invoke::<BooleanArray, bool>(
57-
args,
58-
jiter_json_contains,
59-
|c| Ok(Arc::new(c) as ArrayRef),
60-
ScalarValue::Boolean,
61-
false,
62-
)
57+
invoke::<BooleanArray>(args, jiter_json_contains, false)
6358
}
6459

6560
fn aliases(&self) -> &[String] {
6661
&self.aliases
6762
}
6863
}
6964

65+
impl InvokeResult for BooleanArray {
66+
type Item = bool;
67+
68+
type Builder = BooleanBuilder;
69+
70+
fn builder(capacity: usize) -> Self::Builder {
71+
BooleanBuilder::with_capacity(capacity)
72+
}
73+
74+
fn append_value(builder: &mut Self::Builder, value: Option<Self::Item>) {
75+
builder.append_option(value)
76+
}
77+
78+
fn finish(mut builder: Self::Builder) -> Result<ArrayRef> {
79+
Ok(Arc::new(builder.finish()))
80+
}
81+
82+
fn scalar(value: Option<Self::Item>) -> ScalarValue {
83+
ScalarValue::Boolean(value)
84+
}
85+
}
86+
7087
#[allow(clippy::unnecessary_wraps)]
7188
fn jiter_json_contains(json_data: Option<&str>, path: &[JsonPath]) -> Result<bool, GetError> {
7289
Ok(jiter_json_find(json_data, path).is_some())

‎src/json_get.rs‎

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ use datafusion::arrow::array::UnionArray;
66
use datafusion::arrow::datatypes::DataType;
77
use datafusion::common::Result as DataFusionResult;
88
use datafusion::logical_expr::{ColumnarValue, ScalarUDFImpl, Signature, Volatility};
9+
use datafusion::scalar::ScalarValue;
910
use jiter::{Jiter, NumberAny, NumberInt, Peek};
1011

12+
use crate::common::InvokeResult;
1113
use crate::common::{get_err, invoke, jiter_json_find, return_type_check, GetError, JsonPath};
1214
use crate::common_macros::make_udf_function;
1315
use crate::common_union::{JsonUnion, JsonUnionField};
@@ -54,18 +56,41 @@ impl ScalarUDFImpl for JsonGet {
5456
}
5557

5658
fn invoke(&self, args: &[ColumnarValue]) -> DataFusionResult<ColumnarValue> {
57-
let to_array = |c: JsonUnion| {
58-
let array: UnionArray = c.try_into()?;
59-
Ok(Arc::new(array) as ArrayRef)
60-
};
61-
invoke::<JsonUnion, JsonUnionField>(args, jiter_json_get_union, to_array, JsonUnionField::scalar_value, true)
59+
invoke::<JsonUnion>(args, jiter_json_get_union, true)
6260
}
6361

6462
fn aliases(&self) -> &[String] {
6563
&self.aliases
6664
}
6765
}
6866

67+
impl InvokeResult for JsonUnion {
68+
type Item = JsonUnionField;
69+
70+
type Builder = JsonUnion;
71+
72+
fn builder(capacity: usize) -> Self::Builder {
73+
JsonUnion::new(capacity)
74+
}
75+
76+
fn append_value(builder: &mut Self::Builder, value: Option<Self::Item>) {
77+
if let Some(value) = value {
78+
builder.push(value)
79+
} else {
80+
builder.push_none()
81+
}
82+
}
83+
84+
fn finish(builder: Self::Builder) -> DataFusionResult<ArrayRef> {
85+
let array: UnionArray = builder.try_into()?;
86+
Ok(Arc::new(array) as ArrayRef)
87+
}
88+
89+
fn scalar(value: Option<Self::Item>) -> ScalarValue {
90+
JsonUnionField::scalar_value(value)
91+
}
92+
}
93+
6994
fn jiter_json_get_union(opt_json: Option<&str>, path: &[JsonPath]) -> Result<JsonUnionField, GetError> {
7095
if let Some((mut jiter, peek)) = jiter_json_find(opt_json, path) {
7196
build_union(&mut jiter, peek)

‎src/json_get_bool.rs‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
use std::any::Any;
2-
use std::sync::Arc;
32

4-
use datafusion::arrow::array::{ArrayRef, BooleanArray};
3+
use datafusion::arrow::array::BooleanArray;
54
use datafusion::arrow::datatypes::DataType;
6-
use datafusion::common::{Result as DataFusionResult, ScalarValue};
5+
use datafusion::common::Result as DataFusionResult;
76
use datafusion::logical_expr::{ColumnarValue, ScalarUDFImpl, Signature, Volatility};
87
use jiter::Peek;
98

@@ -50,13 +49,7 @@ impl ScalarUDFImpl for JsonGetBool {
5049
}
5150

5251
fn invoke(&self, args: &[ColumnarValue]) -> DataFusionResult<ColumnarValue> {
53-
invoke::<BooleanArray, bool>(
54-
args,
55-
jiter_json_get_bool,
56-
|c| Ok(Arc::new(c) as ArrayRef),
57-
ScalarValue::Boolean,
58-
false,
59-
)
52+
invoke::<BooleanArray>(args, jiter_json_get_bool, false)
6053
}
6154

6255
fn aliases(&self) -> &[String] {

‎src/json_get_float.rs‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
use std::any::Any;
22
use std::sync::Arc;
33

4-
use datafusion::arrow::array::{ArrayRef, Float64Array};
4+
use datafusion::arrow::array::{ArrayRef, Float64Array, Float64Builder};
55
use datafusion::arrow::datatypes::DataType;
66
use datafusion::common::{Result as DataFusionResult, ScalarValue};
77
use datafusion::logical_expr::{ColumnarValue, ScalarUDFImpl, Signature, Volatility};
88
use jiter::{NumberAny, Peek};
99

10-
use crate::common::{get_err, invoke, jiter_json_find, return_type_check, GetError, JsonPath};
10+
use crate::common::{get_err, invoke, jiter_json_find, return_type_check, GetError, InvokeResult, JsonPath};
1111
use crate::common_macros::make_udf_function;
1212

1313
make_udf_function!(
@@ -50,20 +50,36 @@ impl ScalarUDFImpl for JsonGetFloat {
5050
}
5151

5252
fn invoke(&self, args: &[ColumnarValue]) -> DataFusionResult<ColumnarValue> {
53-
invoke::<Float64Array, f64>(
54-
args,
55-
jiter_json_get_float,
56-
|c| Ok(Arc::new(c) as ArrayRef),
57-
ScalarValue::Float64,
58-
true,
59-
)
53+
invoke::<Float64Array>(args, jiter_json_get_float, true)
6054
}
6155

6256
fn aliases(&self) -> &[String] {
6357
&self.aliases
6458
}
6559
}
6660

61+
impl InvokeResult for Float64Array {
62+
type Item = f64;
63+
64+
type Builder = Float64Builder;
65+
66+
fn builder(capacity: usize) -> Self::Builder {
67+
Float64Builder::with_capacity(capacity)
68+
}
69+
70+
fn append_value(builder: &mut Self::Builder, value: Option<Self::Item>) {
71+
builder.append_option(value)
72+
}
73+
74+
fn finish(mut builder: Self::Builder) -> DataFusionResult<ArrayRef> {
75+
Ok(Arc::new(builder.finish()))
76+
}
77+
78+
fn scalar(value: Option<Self::Item>) -> ScalarValue {
79+
ScalarValue::Float64(value)
80+
}
81+
}
82+
6783
fn jiter_json_get_float(json_data: Option<&str>, path: &[JsonPath]) -> Result<f64, GetError> {
6884
if let Some((mut jiter, peek)) = jiter_json_find(json_data, path) {
6985
match peek {

‎src/json_get_int.rs‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
use std::any::Any;
22
use std::sync::Arc;
33

4-
use datafusion::arrow::array::{ArrayRef, Int64Array};
4+
use datafusion::arrow::array::{ArrayRef, Int64Array, Int64Builder};
55
use datafusion::arrow::datatypes::DataType;
66
use datafusion::common::{Result as DataFusionResult, ScalarValue};
77
use datafusion::logical_expr::{ColumnarValue, ScalarUDFImpl, Signature, Volatility};
88
use jiter::{NumberInt, Peek};
99

10-
use crate::common::{get_err, invoke, jiter_json_find, return_type_check, GetError, JsonPath};
10+
use crate::common::{get_err, invoke, jiter_json_find, return_type_check, GetError, InvokeResult, JsonPath};
1111
use crate::common_macros::make_udf_function;
1212

1313
make_udf_function!(
@@ -50,20 +50,36 @@ impl ScalarUDFImpl for JsonGetInt {
5050
}
5151

5252
fn invoke(&self, args: &[ColumnarValue]) -> DataFusionResult<ColumnarValue> {
53-
invoke::<Int64Array, i64>(
54-
args,
55-
jiter_json_get_int,
56-
|c| Ok(Arc::new(c) as ArrayRef),
57-
ScalarValue::Int64,
58-
true,
59-
)
53+
invoke::<Int64Array>(args, jiter_json_get_int, true)
6054
}
6155

6256
fn aliases(&self) -> &[String] {
6357
&self.aliases
6458
}
6559
}
6660

61+
impl InvokeResult for Int64Array {
62+
type Item = i64;
63+
64+
type Builder = Int64Builder;
65+
66+
fn builder(capacity: usize) -> Self::Builder {
67+
Int64Builder::with_capacity(capacity)
68+
}
69+
70+
fn append_value(builder: &mut Self::Builder, value: Option<Self::Item>) {
71+
builder.append_option(value);
72+
}
73+
74+
fn finish(mut builder: Self::Builder) -> DataFusionResult<ArrayRef> {
75+
Ok(Arc::new(builder.finish()))
76+
}
77+
78+
fn scalar(value: Option<Self::Item>) -> ScalarValue {
79+
ScalarValue::Int64(value)
80+
}
81+
}
82+
6783
fn jiter_json_get_int(json_data: Option<&str>, path: &[JsonPath]) -> Result<i64, GetError> {
6884
if let Some((mut jiter, peek)) = jiter_json_find(json_data, path) {
6985
match peek {

‎src/json_get_json.rs‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
use std::any::Any;
2-
use std::sync::Arc;
32

4-
use datafusion::arrow::array::{ArrayRef, StringArray};
3+
use datafusion::arrow::array::StringArray;
54
use datafusion::arrow::datatypes::DataType;
6-
use datafusion::common::{Result as DataFusionResult, ScalarValue};
5+
use datafusion::common::Result as DataFusionResult;
76
use datafusion::logical_expr::{ColumnarValue, ScalarUDFImpl, Signature, Volatility};
87

98
use crate::common::{get_err, invoke, jiter_json_find, return_type_check, GetError, JsonPath};
@@ -49,13 +48,7 @@ impl ScalarUDFImpl for JsonGetJson {
4948
}
5049

5150
fn invoke(&self, args: &[ColumnarValue]) -> DataFusionResult<ColumnarValue> {
52-
invoke::<StringArray, String>(
53-
args,
54-
jiter_json_get_json,
55-
|c| Ok(Arc::new(c) as ArrayRef),
56-
ScalarValue::Utf8,
57-
true,
58-
)
51+
invoke::<StringArray>(args, jiter_json_get_json, true)
5952
}
6053

6154
fn aliases(&self) -> &[String] {

0 commit comments

Comments
 (0)