From 54d828fc3100fd4aa30ed4dc27f191fee52605c7 Mon Sep 17 00:00:00 2001 From: SeaRise Date: Fri, 23 Dec 2022 01:08:17 +0800 Subject: [PATCH] u --- dbms/src/Interpreters/Aggregator.cpp | 1 - .../Interpreters/MergingAndConvertingBlockInputStream.h | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/dbms/src/Interpreters/Aggregator.cpp b/dbms/src/Interpreters/Aggregator.cpp index fcef7b9ad37..4a9ffc1c993 100644 --- 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 index d7a03a90001..1e9f902ef6a 100644 --- 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(ptr)) -#define ToAggregationMethodPtrTwoLevel(NAME, ptr) (reinterpret_cast(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