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 9d23b461f4 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250207)
(#8681)
9d23b461f4 is described below
commit 9d23b461f45eef198ef296fb1b6a5aa5ee65d6e6
Author: Kyligence Git <[email protected]>
AuthorDate: Fri Feb 7 03:43:43 2025 -0600
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20250207) (#8681)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250207)
* Fix build due to https://github.com/ClickHouse/ClickHouse/pull/75299
* Fix build due to https://github.com/ClickHouse/ClickHouse/pull/75636
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 ++--
cpp-ch/local-engine/Common/ChunkBuffer.cpp | 2 ++
cpp-ch/local-engine/Functions/FunctionsBloomFilter.h | 2 +-
cpp-ch/local-engine/Functions/SparkArrayFlatten.cpp | 9 +++++----
cpp-ch/local-engine/Functions/SparkFunctionArraySort.cpp | 10 +++++-----
.../Functions/SparkFunctionCheckDecimalOverflow.cpp | 3 ++-
cpp-ch/local-engine/Functions/SparkFunctionFloor.h | 1 +
.../local-engine/Functions/SparkFunctionMakeDecimal.cpp | 2 ++
cpp-ch/local-engine/Functions/SparkFunctionMapToString.h | 3 ++-
cpp-ch/local-engine/Functions/SparkFunctionToDateTime.h | 1 +
.../local-engine/Functions/SparkFunctionTupleElement.cpp | 3 ++-
.../local-engine/Functions/SparkFunctionUnscaleValue.cpp | 1 +
cpp-ch/local-engine/Operator/AdvancedExpandStep.cpp | 8 +++-----
.../Operator/PartitionColumnFillingTransform.cpp | 3 ++-
cpp-ch/local-engine/Operator/ReplicateRowsStep.cpp | 3 +--
cpp-ch/local-engine/Operator/WindowGroupLimitStep.cpp | 1 +
cpp-ch/local-engine/Parser/AggregateFunctionParser.cpp | 1 +
.../local-engine/Parser/RelParsers/ExpandRelParser.cpp | 16 +++++-----------
cpp-ch/local-engine/Parser/RelParsers/ReadRelParser.cpp | 4 +++-
cpp-ch/local-engine/Shuffle/PartitionWriter.cpp | 1 +
cpp-ch/local-engine/Shuffle/SelectorBuilder.h | 4 +---
cpp-ch/local-engine/Storages/Output/NormalFileWriter.cpp | 2 ++
cpp-ch/local-engine/Storages/Output/NormalFileWriter.h | 1 +
.../Storages/Serializations/ExcelDecimalSerialization.h | 8 ++++++++
.../Storages/Serializations/ExcelSerialization.h | 1 +
.../local-engine/Storages/SubstraitSource/FormatFile.cpp | 1 +
cpp-ch/local-engine/tests/gtest_transformer.cpp | 1 +
27 files changed, 58 insertions(+), 38 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index 45a2eb06c3..72d0685e15 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20250205
-CH_COMMIT=c1451130e6d
+CH_BRANCH=rebase_ch/20250207
+CH_COMMIT=b6c11f40aed
diff --git a/cpp-ch/local-engine/Common/ChunkBuffer.cpp
b/cpp-ch/local-engine/Common/ChunkBuffer.cpp
index 9477a61a86..629b83c059 100644
--- a/cpp-ch/local-engine/Common/ChunkBuffer.cpp
+++ b/cpp-ch/local-engine/Common/ChunkBuffer.cpp
@@ -16,6 +16,8 @@
*/
#include "ChunkBuffer.h"
+#include <Columns/IColumn.h>
+
namespace local_engine
{
void ChunkBuffer::add(DB::Chunk & columns, int start, int end)
diff --git a/cpp-ch/local-engine/Functions/FunctionsBloomFilter.h
b/cpp-ch/local-engine/Functions/FunctionsBloomFilter.h
index d677a3311c..2546030db5 100644
--- a/cpp-ch/local-engine/Functions/FunctionsBloomFilter.h
+++ b/cpp-ch/local-engine/Functions/FunctionsBloomFilter.h
@@ -18,7 +18,6 @@
#include <cstddef>
#include <memory>
-#include <type_traits>
#include <AggregateFunctions/AggregateFunctionFactory.h>
#include <AggregateFunctions/AggregateFunctionGroupBloomFilter.h>
#include <AggregateFunctions/IAggregateFunction_fwd.h>
@@ -31,6 +30,7 @@
#include <Columns/IColumn.h>
#include <Core/TypeId.h>
#include <DataTypes/DataTypeAggregateFunction.h>
+#include <DataTypes/DataTypeNullable.h>
#include <DataTypes/DataTypesNumber.h>
#include <DataTypes/IDataType.h>
#include <Functions/FunctionHelpers.h>
diff --git a/cpp-ch/local-engine/Functions/SparkArrayFlatten.cpp
b/cpp-ch/local-engine/Functions/SparkArrayFlatten.cpp
index d39bca5ea1..96faa9d1dc 100644
--- a/cpp-ch/local-engine/Functions/SparkArrayFlatten.cpp
+++ b/cpp-ch/local-engine/Functions/SparkArrayFlatten.cpp
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include <Functions/IFunction.h>
-#include <Functions/FunctionFactory.h>
-#include <Functions/FunctionHelpers.h>
-#include <DataTypes/DataTypeArray.h>
#include <Columns/ColumnArray.h>
#include <Columns/ColumnNullable.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/IFunction.h>
namespace DB
diff --git a/cpp-ch/local-engine/Functions/SparkFunctionArraySort.cpp
b/cpp-ch/local-engine/Functions/SparkFunctionArraySort.cpp
index cf9d67f169..c53d9dbd31 100644
--- a/cpp-ch/local-engine/Functions/SparkFunctionArraySort.cpp
+++ b/cpp-ch/local-engine/Functions/SparkFunctionArraySort.cpp
@@ -14,18 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include <Functions/FunctionHelpers.h>
-#include <Functions/FunctionFactory.h>
#include <Columns/ColumnArray.h>
#include <Columns/ColumnFunction.h>
#include <Columns/ColumnNullable.h>
-#include <Common/Exception.h>
#include <DataTypes/DataTypeArray.h>
#include <DataTypes/DataTypeFunction.h>
#include <DataTypes/DataTypeLowCardinality.h>
-#include <Poco/Logger.h>
-#include <Common/logger_useful.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
#include <base/sort.h>
+#include <Common/Exception.h>
+#include <Common/logger_useful.h>
namespace DB::ErrorCodes
{
diff --git
a/cpp-ch/local-engine/Functions/SparkFunctionCheckDecimalOverflow.cpp
b/cpp-ch/local-engine/Functions/SparkFunctionCheckDecimalOverflow.cpp
index 73fc7b5d4e..95853b187a 100644
--- a/cpp-ch/local-engine/Functions/SparkFunctionCheckDecimalOverflow.cpp
+++ b/cpp-ch/local-engine/Functions/SparkFunctionCheckDecimalOverflow.cpp
@@ -16,16 +16,17 @@
*/
#include "SparkFunctionCheckDecimalOverflow.h"
+#include <typeinfo>
#include <Columns/ColumnDecimal.h>
#include <Columns/ColumnNullable.h>
#include <Columns/ColumnsNumber.h>
#include <Core/DecimalFunctions.h>
+#include <Core/callOnTypeIndex.h>
#include <DataTypes/DataTypeNullable.h>
#include <DataTypes/DataTypesDecimal.h>
#include <Functions/FunctionFactory.h>
#include <Functions/FunctionHelpers.h>
#include <Functions/IFunction.h>
-#include <typeinfo>
namespace DB
{
diff --git a/cpp-ch/local-engine/Functions/SparkFunctionFloor.h
b/cpp-ch/local-engine/Functions/SparkFunctionFloor.h
index a2db1083e1..a56c33badd 100644
--- a/cpp-ch/local-engine/Functions/SparkFunctionFloor.h
+++ b/cpp-ch/local-engine/Functions/SparkFunctionFloor.h
@@ -18,6 +18,7 @@
#include <Columns/ColumnNullable.h>
#include <Columns/ColumnVector.h>
+#include <DataTypes/DataTypeNullable.h>
#include <DataTypes/DataTypesNumber.h>
#include <DataTypes/IDataType.h>
#include <Functions/FunctionFactory.h>
diff --git a/cpp-ch/local-engine/Functions/SparkFunctionMakeDecimal.cpp
b/cpp-ch/local-engine/Functions/SparkFunctionMakeDecimal.cpp
index f136f587c5..7ffb390bc8 100644
--- a/cpp-ch/local-engine/Functions/SparkFunctionMakeDecimal.cpp
+++ b/cpp-ch/local-engine/Functions/SparkFunctionMakeDecimal.cpp
@@ -16,6 +16,8 @@
*/
#include <Columns/ColumnNullable.h>
#include <Core/DecimalFunctions.h>
+#include <Core/callOnTypeIndex.h>
+#include <DataTypes/DataTypeNullable.h>
#include <DataTypes/DataTypesDecimal.h>
#include <Functions/FunctionFactory.h>
#include <Functions/FunctionHelpers.h>
diff --git a/cpp-ch/local-engine/Functions/SparkFunctionMapToString.h
b/cpp-ch/local-engine/Functions/SparkFunctionMapToString.h
index 739f9536d6..6c49d3c18d 100644
--- a/cpp-ch/local-engine/Functions/SparkFunctionMapToString.h
+++ b/cpp-ch/local-engine/Functions/SparkFunctionMapToString.h
@@ -15,10 +15,11 @@
* limitations under the License.
*/
#pragma once
-#include <memory>
+
#include <Columns/ColumnMap.h>
#include <Columns/ColumnNullable.h>
#include <Columns/ColumnStringHelpers.h>
+#include <Columns/ColumnTuple.h>
#include <Columns/ColumnsNumber.h>
#include <DataTypes/DataTypeNullable.h>
#include <DataTypes/DataTypeString.h>
diff --git a/cpp-ch/local-engine/Functions/SparkFunctionToDateTime.h
b/cpp-ch/local-engine/Functions/SparkFunctionToDateTime.h
index 15c23041d9..aae0a359f5 100644
--- a/cpp-ch/local-engine/Functions/SparkFunctionToDateTime.h
+++ b/cpp-ch/local-engine/Functions/SparkFunctionToDateTime.h
@@ -19,6 +19,7 @@
#include <Columns/ColumnsDateTime.h>
#include <Columns/ColumnsNumber.h>
#include <DataTypes/DataTypeDateTime64.h>
+#include <DataTypes/DataTypeNullable.h>
#include <Functions/FunctionFactory.h>
#include <Functions/FunctionHelpers.h>
#include <Functions/extractTimeZoneFromFunctionArguments.h>
diff --git a/cpp-ch/local-engine/Functions/SparkFunctionTupleElement.cpp
b/cpp-ch/local-engine/Functions/SparkFunctionTupleElement.cpp
index 53c48b97c7..d52abde2cc 100644
--- a/cpp-ch/local-engine/Functions/SparkFunctionTupleElement.cpp
+++ b/cpp-ch/local-engine/Functions/SparkFunctionTupleElement.cpp
@@ -16,17 +16,18 @@
*/
#include <memory>
#include <Columns/ColumnArray.h>
+#include <Columns/ColumnNullable.h>
#include <Columns/ColumnString.h>
#include <Columns/ColumnTuple.h>
#include <Columns/ColumnsNumber.h>
#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeNullable.h>
#include <DataTypes/DataTypeTuple.h>
#include <DataTypes/IDataType.h>
#include <Functions/FunctionFactory.h>
#include <Functions/FunctionHelpers.h>
#include <Functions/IFunction.h>
#include <Common/assert_cast.h>
-#include "Columns/ColumnNullable.h"
namespace DB
diff --git a/cpp-ch/local-engine/Functions/SparkFunctionUnscaleValue.cpp
b/cpp-ch/local-engine/Functions/SparkFunctionUnscaleValue.cpp
index 33ec2e308a..c964482c89 100644
--- a/cpp-ch/local-engine/Functions/SparkFunctionUnscaleValue.cpp
+++ b/cpp-ch/local-engine/Functions/SparkFunctionUnscaleValue.cpp
@@ -15,6 +15,7 @@
* limitations under the License.
*/
#include <Columns/ColumnConst.h>
+#include <Core/callOnTypeIndex.h>
#include <DataTypes/DataTypesDecimal.h>
#include <Functions/FunctionFactory.h>
#include <Functions/FunctionHelpers.h>
diff --git a/cpp-ch/local-engine/Operator/AdvancedExpandStep.cpp
b/cpp-ch/local-engine/Operator/AdvancedExpandStep.cpp
index 72721ce859..458e8d5a7c 100644
--- a/cpp-ch/local-engine/Operator/AdvancedExpandStep.cpp
+++ b/cpp-ch/local-engine/Operator/AdvancedExpandStep.cpp
@@ -16,8 +16,9 @@
*/
#include "AdvancedExpandStep.h"
+
+#include <Columns/ColumnAggregateFunction.h>
#include <Columns/ColumnNullable.h>
-#include <Columns/ColumnsNumber.h>
#include <Columns/IColumn.h>
#include <Core/Settings.h>
#include <DataTypes/DataTypeNullable.h>
@@ -27,14 +28,11 @@
#include <Interpreters/castColumn.h>
#include <Operator/StreamingAggregatingStep.h>
#include <Processors/ResizeProcessor.h>
-#include <Processors/Transforms/ExpressionTransform.h>
#include <QueryPipeline/Pipe.h>
#include <QueryPipeline/QueryPipelineBuilder.h>
+#include <Poco/Logger.h>
#include <Common/AggregateUtil.h>
#include <Common/CHUtil.h>
-#include <Common/WeakHash.h>
-
-#include <Poco/Logger.h>
#include <Common/logger_useful.h>
namespace local_engine
diff --git a/cpp-ch/local-engine/Operator/PartitionColumnFillingTransform.cpp
b/cpp-ch/local-engine/Operator/PartitionColumnFillingTransform.cpp
index ab87e1b39b..d0e2a4b3b6 100644
--- a/cpp-ch/local-engine/Operator/PartitionColumnFillingTransform.cpp
+++ b/cpp-ch/local-engine/Operator/PartitionColumnFillingTransform.cpp
@@ -15,8 +15,9 @@
* limitations under the License.
*/
#include "PartitionColumnFillingTransform.h"
-#include <Columns/ColumnNullable.h>
+
#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeNullable.h>
#include <DataTypes/DataTypesNumber.h>
#include <Functions/FunctionHelpers.h>
#include <IO/ReadBufferFromString.h>
diff --git a/cpp-ch/local-engine/Operator/ReplicateRowsStep.cpp
b/cpp-ch/local-engine/Operator/ReplicateRowsStep.cpp
index 705e413675..5281ce4a5f 100644
--- a/cpp-ch/local-engine/Operator/ReplicateRowsStep.cpp
+++ b/cpp-ch/local-engine/Operator/ReplicateRowsStep.cpp
@@ -16,8 +16,7 @@
*/
#include "ReplicateRowsStep.h"
-#include <iostream>
-
+#include <Columns/IColumn.h>
#include <QueryPipeline/QueryPipelineBuilder.h>
namespace DB
diff --git a/cpp-ch/local-engine/Operator/WindowGroupLimitStep.cpp
b/cpp-ch/local-engine/Operator/WindowGroupLimitStep.cpp
index d2264e24dc..a0b623b7cc 100644
--- a/cpp-ch/local-engine/Operator/WindowGroupLimitStep.cpp
+++ b/cpp-ch/local-engine/Operator/WindowGroupLimitStep.cpp
@@ -17,6 +17,7 @@
#include "WindowGroupLimitStep.h"
+#include <Columns/IColumn.h>
#include <Processors/Chunk.h>
#include <Processors/IProcessor.h>
#include <QueryPipeline/QueryPipelineBuilder.h>
diff --git a/cpp-ch/local-engine/Parser/AggregateFunctionParser.cpp
b/cpp-ch/local-engine/Parser/AggregateFunctionParser.cpp
index e02af53d37..696f5352f2 100644
--- a/cpp-ch/local-engine/Parser/AggregateFunctionParser.cpp
+++ b/cpp-ch/local-engine/Parser/AggregateFunctionParser.cpp
@@ -18,6 +18,7 @@
#include <AggregateFunctions/AggregateFunctionFactory.h>
#include <DataTypes/DataTypeAggregateFunction.h>
+#include <DataTypes/DataTypeNullable.h>
#include <DataTypes/DataTypeTuple.h>
#include <DataTypes/DataTypesNumber.h>
#include <Functions/FunctionHelpers.h>
diff --git a/cpp-ch/local-engine/Parser/RelParsers/ExpandRelParser.cpp
b/cpp-ch/local-engine/Parser/RelParsers/ExpandRelParser.cpp
index f3d8b4ab11..7d31fcf2bc 100644
--- a/cpp-ch/local-engine/Parser/RelParsers/ExpandRelParser.cpp
+++ b/cpp-ch/local-engine/Parser/RelParsers/ExpandRelParser.cpp
@@ -15,8 +15,9 @@
* limitations under the License.
*/
#include "ExpandRelParser.h"
-#include <ratio>
+
#include <vector>
+#include <Columns/ColumnAggregateFunction.h>
#include <Core/Block.h>
#include <Core/ColumnWithTypeAndName.h>
#include <Operator/AdvancedExpandStep.h>
@@ -41,9 +42,7 @@ ExpandRelParser::ExpandRelParser(ParserContextPtr
parser_context_) : RelParser(p
void updateType(DB::DataTypePtr & type, const DB::DataTypePtr & new_type)
{
if (type == nullptr || (!type->isNullable() && new_type->isNullable()))
- {
type = new_type;
- }
}
DB::QueryPlanPtr
@@ -91,7 +90,8 @@ ExpandField ExpandRelParser::buildExpandField(const DB::Block
& header, const su
fields.push_back(field);
if (field >= header.columns())
{
- throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "Field
index out of range: {}, header: {}", field, header.dumpStructure());
+ throw DB::Exception(
+ DB::ErrorCodes::LOGICAL_ERROR, "Field index out of
range: {}, header: {}", field, header.dumpStructure());
}
updateType(types[i], header.getByPosition(field).type);
const auto & name = header.getByPosition(field).name;
@@ -128,10 +128,8 @@ ExpandField ExpandRelParser::buildExpandField(const
DB::Block & header, const su
}
for (int i = 0; i < names.size(); ++i)
- {
if (names[i].empty())
names[i] = getUniqueName("expand_" + std::to_string(i));
- }
ExpandField expand_field(names, types, expand_kinds, expand_fields);
return expand_field;
@@ -144,10 +142,8 @@ bool ExpandRelParser::isLazyAggregateExpand(const
substrait::ExpandRel & expand_
return false;
const auto & aggregate_rel = input_rel.aggregate();
for (const auto & measure : aggregate_rel.measures())
- {
if (measure.measure().phase() !=
substrait::AggregationPhase::AGGREGATION_PHASE_INITIAL_TO_INTERMEDIATE)
return false;
- }
return true;
}
@@ -172,7 +168,7 @@ DB::QueryPlanPtr ExpandRelParser::lazyAggregateExpandParse(
auto aggregate_rel = rel.expand().input().aggregate();
auto aggregate_descriptions = buildAggregations(input_header,
expand_field, aggregate_rel);
- size_t grouping_keys =
aggregate_rel.groupings(0).grouping_expressions_size();
+ size_t grouping_keys =
aggregate_rel.groupings(0).grouping_expressions_size();
auto expand_step
= std::make_unique<AdvancedExpandStep>(getContext(), input_header,
grouping_keys, aggregate_descriptions, expand_field);
@@ -189,10 +185,8 @@ DB::AggregateDescriptions
ExpandRelParser::buildAggregations(
DB::AggregateDescriptions descriptions;
DB::ColumnsWithTypeAndName aggregate_columns;
for (const auto & col : header.getColumnsWithTypeAndName())
- {
if (typeid_cast<const DB::ColumnAggregateFunction *>(col.column.get()))
aggregate_columns.push_back(col);
- }
for (size_t i = 0; i < aggregate_rel.measures_size(); ++i)
{
diff --git a/cpp-ch/local-engine/Parser/RelParsers/ReadRelParser.cpp
b/cpp-ch/local-engine/Parser/RelParsers/ReadRelParser.cpp
index 0a663a88a6..8056d26b2e 100644
--- a/cpp-ch/local-engine/Parser/RelParsers/ReadRelParser.cpp
+++ b/cpp-ch/local-engine/Parser/RelParsers/ReadRelParser.cpp
@@ -19,6 +19,7 @@
#include <memory>
#include <Core/Block.h>
#include <Core/Settings.h>
+#include <IO/ReadBufferFromString.h>
#include <Interpreters/Context.h>
#include <Operator/BlocksBufferPoolTransform.h>
#include <Parser/RelParsers/MergeTreeRelParser.h>
@@ -47,7 +48,8 @@ extern const int LOGICAL_ERROR;
namespace local_engine
{
using namespace DB;
-DB::QueryPlanPtr ReadRelParser::parse(DB::QueryPlanPtr query_plan, const
substrait::Rel & rel, std::list<const substrait::Rel *> & rel_stack)
+DB::QueryPlanPtr
+ReadRelParser::parse(DB::QueryPlanPtr query_plan, const substrait::Rel & rel,
std::list<const substrait::Rel *> & rel_stack)
{
if (query_plan)
throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "Source node's
input plan should be null");
diff --git a/cpp-ch/local-engine/Shuffle/PartitionWriter.cpp
b/cpp-ch/local-engine/Shuffle/PartitionWriter.cpp
index 158f1a9cfa..ebda09a4e6 100644
--- a/cpp-ch/local-engine/Shuffle/PartitionWriter.cpp
+++ b/cpp-ch/local-engine/Shuffle/PartitionWriter.cpp
@@ -31,6 +31,7 @@
#include <boost/algorithm/string/case_conv.hpp>
#include <Common/Stopwatch.h>
#include <Common/ThreadPool.h>
+#include <Common/logger_useful.h>
namespace DB
{
diff --git a/cpp-ch/local-engine/Shuffle/SelectorBuilder.h
b/cpp-ch/local-engine/Shuffle/SelectorBuilder.h
index 7349849f53..b972e0a516 100644
--- a/cpp-ch/local-engine/Shuffle/SelectorBuilder.h
+++ b/cpp-ch/local-engine/Shuffle/SelectorBuilder.h
@@ -17,17 +17,15 @@
#pragma once
#include <memory>
#include <vector>
+#include <Columns/IColumn.h>
#include <Core/Block.h>
-#include <Core/ColumnWithTypeAndName.h>
#include <Core/SortDescription.h>
#include <Functions/IFunction.h>
-#include <Interpreters/ActionsDAG.h>
#include <Interpreters/ExpressionActions.h>
#include <Processors/Chunk.h>
#include <base/types.h>
#include <substrait/plan.pb.h>
#include <Poco/JSON/Array.h>
-#include <Common/BlockIterator.h>
#include <Common/PODArray.h>
namespace local_engine
diff --git a/cpp-ch/local-engine/Storages/Output/NormalFileWriter.cpp
b/cpp-ch/local-engine/Storages/Output/NormalFileWriter.cpp
index 1f3d7f0b25..546a29be71 100644
--- a/cpp-ch/local-engine/Storages/Output/NormalFileWriter.cpp
+++ b/cpp-ch/local-engine/Storages/Output/NormalFileWriter.cpp
@@ -19,6 +19,8 @@
#include <Columns/ColumnArray.h>
#include <Columns/ColumnConst.h>
#include <Columns/ColumnMap.h>
+#include <Columns/ColumnTuple.h>
+#include <Interpreters/castColumn.h>
#include <QueryPipeline/QueryPipeline.h>
#include <Poco/URI.h>
#include <Common/DebugUtils.h>
diff --git a/cpp-ch/local-engine/Storages/Output/NormalFileWriter.h
b/cpp-ch/local-engine/Storages/Output/NormalFileWriter.h
index d12ccaae60..c337a50f75 100644
--- a/cpp-ch/local-engine/Storages/Output/NormalFileWriter.h
+++ b/cpp-ch/local-engine/Storages/Output/NormalFileWriter.h
@@ -16,6 +16,7 @@
*/
#pragma once
+#include <Columns/ColumnNullable.h>
#include <Core/Block.h>
#include <Core/Field.h>
#include <Interpreters/Context.h>
diff --git
a/cpp-ch/local-engine/Storages/Serializations/ExcelDecimalSerialization.h
b/cpp-ch/local-engine/Storages/Serializations/ExcelDecimalSerialization.h
index 351e4458ab..29bafe0a90 100644
--- a/cpp-ch/local-engine/Storages/Serializations/ExcelDecimalSerialization.h
+++ b/cpp-ch/local-engine/Storages/Serializations/ExcelDecimalSerialization.h
@@ -19,6 +19,14 @@
#include <DataTypes/Serializations/SerializationNumber.h>
#include <Common/DateLUTImpl.h>
+namespace DB
+{
+namespace ErrorCodes
+{
+extern const int NOT_IMPLEMENTED;
+}
+}
+
namespace local_engine
{
diff --git a/cpp-ch/local-engine/Storages/Serializations/ExcelSerialization.h
b/cpp-ch/local-engine/Storages/Serializations/ExcelSerialization.h
index a7215b3490..f55d7df9cb 100644
--- a/cpp-ch/local-engine/Storages/Serializations/ExcelSerialization.h
+++ b/cpp-ch/local-engine/Storages/Serializations/ExcelSerialization.h
@@ -26,6 +26,7 @@ namespace DB
namespace ErrorCodes
{
extern const int ATTEMPT_TO_READ_AFTER_EOF;
+ extern const int NOT_IMPLEMENTED;
}
}
diff --git a/cpp-ch/local-engine/Storages/SubstraitSource/FormatFile.cpp
b/cpp-ch/local-engine/Storages/SubstraitSource/FormatFile.cpp
index 0fb5294e60..cc63667856 100644
--- a/cpp-ch/local-engine/Storages/SubstraitSource/FormatFile.cpp
+++ b/cpp-ch/local-engine/Storages/SubstraitSource/FormatFile.cpp
@@ -17,6 +17,7 @@
#include "FormatFile.h"
#include <Core/Settings.h>
#include <IO/ReadBufferFromFile.h>
+#include <IO/ReadBufferFromString.h>
#include <Storages/SubstraitSource/JSONFormatFile.h>
#include <boost/algorithm/string/case_conv.hpp>
#include <Common/GlutenConfig.h>
diff --git a/cpp-ch/local-engine/tests/gtest_transformer.cpp
b/cpp-ch/local-engine/tests/gtest_transformer.cpp
index a4d62d5681..d6ed2d8ef8 100644
--- a/cpp-ch/local-engine/tests/gtest_transformer.cpp
+++ b/cpp-ch/local-engine/tests/gtest_transformer.cpp
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#include <Columns/IColumn.h>
#include <Core/Field.h>
#include <DataTypes/DataTypeFactory.h>
#include <Operator/PartitionColumnFillingTransform.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
