u

pingcap · Dec 22, 2022 · 54d828f · 54d828f
1 parent e9a93eb
commit 54d828f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/dbms/src/Interpreters/Aggregator.cpp b/dbms/src/Interpreters/Aggregator.cpp
@@ -57,7 +57,6 @@ extern const int LOGICAL_ERROR;
 namespace FailPoints
 {
 extern const char random_aggregate_create_state_failpoint[];
-extern const char random_aggregate_merge_failpoint[];
 } // namespace FailPoints
 
 #define AggregationMethodName(NAME) AggregatedDataVariants::AggregationMethod_##NAME

diff --git a/dbms/src/Interpreters/MergingAndConvertingBlockInputStream.h b/dbms/src/Interpreters/MergingAndConvertingBlockInputStream.h
@@ -13,11 +13,8 @@ extern const char random_aggregate_merge_failpoint[];
 } // namespace FailPoints
 
 #define AggregationMethodName(NAME) AggregatedDataVariants::AggregationMethod_##NAME
-#define AggregationMethodNameTwoLevel(NAME) AggregatedDataVariants::AggregationMethod_##NAME##_two_level
 #define AggregationMethodType(NAME) AggregatedDataVariants::Type::NAME
-#define AggregationMethodTypeTwoLevel(NAME) AggregatedDataVariants::Type::NAME##_two_level
 #define ToAggregationMethodPtr(NAME, ptr) (reinterpret_cast<AggregationMethodName(NAME) *>(ptr))
-#define ToAggregationMethodPtrTwoLevel(NAME, ptr) (reinterpret_cast<AggregationMethodNameTwoLevel(NAME) *>(ptr))
 
 /** Combines aggregation states together, turns them into blocks, and outputs streams.
   * If the aggregation states are two-level, then it produces blocks strictly in order of 'bucket_num'.
@@ -236,9 +233,6 @@ class MergingAndConvertingBlockInputStream : public IProfilingBlockInputStream
 };
 
 #undef AggregationMethodName
-#undef AggregationMethodNameTwoLevel
 #undef AggregationMethodType
-#undef AggregationMethodTypeTwoLevel
 #undef ToAggregationMethodPtr
-#undef ToAggregationMethodPtrTwoLevel
-}
+} // namespace DB