From de71bfd18b2df90100d10bf2291dfae1571b75f1 Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Sun, 24 Sep 2023 03:14:30 +0800
Subject: [PATCH 1/7] Introduce -ArgMin/-ArgMax combinators.

---
 .../AggregateFunctionCombinatorMinMax.cpp     |  92 +++++++++++++++
 .../AggregateFunctionCombinatorMinMax.h       | 111 ++++++++++++++++++
 .../registerAggregateFunctions.cpp            |   2 +
 3 files changed, 205 insertions(+)
 create mode 100644 src/AggregateFunctions/AggregateFunctionCombinatorMinMax.cpp
 create mode 100644 src/AggregateFunctions/AggregateFunctionCombinatorMinMax.h

diff --git a/src/AggregateFunctions/AggregateFunctionCombinatorMinMax.cpp b/src/AggregateFunctions/AggregateFunctionCombinatorMinMax.cpp
new file mode 100644
index 000000000000..882008b303fd
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionCombinatorMinMax.cpp
@@ -0,0 +1,92 @@
+#include <AggregateFunctions/AggregateFunctionCombinatorFactory.h>
+#include <AggregateFunctions/AggregateFunctionCombinatorMinMax.h>
+#include <AggregateFunctions/AggregateFunctionMinMaxAny.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeString.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+}
+
+namespace
+{
+template <template <typename> class Data>
+class AggregateFunctionCombinatorMinMax final : public IAggregateFunctionCombinator
+{
+public:
+    String getName() const override { return Data<SingleValueDataGeneric<>>::name(); }
+
+    DataTypes transformArguments(const DataTypes & arguments) const override
+    {
+        if (arguments.empty())
+            throw Exception(
+                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                "Incorrect number of arguments for aggregate function with {} suffix",
+                getName());
+
+        return DataTypes(arguments.begin(), arguments.end() - 1);
+    }
+
+    AggregateFunctionPtr transformAggregateFunction(
+        const AggregateFunctionPtr & nested_function,
+        const AggregateFunctionProperties &,
+        const DataTypes & arguments,
+        const Array & params) const override
+    {
+        const DataTypePtr & argument_type = arguments.back();
+        WhichDataType which(argument_type);
+#define DISPATCH(TYPE) \
+    if (which.idx == TypeIndex::TYPE) \
+        return std::make_shared<AggregateFunctionMinMax<Data<SingleValueDataFixed<TYPE>>>>(nested_function, arguments, params); /// NOLINT
+        FOR_NUMERIC_TYPES(DISPATCH)
+#undef DISPATCH
+
+        if (which.idx == TypeIndex::Date)
+            return std::make_shared<AggregateFunctionMinMax<Data<SingleValueDataFixed<DataTypeDate::FieldType>>>>(
+                nested_function, arguments, params);
+        if (which.idx == TypeIndex::DateTime)
+            return std::make_shared<AggregateFunctionMinMax<Data<SingleValueDataFixed<DataTypeDateTime::FieldType>>>>(
+                nested_function, arguments, params);
+        if (which.idx == TypeIndex::DateTime64)
+            return std::make_shared<AggregateFunctionMinMax<Data<SingleValueDataFixed<DateTime64>>>>(nested_function, arguments, params);
+        if (which.idx == TypeIndex::Decimal32)
+            return std::make_shared<AggregateFunctionMinMax<Data<SingleValueDataFixed<Decimal32>>>>(nested_function, arguments, params);
+        if (which.idx == TypeIndex::Decimal64)
+            return std::make_shared<AggregateFunctionMinMax<Data<SingleValueDataFixed<Decimal64>>>>(nested_function, arguments, params);
+        if (which.idx == TypeIndex::Decimal128)
+            return std::make_shared<AggregateFunctionMinMax<Data<SingleValueDataFixed<Decimal128>>>>(nested_function, arguments, params);
+        if (which.idx == TypeIndex::Decimal256)
+            return std::make_shared<AggregateFunctionMinMax<Data<SingleValueDataFixed<Decimal256>>>>(nested_function, arguments, params);
+        if (which.idx == TypeIndex::String)
+            return std::make_shared<AggregateFunctionMinMax<Data<SingleValueDataString>>>(nested_function, arguments, params);
+
+        return std::make_shared<AggregateFunctionMinMax<Data<SingleValueDataGeneric<>>>>(nested_function, arguments, params);
+    }
+};
+
+template <typename Data>
+struct AggregateFunctionMinDataCapitalized : AggregateFunctionMinData<Data>
+{
+    static const char * name() { return "Min"; }
+};
+
+template <typename Data>
+struct AggregateFunctionMaxDataCapitalized : AggregateFunctionMaxData<Data>
+{
+    static const char * name() { return "Max"; }
+};
+
+}
+
+void registerAggregateFunctionCombinatorMinMax(AggregateFunctionCombinatorFactory & factory)
+{
+    factory.registerCombinator(std::make_shared<AggregateFunctionCombinatorMinMax<AggregateFunctionMinDataCapitalized>>());
+    factory.registerCombinator(std::make_shared<AggregateFunctionCombinatorMinMax<AggregateFunctionMaxDataCapitalized>>());
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionCombinatorMinMax.h b/src/AggregateFunctions/AggregateFunctionCombinatorMinMax.h
new file mode 100644
index 000000000000..159bfbb0a758
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionCombinatorMinMax.h
@@ -0,0 +1,111 @@
+#pragma once
+
+#include <AggregateFunctions/IAggregateFunction.h>
+
+namespace DB
+{
+
+template <typename Key>
+class AggregateFunctionMinMax final : public IAggregateFunctionHelper<AggregateFunctionMinMax<Key>>
+{
+private:
+    AggregateFunctionPtr nested_function;
+    SerializationPtr serialization;
+    size_t key_col;
+    size_t key_offset;
+
+    Key & key(AggregateDataPtr __restrict place) const { return *reinterpret_cast<Key *>(place + key_offset); }
+    const Key & key(ConstAggregateDataPtr __restrict place) const { return *reinterpret_cast<const Key *>(place + key_offset); }
+
+public:
+    AggregateFunctionMinMax(AggregateFunctionPtr nested_function_, const DataTypes & arguments, const Array & params)
+        : IAggregateFunctionHelper<AggregateFunctionMinMax<Key>>{arguments, params, nested_function_->getResultType()}
+        , nested_function{nested_function_}
+        , serialization(arguments.back()->getDefaultSerialization())
+        , key_col{arguments.size() - 1}
+        , key_offset{(nested_function->sizeOfData() + alignof(Key) - 1) / alignof(Key) * alignof(Key)}
+    {
+    }
+
+    String getName() const override { return nested_function->getName() + Key::name(); }
+
+    bool isState() const override { return nested_function->isState(); }
+
+    bool isVersioned() const override { return nested_function->isVersioned(); }
+
+    size_t getVersionFromRevision(size_t revision) const override { return nested_function->getVersionFromRevision(revision); }
+
+    size_t getDefaultVersion() const override { return nested_function->getDefaultVersion(); }
+
+    bool allocatesMemoryInArena() const override { return nested_function->allocatesMemoryInArena() || Key::allocatesMemoryInArena(); }
+
+    bool hasTrivialDestructor() const override { return nested_function->hasTrivialDestructor(); }
+
+    size_t sizeOfData() const override { return key_offset + sizeof(Key); }
+
+    size_t alignOfData() const override { return nested_function->alignOfData(); }
+
+    void create(AggregateDataPtr __restrict place) const override
+    {
+        nested_function->create(place);
+        new (place + key_offset) Key;
+    }
+
+    void destroy(AggregateDataPtr __restrict place) const noexcept override { nested_function->destroy(place); }
+
+    void destroyUpToState(AggregateDataPtr __restrict place) const noexcept override { nested_function->destroyUpToState(place); }
+
+    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * arena) const override
+    {
+        if (key(place).changeIfBetter(*columns[key_col], row_num, arena))
+        {
+            nested_function->destroy(place);
+            nested_function->create(place);
+            nested_function->add(place, columns, row_num, arena);
+        }
+        else if (key(place).isEqualTo(*columns[key_col], row_num))
+        {
+            nested_function->add(place, columns, row_num, arena);
+        }
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const override
+    {
+        if (key(place).changeIfBetter(key(rhs), arena))
+        {
+            nested_function->destroy(place);
+            nested_function->create(place);
+            nested_function->merge(place, rhs, arena);
+        }
+        else if (key(place).isEqualTo(key(rhs)))
+        {
+            nested_function->merge(place, rhs, arena);
+        }
+    }
+
+    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> version) const override
+    {
+        nested_function->serialize(place, buf, version);
+        key(place).write(buf, *serialization);
+    }
+
+    void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, std::optional<size_t> version, Arena * arena) const override
+    {
+        nested_function->deserialize(place, buf, version, arena);
+        key(place).read(buf, *serialization, arena);
+    }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    {
+        nested_function->insertResultInto(place, to, arena);
+    }
+
+    void insertMergeResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    {
+        nested_function->insertMergeResultInto(place, to, arena);
+    }
+
+    AggregateFunctionPtr getNestedFunction() const override { return nested_function; }
+};
+
+}
diff --git a/src/AggregateFunctions/registerAggregateFunctions.cpp b/src/AggregateFunctions/registerAggregateFunctions.cpp
index 21bd783e6bc3..0164e8ccf144 100644
--- a/src/AggregateFunctions/registerAggregateFunctions.cpp
+++ b/src/AggregateFunctions/registerAggregateFunctions.cpp
@@ -95,6 +95,7 @@ void registerAggregateFunctionCombinatorOrFill(AggregateFunctionCombinatorFactor
 void registerAggregateFunctionCombinatorResample(AggregateFunctionCombinatorFactory &);
 void registerAggregateFunctionCombinatorDistinct(AggregateFunctionCombinatorFactory &);
 void registerAggregateFunctionCombinatorMap(AggregateFunctionCombinatorFactory & factory);
+void registerAggregateFunctionCombinatorMinMax(AggregateFunctionCombinatorFactory & factory);
 
 void registerWindowFunctions(AggregateFunctionFactory & factory);
 
@@ -194,6 +195,7 @@ void registerAggregateFunctions()
         registerAggregateFunctionCombinatorResample(factory);
         registerAggregateFunctionCombinatorDistinct(factory);
         registerAggregateFunctionCombinatorMap(factory);
+        registerAggregateFunctionCombinatorMinMax(factory);
     }
 }
 

From 056b2693a322feadd458239ac7068cf5fa191ee1 Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Sun, 24 Sep 2023 03:41:26 +0800
Subject: [PATCH 2/7] Reorganize combinators into dedicated folder

---
 src/AggregateFunctions/AggregateFunctionFactory.cpp |  2 +-
 .../AggregateFunctionIntervalLengthSum.h            |  2 +-
 .../AggregateFunctionSequenceNextNode.h             |  1 -
 .../AggregateFunctionWindowFunnel.h                 |  2 --
 src/AggregateFunctions/CMakeLists.txt               | 11 ++++++-----
 .../{ => combinators}/AggregateFunctionArray.cpp    |  6 +++---
 .../{ => combinators}/AggregateFunctionArray.h      |  0
 .../AggregateFunctionCombinatorFactory.cpp          |  4 ++--
 .../AggregateFunctionCombinatorFactory.h            |  3 +--
 .../{ => combinators}/AggregateFunctionDistinct.cpp |  6 +++---
 .../{ => combinators}/AggregateFunctionDistinct.h   |  0
 .../{ => combinators}/AggregateFunctionForEach.cpp  |  5 +++--
 .../{ => combinators}/AggregateFunctionForEach.h    |  0
 .../{ => combinators}/AggregateFunctionIf.cpp       |  4 ++--
 .../{ => combinators}/AggregateFunctionIf.h         |  0
 .../{ => combinators}/AggregateFunctionMap.cpp      |  5 +++--
 .../{ => combinators}/AggregateFunctionMap.h        | 11 +++++------
 .../{ => combinators}/AggregateFunctionMerge.cpp    |  6 +++---
 .../{ => combinators}/AggregateFunctionMerge.h      |  0
 .../AggregateFunctionMinMax.cpp}                    |  5 +++--
 .../AggregateFunctionMinMax.h}                      |  0
 .../{ => combinators}/AggregateFunctionNull.cpp     | 13 ++++++++-----
 .../{ => combinators}/AggregateFunctionNull.h       |  0
 .../{ => combinators}/AggregateFunctionOrFill.cpp   |  6 ++----
 .../{ => combinators}/AggregateFunctionOrFill.h     |  0
 .../{ => combinators}/AggregateFunctionResample.cpp |  6 ++----
 .../{ => combinators}/AggregateFunctionResample.h   |  0
 .../AggregateFunctionSimpleState.cpp                |  4 ++--
 .../AggregateFunctionSimpleState.h                  |  0
 .../{ => combinators}/AggregateFunctionState.cpp    |  7 ++++---
 .../{ => combinators}/AggregateFunctionState.h      |  0
 .../IAggregateFunctionCombinator.h                  |  0
 .../registerAggregateFunctions.cpp                  |  2 +-
 src/Client/Suggest.cpp                              |  2 +-
 src/Functions/array/arrayReduce.cpp                 |  2 +-
 src/Functions/array/arrayReduceInRanges.cpp         |  2 +-
 src/Functions/initializeAggregation.cpp             |  2 +-
 src/Interpreters/Aggregator.cpp                     |  4 ++--
 .../StorageSystemAggregateFunctionCombinators.cpp   |  2 +-
 39 files changed, 62 insertions(+), 63 deletions(-)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionArray.cpp (93%)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionArray.h (100%)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionCombinatorFactory.cpp (94%)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionCombinatorFactory.h (95%)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionDistinct.cpp (94%)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionDistinct.h (100%)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionForEach.cpp (92%)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionForEach.h (100%)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionIf.cpp (99%)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionIf.h (100%)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionMap.cpp (98%)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionMap.h (98%)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionMerge.cpp (95%)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionMerge.h (100%)
 rename src/AggregateFunctions/{AggregateFunctionCombinatorMinMax.cpp => combinators/AggregateFunctionMinMax.cpp} (96%)
 rename src/AggregateFunctions/{AggregateFunctionCombinatorMinMax.h => combinators/AggregateFunctionMinMax.h} (100%)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionNull.cpp (96%)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionNull.h (100%)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionOrFill.cpp (91%)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionOrFill.h (100%)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionResample.cpp (96%)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionResample.h (100%)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionSimpleState.cpp (87%)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionSimpleState.h (100%)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionState.cpp (83%)
 rename src/AggregateFunctions/{ => combinators}/AggregateFunctionState.h (100%)
 rename src/AggregateFunctions/{ => combinators}/IAggregateFunctionCombinator.h (100%)

diff --git a/src/AggregateFunctions/AggregateFunctionFactory.cpp b/src/AggregateFunctions/AggregateFunctionFactory.cpp
index f52c9ac8510b..1de2baf6103e 100644
--- a/src/AggregateFunctions/AggregateFunctionFactory.cpp
+++ b/src/AggregateFunctions/AggregateFunctionFactory.cpp
@@ -1,5 +1,5 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <AggregateFunctions/AggregateFunctionCombinatorFactory.h>
+#include <AggregateFunctions/combinators/AggregateFunctionCombinatorFactory.h>
 
 #include <DataTypes/DataTypeAggregateFunction.h>
 #include <DataTypes/DataTypeNullable.h>
diff --git a/src/AggregateFunctions/AggregateFunctionIntervalLengthSum.h b/src/AggregateFunctions/AggregateFunctionIntervalLengthSum.h
index 16e9388d4bb8..94cab09eb69b 100644
--- a/src/AggregateFunctions/AggregateFunctionIntervalLengthSum.h
+++ b/src/AggregateFunctions/AggregateFunctionIntervalLengthSum.h
@@ -2,7 +2,7 @@
 
 #include <unordered_set>
 
-#include <AggregateFunctions/AggregateFunctionNull.h>
+#include <AggregateFunctions/combinators/AggregateFunctionNull.h>
 
 #include <Columns/ColumnsNumber.h>
 
diff --git a/src/AggregateFunctions/AggregateFunctionSequenceNextNode.h b/src/AggregateFunctions/AggregateFunctionSequenceNextNode.h
index 77bd590ebbb5..0f132a28b2b6 100644
--- a/src/AggregateFunctions/AggregateFunctionSequenceNextNode.h
+++ b/src/AggregateFunctions/AggregateFunctionSequenceNextNode.h
@@ -19,7 +19,6 @@
 #include <Common/assert_cast.h>
 
 #include <AggregateFunctions/IAggregateFunction.h>
-#include <AggregateFunctions/AggregateFunctionNull.h>
 
 #include <type_traits>
 #include <bitset>
diff --git a/src/AggregateFunctions/AggregateFunctionWindowFunnel.h b/src/AggregateFunctions/AggregateFunctionWindowFunnel.h
index e83c5277d260..8fee41b9f75c 100644
--- a/src/AggregateFunctions/AggregateFunctionWindowFunnel.h
+++ b/src/AggregateFunctions/AggregateFunctionWindowFunnel.h
@@ -8,8 +8,6 @@
 #include <IO/WriteHelpers.h>
 #include <Common/assert_cast.h>
 
-#include <AggregateFunctions/AggregateFunctionNull.h>
-
 namespace DB
 {
 struct Settings;
diff --git a/src/AggregateFunctions/CMakeLists.txt b/src/AggregateFunctions/CMakeLists.txt
index cf696da31275..693d9a13a8ee 100644
--- a/src/AggregateFunctions/CMakeLists.txt
+++ b/src/AggregateFunctions/CMakeLists.txt
@@ -1,20 +1,21 @@
 include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
 add_headers_and_sources(clickhouse_aggregate_functions .)
+add_headers_and_sources(clickhouse_aggregate_functions combinators)
 
 extract_into_parent_list(clickhouse_aggregate_functions_sources dbms_sources
     IAggregateFunction.cpp
     AggregateFunctionFactory.cpp
-    AggregateFunctionCombinatorFactory.cpp
-    AggregateFunctionState.cpp
+    combinators/AggregateFunctionCombinatorFactory.cpp
+    combinators/AggregateFunctionState.cpp
     AggregateFunctionCount.cpp
     parseAggregateFunctionParameters.cpp
 )
 extract_into_parent_list(clickhouse_aggregate_functions_headers dbms_headers
     IAggregateFunction.h
-    IAggregateFunctionCombinator.h
+    combinators/IAggregateFunctionCombinator.h
     AggregateFunctionFactory.h
-    AggregateFunctionCombinatorFactory.h
-    AggregateFunctionState.h
+    combinators/AggregateFunctionCombinatorFactory.h
+    combinators/AggregateFunctionState.h
     AggregateFunctionCount.cpp
     FactoryHelpers.h
     parseAggregateFunctionParameters.h
diff --git a/src/AggregateFunctions/AggregateFunctionArray.cpp b/src/AggregateFunctions/combinators/AggregateFunctionArray.cpp
similarity index 93%
rename from src/AggregateFunctions/AggregateFunctionArray.cpp
rename to src/AggregateFunctions/combinators/AggregateFunctionArray.cpp
index 9a25dcce2191..a54092f0bcb7 100644
--- a/src/AggregateFunctions/AggregateFunctionArray.cpp
+++ b/src/AggregateFunctions/combinators/AggregateFunctionArray.cpp
@@ -1,7 +1,7 @@
-#include <AggregateFunctions/AggregateFunctionArray.h>
-#include <AggregateFunctions/AggregateFunctionCombinatorFactory.h>
-#include <Common/typeid_cast.h>
+#include "AggregateFunctionArray.h"
+#include "AggregateFunctionCombinatorFactory.h"
 
+#include <Common/typeid_cast.h>
 
 namespace DB
 {
diff --git a/src/AggregateFunctions/AggregateFunctionArray.h b/src/AggregateFunctions/combinators/AggregateFunctionArray.h
similarity index 100%
rename from src/AggregateFunctions/AggregateFunctionArray.h
rename to src/AggregateFunctions/combinators/AggregateFunctionArray.h
diff --git a/src/AggregateFunctions/AggregateFunctionCombinatorFactory.cpp b/src/AggregateFunctions/combinators/AggregateFunctionCombinatorFactory.cpp
similarity index 94%
rename from src/AggregateFunctions/AggregateFunctionCombinatorFactory.cpp
rename to src/AggregateFunctions/combinators/AggregateFunctionCombinatorFactory.cpp
index 7f815f74e7c0..a42e4177ac51 100644
--- a/src/AggregateFunctions/AggregateFunctionCombinatorFactory.cpp
+++ b/src/AggregateFunctions/combinators/AggregateFunctionCombinatorFactory.cpp
@@ -1,6 +1,6 @@
-#include <Common/StringUtils/StringUtils.h>
-#include <AggregateFunctions/AggregateFunctionCombinatorFactory.h>
+#include "AggregateFunctionCombinatorFactory.h"
 
+#include <Common/StringUtils/StringUtils.h>
 
 namespace DB
 {
diff --git a/src/AggregateFunctions/AggregateFunctionCombinatorFactory.h b/src/AggregateFunctions/combinators/AggregateFunctionCombinatorFactory.h
similarity index 95%
rename from src/AggregateFunctions/AggregateFunctionCombinatorFactory.h
rename to src/AggregateFunctions/combinators/AggregateFunctionCombinatorFactory.h
index cb9c84eb7b7a..98946ff02d2b 100644
--- a/src/AggregateFunctions/AggregateFunctionCombinatorFactory.h
+++ b/src/AggregateFunctions/combinators/AggregateFunctionCombinatorFactory.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <AggregateFunctions/IAggregateFunctionCombinator.h>
-
+#include "IAggregateFunctionCombinator.h"
 
 #include <string>
 #include <unordered_map>
diff --git a/src/AggregateFunctions/AggregateFunctionDistinct.cpp b/src/AggregateFunctions/combinators/AggregateFunctionDistinct.cpp
similarity index 94%
rename from src/AggregateFunctions/AggregateFunctionDistinct.cpp
rename to src/AggregateFunctions/combinators/AggregateFunctionDistinct.cpp
index 623d5fc98953..178915ed2088 100644
--- a/src/AggregateFunctions/AggregateFunctionDistinct.cpp
+++ b/src/AggregateFunctions/combinators/AggregateFunctionDistinct.cpp
@@ -1,9 +1,9 @@
-#include <AggregateFunctions/AggregateFunctionDistinct.h>
-#include <AggregateFunctions/AggregateFunctionCombinatorFactory.h>
+#include "AggregateFunctionDistinct.h"
+#include "AggregateFunctionCombinatorFactory.h"
+
 #include <AggregateFunctions/Helpers.h>
 #include <Common/typeid_cast.h>
 
-
 namespace DB
 {
 struct Settings;
diff --git a/src/AggregateFunctions/AggregateFunctionDistinct.h b/src/AggregateFunctions/combinators/AggregateFunctionDistinct.h
similarity index 100%
rename from src/AggregateFunctions/AggregateFunctionDistinct.h
rename to src/AggregateFunctions/combinators/AggregateFunctionDistinct.h
diff --git a/src/AggregateFunctions/AggregateFunctionForEach.cpp b/src/AggregateFunctions/combinators/AggregateFunctionForEach.cpp
similarity index 92%
rename from src/AggregateFunctions/AggregateFunctionForEach.cpp
rename to src/AggregateFunctions/combinators/AggregateFunctionForEach.cpp
index 2e973b69fde4..e8903325fba9 100644
--- a/src/AggregateFunctions/AggregateFunctionForEach.cpp
+++ b/src/AggregateFunctions/combinators/AggregateFunctionForEach.cpp
@@ -1,5 +1,6 @@
-#include <AggregateFunctions/AggregateFunctionForEach.h>
-#include <AggregateFunctions/AggregateFunctionCombinatorFactory.h>
+#include "AggregateFunctionForEach.h"
+#include "AggregateFunctionCombinatorFactory.h"
+
 #include <Common/typeid_cast.h>
 
 
diff --git a/src/AggregateFunctions/AggregateFunctionForEach.h b/src/AggregateFunctions/combinators/AggregateFunctionForEach.h
similarity index 100%
rename from src/AggregateFunctions/AggregateFunctionForEach.h
rename to src/AggregateFunctions/combinators/AggregateFunctionForEach.h
diff --git a/src/AggregateFunctions/AggregateFunctionIf.cpp b/src/AggregateFunctions/combinators/AggregateFunctionIf.cpp
similarity index 99%
rename from src/AggregateFunctions/AggregateFunctionIf.cpp
rename to src/AggregateFunctions/combinators/AggregateFunctionIf.cpp
index 87fa82395079..20a4bde6bb40 100644
--- a/src/AggregateFunctions/AggregateFunctionIf.cpp
+++ b/src/AggregateFunctions/combinators/AggregateFunctionIf.cpp
@@ -1,5 +1,5 @@
-#include <AggregateFunctions/AggregateFunctionCombinatorFactory.h>
-#include <AggregateFunctions/AggregateFunctionIf.h>
+#include "AggregateFunctionCombinatorFactory.h"
+#include "AggregateFunctionIf.h"
 #include "AggregateFunctionNull.h"
 
 namespace DB
diff --git a/src/AggregateFunctions/AggregateFunctionIf.h b/src/AggregateFunctions/combinators/AggregateFunctionIf.h
similarity index 100%
rename from src/AggregateFunctions/AggregateFunctionIf.h
rename to src/AggregateFunctions/combinators/AggregateFunctionIf.h
diff --git a/src/AggregateFunctions/AggregateFunctionMap.cpp b/src/AggregateFunctions/combinators/AggregateFunctionMap.cpp
similarity index 98%
rename from src/AggregateFunctions/AggregateFunctionMap.cpp
rename to src/AggregateFunctions/combinators/AggregateFunctionMap.cpp
index b957b541fe10..0ef80e811823 100644
--- a/src/AggregateFunctions/AggregateFunctionMap.cpp
+++ b/src/AggregateFunctions/combinators/AggregateFunctionMap.cpp
@@ -1,6 +1,7 @@
 #include "AggregateFunctionMap.h"
-#include "AggregateFunctions/AggregateFunctionCombinatorFactory.h"
-#include "Functions/FunctionHelpers.h"
+#include "AggregateFunctionCombinatorFactory.h"
+
+#include <Functions/FunctionHelpers.h>
 
 namespace DB
 {
diff --git a/src/AggregateFunctions/AggregateFunctionMap.h b/src/AggregateFunctions/combinators/AggregateFunctionMap.h
similarity index 98%
rename from src/AggregateFunctions/AggregateFunctionMap.h
rename to src/AggregateFunctions/combinators/AggregateFunctionMap.h
index 7b9bb088d8fc..a3cfa888b2d0 100644
--- a/src/AggregateFunctions/AggregateFunctionMap.h
+++ b/src/AggregateFunctions/combinators/AggregateFunctionMap.h
@@ -1,8 +1,7 @@
 #pragma once
 
 #include <unordered_map>
-#include <base/sort.h>
-#include <AggregateFunctions/AggregateFunctionCombinatorFactory.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <AggregateFunctions/IAggregateFunction.h>
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnMap.h>
@@ -14,16 +13,16 @@
 #include <DataTypes/DataTypeMap.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/Serializations/ISerialization.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
-#include "DataTypes/Serializations/ISerialization.h"
 #include <base/IPv4andIPv6.h>
-#include "base/types.h"
-#include <Common/formatIPv6.h>
+#include <base/sort.h>
+#include <base/types.h>
 #include <Common/Arena.h>
-#include "AggregateFunctions/AggregateFunctionFactory.h"
+#include <Common/formatIPv6.h>
 
 namespace DB
 {
diff --git a/src/AggregateFunctions/AggregateFunctionMerge.cpp b/src/AggregateFunctions/combinators/AggregateFunctionMerge.cpp
similarity index 95%
rename from src/AggregateFunctions/AggregateFunctionMerge.cpp
rename to src/AggregateFunctions/combinators/AggregateFunctionMerge.cpp
index a6d3a0771abc..01530b11b7a3 100644
--- a/src/AggregateFunctions/AggregateFunctionMerge.cpp
+++ b/src/AggregateFunctions/combinators/AggregateFunctionMerge.cpp
@@ -1,7 +1,7 @@
-#include <AggregateFunctions/AggregateFunctionMerge.h>
-#include <AggregateFunctions/AggregateFunctionCombinatorFactory.h>
-#include <DataTypes/DataTypeAggregateFunction.h>
+#include "AggregateFunctionMerge.h"
+#include "AggregateFunctionCombinatorFactory.h"
 
+#include <DataTypes/DataTypeAggregateFunction.h>
 
 namespace DB
 {
diff --git a/src/AggregateFunctions/AggregateFunctionMerge.h b/src/AggregateFunctions/combinators/AggregateFunctionMerge.h
similarity index 100%
rename from src/AggregateFunctions/AggregateFunctionMerge.h
rename to src/AggregateFunctions/combinators/AggregateFunctionMerge.h
diff --git a/src/AggregateFunctions/AggregateFunctionCombinatorMinMax.cpp b/src/AggregateFunctions/combinators/AggregateFunctionMinMax.cpp
similarity index 96%
rename from src/AggregateFunctions/AggregateFunctionCombinatorMinMax.cpp
rename to src/AggregateFunctions/combinators/AggregateFunctionMinMax.cpp
index 882008b303fd..41daef626b4b 100644
--- a/src/AggregateFunctions/AggregateFunctionCombinatorMinMax.cpp
+++ b/src/AggregateFunctions/combinators/AggregateFunctionMinMax.cpp
@@ -1,5 +1,6 @@
-#include <AggregateFunctions/AggregateFunctionCombinatorFactory.h>
-#include <AggregateFunctions/AggregateFunctionCombinatorMinMax.h>
+#include "AggregateFunctionCombinatorFactory.h"
+#include "AggregateFunctionMinMax.h"
+
 #include <AggregateFunctions/AggregateFunctionMinMaxAny.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
diff --git a/src/AggregateFunctions/AggregateFunctionCombinatorMinMax.h b/src/AggregateFunctions/combinators/AggregateFunctionMinMax.h
similarity index 100%
rename from src/AggregateFunctions/AggregateFunctionCombinatorMinMax.h
rename to src/AggregateFunctions/combinators/AggregateFunctionMinMax.h
diff --git a/src/AggregateFunctions/AggregateFunctionNull.cpp b/src/AggregateFunctions/combinators/AggregateFunctionNull.cpp
similarity index 96%
rename from src/AggregateFunctions/AggregateFunctionNull.cpp
rename to src/AggregateFunctions/combinators/AggregateFunctionNull.cpp
index 6d304c21d331..1f5bf4c38186 100644
--- a/src/AggregateFunctions/AggregateFunctionNull.cpp
+++ b/src/AggregateFunctions/combinators/AggregateFunctionNull.cpp
@@ -1,9 +1,12 @@
-#include <DataTypes/DataTypeNullable.h>
-#include <AggregateFunctions/AggregateFunctionNull.h>
+#include "AggregateFunctionNull.h"
+#include "AggregateFunctionState.h"
+#include "AggregateFunctionSimpleState.h"
+#include "AggregateFunctionCombinatorFactory.h"
+
 #include <AggregateFunctions/AggregateFunctionNothing.h>
-#include <AggregateFunctions/AggregateFunctionState.h>
-#include <AggregateFunctions/AggregateFunctionCombinatorFactory.h>
-#include <AggregateFunctions/AggregateFunctionSimpleState.h>
+#include <AggregateFunctions/AggregateFunctionCount.h>
+#include <DataTypes/DataTypeNullable.h>
+
 
 namespace DB
 {
diff --git a/src/AggregateFunctions/AggregateFunctionNull.h b/src/AggregateFunctions/combinators/AggregateFunctionNull.h
similarity index 100%
rename from src/AggregateFunctions/AggregateFunctionNull.h
rename to src/AggregateFunctions/combinators/AggregateFunctionNull.h
diff --git a/src/AggregateFunctions/AggregateFunctionOrFill.cpp b/src/AggregateFunctions/combinators/AggregateFunctionOrFill.cpp
similarity index 91%
rename from src/AggregateFunctions/AggregateFunctionOrFill.cpp
rename to src/AggregateFunctions/combinators/AggregateFunctionOrFill.cpp
index 7aee02898796..99f43149d142 100644
--- a/src/AggregateFunctions/AggregateFunctionOrFill.cpp
+++ b/src/AggregateFunctions/combinators/AggregateFunctionOrFill.cpp
@@ -1,7 +1,5 @@
-#include <AggregateFunctions/AggregateFunctionOrFill.h>
-
-#include <AggregateFunctions/AggregateFunctionCombinatorFactory.h>
-
+#include "AggregateFunctionOrFill.h"
+#include "AggregateFunctionCombinatorFactory.h"
 
 namespace DB
 {
diff --git a/src/AggregateFunctions/AggregateFunctionOrFill.h b/src/AggregateFunctions/combinators/AggregateFunctionOrFill.h
similarity index 100%
rename from src/AggregateFunctions/AggregateFunctionOrFill.h
rename to src/AggregateFunctions/combinators/AggregateFunctionOrFill.h
diff --git a/src/AggregateFunctions/AggregateFunctionResample.cpp b/src/AggregateFunctions/combinators/AggregateFunctionResample.cpp
similarity index 96%
rename from src/AggregateFunctions/AggregateFunctionResample.cpp
rename to src/AggregateFunctions/combinators/AggregateFunctionResample.cpp
index cc64ed070656..c098345b2217 100644
--- a/src/AggregateFunctions/AggregateFunctionResample.cpp
+++ b/src/AggregateFunctions/combinators/AggregateFunctionResample.cpp
@@ -1,7 +1,5 @@
-#include <AggregateFunctions/AggregateFunctionResample.h>
-
-#include <AggregateFunctions/AggregateFunctionCombinatorFactory.h>
-
+#include "AggregateFunctionResample.h"
+#include "AggregateFunctionCombinatorFactory.h"
 
 namespace DB
 {
diff --git a/src/AggregateFunctions/AggregateFunctionResample.h b/src/AggregateFunctions/combinators/AggregateFunctionResample.h
similarity index 100%
rename from src/AggregateFunctions/AggregateFunctionResample.h
rename to src/AggregateFunctions/combinators/AggregateFunctionResample.h
diff --git a/src/AggregateFunctions/AggregateFunctionSimpleState.cpp b/src/AggregateFunctions/combinators/AggregateFunctionSimpleState.cpp
similarity index 87%
rename from src/AggregateFunctions/AggregateFunctionSimpleState.cpp
rename to src/AggregateFunctions/combinators/AggregateFunctionSimpleState.cpp
index 686571f2f839..f58cdeeb8b02 100644
--- a/src/AggregateFunctions/AggregateFunctionSimpleState.cpp
+++ b/src/AggregateFunctions/combinators/AggregateFunctionSimpleState.cpp
@@ -1,5 +1,5 @@
-#include <AggregateFunctions/AggregateFunctionCombinatorFactory.h>
-#include <AggregateFunctions/AggregateFunctionSimpleState.h>
+#include "AggregateFunctionCombinatorFactory.h"
+#include "AggregateFunctionSimpleState.h"
 
 namespace DB
 {
diff --git a/src/AggregateFunctions/AggregateFunctionSimpleState.h b/src/AggregateFunctions/combinators/AggregateFunctionSimpleState.h
similarity index 100%
rename from src/AggregateFunctions/AggregateFunctionSimpleState.h
rename to src/AggregateFunctions/combinators/AggregateFunctionSimpleState.h
diff --git a/src/AggregateFunctions/AggregateFunctionState.cpp b/src/AggregateFunctions/combinators/AggregateFunctionState.cpp
similarity index 83%
rename from src/AggregateFunctions/AggregateFunctionState.cpp
rename to src/AggregateFunctions/combinators/AggregateFunctionState.cpp
index 4b304cd7d666..f56512f8c21e 100644
--- a/src/AggregateFunctions/AggregateFunctionState.cpp
+++ b/src/AggregateFunctions/combinators/AggregateFunctionState.cpp
@@ -1,6 +1,7 @@
-#include <AggregateFunctions/AggregateFunctionState.h>
-#include <AggregateFunctions/AggregateFunctionMerge.h>
-#include <AggregateFunctions/AggregateFunctionCombinatorFactory.h>
+#include "AggregateFunctionState.h"
+#include "AggregateFunctionMerge.h"
+#include "AggregateFunctionCombinatorFactory.h"
+
 #include <DataTypes/DataTypeAggregateFunction.h>
 
 
diff --git a/src/AggregateFunctions/AggregateFunctionState.h b/src/AggregateFunctions/combinators/AggregateFunctionState.h
similarity index 100%
rename from src/AggregateFunctions/AggregateFunctionState.h
rename to src/AggregateFunctions/combinators/AggregateFunctionState.h
diff --git a/src/AggregateFunctions/IAggregateFunctionCombinator.h b/src/AggregateFunctions/combinators/IAggregateFunctionCombinator.h
similarity index 100%
rename from src/AggregateFunctions/IAggregateFunctionCombinator.h
rename to src/AggregateFunctions/combinators/IAggregateFunctionCombinator.h
diff --git a/src/AggregateFunctions/registerAggregateFunctions.cpp b/src/AggregateFunctions/registerAggregateFunctions.cpp
index 0164e8ccf144..09e2107f25e1 100644
--- a/src/AggregateFunctions/registerAggregateFunctions.cpp
+++ b/src/AggregateFunctions/registerAggregateFunctions.cpp
@@ -1,7 +1,7 @@
 #include <AggregateFunctions/registerAggregateFunctions.h>
 
 #include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <AggregateFunctions/AggregateFunctionCombinatorFactory.h>
+#include <AggregateFunctions/combinators/AggregateFunctionCombinatorFactory.h>
 
 
 namespace DB
diff --git a/src/Client/Suggest.cpp b/src/Client/Suggest.cpp
index c854d471fae8..5f4a28d4daee 100644
--- a/src/Client/Suggest.cpp
+++ b/src/Client/Suggest.cpp
@@ -1,7 +1,7 @@
 #include "Suggest.h"
 
 #include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <AggregateFunctions/AggregateFunctionCombinatorFactory.h>
+#include <AggregateFunctions/combinators/AggregateFunctionCombinatorFactory.h>
 #include <Core/Settings.h>
 #include <Columns/ColumnString.h>
 #include <Common/typeid_cast.h>
diff --git a/src/Functions/array/arrayReduce.cpp b/src/Functions/array/arrayReduce.cpp
index a4b2cc037ab1..505632610c96 100644
--- a/src/Functions/array/arrayReduce.cpp
+++ b/src/Functions/array/arrayReduce.cpp
@@ -6,7 +6,7 @@
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnAggregateFunction.h>
 #include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <AggregateFunctions/AggregateFunctionState.h>
+#include <AggregateFunctions/combinators/AggregateFunctionState.h>
 #include <AggregateFunctions/IAggregateFunction.h>
 #include <AggregateFunctions/parseAggregateFunctionParameters.h>
 #include <Common/Arena.h>
diff --git a/src/Functions/array/arrayReduceInRanges.cpp b/src/Functions/array/arrayReduceInRanges.cpp
index 790bc3ef8798..9bf8227a4a75 100644
--- a/src/Functions/array/arrayReduceInRanges.cpp
+++ b/src/Functions/array/arrayReduceInRanges.cpp
@@ -8,7 +8,7 @@
 #include <Columns/ColumnTuple.h>
 #include <Columns/ColumnAggregateFunction.h>
 #include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <AggregateFunctions/AggregateFunctionState.h>
+#include <AggregateFunctions/combinators/AggregateFunctionState.h>
 #include <AggregateFunctions/IAggregateFunction.h>
 #include <AggregateFunctions/parseAggregateFunctionParameters.h>
 #include <Common/Arena.h>
diff --git a/src/Functions/initializeAggregation.cpp b/src/Functions/initializeAggregation.cpp
index cec9f0d94a38..5271d3cddd7b 100644
--- a/src/Functions/initializeAggregation.cpp
+++ b/src/Functions/initializeAggregation.cpp
@@ -4,7 +4,7 @@
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnAggregateFunction.h>
 #include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <AggregateFunctions/AggregateFunctionState.h>
+#include <AggregateFunctions/combinators/AggregateFunctionState.h>
 #include <AggregateFunctions/IAggregateFunction.h>
 #include <AggregateFunctions/parseAggregateFunctionParameters.h>
 #include <Common/Arena.h>
diff --git a/src/Interpreters/Aggregator.cpp b/src/Interpreters/Aggregator.cpp
index e16064db713b..d04704ffc2b9 100644
--- a/src/Interpreters/Aggregator.cpp
+++ b/src/Interpreters/Aggregator.cpp
@@ -18,8 +18,8 @@
 #include <IO/WriteBufferFromFile.h>
 #include <Compression/CompressedWriteBuffer.h>
 #include <Interpreters/Aggregator.h>
-#include <AggregateFunctions/AggregateFunctionArray.h>
-#include <AggregateFunctions/AggregateFunctionState.h>
+#include <AggregateFunctions/combinators/AggregateFunctionArray.h>
+#include <AggregateFunctions/combinators/AggregateFunctionState.h>
 #include <IO/Operators.h>
 #include <Interpreters/JIT/compileFunction.h>
 #include <Interpreters/JIT/CompiledExpressionCache.h>
diff --git a/src/Storages/System/StorageSystemAggregateFunctionCombinators.cpp b/src/Storages/System/StorageSystemAggregateFunctionCombinators.cpp
index c2d82c6cd7ca..b2cfb3528f4f 100644
--- a/src/Storages/System/StorageSystemAggregateFunctionCombinators.cpp
+++ b/src/Storages/System/StorageSystemAggregateFunctionCombinators.cpp
@@ -1,4 +1,4 @@
-#include <AggregateFunctions/AggregateFunctionCombinatorFactory.h>
+#include <AggregateFunctions/combinators/AggregateFunctionCombinatorFactory.h>
 #include <Storages/System/StorageSystemAggregateFunctionCombinators.h>
 
 namespace DB

From f65e0a3c53a18d75f926b8285ea895cadc9db413 Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Sun, 24 Sep 2023 14:50:59 +0800
Subject: [PATCH 3/7] Add tests

---
 tests/queries/0_stateless/02885_min_max_combinator.reference | 3 +++
 tests/queries/0_stateless/02885_min_max_combinator.sql       | 3 +++
 2 files changed, 6 insertions(+)
 create mode 100644 tests/queries/0_stateless/02885_min_max_combinator.reference
 create mode 100644 tests/queries/0_stateless/02885_min_max_combinator.sql

diff --git a/tests/queries/0_stateless/02885_min_max_combinator.reference b/tests/queries/0_stateless/02885_min_max_combinator.reference
new file mode 100644
index 000000000000..c4e850c0b991
--- /dev/null
+++ b/tests/queries/0_stateless/02885_min_max_combinator.reference
@@ -0,0 +1,3 @@
+200	295
+200	245
+200	290
diff --git a/tests/queries/0_stateless/02885_min_max_combinator.sql b/tests/queries/0_stateless/02885_min_max_combinator.sql
new file mode 100644
index 000000000000..eeeaf4964441
--- /dev/null
+++ b/tests/queries/0_stateless/02885_min_max_combinator.sql
@@ -0,0 +1,3 @@
+select sumMin(number, number % 20), sumMax(number, number % 20) from numbers(100);
+select sumMin(number, toString(number % 20)), sumMax(number, toString(number % 20)) from numbers(100);
+select sumMinIf(number, number % 20, number % 2 = 0), sumMaxIf(number, number % 20, number % 2 = 0) from numbers(100);

From 88cc1e0fa77746ab56c92fe29f8515b5819be00e Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Sun, 24 Sep 2023 15:52:03 +0800
Subject: [PATCH 4/7] Add docs

---
 .../sql-reference/aggregate-functions/combinators.md  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/en/sql-reference/aggregate-functions/combinators.md b/docs/en/sql-reference/aggregate-functions/combinators.md
index 18ff5073e3f9..03b86dd27ae2 100644
--- a/docs/en/sql-reference/aggregate-functions/combinators.md
+++ b/docs/en/sql-reference/aggregate-functions/combinators.md
@@ -44,7 +44,7 @@ INSERT INTO map_map VALUES
     ('2000-01-01', '2000-01-01 00:00:00', (['c', 'd', 'e'], [10, 10, 10])),
     ('2000-01-01', '2000-01-01 00:01:00', (['d', 'e', 'f'], [10, 10, 10])),
     ('2000-01-01', '2000-01-01 00:01:00', (['f', 'g', 'g'], [10, 10, 10]));
-    
+
 SELECT
     timeslot,
     sumMap(status),
@@ -317,6 +317,15 @@ FROM people
 └────────┴───────────────────────────┘
 ```
 
+## -Min
+
+The suffix -Min can be appended to the name of any aggregate function. In this case, the aggregate function accepts an additional argument, which should be any comparable expression. The aggregate function processes only the rows that have the minimum value for the specified extra expression.
+
+Examples: `sumMin(column, expr)`, `countMin(expr)`, `avgMin(x, expr)` and so on.
+
+## -Max
+
+Similar to suffix -Min but processes only the rows that have the maximum value for the specified extra expression.
 
 ## Related Content
 

From 4a4c5eef091e210bc239f6648af6266d6f4c3049 Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Mon, 25 Sep 2023 22:37:08 +0800
Subject: [PATCH 5/7] Tweak for clang-format 17

---
 .clang-format | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.clang-format b/.clang-format
index 52e014971878..60ad398df822 100644
--- a/.clang-format
+++ b/.clang-format
@@ -53,6 +53,7 @@ ReflowComments: false
 AlignEscapedNewlinesLeft: false
 AlignEscapedNewlines: DontAlign
 AlignTrailingComments: false
+InsertBraces: WrapLikely
 
 # Not changed:
 AccessModifierOffset: -4

From 51f603bdfca3b15026542a97ce1018341eccb105 Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Wed, 27 Sep 2023 22:11:29 +0800
Subject: [PATCH 6/7] Rename as suggested.

---
 .../AggregateFunctionFactory.cpp              |  2 +-
 .../AggregateFunctionIntervalLengthSum.h      |  2 +-
 src/AggregateFunctions/CMakeLists.txt         | 12 +++----
 .../AggregateFunctionArgMinMax.cpp}           | 36 +++++++++----------
 .../AggregateFunctionArgMinMax.h}             |  6 ++--
 .../AggregateFunctionArray.cpp                |  0
 .../AggregateFunctionArray.h                  |  0
 .../AggregateFunctionCombinatorFactory.cpp    |  0
 .../AggregateFunctionCombinatorFactory.h      |  0
 .../AggregateFunctionDistinct.cpp             |  0
 .../AggregateFunctionDistinct.h               |  0
 .../AggregateFunctionForEach.cpp              |  0
 .../AggregateFunctionForEach.h                |  0
 .../AggregateFunctionIf.cpp                   |  0
 .../AggregateFunctionIf.h                     |  0
 .../AggregateFunctionMap.cpp                  |  0
 .../AggregateFunctionMap.h                    |  0
 .../AggregateFunctionMerge.cpp                |  0
 .../AggregateFunctionMerge.h                  |  0
 .../AggregateFunctionNull.cpp                 |  0
 .../AggregateFunctionNull.h                   |  0
 .../AggregateFunctionOrFill.cpp               |  0
 .../AggregateFunctionOrFill.h                 |  0
 .../AggregateFunctionResample.cpp             |  0
 .../AggregateFunctionResample.h               |  0
 .../AggregateFunctionSimpleState.cpp          |  0
 .../AggregateFunctionSimpleState.h            |  0
 .../AggregateFunctionState.cpp                |  0
 .../AggregateFunctionState.h                  |  0
 .../IAggregateFunctionCombinator.h            |  0
 .../registerAggregateFunctions.cpp            |  2 +-
 src/Client/Suggest.cpp                        |  2 +-
 src/Functions/array/arrayReduce.cpp           |  2 +-
 src/Functions/array/arrayReduceInRanges.cpp   |  2 +-
 src/Functions/initializeAggregation.cpp       |  2 +-
 src/Interpreters/Aggregator.cpp               |  4 +--
 ...rageSystemAggregateFunctionCombinators.cpp |  2 +-
 ...=> 02885_arg_min_max_combinator.reference} |  0
 .../02885_arg_min_max_combinator.sql          |  3 ++
 .../0_stateless/02885_min_max_combinator.sql  |  3 --
 40 files changed, 40 insertions(+), 40 deletions(-)
 rename src/AggregateFunctions/{combinators/AggregateFunctionMinMax.cpp => Combinators/AggregateFunctionArgMinMax.cpp} (53%)
 rename src/AggregateFunctions/{combinators/AggregateFunctionMinMax.h => Combinators/AggregateFunctionArgMinMax.h} (91%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionArray.cpp (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionArray.h (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionCombinatorFactory.cpp (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionCombinatorFactory.h (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionDistinct.cpp (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionDistinct.h (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionForEach.cpp (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionForEach.h (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionIf.cpp (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionIf.h (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionMap.cpp (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionMap.h (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionMerge.cpp (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionMerge.h (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionNull.cpp (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionNull.h (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionOrFill.cpp (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionOrFill.h (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionResample.cpp (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionResample.h (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionSimpleState.cpp (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionSimpleState.h (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionState.cpp (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/AggregateFunctionState.h (100%)
 rename src/AggregateFunctions/{combinators => Combinators}/IAggregateFunctionCombinator.h (100%)
 rename tests/queries/0_stateless/{02885_min_max_combinator.reference => 02885_arg_min_max_combinator.reference} (100%)
 create mode 100644 tests/queries/0_stateless/02885_arg_min_max_combinator.sql
 delete mode 100644 tests/queries/0_stateless/02885_min_max_combinator.sql

diff --git a/src/AggregateFunctions/AggregateFunctionFactory.cpp b/src/AggregateFunctions/AggregateFunctionFactory.cpp
index 1de2baf6103e..a195e0abf33c 100644
--- a/src/AggregateFunctions/AggregateFunctionFactory.cpp
+++ b/src/AggregateFunctions/AggregateFunctionFactory.cpp
@@ -1,5 +1,5 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <AggregateFunctions/combinators/AggregateFunctionCombinatorFactory.h>
+#include <AggregateFunctions/Combinators/AggregateFunctionCombinatorFactory.h>
 
 #include <DataTypes/DataTypeAggregateFunction.h>
 #include <DataTypes/DataTypeNullable.h>
diff --git a/src/AggregateFunctions/AggregateFunctionIntervalLengthSum.h b/src/AggregateFunctions/AggregateFunctionIntervalLengthSum.h
index 94cab09eb69b..e16645c7a1e9 100644
--- a/src/AggregateFunctions/AggregateFunctionIntervalLengthSum.h
+++ b/src/AggregateFunctions/AggregateFunctionIntervalLengthSum.h
@@ -2,7 +2,7 @@
 
 #include <unordered_set>
 
-#include <AggregateFunctions/combinators/AggregateFunctionNull.h>
+#include <AggregateFunctions/Combinators/AggregateFunctionNull.h>
 
 #include <Columns/ColumnsNumber.h>
 
diff --git a/src/AggregateFunctions/CMakeLists.txt b/src/AggregateFunctions/CMakeLists.txt
index 693d9a13a8ee..9471934aec86 100644
--- a/src/AggregateFunctions/CMakeLists.txt
+++ b/src/AggregateFunctions/CMakeLists.txt
@@ -1,21 +1,21 @@
 include("${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake")
 add_headers_and_sources(clickhouse_aggregate_functions .)
-add_headers_and_sources(clickhouse_aggregate_functions combinators)
+add_headers_and_sources(clickhouse_aggregate_functions Combinators)
 
 extract_into_parent_list(clickhouse_aggregate_functions_sources dbms_sources
     IAggregateFunction.cpp
     AggregateFunctionFactory.cpp
-    combinators/AggregateFunctionCombinatorFactory.cpp
-    combinators/AggregateFunctionState.cpp
+    Combinators/AggregateFunctionCombinatorFactory.cpp
+    Combinators/AggregateFunctionState.cpp
     AggregateFunctionCount.cpp
     parseAggregateFunctionParameters.cpp
 )
 extract_into_parent_list(clickhouse_aggregate_functions_headers dbms_headers
     IAggregateFunction.h
-    combinators/IAggregateFunctionCombinator.h
+    Combinators/IAggregateFunctionCombinator.h
     AggregateFunctionFactory.h
-    combinators/AggregateFunctionCombinatorFactory.h
-    combinators/AggregateFunctionState.h
+    Combinators/AggregateFunctionCombinatorFactory.h
+    Combinators/AggregateFunctionState.h
     AggregateFunctionCount.cpp
     FactoryHelpers.h
     parseAggregateFunctionParameters.h
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionMinMax.cpp b/src/AggregateFunctions/Combinators/AggregateFunctionArgMinMax.cpp
similarity index 53%
rename from src/AggregateFunctions/combinators/AggregateFunctionMinMax.cpp
rename to src/AggregateFunctions/Combinators/AggregateFunctionArgMinMax.cpp
index 41daef626b4b..480e6e9a64dd 100644
--- a/src/AggregateFunctions/combinators/AggregateFunctionMinMax.cpp
+++ b/src/AggregateFunctions/Combinators/AggregateFunctionArgMinMax.cpp
@@ -1,5 +1,5 @@
+#include "AggregateFunctionArgMinMax.h"
 #include "AggregateFunctionCombinatorFactory.h"
-#include "AggregateFunctionMinMax.h"
 
 #include <AggregateFunctions/AggregateFunctionMinMaxAny.h>
 #include <DataTypes/DataTypeDate.h>
@@ -17,7 +17,7 @@ extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 namespace
 {
 template <template <typename> class Data>
-class AggregateFunctionCombinatorMinMax final : public IAggregateFunctionCombinator
+class AggregateFunctionCombinatorArgMinMax final : public IAggregateFunctionCombinator
 {
 public:
     String getName() const override { return Data<SingleValueDataGeneric<>>::name(); }
@@ -43,51 +43,51 @@ class AggregateFunctionCombinatorMinMax final : public IAggregateFunctionCombina
         WhichDataType which(argument_type);
 #define DISPATCH(TYPE) \
     if (which.idx == TypeIndex::TYPE) \
-        return std::make_shared<AggregateFunctionMinMax<Data<SingleValueDataFixed<TYPE>>>>(nested_function, arguments, params); /// NOLINT
+        return std::make_shared<AggregateFunctionArgMinMax<Data<SingleValueDataFixed<TYPE>>>>(nested_function, arguments, params); /// NOLINT
         FOR_NUMERIC_TYPES(DISPATCH)
 #undef DISPATCH
 
         if (which.idx == TypeIndex::Date)
-            return std::make_shared<AggregateFunctionMinMax<Data<SingleValueDataFixed<DataTypeDate::FieldType>>>>(
+            return std::make_shared<AggregateFunctionArgMinMax<Data<SingleValueDataFixed<DataTypeDate::FieldType>>>>(
                 nested_function, arguments, params);
         if (which.idx == TypeIndex::DateTime)
-            return std::make_shared<AggregateFunctionMinMax<Data<SingleValueDataFixed<DataTypeDateTime::FieldType>>>>(
+            return std::make_shared<AggregateFunctionArgMinMax<Data<SingleValueDataFixed<DataTypeDateTime::FieldType>>>>(
                 nested_function, arguments, params);
         if (which.idx == TypeIndex::DateTime64)
-            return std::make_shared<AggregateFunctionMinMax<Data<SingleValueDataFixed<DateTime64>>>>(nested_function, arguments, params);
+            return std::make_shared<AggregateFunctionArgMinMax<Data<SingleValueDataFixed<DateTime64>>>>(nested_function, arguments, params);
         if (which.idx == TypeIndex::Decimal32)
-            return std::make_shared<AggregateFunctionMinMax<Data<SingleValueDataFixed<Decimal32>>>>(nested_function, arguments, params);
+            return std::make_shared<AggregateFunctionArgMinMax<Data<SingleValueDataFixed<Decimal32>>>>(nested_function, arguments, params);
         if (which.idx == TypeIndex::Decimal64)
-            return std::make_shared<AggregateFunctionMinMax<Data<SingleValueDataFixed<Decimal64>>>>(nested_function, arguments, params);
+            return std::make_shared<AggregateFunctionArgMinMax<Data<SingleValueDataFixed<Decimal64>>>>(nested_function, arguments, params);
         if (which.idx == TypeIndex::Decimal128)
-            return std::make_shared<AggregateFunctionMinMax<Data<SingleValueDataFixed<Decimal128>>>>(nested_function, arguments, params);
+            return std::make_shared<AggregateFunctionArgMinMax<Data<SingleValueDataFixed<Decimal128>>>>(nested_function, arguments, params);
         if (which.idx == TypeIndex::Decimal256)
-            return std::make_shared<AggregateFunctionMinMax<Data<SingleValueDataFixed<Decimal256>>>>(nested_function, arguments, params);
+            return std::make_shared<AggregateFunctionArgMinMax<Data<SingleValueDataFixed<Decimal256>>>>(nested_function, arguments, params);
         if (which.idx == TypeIndex::String)
-            return std::make_shared<AggregateFunctionMinMax<Data<SingleValueDataString>>>(nested_function, arguments, params);
+            return std::make_shared<AggregateFunctionArgMinMax<Data<SingleValueDataString>>>(nested_function, arguments, params);
 
-        return std::make_shared<AggregateFunctionMinMax<Data<SingleValueDataGeneric<>>>>(nested_function, arguments, params);
+        return std::make_shared<AggregateFunctionArgMinMax<Data<SingleValueDataGeneric<>>>>(nested_function, arguments, params);
     }
 };
 
 template <typename Data>
-struct AggregateFunctionMinDataCapitalized : AggregateFunctionMinData<Data>
+struct AggregateFunctionArgMinDataCapitalized : AggregateFunctionMinData<Data>
 {
-    static const char * name() { return "Min"; }
+    static const char * name() { return "ArgMin"; }
 };
 
 template <typename Data>
-struct AggregateFunctionMaxDataCapitalized : AggregateFunctionMaxData<Data>
+struct AggregateFunctionArgMaxDataCapitalized : AggregateFunctionMaxData<Data>
 {
-    static const char * name() { return "Max"; }
+    static const char * name() { return "ArgMax"; }
 };
 
 }
 
 void registerAggregateFunctionCombinatorMinMax(AggregateFunctionCombinatorFactory & factory)
 {
-    factory.registerCombinator(std::make_shared<AggregateFunctionCombinatorMinMax<AggregateFunctionMinDataCapitalized>>());
-    factory.registerCombinator(std::make_shared<AggregateFunctionCombinatorMinMax<AggregateFunctionMaxDataCapitalized>>());
+    factory.registerCombinator(std::make_shared<AggregateFunctionCombinatorArgMinMax<AggregateFunctionArgMinDataCapitalized>>());
+    factory.registerCombinator(std::make_shared<AggregateFunctionCombinatorArgMinMax<AggregateFunctionArgMaxDataCapitalized>>());
 }
 
 }
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionMinMax.h b/src/AggregateFunctions/Combinators/AggregateFunctionArgMinMax.h
similarity index 91%
rename from src/AggregateFunctions/combinators/AggregateFunctionMinMax.h
rename to src/AggregateFunctions/Combinators/AggregateFunctionArgMinMax.h
index 159bfbb0a758..af20cd985fce 100644
--- a/src/AggregateFunctions/combinators/AggregateFunctionMinMax.h
+++ b/src/AggregateFunctions/Combinators/AggregateFunctionArgMinMax.h
@@ -6,7 +6,7 @@ namespace DB
 {
 
 template <typename Key>
-class AggregateFunctionMinMax final : public IAggregateFunctionHelper<AggregateFunctionMinMax<Key>>
+class AggregateFunctionArgMinMax final : public IAggregateFunctionHelper<AggregateFunctionArgMinMax<Key>>
 {
 private:
     AggregateFunctionPtr nested_function;
@@ -18,8 +18,8 @@ class AggregateFunctionMinMax final : public IAggregateFunctionHelper<AggregateF
     const Key & key(ConstAggregateDataPtr __restrict place) const { return *reinterpret_cast<const Key *>(place + key_offset); }
 
 public:
-    AggregateFunctionMinMax(AggregateFunctionPtr nested_function_, const DataTypes & arguments, const Array & params)
-        : IAggregateFunctionHelper<AggregateFunctionMinMax<Key>>{arguments, params, nested_function_->getResultType()}
+    AggregateFunctionArgMinMax(AggregateFunctionPtr nested_function_, const DataTypes & arguments, const Array & params)
+        : IAggregateFunctionHelper<AggregateFunctionArgMinMax<Key>>{arguments, params, nested_function_->getResultType()}
         , nested_function{nested_function_}
         , serialization(arguments.back()->getDefaultSerialization())
         , key_col{arguments.size() - 1}
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionArray.cpp b/src/AggregateFunctions/Combinators/AggregateFunctionArray.cpp
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionArray.cpp
rename to src/AggregateFunctions/Combinators/AggregateFunctionArray.cpp
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionArray.h b/src/AggregateFunctions/Combinators/AggregateFunctionArray.h
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionArray.h
rename to src/AggregateFunctions/Combinators/AggregateFunctionArray.h
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionCombinatorFactory.cpp b/src/AggregateFunctions/Combinators/AggregateFunctionCombinatorFactory.cpp
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionCombinatorFactory.cpp
rename to src/AggregateFunctions/Combinators/AggregateFunctionCombinatorFactory.cpp
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionCombinatorFactory.h b/src/AggregateFunctions/Combinators/AggregateFunctionCombinatorFactory.h
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionCombinatorFactory.h
rename to src/AggregateFunctions/Combinators/AggregateFunctionCombinatorFactory.h
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionDistinct.cpp b/src/AggregateFunctions/Combinators/AggregateFunctionDistinct.cpp
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionDistinct.cpp
rename to src/AggregateFunctions/Combinators/AggregateFunctionDistinct.cpp
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionDistinct.h b/src/AggregateFunctions/Combinators/AggregateFunctionDistinct.h
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionDistinct.h
rename to src/AggregateFunctions/Combinators/AggregateFunctionDistinct.h
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionForEach.cpp b/src/AggregateFunctions/Combinators/AggregateFunctionForEach.cpp
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionForEach.cpp
rename to src/AggregateFunctions/Combinators/AggregateFunctionForEach.cpp
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionForEach.h b/src/AggregateFunctions/Combinators/AggregateFunctionForEach.h
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionForEach.h
rename to src/AggregateFunctions/Combinators/AggregateFunctionForEach.h
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionIf.cpp b/src/AggregateFunctions/Combinators/AggregateFunctionIf.cpp
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionIf.cpp
rename to src/AggregateFunctions/Combinators/AggregateFunctionIf.cpp
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionIf.h b/src/AggregateFunctions/Combinators/AggregateFunctionIf.h
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionIf.h
rename to src/AggregateFunctions/Combinators/AggregateFunctionIf.h
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionMap.cpp b/src/AggregateFunctions/Combinators/AggregateFunctionMap.cpp
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionMap.cpp
rename to src/AggregateFunctions/Combinators/AggregateFunctionMap.cpp
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionMap.h b/src/AggregateFunctions/Combinators/AggregateFunctionMap.h
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionMap.h
rename to src/AggregateFunctions/Combinators/AggregateFunctionMap.h
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionMerge.cpp b/src/AggregateFunctions/Combinators/AggregateFunctionMerge.cpp
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionMerge.cpp
rename to src/AggregateFunctions/Combinators/AggregateFunctionMerge.cpp
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionMerge.h b/src/AggregateFunctions/Combinators/AggregateFunctionMerge.h
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionMerge.h
rename to src/AggregateFunctions/Combinators/AggregateFunctionMerge.h
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionNull.cpp b/src/AggregateFunctions/Combinators/AggregateFunctionNull.cpp
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionNull.cpp
rename to src/AggregateFunctions/Combinators/AggregateFunctionNull.cpp
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionNull.h b/src/AggregateFunctions/Combinators/AggregateFunctionNull.h
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionNull.h
rename to src/AggregateFunctions/Combinators/AggregateFunctionNull.h
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionOrFill.cpp b/src/AggregateFunctions/Combinators/AggregateFunctionOrFill.cpp
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionOrFill.cpp
rename to src/AggregateFunctions/Combinators/AggregateFunctionOrFill.cpp
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionOrFill.h b/src/AggregateFunctions/Combinators/AggregateFunctionOrFill.h
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionOrFill.h
rename to src/AggregateFunctions/Combinators/AggregateFunctionOrFill.h
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionResample.cpp b/src/AggregateFunctions/Combinators/AggregateFunctionResample.cpp
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionResample.cpp
rename to src/AggregateFunctions/Combinators/AggregateFunctionResample.cpp
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionResample.h b/src/AggregateFunctions/Combinators/AggregateFunctionResample.h
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionResample.h
rename to src/AggregateFunctions/Combinators/AggregateFunctionResample.h
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionSimpleState.cpp b/src/AggregateFunctions/Combinators/AggregateFunctionSimpleState.cpp
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionSimpleState.cpp
rename to src/AggregateFunctions/Combinators/AggregateFunctionSimpleState.cpp
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionSimpleState.h b/src/AggregateFunctions/Combinators/AggregateFunctionSimpleState.h
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionSimpleState.h
rename to src/AggregateFunctions/Combinators/AggregateFunctionSimpleState.h
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionState.cpp b/src/AggregateFunctions/Combinators/AggregateFunctionState.cpp
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionState.cpp
rename to src/AggregateFunctions/Combinators/AggregateFunctionState.cpp
diff --git a/src/AggregateFunctions/combinators/AggregateFunctionState.h b/src/AggregateFunctions/Combinators/AggregateFunctionState.h
similarity index 100%
rename from src/AggregateFunctions/combinators/AggregateFunctionState.h
rename to src/AggregateFunctions/Combinators/AggregateFunctionState.h
diff --git a/src/AggregateFunctions/combinators/IAggregateFunctionCombinator.h b/src/AggregateFunctions/Combinators/IAggregateFunctionCombinator.h
similarity index 100%
rename from src/AggregateFunctions/combinators/IAggregateFunctionCombinator.h
rename to src/AggregateFunctions/Combinators/IAggregateFunctionCombinator.h
diff --git a/src/AggregateFunctions/registerAggregateFunctions.cpp b/src/AggregateFunctions/registerAggregateFunctions.cpp
index 09e2107f25e1..ee4172deb7c9 100644
--- a/src/AggregateFunctions/registerAggregateFunctions.cpp
+++ b/src/AggregateFunctions/registerAggregateFunctions.cpp
@@ -1,7 +1,7 @@
 #include <AggregateFunctions/registerAggregateFunctions.h>
 
 #include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <AggregateFunctions/combinators/AggregateFunctionCombinatorFactory.h>
+#include <AggregateFunctions/Combinators/AggregateFunctionCombinatorFactory.h>
 
 
 namespace DB
diff --git a/src/Client/Suggest.cpp b/src/Client/Suggest.cpp
index 5f4a28d4daee..cbcccdf9b28a 100644
--- a/src/Client/Suggest.cpp
+++ b/src/Client/Suggest.cpp
@@ -1,7 +1,7 @@
 #include "Suggest.h"
 
 #include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <AggregateFunctions/combinators/AggregateFunctionCombinatorFactory.h>
+#include <AggregateFunctions/Combinators/AggregateFunctionCombinatorFactory.h>
 #include <Core/Settings.h>
 #include <Columns/ColumnString.h>
 #include <Common/typeid_cast.h>
diff --git a/src/Functions/array/arrayReduce.cpp b/src/Functions/array/arrayReduce.cpp
index 505632610c96..ea087f4f9a87 100644
--- a/src/Functions/array/arrayReduce.cpp
+++ b/src/Functions/array/arrayReduce.cpp
@@ -6,7 +6,7 @@
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnAggregateFunction.h>
 #include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <AggregateFunctions/combinators/AggregateFunctionState.h>
+#include <AggregateFunctions/Combinators/AggregateFunctionState.h>
 #include <AggregateFunctions/IAggregateFunction.h>
 #include <AggregateFunctions/parseAggregateFunctionParameters.h>
 #include <Common/Arena.h>
diff --git a/src/Functions/array/arrayReduceInRanges.cpp b/src/Functions/array/arrayReduceInRanges.cpp
index 9bf8227a4a75..b871f33fc12e 100644
--- a/src/Functions/array/arrayReduceInRanges.cpp
+++ b/src/Functions/array/arrayReduceInRanges.cpp
@@ -8,7 +8,7 @@
 #include <Columns/ColumnTuple.h>
 #include <Columns/ColumnAggregateFunction.h>
 #include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <AggregateFunctions/combinators/AggregateFunctionState.h>
+#include <AggregateFunctions/Combinators/AggregateFunctionState.h>
 #include <AggregateFunctions/IAggregateFunction.h>
 #include <AggregateFunctions/parseAggregateFunctionParameters.h>
 #include <Common/Arena.h>
diff --git a/src/Functions/initializeAggregation.cpp b/src/Functions/initializeAggregation.cpp
index 5271d3cddd7b..83df28808a11 100644
--- a/src/Functions/initializeAggregation.cpp
+++ b/src/Functions/initializeAggregation.cpp
@@ -4,7 +4,7 @@
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnAggregateFunction.h>
 #include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <AggregateFunctions/combinators/AggregateFunctionState.h>
+#include <AggregateFunctions/Combinators/AggregateFunctionState.h>
 #include <AggregateFunctions/IAggregateFunction.h>
 #include <AggregateFunctions/parseAggregateFunctionParameters.h>
 #include <Common/Arena.h>
diff --git a/src/Interpreters/Aggregator.cpp b/src/Interpreters/Aggregator.cpp
index d04704ffc2b9..059bd434dd6c 100644
--- a/src/Interpreters/Aggregator.cpp
+++ b/src/Interpreters/Aggregator.cpp
@@ -18,8 +18,8 @@
 #include <IO/WriteBufferFromFile.h>
 #include <Compression/CompressedWriteBuffer.h>
 #include <Interpreters/Aggregator.h>
-#include <AggregateFunctions/combinators/AggregateFunctionArray.h>
-#include <AggregateFunctions/combinators/AggregateFunctionState.h>
+#include <AggregateFunctions/Combinators/AggregateFunctionArray.h>
+#include <AggregateFunctions/Combinators/AggregateFunctionState.h>
 #include <IO/Operators.h>
 #include <Interpreters/JIT/compileFunction.h>
 #include <Interpreters/JIT/CompiledExpressionCache.h>
diff --git a/src/Storages/System/StorageSystemAggregateFunctionCombinators.cpp b/src/Storages/System/StorageSystemAggregateFunctionCombinators.cpp
index b2cfb3528f4f..6a7d9a2a948e 100644
--- a/src/Storages/System/StorageSystemAggregateFunctionCombinators.cpp
+++ b/src/Storages/System/StorageSystemAggregateFunctionCombinators.cpp
@@ -1,4 +1,4 @@
-#include <AggregateFunctions/combinators/AggregateFunctionCombinatorFactory.h>
+#include <AggregateFunctions/Combinators/AggregateFunctionCombinatorFactory.h>
 #include <Storages/System/StorageSystemAggregateFunctionCombinators.h>
 
 namespace DB
diff --git a/tests/queries/0_stateless/02885_min_max_combinator.reference b/tests/queries/0_stateless/02885_arg_min_max_combinator.reference
similarity index 100%
rename from tests/queries/0_stateless/02885_min_max_combinator.reference
rename to tests/queries/0_stateless/02885_arg_min_max_combinator.reference
diff --git a/tests/queries/0_stateless/02885_arg_min_max_combinator.sql b/tests/queries/0_stateless/02885_arg_min_max_combinator.sql
new file mode 100644
index 000000000000..86ee73d8f3bd
--- /dev/null
+++ b/tests/queries/0_stateless/02885_arg_min_max_combinator.sql
@@ -0,0 +1,3 @@
+select sumArgMin(number, number % 20), sumArgMax(number, number % 20) from numbers(100);
+select sumArgMin(number, toString(number % 20)), sumArgMax(number, toString(number % 20)) from numbers(100);
+select sumArgMinIf(number, number % 20, number % 2 = 0), sumArgMaxIf(number, number % 20, number % 2 = 0) from numbers(100);
diff --git a/tests/queries/0_stateless/02885_min_max_combinator.sql b/tests/queries/0_stateless/02885_min_max_combinator.sql
deleted file mode 100644
index eeeaf4964441..000000000000
--- a/tests/queries/0_stateless/02885_min_max_combinator.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-select sumMin(number, number % 20), sumMax(number, number % 20) from numbers(100);
-select sumMin(number, toString(number % 20)), sumMax(number, toString(number % 20)) from numbers(100);
-select sumMinIf(number, number % 20, number % 2 = 0), sumMaxIf(number, number % 20, number % 2 = 0) from numbers(100);

From ff86fad3d0dec609b602b33e0b37dde134991275 Mon Sep 17 00:00:00 2001
From: Amos Bird <amosbird@gmail.com>
Date: Thu, 28 Sep 2023 02:58:44 +0800
Subject: [PATCH 7/7] Update docs

---
 .../sql-reference/aggregate-functions/combinators.md   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/en/sql-reference/aggregate-functions/combinators.md b/docs/en/sql-reference/aggregate-functions/combinators.md
index 03b86dd27ae2..8ccc5e292b50 100644
--- a/docs/en/sql-reference/aggregate-functions/combinators.md
+++ b/docs/en/sql-reference/aggregate-functions/combinators.md
@@ -317,15 +317,15 @@ FROM people
 └────────┴───────────────────────────┘
 ```
 
-## -Min
+## -ArgMin
 
-The suffix -Min can be appended to the name of any aggregate function. In this case, the aggregate function accepts an additional argument, which should be any comparable expression. The aggregate function processes only the rows that have the minimum value for the specified extra expression.
+The suffix -ArgMin can be appended to the name of any aggregate function. In this case, the aggregate function accepts an additional argument, which should be any comparable expression. The aggregate function processes only the rows that have the minimum value for the specified extra expression.
 
-Examples: `sumMin(column, expr)`, `countMin(expr)`, `avgMin(x, expr)` and so on.
+Examples: `sumArgMin(column, expr)`, `countArgMin(expr)`, `avgArgMin(x, expr)` and so on.
 
-## -Max
+## -ArgMax
 
-Similar to suffix -Min but processes only the rows that have the maximum value for the specified extra expression.
+Similar to suffix -ArgMin but processes only the rows that have the maximum value for the specified extra expression.
 
 ## Related Content