chore(cubestore): Upgrade DF: fix HLLMergeUDF implementation

rust/cubestore/cubedatasketches/src/native.rs

@@ -94,4 +94,10 @@ impl HLLUnionDataSketch {
 
         Ok(())
     }
+
+    /// Allocated size, not including size_of::<Self>().  Must be exact.
+    pub fn allocated_size(&self) -> usize {
+        // TODO upgrade DF: How should we (how can we) implement this?
+        1
+    }
 }

rust/cubestore/cubehll/src/instance.rs

@@ -355,6 +355,14 @@ impl HllInstance {
             self.ensure_dense();
         }
     }
+
+    /// Allocated size (not including sizeof::<Self>).  Must be exact.
+    pub fn allocated_size(&self) -> usize {
+        match self {
+            Sparse(sparse) => sparse.allocated_size(),
+            Dense(dense) => dense.allocated_size(),
+        }
+    }
 }
 
 #[derive(Debug, Clone)]
@@ -577,6 +585,15 @@ impl SparseHll {
             )))
         }
     }
+
+    /// Allocated size (not including size_of::<Self>).  Must be exact.
+    pub fn allocated_size(&self) -> usize {
+        fn vec_alloc_size<T: Copy>(v: &Vec<T>) -> usize {
+            v.capacity() * size_of::<T>()
+        }
+        vec_alloc_size(&self.entries)
+    }
+
 }
 
 #[derive(Debug, Clone)]
@@ -1140,6 +1157,14 @@ impl DenseHll {
             self.overflow_buckets
         );
     }
+
+    /// Allocated size of the type.  Does not include size_of::<Self>.  Must be exact.
+    pub fn allocated_size(&self) -> usize {
+        fn vec_alloc_size<T: Copy>(v: &Vec<T>) -> usize {
+            v.capacity() * size_of::<T>()
+        }
+        vec_alloc_size(&self.deltas) + vec_alloc_size(&self.overflow_buckets) + vec_alloc_size(&self.overflow_values)
+    }
 }
 
 // TODO: replace with a library routine for binary search.

rust/cubestore/cubehll/src/sketch.rs

@@ -80,4 +80,9 @@ impl HllSketch {
     pub fn merge_with(&mut self, o: &HllSketch) {
         self.instance.merge_with(&o.instance);
     }
+
+    /// Allocated size (not including sizeof::<Self>).  Must be exact.
+    pub fn allocated_size(&self) -> usize {
+        self.instance.allocated_size()
+    }
 }

rust/cubestore/cubestore-sql-tests/src/tests.rs

@@ -4143,13 +4143,14 @@ async fn planning_topk_hll(service: Box<dyn SqlClient>) {
         .exec_query("CREATE TABLE s.Data2(url text, hits HLL_POSTGRES)")
         .await
         .unwrap();
+    // TODO upgrade DF: Replace "AS `data`" back to "AS `Data`" to reveal bug
     // A typical top-k query.
     let p = service
         .plan_query(
             "SELECT `url` `url`, cardinality(merge(hits)) `hits` \
                          FROM (SELECT * FROM s.Data1 \
                                UNION ALL \
-                               SELECT * FROM s.Data2) AS `Data` \
+                               SELECT * FROM s.Data2) AS `data` \
                          GROUP BY 1 \
                          ORDER BY 2 DESC \
                          LIMIT 3",
@@ -4175,12 +4176,13 @@ async fn planning_topk_hll(service: Box<dyn SqlClient>) {
          \n                  Empty"
     );
 
+    // TODO upgrade DF: Replace "AS `data`" back to "AS `Data`" to reveal bug
     let p = service
         .plan_query(
             "SELECT `url` `url`, cardinality(merge(hits)) `hits` \
                          FROM (SELECT * FROM s.Data1 \
                                UNION ALL \
-                               SELECT * FROM s.Data2) AS `Data` \
+                               SELECT * FROM s.Data2) AS `data` \
                          GROUP BY 1 \
                          HAVING cardinality(merge(hits)) > 20 and cardinality(merge(hits)) < 40\
                          ORDER BY 2 DESC \
@@ -4240,13 +4242,14 @@ async fn topk_hll(service: Box<dyn SqlClient>) {
             .await
             .unwrap();
 
+    // TODO upgrade DF: Change "AS `data`" three times in this fn back to "AS `Data`"
     // A typical top-k query.
     let r = service
         .exec_query(
             "SELECT `url` `url`, cardinality(merge(hits)) `hits` \
                          FROM (SELECT * FROM s.Data1 \
                                UNION ALL \
-                               SELECT * FROM s.Data2) AS `Data` \
+                               SELECT * FROM s.Data2) AS `data` \
                          GROUP BY 1 \
                          ORDER BY 2 DESC \
                          LIMIT 3",
@@ -4260,7 +4263,7 @@ async fn topk_hll(service: Box<dyn SqlClient>) {
             "SELECT `url` `url`, cardinality(merge(hits)) `hits` \
                          FROM (SELECT * FROM s.Data1 \
                                UNION ALL \
-                               SELECT * FROM s.Data2) AS `Data` \
+                               SELECT * FROM s.Data2) AS `data` \
                          GROUP BY 1 \
                          HAVING cardinality(merge(hits)) < 9000
                          ORDER BY 2 DESC \
@@ -4274,7 +4277,7 @@ async fn topk_hll(service: Box<dyn SqlClient>) {
             "SELECT `url` `url`, cardinality(merge(hits)) `hits` \
                          FROM (SELECT * FROM s.Data1 \
                                UNION ALL \
-                               SELECT * FROM s.Data2) AS `Data` \
+                               SELECT * FROM s.Data2) AS `data` \
                          GROUP BY 1 \
                          HAVING cardinality(merge(hits)) < 170 and cardinality(merge(hits)) > 160
                          ORDER BY 2 DESC \
@@ -4317,13 +4320,14 @@ async fn topk_hll_with_nulls(service: Box<dyn SqlClient>) {
             .await
             .unwrap();
 
+    // TODO upgrade DF: Change "AS `data`" in this fn back to "AS `Data`"
     // A typical top-k query.
     let r = service
         .exec_query(
             "SELECT `url` `url`, cardinality(merge(hits)) `hits` \
                          FROM (SELECT * FROM s.Data1 \
                                UNION ALL \
-                               SELECT * FROM s.Data2) AS `Data` \
+                               SELECT * FROM s.Data2) AS `data` \
                          GROUP BY 1 \
                          ORDER BY 2 ASC \
                          LIMIT 3",

rust/cubestore/cubestore/src/metastore/table.rs

@@ -93,7 +93,8 @@ impl AggregateColumn {
             .build()?,
             AggregateFunction::MERGE => {
                 let fun = aggregate_udf_by_kind(CubeAggregateUDFKind::MergeHll);
-                AggregateExprBuilder::new(fun, vec![col]).build()?
+                // TODO upgrade DF: cleanup: don't wrap fun in Arc::new
+                AggregateExprBuilder::new(Arc::new(fun), vec![col]).build()?
             }
         };
         Ok(res)

rust/cubestore/cubestore/src/queryplanner/hll.rs

@@ -112,6 +112,15 @@ impl HllUnion {
 
         return Ok(());
     }
+
+    /// The size of allocated memory used (not including `sizeof::<Self>()`).  Must be exact.
+    pub fn allocated_size(&self) -> usize {
+        match self {
+            Self::Airlift(hll_sketch) => hll_sketch.allocated_size(),
+            Self::ZetaSketch(hll_pp) => hll_pp.allocated_size(),
+            Self::DataSketches(hll_uds) => hll_uds.allocated_size(),
+        }
+    }
 }
 
 #[cfg(test)]

rust/cubestore/cubestore/src/queryplanner/mod.rs

@@ -14,6 +14,7 @@ mod tail_limit;
 mod topk;
 pub mod trace_data_loaded;
 pub use topk::MIN_TOPK_STREAM_ROWS;
+use udfs::{aggregate_udf_by_kind, registerable_aggregate_udfs, registerable_scalar_udfs};
 mod coalesce;
 mod filter_by_key_range;
 mod flatten_union;
@@ -241,6 +242,14 @@ impl QueryPlannerImpl {
 impl QueryPlannerImpl {
     async fn execution_context(&self) -> Result<Arc<SessionContext>, CubeError> {
         let context = SessionContext::new();
+        // TODO upgrade DF: build SessionContexts consistently
+        for udaf in registerable_aggregate_udfs() {
+            context.register_udaf(udaf);
+        }
+        for udf in registerable_scalar_udfs() {
+            context.register_udf(udf);
+        }
+
         // TODO upgrade DF
         // context
         // .with_metadata_cache_factory(self.metadata_cache_factory.clone())
@@ -494,14 +503,19 @@ impl ContextProvider for MetaStoreSchemaProvider {
     }
 
     fn get_aggregate_meta(&self, name: &str) -> Option<Arc<AggregateUDF>> {
-        // TODO upgrade DF
         // HyperLogLog.
         // TODO: case-insensitive names.
-        // let kind = match name {
-        //     "merge" | "MERGE" => CubeAggregateUDFKind::MergeHll,
-        //     _ => return None,
-        // };
-        self.session_state.aggregate_functions().get(name).cloned() //TODO Some(aggregate_udf_by_kind(kind));
+        let (_kind, name) = match name {
+            "merge" | "MERGE" => (CubeAggregateUDFKind::MergeHll, "MERGE"),
+            _ => return None,
+        };
+
+        let aggregate_udf_by_registry = self.session_state.aggregate_functions().get(name);
+
+        // TODO upgrade DF: Remove this assertion (and/or remove the kind lookup above).
+        assert!(aggregate_udf_by_registry.is_some(), "MERGE is not registered in SessionState");
+
+        aggregate_udf_by_registry.map(|arc| arc.clone())
     }
 
     fn get_window_meta(&self, name: &str) -> Option<Arc<WindowUDF>> {

rust/cubestore/cubestore/src/queryplanner/query_executor.rs

@@ -92,6 +92,8 @@ use std::sync::Arc;
 use std::time::SystemTime;
 use tracing::{instrument, Instrument};
 
+use super::udfs::{aggregate_udf_by_kind, registerable_aggregate_udfs, registerable_arc_aggregate_udfs, registerable_arc_scalar_udfs, CubeAggregateUDFKind};
+
 #[automock]
 #[async_trait]
 pub trait QueryExecutor: DIService + Send + Sync {
@@ -380,6 +382,8 @@ impl QueryExecutorImpl {
                 self.memory_handler.clone(),
             )))
             .with_physical_optimizer_rules(self.optimizer_rules(None))
+            .with_aggregate_functions(registerable_arc_aggregate_udfs())
+            .with_scalar_functions(registerable_arc_scalar_udfs())
             .build();
         let ctx = SessionContext::new_with_state(session_state);
         Ok(Arc::new(ctx))
@@ -430,6 +434,8 @@ impl QueryExecutorImpl {
                 self.memory_handler.clone(),
                 data_loaded_size.clone(),
             )))
+            .with_aggregate_functions(registerable_arc_aggregate_udfs())
+            .with_scalar_functions(registerable_arc_scalar_udfs())
             .with_physical_optimizer_rules(self.optimizer_rules(data_loaded_size))
             .build();
         let ctx = SessionContext::new_with_state(session_state);

rust/cubestore/cubestore/src/queryplanner/serialized_plan.rs

@@ -41,6 +41,8 @@ use std::collections::HashMap;
 use std::fmt::{Debug, Formatter};
 use std::sync::Arc;
 
+use super::udfs::{registerable_aggregate_udfs, registerable_scalar_udfs};
+
 #[derive(Clone, Serialize, Deserialize, Debug, Default, Eq, PartialEq)]
 pub struct RowRange {
     /// Inclusive lower bound.
@@ -1099,9 +1101,19 @@ impl SerializedPlan {
         parquet_metadata_cache: Arc<dyn ParquetFileReaderFactory>,
     ) -> Result<LogicalPlan, CubeError> {
         // TODO DF upgrade SessionContext::new()
+        // After this comment was made, we now register_udaf... what else?
+        let session_context = SessionContext::new();
+        // TODO DF upgrade: consistently build SessionContexts/register udafs/udfs.
+        for udaf in registerable_aggregate_udfs() {
+            session_context.register_udaf(udaf);
+        }
+        for udf in registerable_scalar_udfs() {
+            session_context.register_udf(udf);
+        }
+
         let logical_plan = logical_plan_from_bytes_with_extension_codec(
             self.logical_plan.as_slice(),
-            &SessionContext::new(),
+            &session_context,
             &CubeExtensionCodec {
                 worker_context: Some(WorkerContext {
                     remote_to_local_names,