From 011e50cae6b15d6ae1bf51621c5fdc505a84ae27 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Sun, 11 Aug 2019 02:27:25 +0300 Subject: [PATCH] Removed useless function arguments --- dbms/src/Interpreters/Aggregator.cpp | 5 ++--- dbms/src/Interpreters/Aggregator.h | 3 --- dbms/src/Interpreters/SpecializedAggregator.h | 7 ++----- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dbms/src/Interpreters/Aggregator.cpp b/dbms/src/Interpreters/Aggregator.cpp index 2498bcec7fd..c19a54a07af 100644 --- a/dbms/src/Interpreters/Aggregator.cpp +++ b/dbms/src/Interpreters/Aggregator.cpp @@ -289,7 +289,7 @@ void Aggregator::compileIfPossible(AggregatedDataVariants::Type type) "template void Aggregator::executeSpecialized<\n" " " << method_typename << ", TypeList<" << aggregate_functions_typenames << ">>(\n" " " << method_typename << " &, Arena *, size_t, ColumnRawPtrs &,\n" - " AggregateColumns &, StringRefs &, bool, AggregateDataPtr) const;\n" + " AggregateColumns &, bool, AggregateDataPtr) const;\n" "\n" "static void wrapper" << suffix << "(\n" " const Aggregator & aggregator,\n" @@ -298,13 +298,12 @@ void Aggregator::compileIfPossible(AggregatedDataVariants::Type type) " size_t rows,\n" " ColumnRawPtrs & key_columns,\n" " Aggregator::AggregateColumns & aggregate_columns,\n" - " StringRefs & keys,\n" " bool no_more_keys,\n" " AggregateDataPtr overflow_row)\n" "{\n" " aggregator.executeSpecialized<\n" " " << method_typename << ", TypeList<" << aggregate_functions_typenames << ">>(\n" - " method, arena, rows, key_columns, aggregate_columns, keys, no_more_keys, overflow_row);\n" + " method, arena, rows, key_columns, aggregate_columns, no_more_keys, overflow_row);\n" "}\n" "\n" "void * getPtr" << suffix << "() __attribute__((__visibility__(\"default\")));\n" diff --git a/dbms/src/Interpreters/Aggregator.h b/dbms/src/Interpreters/Aggregator.h index e089f4707d2..4b6f7d16b90 100644 --- a/dbms/src/Interpreters/Aggregator.h +++ b/dbms/src/Interpreters/Aggregator.h @@ -1047,7 +1047,6 @@ public: size_t rows, ColumnRawPtrs & key_columns, AggregateColumns & aggregate_columns, - StringRefs & keys, bool no_more_keys, AggregateDataPtr overflow_row) const; @@ -1057,9 +1056,7 @@ public: typename Method::State & state, Arena * aggregates_pool, size_t rows, - ColumnRawPtrs & key_columns, AggregateColumns & aggregate_columns, - StringRefs & keys, AggregateDataPtr overflow_row) const; template diff --git a/dbms/src/Interpreters/SpecializedAggregator.h b/dbms/src/Interpreters/SpecializedAggregator.h index 8ec6b297111..4136f2162ac 100644 --- a/dbms/src/Interpreters/SpecializedAggregator.h +++ b/dbms/src/Interpreters/SpecializedAggregator.h @@ -103,7 +103,6 @@ void NO_INLINE Aggregator::executeSpecialized( size_t rows, ColumnRawPtrs & key_columns, AggregateColumns & aggregate_columns, - StringRefs & keys, bool no_more_keys, AggregateDataPtr overflow_row) const { @@ -111,10 +110,10 @@ void NO_INLINE Aggregator::executeSpecialized( if (!no_more_keys) executeSpecializedCase( - method, state, aggregates_pool, rows, key_columns, aggregate_columns, keys, overflow_row); + method, state, aggregates_pool, rows, aggregate_columns, overflow_row); else executeSpecializedCase( - method, state, aggregates_pool, rows, key_columns, aggregate_columns, keys, overflow_row); + method, state, aggregates_pool, rows, aggregate_columns, overflow_row); } #pragma GCC diagnostic push @@ -126,9 +125,7 @@ void NO_INLINE Aggregator::executeSpecializedCase( typename Method::State & state, Arena * aggregates_pool, size_t rows, - ColumnRawPtrs & /*key_columns*/, AggregateColumns & aggregate_columns, - StringRefs & /*keys*/, AggregateDataPtr overflow_row) const { /// For all rows.