andygrove commented on a change in pull request #7936:
URL: https://github.com/apache/arrow/pull/7936#discussion_r469332693
##########
File path: rust/datafusion/src/execution/physical_plan/hash_aggregate.rs
##########
@@ -677,6 +532,152 @@ impl RecordBatchReader for HashAggregateIterator {
}
}
+/// Append a grouping expression value to a builder
+macro_rules! append_group_value {
+ ($BUILDER:expr, $BUILDER_TY:ident, $VALUE:expr) => {{
+ let builder = $BUILDER
+ .downcast_mut::<$BUILDER_TY>()
+ .expect("failed to downcast group value builder to expected type");
+ builder.append_value($VALUE)?;
+ }};
+}
+
+/// Append an aggregate expression value to a builder
+macro_rules! append_aggr_value {
+ ($BUILDER:expr, $BUILDER_TY:ident, $VALUE:expr, $SCALAR_TY:ident) => {{
+ println!("downcast {:#?} to {:#?}", $BUILDER, $VALUE);
+ let builder = $BUILDER
+ .downcast_mut::<$BUILDER_TY>()
+ .expect("failed to downcast aggregate value builder to expected
type");
+ match $VALUE {
+ Some(ScalarValue::$SCALAR_TY(n)) => builder.append_value(n)?,
+ None => builder.append_null()?,
+ Some(_) => panic!(),
+ }
+ }};
+}
+
+/// Create a RecordBatch representing the accumulated results in a map
+fn create_batch_from_map(
+ map: &FnvHashMap<Vec<GroupByScalar>, Rc<AccumulatorSet>>,
+ num_group_expr: usize,
+ num_aggr_expr: usize,
+ output_schema: &Schema,
+) -> Result<RecordBatch> {
+ let mut builders: Vec<Box<dyn ArrayBuilder>> = vec![];
+ for i in 0..num_group_expr + num_aggr_expr {
Review comment:
I took a quick look at doing this but I needed an explicit assignment
still otherwise it complained about the match arms returning different types,
so it ended up not being much cleaner really. However, I did change it to use
`for data_type in &output_types` which is a little cleaner.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
