Skip to content

Commit 669f534

Browse files
tobixdevtobixdev
committed
Fmt
1 parent 506d9b4 commit 669f534

File tree

37 files changed

+165
-97
lines changed

37 files changed

+165
-97
lines changed

‎lib/arrow-rdf/src/encoded/aggregates/avg.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ impl Accumulator for SparqlAvg {
6363
lhs.checked_add(rhs).map(Numeric::Decimal).ok_or(())
6464
}
6565
};
66-
}
67-
else {
66+
} else {
6867
self.sum = Err(());
6968
}
7069
}
@@ -131,8 +130,7 @@ impl Accumulator for SparqlAvg {
131130
lhs.checked_add(rhs).map(Numeric::Decimal).ok_or(())
132131
}
133132
};
134-
}
135-
else {
133+
} else {
136134
self.sum = Err(());
137135
}
138136
}

‎lib/arrow-rdf/src/encoded/builder.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
use crate::encoded::{EncTerm, EncTermField};
22
use crate::error::LiteralEncodingError;
33
use crate::{AResult, DFResult};
4-
use datafusion::arrow::array::{ArrayBuilder, ArrayRef, BooleanBuilder, Decimal128Builder, Float32Builder, Float64Builder, Int16Builder, Int32Builder, Int64Builder, NullBuilder, StringBuilder, StructBuilder, UnionArray};
4+
use datafusion::arrow::array::{
5+
ArrayBuilder, ArrayRef, BooleanBuilder, Decimal128Builder, Float32Builder, Float64Builder,
6+
Int16Builder, Int32Builder, Int64Builder, NullBuilder, StringBuilder, StructBuilder,
7+
UnionArray,
8+
};
59
use datafusion::arrow::buffer::ScalarBuffer;
610
use datafusion::arrow::error::ArrowError;
711
use datamodel::{BlankNode, Date, DateTime, DayTimeDuration, Time, Timestamp, YearMonthDuration};
@@ -301,9 +305,7 @@ fn append_timestamp(builder: &mut StructBuilder, value: Timestamp) -> AResult<()
301305
.unwrap()
302306
.append_value(i128::from_be_bytes(value.value().to_be_bytes()));
303307

304-
let offset_builder = builder
305-
.field_builder::<Int16Builder>(1)
306-
.unwrap();
308+
let offset_builder = builder.field_builder::<Int16Builder>(1).unwrap();
307309
if let Some(offset) = value.offset() {
308310
offset_builder.append_value(offset.in_minutes());
309311
} else {
@@ -312,4 +314,4 @@ fn append_timestamp(builder: &mut StructBuilder, value: Timestamp) -> AResult<()
312314
builder.append(true);
313315

314316
Ok(())
315-
}
317+
}

‎lib/arrow-rdf/src/encoded/dispatch/dispatch_unary.rs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
use crate::encoded::write_enc_term::WriteEncTerm;
1+
use crate::encoded::from_encoded_term::FromEncodedTerm;
22
use crate::encoded::scalars::encode_scalar_null;
3+
use crate::encoded::write_enc_term::WriteEncTerm;
34
use crate::encoded::EncTermField;
45
use crate::{as_enc_term_array, DFResult};
56
use datafusion::arrow::array::{Array, AsArray, BooleanArray};
@@ -8,7 +9,6 @@ use datafusion::common::{DataFusionError, ScalarValue};
89
use datafusion::logical_expr::ColumnarValue;
910
use datamodel::{Boolean, RdfValueRef, TermRef};
1011
use functions_scalar::ScalarUnaryRdfOp;
11-
use crate::encoded::from_encoded_term::FromEncodedTerm;
1212

1313
pub fn dispatch_unary<'data, TUdf>(
1414
udf: &TUdf,
@@ -29,7 +29,10 @@ where
2929
}
3030
}
3131

32-
fn dispatch_unary_scalar<'data, TUdf>(udf: &TUdf, value: &'data ScalarValue) -> DFResult<ColumnarValue>
32+
fn dispatch_unary_scalar<'data, TUdf>(
33+
udf: &TUdf,
34+
value: &'data ScalarValue,
35+
) -> DFResult<ColumnarValue>
3336
where
3437
TUdf: ScalarUnaryRdfOp,
3538
TUdf::Arg<'data>: FromEncodedTerm<'data>,
@@ -46,7 +49,10 @@ where
4649
Ok(ColumnarValue::Scalar(result))
4750
}
4851

49-
fn dispatch_unary_array<'data, TUdf>(udf: &TUdf, values: &'data dyn Array) -> DFResult<ColumnarValue>
52+
fn dispatch_unary_array<'data, TUdf>(
53+
udf: &TUdf,
54+
values: &'data dyn Array,
55+
) -> DFResult<ColumnarValue>
5056
where
5157
TUdf: ScalarUnaryRdfOp,
5258
TUdf::Arg<'data>: FromEncodedTerm<'data>,

‎lib/arrow-rdf/src/encoded/dispatch/mod.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
use datafusion::logical_expr::ColumnarValue;
2-
use datamodel::RdfOpResult;
31
use crate::as_enc_term_array;
42
use crate::encoded::from_encoded_term::FromEncodedTerm;
3+
use datafusion::logical_expr::ColumnarValue;
4+
use datamodel::RdfOpResult;
55

6-
mod dispatch_unary;
76
mod dispatch_binary;
8-
mod dispatch_ternary;
9-
mod dispatch_quaternary;
107
mod dispatch_n_ary;
8+
mod dispatch_quaternary;
9+
mod dispatch_ternary;
10+
mod dispatch_unary;
1111

12-
pub use dispatch_unary::dispatch_unary;
1312
pub use dispatch_binary::dispatch_binary;
14-
pub use dispatch_ternary::dispatch_ternary;
15-
pub use dispatch_quaternary::dispatch_quaternary;
1613
pub use dispatch_n_ary::dispatch_n_ary;
14+
pub use dispatch_quaternary::dispatch_quaternary;
15+
pub use dispatch_ternary::dispatch_ternary;
16+
pub use dispatch_unary::dispatch_unary;
1717

1818
fn borrow_value<'data, TValue>(value: &'data ColumnarValue, index: usize) -> RdfOpResult<TValue>
1919
where

‎lib/arrow-rdf/src/encoded/encoding/as_native_boolean.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ use crate::{as_enc_term_array, DFResult};
33
use datafusion::arrow::array::{as_boolean_array, Array, BooleanArray};
44
use datafusion::arrow::datatypes::DataType;
55
use datafusion::common::internal_err;
6-
use datafusion::logical_expr::{ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, TypeSignature, Volatility};
6+
use datafusion::logical_expr::{
7+
ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, TypeSignature, Volatility,
8+
};
79
use std::any::Any;
810
use std::sync::Arc;
911

‎lib/arrow-rdf/src/encoded/encoding/int64_as_rdf_term.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ use datafusion::arrow::array::Array;
44
use datafusion::arrow::datatypes::DataType;
55
use datafusion::common::cast::as_int64_array;
66
use datafusion::common::exec_err;
7-
use datafusion::logical_expr::{ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, TypeSignature, Volatility};
7+
use datafusion::logical_expr::{
8+
ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, TypeSignature, Volatility,
9+
};
810
use std::any::Any;
911

1012
#[derive(Debug)]

‎lib/arrow-rdf/src/encoded/encoding/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
use crate::encoded::as_native_boolean::EncAsNativeBoolean;
2-
use crate::encoded::with_struct_encoding::EncWithSortableEncoding;
32
use crate::encoded::encoding::boolean_as_rdf_term::EncBooleanAsRdfTerm;
43
use crate::encoded::encoding::int64_as_rdf_term::EncInt64AsRdfTerm;
4+
use crate::encoded::with_struct_encoding::EncWithSortableEncoding;
55
use datafusion::logical_expr::ScalarUDF;
66
use once_cell::sync::Lazy;
77

88
pub mod as_native_boolean;
9-
pub mod with_struct_encoding;
109
mod boolean_as_rdf_term;
1110
mod int64_as_rdf_term;
11+
pub mod with_struct_encoding;
1212

1313
pub const ENC_AS_NATIVE_BOOLEAN: once_cell::unsync::Lazy<ScalarUDF> =
1414
once_cell::unsync::Lazy::new(|| ScalarUDF::from(EncAsNativeBoolean::new()));

‎lib/arrow-rdf/src/encoded/encoding/with_struct_encoding.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ use crate::DFResult;
44
use datafusion::arrow::array::{as_union_array, StructArray};
55
use datafusion::arrow::datatypes::DataType;
66
use datafusion::common::{exec_err, ScalarValue};
7-
use datafusion::logical_expr::{ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, TypeSignature, Volatility};
7+
use datafusion::logical_expr::{
8+
ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, TypeSignature, Volatility,
9+
};
810
use datamodel::{RdfOpResult, TermRef};
911
use std::any::Any;
1012
use std::sync::Arc;

‎lib/arrow-rdf/src/encoded/logical/and.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
use crate::DFResult;
22
use datafusion::arrow::array::{as_boolean_array, Array, BooleanBuilder};
33
use datafusion::arrow::datatypes::DataType;
4-
use datafusion::logical_expr::{ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, TypeSignature, Volatility};
4+
use datafusion::logical_expr::{
5+
ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, TypeSignature, Volatility,
6+
};
57
use std::any::Any;
68
use std::ops::Not;
79
use std::sync::Arc;
@@ -39,7 +41,10 @@ impl ScalarUDFImpl for EncAnd {
3941
Ok(DataType::Boolean)
4042
}
4143

42-
fn invoke_with_args(&self, args: ScalarFunctionArgs<'_>) -> datafusion::common::Result<ColumnarValue> {
44+
fn invoke_with_args(
45+
&self,
46+
args: ScalarFunctionArgs<'_>,
47+
) -> datafusion::common::Result<ColumnarValue> {
4348
let lhs = args.args[0].to_array(args.number_rows)?;
4449
let rhs = args.args[1].to_array(args.number_rows)?;
4550

‎lib/arrow-rdf/src/encoded/logical/effective_boolean_value.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
use crate::encoded::from_encoded_term::FromEncodedTerm;
22
use crate::encoded::EncTerm;
33
use crate::{as_enc_term_array, DFResult};
4+
use datafusion::arrow::array::BooleanArray;
45
use datafusion::arrow::datatypes::DataType;
56
use datafusion::common::{exec_err, ScalarValue};
6-
use datafusion::logical_expr::{ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, TypeSignature, Volatility};
7+
use datafusion::logical_expr::{
8+
ColumnarValue, ScalarFunctionArgs, ScalarUDFImpl, Signature, TypeSignature, Volatility,
9+
};
710
use datamodel::{Decimal, Double, Float, Int, Integer, Numeric, RdfOpResult, TermRef};
811
use std::any::Any;
912
use std::sync::Arc;
10-
use datafusion::arrow::array::BooleanArray;
1113

1214
#[derive(Debug)]
1315
pub struct EncEffectiveBooleanValue {
@@ -42,7 +44,10 @@ impl ScalarUDFImpl for EncEffectiveBooleanValue {
4244
Ok(DataType::Boolean)
4345
}
4446

45-
fn invoke_with_args(&self, args: ScalarFunctionArgs<'_>) -> datafusion::common::Result<ColumnarValue> {
47+
fn invoke_with_args(
48+
&self,
49+
args: ScalarFunctionArgs<'_>,
50+
) -> datafusion::common::Result<ColumnarValue> {
4651
if args.args.len() != 1 {
4752
return exec_err!("Unexpected number of arguments");
4853
}

0 commit comments

Comments
 (0)