Skip to content

Commit 9d23b46

Browse files
kyligence-gitkyligence-gitbaibaichen
authored
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20250207) (#8681)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250207) * Fix build due to ClickHouse/ClickHouse#75299 * Fix build due to ClickHouse/ClickHouse#75636 --------- Co-authored-by: kyligence-git <gluten@kyligence.io> Co-authored-by: Chang Chen <baibaichen@gmail.com>
1 parent 6cb0b56 commit 9d23b46

27 files changed

+58
-38
lines changed

cpp-ch/clickhouse.version

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
CH_ORG=Kyligence
2-
CH_BRANCH=rebase_ch/20250205
3-
CH_COMMIT=c1451130e6d
2+
CH_BRANCH=rebase_ch/20250207
3+
CH_COMMIT=b6c11f40aed

cpp-ch/local-engine/Common/ChunkBuffer.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
*/
1717
#include "ChunkBuffer.h"
1818

19+
#include <Columns/IColumn.h>
20+
1921
namespace local_engine
2022
{
2123
void ChunkBuffer::add(DB::Chunk & columns, int start, int end)

cpp-ch/local-engine/Functions/FunctionsBloomFilter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
#include <cstddef>
2020
#include <memory>
21-
#include <type_traits>
2221
#include <AggregateFunctions/AggregateFunctionFactory.h>
2322
#include <AggregateFunctions/AggregateFunctionGroupBloomFilter.h>
2423
#include <AggregateFunctions/IAggregateFunction_fwd.h>
@@ -31,6 +30,7 @@
3130
#include <Columns/IColumn.h>
3231
#include <Core/TypeId.h>
3332
#include <DataTypes/DataTypeAggregateFunction.h>
33+
#include <DataTypes/DataTypeNullable.h>
3434
#include <DataTypes/DataTypesNumber.h>
3535
#include <DataTypes/IDataType.h>
3636
#include <Functions/FunctionHelpers.h>

cpp-ch/local-engine/Functions/SparkArrayFlatten.cpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
#include <Functions/IFunction.h>
18-
#include <Functions/FunctionFactory.h>
19-
#include <Functions/FunctionHelpers.h>
20-
#include <DataTypes/DataTypeArray.h>
2117
#include <Columns/ColumnArray.h>
2218
#include <Columns/ColumnNullable.h>
19+
#include <DataTypes/DataTypeArray.h>
20+
#include <DataTypes/DataTypeNullable.h>
21+
#include <Functions/FunctionFactory.h>
22+
#include <Functions/FunctionHelpers.h>
23+
#include <Functions/IFunction.h>
2324

2425

2526
namespace DB

cpp-ch/local-engine/Functions/SparkFunctionArraySort.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
#include <Functions/FunctionHelpers.h>
18-
#include <Functions/FunctionFactory.h>
1917
#include <Columns/ColumnArray.h>
2018
#include <Columns/ColumnFunction.h>
2119
#include <Columns/ColumnNullable.h>
22-
#include <Common/Exception.h>
2320
#include <DataTypes/DataTypeArray.h>
2421
#include <DataTypes/DataTypeFunction.h>
2522
#include <DataTypes/DataTypeLowCardinality.h>
26-
#include <Poco/Logger.h>
27-
#include <Common/logger_useful.h>
23+
#include <DataTypes/DataTypeNullable.h>
24+
#include <Functions/FunctionFactory.h>
25+
#include <Functions/FunctionHelpers.h>
2826
#include <base/sort.h>
27+
#include <Common/Exception.h>
28+
#include <Common/logger_useful.h>
2929

3030
namespace DB::ErrorCodes
3131
{

cpp-ch/local-engine/Functions/SparkFunctionCheckDecimalOverflow.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,17 @@
1616
*/
1717
#include "SparkFunctionCheckDecimalOverflow.h"
1818

19+
#include <typeinfo>
1920
#include <Columns/ColumnDecimal.h>
2021
#include <Columns/ColumnNullable.h>
2122
#include <Columns/ColumnsNumber.h>
2223
#include <Core/DecimalFunctions.h>
24+
#include <Core/callOnTypeIndex.h>
2325
#include <DataTypes/DataTypeNullable.h>
2426
#include <DataTypes/DataTypesDecimal.h>
2527
#include <Functions/FunctionFactory.h>
2628
#include <Functions/FunctionHelpers.h>
2729
#include <Functions/IFunction.h>
28-
#include <typeinfo>
2930

3031
namespace DB
3132
{

cpp-ch/local-engine/Functions/SparkFunctionFloor.h

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
#include <Columns/ColumnNullable.h>
2020
#include <Columns/ColumnVector.h>
21+
#include <DataTypes/DataTypeNullable.h>
2122
#include <DataTypes/DataTypesNumber.h>
2223
#include <DataTypes/IDataType.h>
2324
#include <Functions/FunctionFactory.h>

cpp-ch/local-engine/Functions/SparkFunctionMakeDecimal.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
*/
1717
#include <Columns/ColumnNullable.h>
1818
#include <Core/DecimalFunctions.h>
19+
#include <Core/callOnTypeIndex.h>
20+
#include <DataTypes/DataTypeNullable.h>
1921
#include <DataTypes/DataTypesDecimal.h>
2022
#include <Functions/FunctionFactory.h>
2123
#include <Functions/FunctionHelpers.h>

cpp-ch/local-engine/Functions/SparkFunctionMapToString.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515
* limitations under the License.
1616
*/
1717
#pragma once
18-
#include <memory>
18+
1919
#include <Columns/ColumnMap.h>
2020
#include <Columns/ColumnNullable.h>
2121
#include <Columns/ColumnStringHelpers.h>
22+
#include <Columns/ColumnTuple.h>
2223
#include <Columns/ColumnsNumber.h>
2324
#include <DataTypes/DataTypeNullable.h>
2425
#include <DataTypes/DataTypeString.h>

cpp-ch/local-engine/Functions/SparkFunctionToDateTime.h

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <Columns/ColumnsDateTime.h>
2020
#include <Columns/ColumnsNumber.h>
2121
#include <DataTypes/DataTypeDateTime64.h>
22+
#include <DataTypes/DataTypeNullable.h>
2223
#include <Functions/FunctionFactory.h>
2324
#include <Functions/FunctionHelpers.h>
2425
#include <Functions/extractTimeZoneFromFunctionArguments.h>

cpp-ch/local-engine/Functions/SparkFunctionTupleElement.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,18 @@
1616
*/
1717
#include <memory>
1818
#include <Columns/ColumnArray.h>
19+
#include <Columns/ColumnNullable.h>
1920
#include <Columns/ColumnString.h>
2021
#include <Columns/ColumnTuple.h>
2122
#include <Columns/ColumnsNumber.h>
2223
#include <DataTypes/DataTypeArray.h>
24+
#include <DataTypes/DataTypeNullable.h>
2325
#include <DataTypes/DataTypeTuple.h>
2426
#include <DataTypes/IDataType.h>
2527
#include <Functions/FunctionFactory.h>
2628
#include <Functions/FunctionHelpers.h>
2729
#include <Functions/IFunction.h>
2830
#include <Common/assert_cast.h>
29-
#include "Columns/ColumnNullable.h"
3031

3132

3233
namespace DB

cpp-ch/local-engine/Functions/SparkFunctionUnscaleValue.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* limitations under the License.
1616
*/
1717
#include <Columns/ColumnConst.h>
18+
#include <Core/callOnTypeIndex.h>
1819
#include <DataTypes/DataTypesDecimal.h>
1920
#include <Functions/FunctionFactory.h>
2021
#include <Functions/FunctionHelpers.h>

cpp-ch/local-engine/Operator/AdvancedExpandStep.cpp

+3-5
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
*/
1717

1818
#include "AdvancedExpandStep.h"
19+
20+
#include <Columns/ColumnAggregateFunction.h>
1921
#include <Columns/ColumnNullable.h>
20-
#include <Columns/ColumnsNumber.h>
2122
#include <Columns/IColumn.h>
2223
#include <Core/Settings.h>
2324
#include <DataTypes/DataTypeNullable.h>
@@ -27,14 +28,11 @@
2728
#include <Interpreters/castColumn.h>
2829
#include <Operator/StreamingAggregatingStep.h>
2930
#include <Processors/ResizeProcessor.h>
30-
#include <Processors/Transforms/ExpressionTransform.h>
3131
#include <QueryPipeline/Pipe.h>
3232
#include <QueryPipeline/QueryPipelineBuilder.h>
33+
#include <Poco/Logger.h>
3334
#include <Common/AggregateUtil.h>
3435
#include <Common/CHUtil.h>
35-
#include <Common/WeakHash.h>
36-
37-
#include <Poco/Logger.h>
3836
#include <Common/logger_useful.h>
3937

4038
namespace local_engine

cpp-ch/local-engine/Operator/PartitionColumnFillingTransform.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
* limitations under the License.
1616
*/
1717
#include "PartitionColumnFillingTransform.h"
18-
#include <Columns/ColumnNullable.h>
18+
1919
#include <Columns/ColumnsNumber.h>
20+
#include <DataTypes/DataTypeNullable.h>
2021
#include <DataTypes/DataTypesNumber.h>
2122
#include <Functions/FunctionHelpers.h>
2223
#include <IO/ReadBufferFromString.h>

cpp-ch/local-engine/Operator/ReplicateRowsStep.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
*/
1717
#include "ReplicateRowsStep.h"
1818

19-
#include <iostream>
20-
19+
#include <Columns/IColumn.h>
2120
#include <QueryPipeline/QueryPipelineBuilder.h>
2221

2322
namespace DB

cpp-ch/local-engine/Operator/WindowGroupLimitStep.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
#include "WindowGroupLimitStep.h"
1919

20+
#include <Columns/IColumn.h>
2021
#include <Processors/Chunk.h>
2122
#include <Processors/IProcessor.h>
2223
#include <QueryPipeline/QueryPipelineBuilder.h>

cpp-ch/local-engine/Parser/AggregateFunctionParser.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
#include <AggregateFunctions/AggregateFunctionFactory.h>
2020
#include <DataTypes/DataTypeAggregateFunction.h>
21+
#include <DataTypes/DataTypeNullable.h>
2122
#include <DataTypes/DataTypeTuple.h>
2223
#include <DataTypes/DataTypesNumber.h>
2324
#include <Functions/FunctionHelpers.h>

cpp-ch/local-engine/Parser/RelParsers/ExpandRelParser.cpp

+5-11
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
* limitations under the License.
1616
*/
1717
#include "ExpandRelParser.h"
18-
#include <ratio>
18+
1919
#include <vector>
20+
#include <Columns/ColumnAggregateFunction.h>
2021
#include <Core/Block.h>
2122
#include <Core/ColumnWithTypeAndName.h>
2223
#include <Operator/AdvancedExpandStep.h>
@@ -41,9 +42,7 @@ ExpandRelParser::ExpandRelParser(ParserContextPtr parser_context_) : RelParser(p
4142
void updateType(DB::DataTypePtr & type, const DB::DataTypePtr & new_type)
4243
{
4344
if (type == nullptr || (!type->isNullable() && new_type->isNullable()))
44-
{
4545
type = new_type;
46-
}
4746
}
4847

4948
DB::QueryPlanPtr
@@ -91,7 +90,8 @@ ExpandField ExpandRelParser::buildExpandField(const DB::Block & header, const su
9190
fields.push_back(field);
9291
if (field >= header.columns())
9392
{
94-
throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "Field index out of range: {}, header: {}", field, header.dumpStructure());
93+
throw DB::Exception(
94+
DB::ErrorCodes::LOGICAL_ERROR, "Field index out of range: {}, header: {}", field, header.dumpStructure());
9595
}
9696
updateType(types[i], header.getByPosition(field).type);
9797
const auto & name = header.getByPosition(field).name;
@@ -128,10 +128,8 @@ ExpandField ExpandRelParser::buildExpandField(const DB::Block & header, const su
128128
}
129129

130130
for (int i = 0; i < names.size(); ++i)
131-
{
132131
if (names[i].empty())
133132
names[i] = getUniqueName("expand_" + std::to_string(i));
134-
}
135133

136134
ExpandField expand_field(names, types, expand_kinds, expand_fields);
137135
return expand_field;
@@ -144,10 +142,8 @@ bool ExpandRelParser::isLazyAggregateExpand(const substrait::ExpandRel & expand_
144142
return false;
145143
const auto & aggregate_rel = input_rel.aggregate();
146144
for (const auto & measure : aggregate_rel.measures())
147-
{
148145
if (measure.measure().phase() != substrait::AggregationPhase::AGGREGATION_PHASE_INITIAL_TO_INTERMEDIATE)
149146
return false;
150-
}
151147
return true;
152148
}
153149

@@ -172,7 +168,7 @@ DB::QueryPlanPtr ExpandRelParser::lazyAggregateExpandParse(
172168
auto aggregate_rel = rel.expand().input().aggregate();
173169
auto aggregate_descriptions = buildAggregations(input_header, expand_field, aggregate_rel);
174170

175-
size_t grouping_keys = aggregate_rel.groupings(0).grouping_expressions_size();
171+
size_t grouping_keys = aggregate_rel.groupings(0).grouping_expressions_size();
176172

177173
auto expand_step
178174
= std::make_unique<AdvancedExpandStep>(getContext(), input_header, grouping_keys, aggregate_descriptions, expand_field);
@@ -189,10 +185,8 @@ DB::AggregateDescriptions ExpandRelParser::buildAggregations(
189185
DB::AggregateDescriptions descriptions;
190186
DB::ColumnsWithTypeAndName aggregate_columns;
191187
for (const auto & col : header.getColumnsWithTypeAndName())
192-
{
193188
if (typeid_cast<const DB::ColumnAggregateFunction *>(col.column.get()))
194189
aggregate_columns.push_back(col);
195-
}
196190

197191
for (size_t i = 0; i < aggregate_rel.measures_size(); ++i)
198192
{

cpp-ch/local-engine/Parser/RelParsers/ReadRelParser.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <memory>
2020
#include <Core/Block.h>
2121
#include <Core/Settings.h>
22+
#include <IO/ReadBufferFromString.h>
2223
#include <Interpreters/Context.h>
2324
#include <Operator/BlocksBufferPoolTransform.h>
2425
#include <Parser/RelParsers/MergeTreeRelParser.h>
@@ -47,7 +48,8 @@ extern const int LOGICAL_ERROR;
4748
namespace local_engine
4849
{
4950
using namespace DB;
50-
DB::QueryPlanPtr ReadRelParser::parse(DB::QueryPlanPtr query_plan, const substrait::Rel & rel, std::list<const substrait::Rel *> & rel_stack)
51+
DB::QueryPlanPtr
52+
ReadRelParser::parse(DB::QueryPlanPtr query_plan, const substrait::Rel & rel, std::list<const substrait::Rel *> & rel_stack)
5153
{
5254
if (query_plan)
5355
throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "Source node's input plan should be null");

cpp-ch/local-engine/Shuffle/PartitionWriter.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include <boost/algorithm/string/case_conv.hpp>
3232
#include <Common/Stopwatch.h>
3333
#include <Common/ThreadPool.h>
34+
#include <Common/logger_useful.h>
3435

3536
namespace DB
3637
{

cpp-ch/local-engine/Shuffle/SelectorBuilder.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,15 @@
1717
#pragma once
1818
#include <memory>
1919
#include <vector>
20+
#include <Columns/IColumn.h>
2021
#include <Core/Block.h>
21-
#include <Core/ColumnWithTypeAndName.h>
2222
#include <Core/SortDescription.h>
2323
#include <Functions/IFunction.h>
24-
#include <Interpreters/ActionsDAG.h>
2524
#include <Interpreters/ExpressionActions.h>
2625
#include <Processors/Chunk.h>
2726
#include <base/types.h>
2827
#include <substrait/plan.pb.h>
2928
#include <Poco/JSON/Array.h>
30-
#include <Common/BlockIterator.h>
3129
#include <Common/PODArray.h>
3230

3331
namespace local_engine

cpp-ch/local-engine/Storages/Output/NormalFileWriter.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
#include <Columns/ColumnArray.h>
2020
#include <Columns/ColumnConst.h>
2121
#include <Columns/ColumnMap.h>
22+
#include <Columns/ColumnTuple.h>
23+
#include <Interpreters/castColumn.h>
2224
#include <QueryPipeline/QueryPipeline.h>
2325
#include <Poco/URI.h>
2426
#include <Common/DebugUtils.h>

cpp-ch/local-engine/Storages/Output/NormalFileWriter.h

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
#pragma once
1818

19+
#include <Columns/ColumnNullable.h>
1920
#include <Core/Block.h>
2021
#include <Core/Field.h>
2122
#include <Interpreters/Context.h>

cpp-ch/local-engine/Storages/Serializations/ExcelDecimalSerialization.h

+8
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@
1919
#include <DataTypes/Serializations/SerializationNumber.h>
2020
#include <Common/DateLUTImpl.h>
2121

22+
namespace DB
23+
{
24+
namespace ErrorCodes
25+
{
26+
extern const int NOT_IMPLEMENTED;
27+
}
28+
}
29+
2230
namespace local_engine
2331
{
2432

cpp-ch/local-engine/Storages/Serializations/ExcelSerialization.h

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ namespace DB
2626
namespace ErrorCodes
2727
{
2828
extern const int ATTEMPT_TO_READ_AFTER_EOF;
29+
extern const int NOT_IMPLEMENTED;
2930
}
3031
}
3132

cpp-ch/local-engine/Storages/SubstraitSource/FormatFile.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "FormatFile.h"
1818
#include <Core/Settings.h>
1919
#include <IO/ReadBufferFromFile.h>
20+
#include <IO/ReadBufferFromString.h>
2021
#include <Storages/SubstraitSource/JSONFormatFile.h>
2122
#include <boost/algorithm/string/case_conv.hpp>
2223
#include <Common/GlutenConfig.h>

cpp-ch/local-engine/tests/gtest_transformer.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17+
#include <Columns/IColumn.h>
1718
#include <Core/Field.h>
1819
#include <DataTypes/DataTypeFactory.h>
1920
#include <Operator/PartitionColumnFillingTransform.h>

0 commit comments

Comments
 (0)