jayzhan211 commented on code in PR #8562:
URL: https://github.com/apache/arrow-datafusion/pull/8562#discussion_r1428611525
##########
datafusion/common/src/scalar.rs:
##########
@@ -3300,33 +3409,6 @@ mod tests {
assert_eq!(result, &expected);
}
- #[test]
Review Comment:
Is ScalarValue::eq_array test for List elsewhere? Otherwise, we can add the
test for it.
##########
datafusion/proto/src/logical_plan/to_proto.rs:
##########
@@ -1159,13 +1160,105 @@ impl TryFrom<&ScalarValue> for protobuf::ScalarValue {
}
// ScalarValue::List and ScalarValue::FixedSizeList are serialized
using
// Arrow IPC messages as a single column RecordBatch
- ScalarValue::List(arr)
- | ScalarValue::LargeList(arr)
- | ScalarValue::FixedSizeList(arr) => {
+ ScalarValue::List(arr) => {
// Wrap in a "field_name" column
let batch = RecordBatch::try_from_iter(vec![(
"field_name",
- arr.to_owned(),
+ arr.to_owned() as ArrayRef,
+ )])
+ .map_err(|e| {
+ Error::General( format!("Error creating temporary batch
while encoding ScalarValue::List: {e}"))
+ })?;
+
+ let gen = IpcDataGenerator {};
+ let mut dict_tracker = DictionaryTracker::new(false);
+ let (_, encoded_message) = gen
+ .encoded_batch(&batch, &mut dict_tracker,
&Default::default())
+ .map_err(|e| {
+ Error::General(format!(
+ "Error encoding ScalarValue::List as IPC: {e}"
+ ))
+ })?;
+
+ let schema: protobuf::Schema = batch.schema().try_into()?;
+
+ let scalar_list_value = protobuf::ScalarListValue {
+ ipc_message: encoded_message.ipc_message,
+ arrow_data: encoded_message.arrow_data,
+ schema: Some(schema),
+ };
+
+ match val {
+ ScalarValue::List(_) => Ok(protobuf::ScalarValue {
+ value: Some(protobuf::scalar_value::Value::ListValue(
+ scalar_list_value,
+ )),
+ }),
+ ScalarValue::LargeList(_) => Ok(protobuf::ScalarValue {
+ value:
Some(protobuf::scalar_value::Value::LargeListValue(
+ scalar_list_value,
+ )),
+ }),
+ ScalarValue::FixedSizeList(_) => Ok(protobuf::ScalarValue {
+ value:
Some(protobuf::scalar_value::Value::FixedSizeListValue(
+ scalar_list_value,
+ )),
+ }),
+ _ => unreachable!(),
+ }
+ }
+ ScalarValue::LargeList(arr) => {
+ // Wrap in a "field_name" column
+ let batch = RecordBatch::try_from_iter(vec![(
+ "field_name",
+ arr.to_owned() as ArrayRef,
+ )])
+ .map_err(|e| {
+ Error::General( format!("Error creating temporary batch
while encoding ScalarValue::List: {e}"))
+ })?;
+
+ let gen = IpcDataGenerator {};
+ let mut dict_tracker = DictionaryTracker::new(false);
+ let (_, encoded_message) = gen
+ .encoded_batch(&batch, &mut dict_tracker,
&Default::default())
+ .map_err(|e| {
+ Error::General(format!(
+ "Error encoding ScalarValue::List as IPC: {e}"
+ ))
+ })?;
+
+ let schema: protobuf::Schema = batch.schema().try_into()?;
+
+ let scalar_list_value = protobuf::ScalarListValue {
+ ipc_message: encoded_message.ipc_message,
+ arrow_data: encoded_message.arrow_data,
+ schema: Some(schema),
+ };
+
+ match val {
+ ScalarValue::List(_) => Ok(protobuf::ScalarValue {
+ value: Some(protobuf::scalar_value::Value::ListValue(
+ scalar_list_value,
+ )),
+ }),
+ ScalarValue::LargeList(_) => Ok(protobuf::ScalarValue {
Review Comment:
Same
##########
datafusion/proto/src/logical_plan/to_proto.rs:
##########
@@ -1159,13 +1160,105 @@ impl TryFrom<&ScalarValue> for protobuf::ScalarValue {
}
// ScalarValue::List and ScalarValue::FixedSizeList are serialized
using
// Arrow IPC messages as a single column RecordBatch
- ScalarValue::List(arr)
- | ScalarValue::LargeList(arr)
- | ScalarValue::FixedSizeList(arr) => {
+ ScalarValue::List(arr) => {
// Wrap in a "field_name" column
let batch = RecordBatch::try_from_iter(vec![(
"field_name",
- arr.to_owned(),
+ arr.to_owned() as ArrayRef,
+ )])
+ .map_err(|e| {
+ Error::General( format!("Error creating temporary batch
while encoding ScalarValue::List: {e}"))
+ })?;
+
+ let gen = IpcDataGenerator {};
+ let mut dict_tracker = DictionaryTracker::new(false);
+ let (_, encoded_message) = gen
+ .encoded_batch(&batch, &mut dict_tracker,
&Default::default())
+ .map_err(|e| {
+ Error::General(format!(
+ "Error encoding ScalarValue::List as IPC: {e}"
+ ))
+ })?;
+
+ let schema: protobuf::Schema = batch.schema().try_into()?;
+
+ let scalar_list_value = protobuf::ScalarListValue {
+ ipc_message: encoded_message.ipc_message,
+ arrow_data: encoded_message.arrow_data,
+ schema: Some(schema),
+ };
+
+ match val {
+ ScalarValue::List(_) => Ok(protobuf::ScalarValue {
Review Comment:
I think val is already matched to ScalarValue::List in this block, just
process it.
##########
datafusion/proto/src/logical_plan/to_proto.rs:
##########
@@ -1159,13 +1160,105 @@ impl TryFrom<&ScalarValue> for protobuf::ScalarValue {
}
// ScalarValue::List and ScalarValue::FixedSizeList are serialized
using
// Arrow IPC messages as a single column RecordBatch
- ScalarValue::List(arr)
- | ScalarValue::LargeList(arr)
- | ScalarValue::FixedSizeList(arr) => {
+ ScalarValue::List(arr) => {
// Wrap in a "field_name" column
let batch = RecordBatch::try_from_iter(vec![(
"field_name",
- arr.to_owned(),
+ arr.to_owned() as ArrayRef,
+ )])
+ .map_err(|e| {
+ Error::General( format!("Error creating temporary batch
while encoding ScalarValue::List: {e}"))
+ })?;
+
+ let gen = IpcDataGenerator {};
+ let mut dict_tracker = DictionaryTracker::new(false);
+ let (_, encoded_message) = gen
+ .encoded_batch(&batch, &mut dict_tracker,
&Default::default())
+ .map_err(|e| {
+ Error::General(format!(
+ "Error encoding ScalarValue::List as IPC: {e}"
+ ))
+ })?;
+
+ let schema: protobuf::Schema = batch.schema().try_into()?;
+
+ let scalar_list_value = protobuf::ScalarListValue {
+ ipc_message: encoded_message.ipc_message,
+ arrow_data: encoded_message.arrow_data,
+ schema: Some(schema),
+ };
+
+ match val {
+ ScalarValue::List(_) => Ok(protobuf::ScalarValue {
+ value: Some(protobuf::scalar_value::Value::ListValue(
+ scalar_list_value,
+ )),
+ }),
+ ScalarValue::LargeList(_) => Ok(protobuf::ScalarValue {
+ value:
Some(protobuf::scalar_value::Value::LargeListValue(
+ scalar_list_value,
+ )),
+ }),
+ ScalarValue::FixedSizeList(_) => Ok(protobuf::ScalarValue {
+ value:
Some(protobuf::scalar_value::Value::FixedSizeListValue(
+ scalar_list_value,
+ )),
+ }),
+ _ => unreachable!(),
+ }
+ }
+ ScalarValue::LargeList(arr) => {
+ // Wrap in a "field_name" column
+ let batch = RecordBatch::try_from_iter(vec![(
+ "field_name",
+ arr.to_owned() as ArrayRef,
+ )])
+ .map_err(|e| {
+ Error::General( format!("Error creating temporary batch
while encoding ScalarValue::List: {e}"))
+ })?;
+
+ let gen = IpcDataGenerator {};
+ let mut dict_tracker = DictionaryTracker::new(false);
+ let (_, encoded_message) = gen
+ .encoded_batch(&batch, &mut dict_tracker,
&Default::default())
+ .map_err(|e| {
+ Error::General(format!(
+ "Error encoding ScalarValue::List as IPC: {e}"
+ ))
+ })?;
+
+ let schema: protobuf::Schema = batch.schema().try_into()?;
+
+ let scalar_list_value = protobuf::ScalarListValue {
+ ipc_message: encoded_message.ipc_message,
+ arrow_data: encoded_message.arrow_data,
+ schema: Some(schema),
+ };
+
+ match val {
+ ScalarValue::List(_) => Ok(protobuf::ScalarValue {
+ value: Some(protobuf::scalar_value::Value::ListValue(
+ scalar_list_value,
+ )),
+ }),
+ ScalarValue::LargeList(_) => Ok(protobuf::ScalarValue {
+ value:
Some(protobuf::scalar_value::Value::LargeListValue(
+ scalar_list_value,
+ )),
+ }),
+ ScalarValue::FixedSizeList(_) => Ok(protobuf::ScalarValue {
+ value:
Some(protobuf::scalar_value::Value::FixedSizeListValue(
+ scalar_list_value,
+ )),
+ }),
+ _ => unreachable!(),
+ }
+ }
+ ScalarValue::FixedSizeList(arr) => {
Review Comment:
Same for this
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
