44use std:: any:: Any ;
55use std:: sync:: Arc ;
66
7+ use vortex_session:: ArcSwapMap ;
78use vortex_session:: SessionExt ;
89use vortex_session:: SessionGuard ;
910use vortex_session:: SessionVar ;
@@ -35,7 +36,6 @@ use crate::aggregate_fn::fns::sum::Sum;
3536use crate :: aggregate_fn:: fns:: uncompressed_size_in_bytes:: UncompressedSizeInBytes ;
3637use crate :: aggregate_fn:: kernels:: DynAggregateKernel ;
3738use crate :: aggregate_fn:: kernels:: DynGroupedAggregateKernel ;
38- use crate :: arc_swap_map:: ArcSwapMap ;
3939use crate :: array:: ArrayId ;
4040use crate :: array:: VTable ;
4141use crate :: arrays:: Chunked ;
@@ -54,12 +54,11 @@ use crate::dtype::DType;
5454/// [`VortexSession`](vortex_session::VortexSession).
5555#[ derive( Clone , Debug ) ]
5656pub struct AggregateFnSession {
57- registry : ArcSwapMap < AggregateFnId , AggregateFnPluginRef > ,
57+ registry : AggregateFnRegistry ,
5858
59- kernels : ArcSwapMap < AggregateKernelKey , & ' static dyn DynAggregateKernel > ,
60- grouped_kernels : ArcSwapMap < AggregateFnId , & ' static dyn DynGroupedAggregateKernel > ,
61- grouped_encoding_kernels :
62- ArcSwapMap < GroupedEncodingKernelKey , & ' static dyn DynGroupedAggregateKernel > ,
59+ kernels : AggregateKernelRegistry ,
60+ grouped_kernels : GroupedKernelRegistry ,
61+ grouped_encoding_kernels : GroupedEncodingKernelRegistry ,
6362}
6463
6564impl SessionVar for AggregateFnSession {
@@ -75,13 +74,23 @@ impl SessionVar for AggregateFnSession {
7574type AggregateKernelKey = ( ArrayId , Option < AggregateFnId > ) ;
7675type GroupedEncodingKernelKey = ( ArrayId , AggregateFnId ) ;
7776
77+ /// Registry of aggregate function plugins, keyed by aggregate function id.
78+ type AggregateFnRegistry = ArcSwapMap < AggregateFnId , AggregateFnPluginRef > ;
79+ /// Registry of aggregate kernels, keyed by encoding and optional aggregate function.
80+ type AggregateKernelRegistry = ArcSwapMap < AggregateKernelKey , & ' static dyn DynAggregateKernel > ;
81+ /// Registry of encoding-agnostic grouped aggregate kernels, keyed by aggregate function id.
82+ type GroupedKernelRegistry = ArcSwapMap < AggregateFnId , & ' static dyn DynGroupedAggregateKernel > ;
83+ /// Registry of grouped aggregate kernels, keyed by encoding and aggregate function.
84+ type GroupedEncodingKernelRegistry =
85+ ArcSwapMap < GroupedEncodingKernelKey , & ' static dyn DynGroupedAggregateKernel > ;
86+
7887impl Default for AggregateFnSession {
7988 fn default ( ) -> Self {
8089 let this = Self {
81- registry : ArcSwapMap :: default ( ) ,
82- kernels : ArcSwapMap :: default ( ) ,
83- grouped_kernels : ArcSwapMap :: default ( ) ,
84- grouped_encoding_kernels : ArcSwapMap :: default ( ) ,
90+ registry : AggregateFnRegistry :: default ( ) ,
91+ kernels : AggregateKernelRegistry :: default ( ) ,
92+ grouped_kernels : GroupedKernelRegistry :: default ( ) ,
93+ grouped_encoding_kernels : GroupedEncodingKernelRegistry :: default ( ) ,
8594 } ;
8695
8796 // Register the built-in aggregate functions
0 commit comments