Another test

amosbird · Aug 1, 2022 · 6934702 · 6934702
1 parent 5580209
commit 6934702
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 13 deletions.
diff --git a/src/AggregateFunctions/AggregateFunctionArray.h b/src/AggregateFunctions/AggregateFunctionArray.h
@@ -54,9 +54,9 @@ class AggregateFunctionArray final : public IAggregateFunctionHelper<AggregateFu
         return nested_func->getBaseAggregateFunctionWithSameStateRepresentation();
     }
 
-    DataTypePtr getNormalizedStateType() const override
+    DataTypePtr getStateType() const override
     {
-        return nested_func->getNormalizedStateType();
+        return nested_func->getStateType();
     }
 
     bool isVersioned() const override

diff --git a/src/AggregateFunctions/AggregateFunctionCount.h b/src/AggregateFunctions/AggregateFunctionCount.h
@@ -109,7 +109,7 @@ class AggregateFunctionCount final : public IAggregateFunctionDataHelper<Aggrega
         return this->getName() == rhs.getName();
     }
 
-    DataTypePtr getNormalizedStateType() const override
+    DataTypePtr getStateType() const override
     {
         /// Return normalized state type: count()
         AggregateFunctionProperties properties;
@@ -260,7 +260,7 @@ class AggregateFunctionCountNotNullUnary final
         return this->getName() == rhs.getName();
     }
 
-    DataTypePtr getNormalizedStateType() const override
+    DataTypePtr getStateType() const override
     {
         /// Return normalized state type: count()
         AggregateFunctionProperties properties;

diff --git a/src/AggregateFunctions/AggregateFunctionIf.h b/src/AggregateFunctions/AggregateFunctionIf.h
@@ -61,9 +61,9 @@ class AggregateFunctionIf final : public IAggregateFunctionHelper<AggregateFunct
         return nested_func->getBaseAggregateFunctionWithSameStateRepresentation();
     }
 
-    DataTypePtr getNormalizedStateType() const override
+    DataTypePtr getStateType() const override
     {
-        return nested_func->getNormalizedStateType();
+        return nested_func->getStateType();
     }
 
     bool isVersioned() const override

diff --git a/src/AggregateFunctions/AggregateFunctionQuantile.h b/src/AggregateFunctions/AggregateFunctionQuantile.h
@@ -116,7 +116,7 @@ class AggregateFunctionQuantile final
             && this->haveEqualArgumentTypes(rhs);
     }
 
-    DataTypePtr getNormalizedStateType() const override
+    DataTypePtr getStateType() const override
     {
         /// Return normalized state type: quantiles*(1)(...)
         Array params{1};

diff --git a/src/AggregateFunctions/AggregateFunctionState.h b/src/AggregateFunctions/AggregateFunctionState.h
@@ -34,7 +34,7 @@ class AggregateFunctionState final : public IAggregateFunctionHelper<AggregateFu
 
     DataTypePtr getReturnType() const override
     {
-        return getNormalizedStateType();
+        return getStateType();
     }
 
     const IAggregateFunction & getBaseAggregateFunctionWithSameStateRepresentation() const override

diff --git a/src/AggregateFunctions/IAggregateFunction.h b/src/AggregateFunctions/IAggregateFunction.h
@@ -73,9 +73,6 @@ class IAggregateFunction : public std::enable_shared_from_this<IAggregateFunctio
     /// Get the data type of internal state. By default it is AggregateFunction(name(params), argument_types...).
     virtual DataTypePtr getStateType() const;
 
-    /// Same as the above but normalize state types so that variants with the same binary representation will use the same type.
-    virtual DataTypePtr getNormalizedStateType() const { return getStateType(); }
-
     /// Returns true if two aggregate functions have the same state representation in memory and the same serialization,
     /// so state of one aggregate function can be safely used with another.
     /// Examples:

diff --git a/src/DataTypes/DataTypeAggregateFunction.cpp b/src/DataTypes/DataTypeAggregateFunction.cpp
@@ -122,8 +122,8 @@ bool DataTypeAggregateFunction::equals(const IDataType & rhs) const
     if (typeid(rhs) != typeid(*this))
         return false;
 
-    auto lhs_state_type = function->getNormalizedStateType();
-    auto rhs_state_type = typeid_cast<const DataTypeAggregateFunction &>(rhs).function->getNormalizedStateType();
+    auto lhs_state_type = function->getStateType();
+    auto rhs_state_type = typeid_cast<const DataTypeAggregateFunction &>(rhs).function->getStateType();
 
     if (typeid(lhs_state_type.get()) != typeid(rhs_state_type.get()))
         return false;