This is an automated email from the ASF dual-hosted git repository.
changchen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 900112fd6 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240407)
(#5298)
900112fd6 is described below
commit 900112fd638384b440fa27b4f50f06e00401254d
Author: Kyligence Git <[email protected]>
AuthorDate: Sun Apr 7 02:57:23 2024 -0500
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20240407) (#5298)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20240407)
* Fix build due to https://github.com/ClickHouse/ClickHouse/pull/62264
using AggregateFunctions/IAggregateFunction_fwd.h in headers
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 ++--
.../AggregateFunctionGroupBloomFilter.h | 7 +++----
.../AggregateFunctions/AggregateFunctionPartialMerge.h | 2 +-
cpp-ch/local-engine/Functions/FunctionsBloomFilter.h | 16 ++++++----------
.../Functions/SparkFunctionCheckDecimalOverflow.cpp | 1 -
.../Functions/SparkFunctionCheckDecimalOverflow.h | 2 ++
cpp-ch/local-engine/Parser/AggregateFunctionParser.cpp | 3 ++-
cpp-ch/local-engine/Parser/FunctionParser.cpp | 7 ++++---
cpp-ch/local-engine/Parser/RelParser.h | 4 +---
cpp-ch/local-engine/Parser/SerializedPlanParser.cpp | 16 ++++------------
.../aggregate_function_parser/ApproxPercentileParser.cpp | 7 +++----
.../Parser/aggregate_function_parser/CountParser.cpp | 4 +++-
.../Parser/example_udf/tests/gtest_my_add.cpp | 1 +
.../Parser/example_udf/tests/gtest_my_md5.cpp | 1 +
.../Parser/scalar_function_parser/arrayMaxAndMin.cpp | 6 +++---
.../local-engine/Parser/scalar_function_parser/elt.cpp | 4 ++--
.../Parser/scalar_function_parser/findInset.cpp | 7 ++++---
.../local-engine/Parser/scalar_function_parser/log.cpp | 4 ++--
.../Parser/scalar_function_parser/logarithm.h | 4 ++--
.../local-engine/Parser/scalar_function_parser/nanvl.cpp | 4 ++--
.../Parser/scalar_function_parser/sequence.cpp | 5 ++---
.../Parser/scalar_function_parser/shiftRightUnsigned.cpp | 4 ++--
.../Parser/scalar_function_parser/unixTimestamp.cpp | 2 +-
cpp-ch/local-engine/Shuffle/SelectorBuilder.cpp | 10 +---------
.../Storages/IO/AggregateSerializationUtils.cpp | 9 ++++++---
.../Storages/IO/AggregateSerializationUtils.h | 2 +-
cpp-ch/local-engine/Storages/IO/NativeReader.cpp | 15 +++++++++------
27 files changed, 70 insertions(+), 81 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index b272486b9..c319d669d 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20240330
-CH_COMMIT=adaaf28c014
\ No newline at end of file
+CH_BRANCH=rebase_ch/20240407
+CH_COMMIT=b89fd4d532b
\ No newline at end of file
diff --git
a/cpp-ch/local-engine/AggregateFunctions/AggregateFunctionGroupBloomFilter.h
b/cpp-ch/local-engine/AggregateFunctions/AggregateFunctionGroupBloomFilter.h
index 767ba0550..6dd15731e 100644
--- a/cpp-ch/local-engine/AggregateFunctions/AggregateFunctionGroupBloomFilter.h
+++ b/cpp-ch/local-engine/AggregateFunctions/AggregateFunctionGroupBloomFilter.h
@@ -17,18 +17,17 @@
#pragma once
#include <cstddef>
-#include <AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/IAggregateFunction_fwd.h>
#include <Columns/ColumnAggregateFunction.h>
#include <Columns/ColumnVector.h>
#include <DataTypes/DataTypesNumber.h>
+#include <IO/VarInt.h>
+#include <base/types.h>
#include "Common/Exception.h"
#include <Common/assert_cast.h>
-#include "IO/VarInt.h"
-#include "base/types.h"
#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
#include <Interpreters/BloomFilter.h>
namespace local_engine
diff --git
a/cpp-ch/local-engine/AggregateFunctions/AggregateFunctionPartialMerge.h
b/cpp-ch/local-engine/AggregateFunctions/AggregateFunctionPartialMerge.h
index f77c253f5..1f5ff9fca 100644
--- a/cpp-ch/local-engine/AggregateFunctions/AggregateFunctionPartialMerge.h
+++ b/cpp-ch/local-engine/AggregateFunctions/AggregateFunctionPartialMerge.h
@@ -16,7 +16,7 @@
*/
#pragma once
-#include <AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/IAggregateFunction_fwd.h>
#include <Columns/ColumnAggregateFunction.h>
#include <DataTypes/DataTypeAggregateFunction.h>
#include <Common/assert_cast.h>
diff --git a/cpp-ch/local-engine/Functions/FunctionsBloomFilter.h
b/cpp-ch/local-engine/Functions/FunctionsBloomFilter.h
index 464763a2a..9fce53414 100644
--- a/cpp-ch/local-engine/Functions/FunctionsBloomFilter.h
+++ b/cpp-ch/local-engine/Functions/FunctionsBloomFilter.h
@@ -20,28 +20,24 @@
#include <memory>
#include <type_traits>
#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/IAggregateFunction_fwd.h>
#include <Columns/ColumnAggregateFunction.h>
-#include <Columns/ColumnArray.h>
#include <Columns/ColumnConst.h>
+#include <Columns/ColumnNullable.h>
#include <Columns/ColumnString.h>
#include <Columns/ColumnVector.h>
#include <Columns/ColumnsNumber.h>
+#include <Columns/IColumn.h>
+#include <Core/TypeId.h>
#include <DataTypes/DataTypeAggregateFunction.h>
-#include <DataTypes/DataTypeArray.h>
#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/IDataType.h>
#include <Functions/FunctionHelpers.h>
#include <Functions/IFunction.h>
#include <IO/ReadBufferFromMemory.h>
#include <Interpreters/castColumn.h>
-#include <Common/assert_cast.h>
+#include <base/types.h>
#include <Common/typeid_cast.h>
-#include "AggregateFunctions/IAggregateFunction.h"
-#include "Columns/ColumnNullable.h"
-#include "Columns/IColumn.h"
-#include "Core/TypeId.h"
-#include "Core/Types.h"
-#include "DataTypes/IDataType.h"
-#include "base/types.h"
#include <AggregateFunctions/AggregateFunctionGroupBloomFilter.h>
diff --git
a/cpp-ch/local-engine/Functions/SparkFunctionCheckDecimalOverflow.cpp
b/cpp-ch/local-engine/Functions/SparkFunctionCheckDecimalOverflow.cpp
index 29eb543b5..2f4652a1f 100644
--- a/cpp-ch/local-engine/Functions/SparkFunctionCheckDecimalOverflow.cpp
+++ b/cpp-ch/local-engine/Functions/SparkFunctionCheckDecimalOverflow.cpp
@@ -32,7 +32,6 @@ namespace ErrorCodes
extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
extern const int ILLEGAL_TYPE_OF_ARGUMENT;
extern const int ILLEGAL_COLUMN;
- extern const int DECIMAL_OVERFLOW;
extern const int TYPE_MISMATCH;
}
}
diff --git a/cpp-ch/local-engine/Functions/SparkFunctionCheckDecimalOverflow.h
b/cpp-ch/local-engine/Functions/SparkFunctionCheckDecimalOverflow.h
index 2351ad28f..32bf79a56 100644
--- a/cpp-ch/local-engine/Functions/SparkFunctionCheckDecimalOverflow.h
+++ b/cpp-ch/local-engine/Functions/SparkFunctionCheckDecimalOverflow.h
@@ -28,6 +28,8 @@ namespace ErrorCodes
{
extern const int TYPE_MISMATCH;
extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+ extern const int DECIMAL_OVERFLOW;
+
}
}
diff --git a/cpp-ch/local-engine/Parser/AggregateFunctionParser.cpp
b/cpp-ch/local-engine/Parser/AggregateFunctionParser.cpp
index 56cd58ad9..77814a427 100644
--- a/cpp-ch/local-engine/Parser/AggregateFunctionParser.cpp
+++ b/cpp-ch/local-engine/Parser/AggregateFunctionParser.cpp
@@ -16,9 +16,10 @@
*/
#include "AggregateFunctionParser.h"
#include <type_traits>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
#include <DataTypes/DataTypeAggregateFunction.h>
#include <DataTypes/DataTypeTuple.h>
-#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
#include <Parser/TypeParser.h>
#include <Common/CHUtil.h>
#include <Common/Exception.h>
diff --git a/cpp-ch/local-engine/Parser/FunctionParser.cpp
b/cpp-ch/local-engine/Parser/FunctionParser.cpp
index 5787ea4fb..e786304b3 100644
--- a/cpp-ch/local-engine/Parser/FunctionParser.cpp
+++ b/cpp-ch/local-engine/Parser/FunctionParser.cpp
@@ -14,14 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+#include "FunctionParser.h"
#include <Core/Field.h>
+#include <DataTypes/DataTypeNullable.h>
#include <DataTypes/IDataType.h>
#include <Functions/FunctionFactory.h>
#include <Parser/TypeParser.h>
#include <Common/CHUtil.h>
-#include "FunctionParser.h"
-
namespace DB
{
@@ -80,7 +81,7 @@ const ActionsDAG::Node *
FunctionParser::convertNodeTypeIfNeeded(
func_node,
// as stated in isTypeMatched， currently we don't change
nullability of the result type
func_node->result_type->isNullable() ?
local_engine::wrapNullableType(true,
TypeParser::parseType(output_type))->getName()
- :
local_engine::removeNullable(TypeParser::parseType(output_type))->getName(),
+ :
DB::removeNullable(TypeParser::parseType(output_type))->getName(),
func_node->result_name);
else
return func_node;
diff --git a/cpp-ch/local-engine/Parser/RelParser.h
b/cpp-ch/local-engine/Parser/RelParser.h
index 310ab7b5d..6ca8af535 100644
--- a/cpp-ch/local-engine/Parser/RelParser.h
+++ b/cpp-ch/local-engine/Parser/RelParser.h
@@ -17,16 +17,14 @@
#pragma once
#include <map>
#include <optional>
-#include <unordered_map>
#include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/IAggregateFunction_fwd.h>
#include <Core/Field.h>
#include <DataTypes/IDataType.h>
#include <DataTypes/Serializations/ISerialization.h>
#include <Parser/SerializedPlanParser.h>
#include <Processors/QueryPlan/QueryPlan.h>
#include <base/types.h>
-#include <google/protobuf/repeated_field.h>
#include <substrait/extensions/extensions.pb.h>
#include <substrait/plan.pb.h>
namespace local_engine
diff --git a/cpp-ch/local-engine/Parser/SerializedPlanParser.cpp
b/cpp-ch/local-engine/Parser/SerializedPlanParser.cpp
index 1b7f0448f..f7926c8ab 100644
--- a/cpp-ch/local-engine/Parser/SerializedPlanParser.cpp
+++ b/cpp-ch/local-engine/Parser/SerializedPlanParser.cpp
@@ -23,15 +23,13 @@
#include <Columns/ColumnSet.h>
#include <Core/Block.h>
#include <Core/ColumnWithTypeAndName.h>
+#include <Core/Field.h>
#include <Core/Names.h>
#include <Core/NamesAndTypes.h>
-#include <Core/Types.h>
-#include <Core/Field.h>
#include <DataTypes/DataTypeAggregateFunction.h>
#include <DataTypes/DataTypeArray.h>
#include <DataTypes/DataTypeDate32.h>
#include <DataTypes/DataTypeDateTime64.h>
-#include <DataTypes/DataTypeFactory.h>
#include <DataTypes/DataTypeMap.h>
#include <DataTypes/DataTypeNothing.h>
#include <DataTypes/DataTypeNullable.h>
@@ -44,6 +42,7 @@
#include <DataTypes/Serializations/ISerialization.h>
#include <DataTypes/getLeastSupertype.h>
#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
#include <Interpreters/ActionsDAG.h>
#include <Interpreters/ActionsVisitor.h>
#include <Interpreters/CollectJoinOnKeysVisitor.h>
@@ -54,31 +53,24 @@
#include <Join/StorageJoinFromReadBuffer.h>
#include <Operator/BlocksBufferPoolTransform.h>
#include <Parser/FunctionParser.h>
-#include <Parser/JoinRelParser.h>
+#include <Parser/MergeTreeRelParser.h>
#include <Parser/RelParser.h>
#include <Parser/TypeParser.h>
-#include <Parser/MergeTreeRelParser.h>
#include <Parsers/ASTIdentifier.h>
#include <Parsers/ExpressionListParsers.h>
-#include <Processors/Executors/PullingAsyncPipelineExecutor.h>
#include <Processors/Formats/Impl/ArrowBlockOutputFormat.h>
#include <Processors/QueryPlan/AggregatingStep.h>
#include <Processors/QueryPlan/ExpressionStep.h>
-#include <Processors/QueryPlan/FilterStep.h>
#include <Processors/QueryPlan/LimitStep.h>
-#include <Processors/QueryPlan/MergingAggregatedStep.h>
#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
#include <Processors/QueryPlan/QueryPlan.h>
#include <Processors/QueryPlan/ReadFromPreparedSource.h>
#include <Processors/Transforms/AggregatingTransform.h>
-#include <Processors/Transforms/MaterializingTransform.h>
#include <QueryPipeline/Pipe.h>
#include <QueryPipeline/QueryPipelineBuilder.h>
#include <QueryPipeline/printPipeline.h>
#include <Storages/CustomStorageMergeTree.h>
-#include <Storages/IStorage.h>
#include <Storages/MergeTree/MergeTreeData.h>
-#include <Storages/StorageMergeTreeFactory.h>
#include <Storages/SubstraitSource/SubstraitFileSource.h>
#include <Storages/SubstraitSource/SubstraitFileSourceStep.h>
#include <google/protobuf/util/json_util.h>
@@ -86,10 +78,10 @@
#include <Poco/Util/MapConfiguration.h>
#include <Common/CHUtil.h>
#include <Common/Exception.h>
+#include <Common/JNIUtils.h>
#include <Common/MergeTreeTool.h>
#include <Common/logger_useful.h>
#include <Common/typeid_cast.h>
-#include <Common/JNIUtils.h>
namespace DB
{
diff --git
a/cpp-ch/local-engine/Parser/aggregate_function_parser/ApproxPercentileParser.cpp
b/cpp-ch/local-engine/Parser/aggregate_function_parser/ApproxPercentileParser.cpp
index 9a164de14..237da650c 100644
---
a/cpp-ch/local-engine/Parser/aggregate_function_parser/ApproxPercentileParser.cpp
+++
b/cpp-ch/local-engine/Parser/aggregate_function_parser/ApproxPercentileParser.cpp
@@ -15,15 +15,14 @@
* limitations under the License.
*/
-#include <cmath>
#include <string>
#include <DataTypes/DataTypeAggregateFunction.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Functions/FunctionHelpers.h>
#include <Interpreters/ActionsDAG.h>
#include <Parser/AggregateFunctionParser.h>
#include <Parser/aggregate_function_parser/ApproxPercentileParser.h>
-#include <Poco/StringTokenizer.h>
-#include <Common/CHUtil.h>
-#include "substrait/algebra.pb.h"
+#include <substrait/algebra.pb.h>
namespace DB
{
diff --git
a/cpp-ch/local-engine/Parser/aggregate_function_parser/CountParser.cpp
b/cpp-ch/local-engine/Parser/aggregate_function_parser/CountParser.cpp
index 6135546f2..da99eb195 100644
--- a/cpp-ch/local-engine/Parser/aggregate_function_parser/CountParser.cpp
+++ b/cpp-ch/local-engine/Parser/aggregate_function_parser/CountParser.cpp
@@ -14,8 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include <Parser/aggregate_function_parser/CountParser.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypesNumber.h>
#include <Interpreters/ActionsDAG.h>
+#include <Parser/aggregate_function_parser/CountParser.h>
#include <Common/CHUtil.h>
namespace DB
diff --git a/cpp-ch/local-engine/Parser/example_udf/tests/gtest_my_add.cpp
b/cpp-ch/local-engine/Parser/example_udf/tests/gtest_my_add.cpp
index 5bf3d16fb..12284ea00 100644
--- a/cpp-ch/local-engine/Parser/example_udf/tests/gtest_my_add.cpp
+++ b/cpp-ch/local-engine/Parser/example_udf/tests/gtest_my_add.cpp
@@ -18,6 +18,7 @@
#include <Parser/FunctionExecutor.h>
#include <Parser/FunctionParser.h>
#include <gtest/gtest.h>
+#include <DataTypes/DataTypeNullable.h>
using namespace DB;
using namespace local_engine;
diff --git a/cpp-ch/local-engine/Parser/example_udf/tests/gtest_my_md5.cpp
b/cpp-ch/local-engine/Parser/example_udf/tests/gtest_my_md5.cpp
index 275c23f35..c58262d98 100644
--- a/cpp-ch/local-engine/Parser/example_udf/tests/gtest_my_md5.cpp
+++ b/cpp-ch/local-engine/Parser/example_udf/tests/gtest_my_md5.cpp
@@ -18,6 +18,7 @@
#include <Parser/FunctionExecutor.h>
#include <Parser/FunctionParser.h>
#include <gtest/gtest.h>
+#include <DataTypes/DataTypeNullable.h>
using namespace DB;
using namespace local_engine;
diff --git
a/cpp-ch/local-engine/Parser/scalar_function_parser/arrayMaxAndMin.cpp
b/cpp-ch/local-engine/Parser/scalar_function_parser/arrayMaxAndMin.cpp
index 1df125d10..87ae8ab77 100644
--- a/cpp-ch/local-engine/Parser/scalar_function_parser/arrayMaxAndMin.cpp
+++ b/cpp-ch/local-engine/Parser/scalar_function_parser/arrayMaxAndMin.cpp
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include <Parser/FunctionParser.h>
-#include <Common/CHUtil.h>
#include <Core/Field.h>
+#include <DataTypes/DataTypeNullable.h>
#include <DataTypes/IDataType.h>
-#include <DataTypes/DataTypeArray.h>
+#include <Parser/FunctionParser.h>
+#include <Common/CHUtil.h>
namespace DB
{
diff --git a/cpp-ch/local-engine/Parser/scalar_function_parser/elt.cpp
b/cpp-ch/local-engine/Parser/scalar_function_parser/elt.cpp
index bd8cf1da8..916e16e7b 100644
--- a/cpp-ch/local-engine/Parser/scalar_function_parser/elt.cpp
+++ b/cpp-ch/local-engine/Parser/scalar_function_parser/elt.cpp
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#include <Core/Field.h>
+#include <DataTypes/DataTypeNullable.h>
#include <Parser/FunctionParser.h>
#include <Common/CHUtil.h>
-#include <Core/Field.h>
-#include <DataTypes/IDataType.h>
namespace DB
{
diff --git a/cpp-ch/local-engine/Parser/scalar_function_parser/findInset.cpp
b/cpp-ch/local-engine/Parser/scalar_function_parser/findInset.cpp
index 76df276c5..b297d7a67 100644
--- a/cpp-ch/local-engine/Parser/scalar_function_parser/findInset.cpp
+++ b/cpp-ch/local-engine/Parser/scalar_function_parser/findInset.cpp
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include <Parser/FunctionParser.h>
-#include <Common/CHUtil.h>
-#include <DataTypes/DataTypesNumber.h>
#include <Core/Field.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypesNumber.h>
#include <DataTypes/IDataType.h>
+#include <Parser/FunctionParser.h>
+#include <Common/CHUtil.h>
namespace DB
{
diff --git a/cpp-ch/local-engine/Parser/scalar_function_parser/log.cpp
b/cpp-ch/local-engine/Parser/scalar_function_parser/log.cpp
index 31d7be6b4..264c0da93 100644
--- a/cpp-ch/local-engine/Parser/scalar_function_parser/log.cpp
+++ b/cpp-ch/local-engine/Parser/scalar_function_parser/log.cpp
@@ -15,10 +15,10 @@
* limitations under the License.
*/
+#include <Core/Field.h>
+#include <DataTypes/DataTypeNullable.h>
#include <Parser/FunctionParser.h>
#include <Common/CHUtil.h>
-#include <Core/Field.h>
-#include <DataTypes/IDataType.h>
namespace DB
{
diff --git a/cpp-ch/local-engine/Parser/scalar_function_parser/logarithm.h
b/cpp-ch/local-engine/Parser/scalar_function_parser/logarithm.h
index 59e22d8cb..2a879623a 100644
--- a/cpp-ch/local-engine/Parser/scalar_function_parser/logarithm.h
+++ b/cpp-ch/local-engine/Parser/scalar_function_parser/logarithm.h
@@ -15,10 +15,10 @@
* limitations under the License.
*/
+#include <Core/Field.h>
+#include <DataTypes/DataTypeNullable.h>
#include <Parser/FunctionParser.h>
#include <Common/CHUtil.h>
-#include <Core/Field.h>
-#include <DataTypes/IDataType.h>
namespace DB
{
diff --git a/cpp-ch/local-engine/Parser/scalar_function_parser/nanvl.cpp
b/cpp-ch/local-engine/Parser/scalar_function_parser/nanvl.cpp
index 33755ca9e..010f3eef3 100644
--- a/cpp-ch/local-engine/Parser/scalar_function_parser/nanvl.cpp
+++ b/cpp-ch/local-engine/Parser/scalar_function_parser/nanvl.cpp
@@ -15,10 +15,10 @@
* limitations under the License.
*/
+#include <Core/Field.h>
+#include <DataTypes/DataTypeNullable.h>
#include <Parser/FunctionParser.h>
#include <Common/CHUtil.h>
-#include <Core/Field.h>
-#include <DataTypes/IDataType.h>
namespace DB
{
diff --git a/cpp-ch/local-engine/Parser/scalar_function_parser/sequence.cpp
b/cpp-ch/local-engine/Parser/scalar_function_parser/sequence.cpp
index bbfd6edee..373bd5313 100644
--- a/cpp-ch/local-engine/Parser/scalar_function_parser/sequence.cpp
+++ b/cpp-ch/local-engine/Parser/scalar_function_parser/sequence.cpp
@@ -14,11 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#include <Core/Field.h>
+#include <DataTypes/DataTypeNullable.h>
#include <Parser/FunctionParser.h>
-#include <DataTypes/IDataType.h>
-#include <DataTypes/DataTypeArray.h>
#include <Common/CHUtil.h>
-#include <Core/Field.h>
namespace DB
{
diff --git
a/cpp-ch/local-engine/Parser/scalar_function_parser/shiftRightUnsigned.cpp
b/cpp-ch/local-engine/Parser/scalar_function_parser/shiftRightUnsigned.cpp
index c9faa81a2..b638e234f 100644
--- a/cpp-ch/local-engine/Parser/scalar_function_parser/shiftRightUnsigned.cpp
+++ b/cpp-ch/local-engine/Parser/scalar_function_parser/shiftRightUnsigned.cpp
@@ -15,8 +15,8 @@
* limitations under the License.
*/
- #include <Parser/FunctionParser.h>
-
+#include <DataTypes/DataTypeNullable.h>
+#include <Parser/FunctionParser.h>
namespace DB
{
diff --git
a/cpp-ch/local-engine/Parser/scalar_function_parser/unixTimestamp.cpp
b/cpp-ch/local-engine/Parser/scalar_function_parser/unixTimestamp.cpp
index 84a7d394e..c12a6d33f 100644
--- a/cpp-ch/local-engine/Parser/scalar_function_parser/unixTimestamp.cpp
+++ b/cpp-ch/local-engine/Parser/scalar_function_parser/unixTimestamp.cpp
@@ -15,8 +15,8 @@
* limitations under the License.
*/
+#include <DataTypes/DataTypeNullable.h>
#include <Parser/FunctionParser.h>
-#include <DataTypes/DataTypesNumber.h>
namespace DB
diff --git a/cpp-ch/local-engine/Shuffle/SelectorBuilder.cpp
b/cpp-ch/local-engine/Shuffle/SelectorBuilder.cpp
index d3a4f6439..73978982c 100644
--- a/cpp-ch/local-engine/Shuffle/SelectorBuilder.cpp
+++ b/cpp-ch/local-engine/Shuffle/SelectorBuilder.cpp
@@ -17,25 +17,17 @@
#include "SelectorBuilder.h"
#include <limits>
#include <memory>
-#include <mutex>
#include <Columns/ColumnArray.h>
#include <Columns/ColumnMap.h>
#include <Columns/ColumnNullable.h>
-#include <Columns/ColumnTuple.h>
#include <DataTypes/DataTypeArray.h>
-#include <DataTypes/DataTypeMap.h>
-#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeNullable.h>
#include <DataTypes/DataTypesDecimal.h>
#include <Functions/FunctionFactory.h>
#include <Parser/SerializedPlanParser.h>
#include <Parser/TypeParser.h>
-#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
-#include <Processors/QueryPlan/QueryPlan.h>
-#include <Poco/Base64Decoder.h>
-#include <Poco/JSON/JSON.h>
#include <Poco/JSON/Parser.h>
#include <Poco/MemoryStream.h>
-#include <Poco/StreamCopier.h>
#include <Common/CHUtil.h>
#include <Common/Exception.h>
diff --git a/cpp-ch/local-engine/Storages/IO/AggregateSerializationUtils.cpp
b/cpp-ch/local-engine/Storages/IO/AggregateSerializationUtils.cpp
index 558f570e2..d5e336833 100644
--- a/cpp-ch/local-engine/Storages/IO/AggregateSerializationUtils.cpp
+++ b/cpp-ch/local-engine/Storages/IO/AggregateSerializationUtils.cpp
@@ -15,15 +15,18 @@
* limitations under the License.
*/
#include "AggregateSerializationUtils.h"
-#include <Common/Arena.h>
-
+#include <AggregateFunctions/IAggregateFunction.h>
#include <Columns/ColumnAggregateFunction.h>
#include <Columns/ColumnFixedString.h>
#include <Columns/ColumnString.h>
#include <DataTypes/DataTypeAggregateFunction.h>
#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeNullable.h>
#include <DataTypes/DataTypeString.h>
-
+#include <Functions/FunctionHelpers.h>
+#include <IO/WriteBufferFromVector.h>
+#include <IO/WriteHelpers.h>
+#include <Common/Arena.h>
using namespace DB;
diff --git a/cpp-ch/local-engine/Storages/IO/AggregateSerializationUtils.h
b/cpp-ch/local-engine/Storages/IO/AggregateSerializationUtils.h
index 6536982ef..a00a3cdd8 100644
--- a/cpp-ch/local-engine/Storages/IO/AggregateSerializationUtils.h
+++ b/cpp-ch/local-engine/Storages/IO/AggregateSerializationUtils.h
@@ -15,7 +15,7 @@
* limitations under the License.
*/
#pragma once
-#include <AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/IAggregateFunction_fwd.h>
#include <Core/Block.h>
#include <DataTypes/IDataType.h>
diff --git a/cpp-ch/local-engine/Storages/IO/NativeReader.cpp
b/cpp-ch/local-engine/Storages/IO/NativeReader.cpp
index f02a1b72f..30d8af593 100644
--- a/cpp-ch/local-engine/Storages/IO/NativeReader.cpp
+++ b/cpp-ch/local-engine/Storages/IO/NativeReader.cpp
@@ -16,14 +16,16 @@
*/
#include "NativeReader.h"
-#include <IO/ReadHelpers.h>
-#include <IO/VarInt.h>
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <Columns/ColumnAggregateFunction.h>
#include <DataTypes/DataTypeFactory.h>
#include <DataTypes/DataTypeNullable.h>
-#include <Columns/ColumnAggregateFunction.h>
-#include <Common/Arena.h>
-#include <Storages/IO/NativeWriter.h>
+#include <Functions/FunctionHelpers.h>
+#include <IO/ReadHelpers.h>
+#include <IO/VarInt.h>
#include <Storages/IO/AggregateSerializationUtils.h>
+#include <Storages/IO/NativeWriter.h>
+#include <Common/Arena.h>
namespace DB
{
@@ -131,7 +133,8 @@ static void readNormalSimpleData(DB::ReadBuffer &in,
DB::ColumnPtr & column, siz
}
// May not efficient.
-static void readNormalComplexData(DB::ReadBuffer &in, DB::ColumnPtr & column,
size_t rows, NativeReader::ColumnParseUtil & column_parse_util)
+static void
+readNormalComplexData(DB::ReadBuffer & in, DB::ColumnPtr & column, size_t
rows, NativeReader::ColumnParseUtil & column_parse_util)
{
ISerialization::DeserializeBinaryBulkSettings settings;
settings.getter = [&](ISerialization::SubstreamPath) -> ReadBuffer * {
return ∈ };
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
