reduced PR

Author: Rich-T-kid

datafusion/physical-plan/src/aggregates/group_values/mod.rs

@@ -1,5 +1,4 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
+// Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
 // regarding copyright ownership.  The ASF licenses this file
 // to you under the Apache License, Version 2.0 (the
@@ -31,8 +30,8 @@ use datafusion_expr::EmitTo;
 
 pub mod multi_group_by;
 
-pub mod row;
-pub mod single_group_by;
+mod row;
+mod single_group_by;
 use datafusion_physical_expr::binary_map::OutputType;
 use multi_group_by::GroupValuesColumn;
 use row::GroupValuesRows;
@@ -49,14 +48,8 @@ use crate::aggregates::{
 };
 
 mod metrics;
-mod null_builder;
-
 pub(crate) use metrics::GroupByMetrics;
-macro_rules! make_dict {
-    ($t:ty, $value_type:expr) => {
-        Ok(Box::new(GroupValuesDictionary::<$t>::new($value_type)))
-    };
-}
+mod null_builder;
 
 /// Stores the group values during hash aggregation.
 ///
@@ -206,14 +199,36 @@ pub fn new_group_values(
             DataType::Dictionary(key_type, value_type) => {
                 if supported_single_dictionary_value(value_type) {
                     return match key_type.as_ref() {
-                        DataType::Int8 => make_dict!(Int8Type, value_type),
-                        DataType::Int16 => make_dict!(Int16Type, value_type),
-                        DataType::Int32 => make_dict!(Int32Type, value_type),
-                        DataType::Int64 => make_dict!(Int64Type, value_type),
-                        DataType::UInt8 => make_dict!(UInt8Type, value_type),
-                        DataType::UInt16 => make_dict!(UInt16Type, value_type),
-                        DataType::UInt32 => make_dict!(UInt32Type, value_type),
-                        DataType::UInt64 => make_dict!(UInt64Type, value_type),
+                        DataType::Int8 => Ok(Box::new(
+                            GroupValuesDictionary::<Int8Type>::new(value_type),
+                        )),
+                        DataType::Int16 => Ok(Box::new(
+                            GroupValuesDictionary::<Int16Type>::new(value_type),
+                        )),
+                        DataType::Int32 => Ok(Box::new(
+                            GroupValuesDictionary::<Int32Type>::new(value_type),
+                        )),
+                        DataType::Int64 => Ok(Box::new(
+                            GroupValuesDictionary::<Int64Type>::new(value_type),
+                        )),
+                        DataType::UInt8 => Ok(Box::new(
+                            GroupValuesDictionary::<UInt8Type>::new(value_type),
+                        )),
+                        DataType::UInt16 => {
+                            Ok(Box::new(GroupValuesDictionary::<UInt16Type>::new(
+                                value_type,
+                            )))
+                        }
+                        DataType::UInt32 => {
+                            Ok(Box::new(GroupValuesDictionary::<UInt32Type>::new(
+                                value_type,
+                            )))
+                        }
+                        DataType::UInt64 => {
+                            Ok(Box::new(GroupValuesDictionary::<UInt64Type>::new(
+                                value_type,
+                            )))
+                        }
                         _ => Err(datafusion_common::DataFusionError::NotImplemented(
                             format!("Unsupported dictionary key type: {key_type:?}"),
                         )),
@@ -231,7 +246,6 @@ pub fn new_group_values(
             Ok(Box::new(GroupValuesColumn::<true>::try_new(schema)?))
         }
     } else {
-        // TODO:  add specialized implementation for dictionary encoding columns for 2+ group by columns case
         Ok(Box::new(GroupValuesRows::try_new(schema)?))
     }
 }