chore(cubestore): Upgrade DF: fix UDF style and organization, lowercase names

Author: srh

rust/cubestore/cubehll/src/instance.rs

@@ -593,7 +593,6 @@ impl SparseHll {
         }
         vec_alloc_size(&self.entries)
     }
-
 }
 
 #[derive(Debug, Clone)]
@@ -1163,7 +1162,9 @@ impl DenseHll {
         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)
+        vec_alloc_size(&self.deltas)
+            + vec_alloc_size(&self.overflow_buckets)
+            + vec_alloc_size(&self.overflow_values)
     }
 }
 

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

@@ -484,32 +484,13 @@ impl ContextProvider for MetaStoreSchemaProvider {
     }
 
     fn get_function_meta(&self, name: &str) -> Option<Arc<ScalarUDF>> {
-        // TODO upgrade DF
-        let kind = match name {
-            "cardinality" | "CARDINALITY" => CubeScalarUDFKind::HllCardinality,
-            "unix_timestamp" | "UNIX_TIMESTAMP" => CubeScalarUDFKind::UnixTimestamp,
-            "date_add" | "DATE_ADD" => CubeScalarUDFKind::DateAdd,
-            "date_sub" | "DATE_SUB" => CubeScalarUDFKind::DateSub,
-            "date_bin" | "DATE_BIN" => CubeScalarUDFKind::DateBin,
-            _ => return self.session_state.scalar_functions().get(name).cloned(),
-        };
-        return Some(scalar_udf_by_kind(kind));
+        let name = name.to_ascii_lowercase();
+        self.session_state.scalar_functions().get(&name).cloned()
     }
 
     fn get_aggregate_meta(&self, name_param: &str) -> Option<Arc<AggregateUDF>> {
-        // HyperLogLog.
-        // TODO: case-insensitive names.
-        /*
-        let (_kind, name) = match name {
-            "merge" | "MERGE" => (CubeAggregateUDFKind::MergeHll, "MERGE"),
-            _ => return None,
-        };
-        */
         let name = name_param.to_ascii_lowercase();
-
-        let aggregate_udf_by_registry: Option<&Arc<AggregateUDF>> = self.session_state.aggregate_functions().get(&name);
-
-        aggregate_udf_by_registry.map(|arc| arc.clone())
+        self.session_state.aggregate_functions().get(&name).cloned()
     }
 
     fn get_window_meta(&self, name: &str) -> Option<Arc<WindowUDF>> {

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

@@ -9,7 +9,7 @@ use crate::queryplanner::query_executor::{CubeTable, InlineTableId, InlineTableP
 use crate::queryplanner::topk::{ClusterAggregateTopK, SortColumn};
 use crate::queryplanner::udfs::aggregate_udf_by_kind;
 use crate::queryplanner::udfs::{
-    aggregate_kind_by_name, scalar_kind_by_name, scalar_udf_by_kind, CubeAggregateUDFKind,
+    aggregate_kind_by_name, scalar_udf_by_kind, CubeAggregateUDFKind,
     CubeScalarUDFKind,
 };
 use crate::queryplanner::{CubeTableLogical, InfoSchemaTableProvider};

rust/cubestore/cubestore/src/queryplanner/topk/plan.rs

@@ -2,7 +2,7 @@ use crate::queryplanner::planning::{ClusterSendNode, CubeExtensionPlanner};
 // use crate::queryplanner::topk::execute::{AggregateTopKExec, TopKAggregateFunction};
 use crate::queryplanner::topk::{ClusterAggregateTopK, SortColumn, MIN_TOPK_STREAM_ROWS};
 use crate::queryplanner::udfs::{
-    aggregate_kind_by_name, scalar_kind_by_name, scalar_udf_by_kind, CubeAggregateUDFKind,
+    aggregate_kind_by_name, scalar_udf_by_kind, CubeAggregateUDFKind,
     CubeScalarUDFKind,
 };
 use datafusion::arrow::datatypes::{DataType, Schema};