fix

apache · Nov 13, 2024 · 82918fe · 82918fe
1 parent ee0de9b
commit 82918fe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 17 deletions.
diff --git a/be/src/vec/aggregate_functions/aggregate_function_stddev.cpp b/be/src/vec/aggregate_functions/aggregate_function_stddev.cpp
@@ -51,32 +51,32 @@ AggregateFunctionPtr create_aggregate_function_variance_samp(const std::string&
                                                              const DataTypes& argument_types,
                                                              const bool result_is_nullable,
                                                              const AggregateFunctionAttr& attr) {
-    return create_function_single_value<AggregateFunctionSamp, VarianceSampName, SampData, false>(
-            name, argument_types, result_is_nullable);
+    return create_function_single_value<AggregateFunctionSampVariance, VarianceSampName, SampData,
+                                        false>(name, argument_types, result_is_nullable);
 }
 
 AggregateFunctionPtr create_aggregate_function_variance_pop(const std::string& name,
                                                             const DataTypes& argument_types,
                                                             const bool result_is_nullable,
                                                             const AggregateFunctionAttr& attr) {
-    return create_function_single_value<AggregateFunctionPop, VarianceName, PopData, false>(
-            name, argument_types, result_is_nullable);
+    return create_function_single_value<AggregateFunctionSampVariance, VarianceName, PopData,
+                                        false>(name, argument_types, result_is_nullable);
 }
 
 AggregateFunctionPtr create_aggregate_function_stddev_pop(const std::string& name,
                                                           const DataTypes& argument_types,
                                                           const bool result_is_nullable,
                                                           const AggregateFunctionAttr& attr) {
-    return create_function_single_value<AggregateFunctionPop, StddevName, PopData, true>(
+    return create_function_single_value<AggregateFunctionSampVariance, StddevName, PopData, true>(
             name, argument_types, result_is_nullable);
 }
 
 AggregateFunctionPtr create_aggregate_function_stddev_samp(const std::string& name,
                                                            const DataTypes& argument_types,
                                                            const bool result_is_nullable,
                                                            const AggregateFunctionAttr& attr) {
-    return create_function_single_value<AggregateFunctionSamp, StddevSampName, SampData, true>(
-            name, argument_types, result_is_nullable);
+    return create_function_single_value<AggregateFunctionSampVariance, StddevSampName, SampData,
+                                        true>(name, argument_types, result_is_nullable);
 }
 
 void register_aggregate_function_stddev_variance_pop(AggregateFunctionSimpleFactory& factory) {

diff --git a/be/src/vec/aggregate_functions/aggregate_function_stddev.h b/be/src/vec/aggregate_functions/aggregate_function_stddev.h
@@ -178,12 +178,12 @@ struct StddevSampName {
     static const char* name() { return "stddev_samp"; }
 };
 
-template <bool is_pop, typename Data>
+template <typename Data>
 class AggregateFunctionSampVariance
-        : public IAggregateFunctionDataHelper<Data, AggregateFunctionSampVariance<is_pop, Data>> {
+        : public IAggregateFunctionDataHelper<Data, AggregateFunctionSampVariance<Data>> {
 public:
     AggregateFunctionSampVariance(const DataTypes& argument_types_)
-            : IAggregateFunctionDataHelper<Data, AggregateFunctionSampVariance<is_pop, Data>>(
+            : IAggregateFunctionDataHelper<Data, AggregateFunctionSampVariance<Data>>(
                       argument_types_) {}
 
     String get_name() const override { return Data::name(); }
@@ -216,11 +216,4 @@ class AggregateFunctionSampVariance
     }
 };
 
-template <typename Data>
-using AggregateFunctionSamp = AggregateFunctionSampVariance<false, Data>;
-
-//pop function have use AggregateFunctionNullBase function, so needn't processing null values
-template <typename Data>
-using AggregateFunctionPop = AggregateFunctionSampVariance<true, Data>;
-
 } // namespace doris::vectorized