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

Implement ScalarValue for FixedSizeBinary #3911

Merged
merged 3 commits into from
Oct 22, 2022
Merged

Implement ScalarValue for FixedSizeBinary #3911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4d196d
implement ScalarValue for FixedSizeBinary
maxburke Oct 20, 2022
82638a4
Return an error instead of panicking
maxburke Oct 22, 2022
dc1d62f
add tests for scalar value fixedsizebinary variant
maxburke Oct 22, 2022
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
79 changes: 78 additions & 1 deletion datafusion/common/src/scalar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ pub enum ScalarValue {
LargeUtf8(Option<String>),
/// binary
Binary(Option<Vec<u8>>),
/// fixed size binary
FixedSizeBinary(i32, Option<Vec<u8>>),
/// large binary
LargeBinary(Option<Vec<u8>>),
/// list of nested ScalarValue
Expand Down Expand Up @@ -160,6 +162,8 @@ impl PartialEq for ScalarValue {
(LargeUtf8(_), _) => false,
(Binary(v1), Binary(v2)) => v1.eq(v2),
(Binary(_), _) => false,
(FixedSizeBinary(_, v1), FixedSizeBinary(_, v2)) => v1.eq(v2),
(FixedSizeBinary(_, _), _) => false,
(LargeBinary(v1), LargeBinary(v2)) => v1.eq(v2),
(LargeBinary(_), _) => false,
(List(v1, t1), List(v2, t2)) => v1.eq(v2) && t1.eq(t2),
Expand Down Expand Up @@ -248,6 +252,8 @@ impl PartialOrd for ScalarValue {
(LargeUtf8(_), _) => None,
(Binary(v1), Binary(v2)) => v1.partial_cmp(v2),
(Binary(_), _) => None,
(FixedSizeBinary(_, v1), FixedSizeBinary(_, v2)) => v1.partial_cmp(v2),
(FixedSizeBinary(_, _), _) => None,
(LargeBinary(v1), LargeBinary(v2)) => v1.partial_cmp(v2),
(LargeBinary(_), _) => None,
(List(v1, t1), List(v2, t2)) => {
Expand Down Expand Up @@ -537,6 +543,7 @@ impl std::hash::Hash for ScalarValue {
Utf8(v) => v.hash(state),
LargeUtf8(v) => v.hash(state),
Binary(v) => v.hash(state),
FixedSizeBinary(_, v) => v.hash(state),
LargeBinary(v) => v.hash(state),
List(v, t) => {
v.hash(state);
Expand Down Expand Up @@ -901,6 +908,7 @@ impl ScalarValue {
ScalarValue::Utf8(_) => DataType::Utf8,
ScalarValue::LargeUtf8(_) => DataType::LargeUtf8,
ScalarValue::Binary(_) => DataType::Binary,
ScalarValue::FixedSizeBinary(sz, _) => DataType::FixedSizeBinary(*sz),
ScalarValue::LargeBinary(_) => DataType::LargeBinary,
ScalarValue::List(_, field) => DataType::List(Box::new(Field::new(
"item",
Expand Down Expand Up @@ -988,6 +996,7 @@ impl ScalarValue {
ScalarValue::Utf8(v) => v.is_none(),
ScalarValue::LargeUtf8(v) => v.is_none(),
ScalarValue::Binary(v) => v.is_none(),
ScalarValue::FixedSizeBinary(_, v) => v.is_none(),
ScalarValue::LargeBinary(v) => v.is_none(),
ScalarValue::List(v, _) => v.is_none(),
ScalarValue::Date32(v) => v.is_none(),
Expand Down Expand Up @@ -1357,13 +1366,30 @@ impl ScalarValue {
_ => unreachable!("Invalid dictionary keys type: {:?}", key_type),
}
}
DataType::FixedSizeBinary(_) => {
let array = scalars
.map(|sv| {
if let ScalarValue::FixedSizeBinary(_, v) = sv {
Ok(v)
} else {
Err(DataFusionError::Internal(format!(
"Inconsistent types in ScalarValue::iter_to_array. \
Expected {:?}, got {:?}",
data_type, sv
)))
}
})
.collect::<Result<Vec<_>>>()?;
let array =
FixedSizeBinaryArray::try_from_sparse_iter(array.into_iter())?;
Arc::new(array)
}
// explicitly enumerate unsupported types so newly added
// types must be aknowledged
DataType::Float16
| DataType::Time32(_)
| DataType::Time64(_)
| DataType::Duration(_)
| DataType::FixedSizeBinary(_)
| DataType::FixedSizeList(_, _)
| DataType::Interval(_)
| DataType::LargeList(_)
Expand Down Expand Up @@ -1566,6 +1592,20 @@ impl ScalarValue {
Arc::new(repeat(None::<&str>).take(size).collect::<BinaryArray>())
}
},
ScalarValue::FixedSizeBinary(_, e) => match e {
Some(value) => Arc::new(
FixedSizeBinaryArray::try_from_sparse_iter(
repeat(Some(value.as_slice())).take(size),
)
.unwrap(),
),
None => Arc::new(
FixedSizeBinaryArray::try_from_sparse_iter(
repeat(None::<&[u8]>).take(size),
)
.unwrap(),
),
},
ScalarValue::LargeBinary(e) => match e {
Some(value) => Arc::new(
repeat(Some(value.as_slice()))
Expand Down Expand Up @@ -1851,6 +1891,23 @@ impl ScalarValue {
};
ScalarValue::new_list(value, nested_type.data_type().clone())
}
DataType::FixedSizeBinary(_) => {
let array = array
.as_any()
.downcast_ref::<FixedSizeBinaryArray>()
.unwrap();
let size = match array.data_type() {
DataType::FixedSizeBinary(size) => *size,
_ => unreachable!(),
};
ScalarValue::FixedSizeBinary(
size,
match array.is_null(index) {
true => None,
false => Some(array.value(index).into()),
},
)
}
other => {
return Err(DataFusionError::NotImplemented(format!(
"Can't create a scalar from array of type \"{:?}\"",
Expand Down Expand Up @@ -1941,6 +1998,9 @@ impl ScalarValue {
ScalarValue::Binary(val) => {
eq_array_primitive!(array, index, BinaryArray, val)
}
ScalarValue::FixedSizeBinary(_, val) => {
eq_array_primitive!(array, index, FixedSizeBinaryArray, val)
}
ScalarValue::LargeBinary(val) => {
eq_array_primitive!(array, index, LargeBinaryArray, val)
}
Expand Down Expand Up @@ -2285,6 +2345,17 @@ impl fmt::Display for ScalarValue {
)?,
None => write!(f, "NULL")?,
},
ScalarValue::FixedSizeBinary(_, e) => match e {
Some(l) => write!(
f,
"{}",
l.iter()
.map(|v| format!("{}", v))
.collect::<Vec<_>>()
.join(",")
)?,
None => write!(f, "NULL")?,
},
ScalarValue::LargeBinary(e) => match e {
Some(l) => write!(
f,
Expand Down Expand Up @@ -2365,6 +2436,12 @@ impl fmt::Debug for ScalarValue {
ScalarValue::LargeUtf8(Some(_)) => write!(f, "LargeUtf8(\"{}\")", self),
ScalarValue::Binary(None) => write!(f, "Binary({})", self),
ScalarValue::Binary(Some(_)) => write!(f, "Binary(\"{}\")", self),
ScalarValue::FixedSizeBinary(size, None) => {
write!(f, "FixedSizeBinary({}, {})", size, self)
}
ScalarValue::FixedSizeBinary(size, Some(_)) => {
write!(f, "FixedSizeBinary({}, \"{}\")", size, self)
}
ScalarValue::LargeBinary(None) => write!(f, "LargeBinary({})", self),
ScalarValue::LargeBinary(Some(_)) => write!(f, "LargeBinary(\"{}\")", self),
ScalarValue::List(_, _) => write!(f, "List([{}])", self),
Expand Down
Binary file added datafusion/core/tests/parquet/test_binary.parquet
View file
Open in desktop
Binary file not shown.
22 changes: 22 additions & 0 deletions datafusion/core/tests/sql/parquet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,28 @@ async fn parquet_query() {
assert_batches_eq!(expected, &actual);
}

#[tokio::test]
async fn fixed_size_binary_columns() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

let ctx = SessionContext::new();
ctx.register_parquet(
"t0",
"tests/parquet/test_binary.parquet",
ParquetReadOptions::default(),
)
.await
.unwrap();
let sql = "SELECT ids FROM t0 ORDER BY ids";
let plan = ctx.create_logical_plan(sql).unwrap();
let plan = ctx.optimize(&plan).unwrap();
let plan = ctx.create_physical_plan(&plan).await.unwrap();
let task_ctx = ctx.task_ctx();
let results = collect(plan, task_ctx).await.unwrap();
for batch in results {
assert_eq!(466, batch.num_rows());
assert_eq!(1, batch.num_columns());
}
}

#[tokio::test]
async fn parquet_single_nan_schema() {
let ctx = SessionContext::new();
Expand Down
5 changes: 5 additions & 0 deletions datafusion/proto/src/to_proto.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1187,6 +1187,11 @@ impl TryFrom<&ScalarValue> for protobuf::ScalarValue {
Value::LargeBinaryValue(s.to_owned())
})
}
scalar::ScalarValue::FixedSizeBinary(_, _) => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Filed #3928 to track

return Err(Error::General(
"FixedSizeBinary is not yet implemented".to_owned(),
))
}

datafusion::scalar::ScalarValue::Time64(v) => {
create_proto_scalar(v, PrimitiveScalarType::Time64, |v| {
Expand Down