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 4aff8d58cf [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250301)
(#8863)
4aff8d58cf is described below
commit 4aff8d58cf2e27aa98b21715b056203421e89684
Author: Kyligence Git <[email protected]>
AuthorDate: Sat Mar 1 09:11:19 2025 -0600
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20250301) (#8863)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250301)
* Fix build due to https://github.com/ClickHouse/ClickHouse/pull/76734
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 ++--
.../local-engine/Parser/RelParsers/MergeTreeRelParser.cpp | 1 +
cpp-ch/local-engine/Parser/RelParsers/WriteRelParser.cpp | 1 +
cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.cpp | 1 +
.../local-engine/Storages/MergeTree/SparkMergeTreeSink.cpp | 1 +
cpp-ch/local-engine/Storages/Output/NormalFileWriter.cpp | 1 +
cpp-ch/local-engine/Storages/Output/NormalFileWriter.h | 6 +++---
cpp-ch/local-engine/Storages/Parquet/ColumnIndexFilter.cpp | 1 +
cpp-ch/local-engine/Storages/Parquet/ParquetConverter.h | 1 +
.../Storages/Serializations/ExcelStringReader.cpp | 14 +++++++++-----
cpp-ch/local-engine/tests/gtest_parquet_columnindex.cpp | 2 +-
cpp-ch/local-engine/tests/gtest_write_pipeline.cpp | 5 ++---
cpp-ch/local-engine/tests/utils/ReaderTestBase.cpp | 1 +
cpp-ch/local-engine/tests/utils/gluten_test_util.cpp | 1 +
14 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index c5af441e4b..aeea25d758 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20250226
-CH_COMMIT=b779d96ab91
+CH_BRANCH=rebase_ch/20250301
+CH_COMMIT=ff66eceae51
diff --git a/cpp-ch/local-engine/Parser/RelParsers/MergeTreeRelParser.cpp
b/cpp-ch/local-engine/Parser/RelParsers/MergeTreeRelParser.cpp
index e60db1405b..7483627d29 100644
--- a/cpp-ch/local-engine/Parser/RelParsers/MergeTreeRelParser.cpp
+++ b/cpp-ch/local-engine/Parser/RelParsers/MergeTreeRelParser.cpp
@@ -24,6 +24,7 @@
#include <Parser/TypeParser.h>
#include <Storages/MergeTree/StorageMergeTreeFactory.h>
#include <boost/algorithm/string/case_conv.hpp>
+#include <boost/algorithm/string/predicate.hpp>
#include <google/protobuf/wrappers.pb.h>
#include <Poco/StringTokenizer.h>
#include <Common/BlockTypeUtils.h>
diff --git a/cpp-ch/local-engine/Parser/RelParsers/WriteRelParser.cpp
b/cpp-ch/local-engine/Parser/RelParsers/WriteRelParser.cpp
index f2bd1fa55d..d5a8dba1f5 100644
--- a/cpp-ch/local-engine/Parser/RelParsers/WriteRelParser.cpp
+++ b/cpp-ch/local-engine/Parser/RelParsers/WriteRelParser.cpp
@@ -24,6 +24,7 @@
#include <Parser/TypeParser.h>
#include <Processors/Transforms/ExpressionTransform.h>
#include <Processors/Transforms/MaterializingTransform.h>
+#include <QueryPipeline/Chain.h>
#include <QueryPipeline/QueryPipelineBuilder.h>
#include <Storages/MergeTree/SparkMergeTreeMeta.h>
#include <Storages/MergeTree/SparkMergeTreeSink.h>
diff --git a/cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.cpp
b/cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.cpp
index 196c2dd560..89758f72d1 100644
--- a/cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.cpp
+++ b/cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.cpp
@@ -17,6 +17,7 @@
#include "GlutenKafkaSource.h"
+#include <Columns/IColumn.h>
#include <Core/Settings.h>
#include <DataTypes/DataTypeNullable.h>
#include <Formats/FormatFactory.h>
diff --git a/cpp-ch/local-engine/Storages/MergeTree/SparkMergeTreeSink.cpp
b/cpp-ch/local-engine/Storages/MergeTree/SparkMergeTreeSink.cpp
index 2b50f62c74..60a8f1fad0 100644
--- a/cpp-ch/local-engine/Storages/MergeTree/SparkMergeTreeSink.cpp
+++ b/cpp-ch/local-engine/Storages/MergeTree/SparkMergeTreeSink.cpp
@@ -17,6 +17,7 @@
#include "SparkMergeTreeSink.h"
#include <Core/Settings.h>
+#include <Disks/IDiskTransaction.h>
#include <IO/copyData.h>
#include <Interpreters/MergeTreeTransaction.h>
#include <Storages/MergeTree/MetaDataHelper.h>
diff --git a/cpp-ch/local-engine/Storages/Output/NormalFileWriter.cpp
b/cpp-ch/local-engine/Storages/Output/NormalFileWriter.cpp
index 01a60b1fc7..7bb685696a 100644
--- a/cpp-ch/local-engine/Storages/Output/NormalFileWriter.cpp
+++ b/cpp-ch/local-engine/Storages/Output/NormalFileWriter.cpp
@@ -25,6 +25,7 @@
#include <QueryPipeline/QueryPipeline.h>
#include <Poco/URI.h>
#include <Common/DebugUtils.h>
+#include <Common/logger_useful.h>
namespace local_engine
{
diff --git a/cpp-ch/local-engine/Storages/Output/NormalFileWriter.h
b/cpp-ch/local-engine/Storages/Output/NormalFileWriter.h
index 160dfe8fa7..c0c762906a 100644
--- a/cpp-ch/local-engine/Storages/Output/NormalFileWriter.h
+++ b/cpp-ch/local-engine/Storages/Output/NormalFileWriter.h
@@ -34,7 +34,7 @@
#include <Common/ArenaUtils.h>
#include <Common/BlockTypeUtils.h>
#include <Common/CHUtil.h>
-#include <Common/FieldVisitorsAccurateComparison.h>
+#include <Common/FieldAccurateComparison.h>
namespace local_engine
{
@@ -149,8 +149,8 @@ struct DeltaStats
}
else
{
- min[i] = applyVisitor(DB::FieldVisitorAccurateLess(), min[i],
min_value) ? min[i] : min_value;
- max[i] = applyVisitor(DB::FieldVisitorAccurateLess(), max[i],
max_value) ? max_value : max[i];
+ min[i] = accurateLess(min[i], min_value) ? min[i] : min_value;
+ max[i] = accurateLess(max[i], max_value) ? max_value : max[i];
}
++i;
}
diff --git a/cpp-ch/local-engine/Storages/Parquet/ColumnIndexFilter.cpp
b/cpp-ch/local-engine/Storages/Parquet/ColumnIndexFilter.cpp
index c236650736..5ba358942b 100644
--- a/cpp-ch/local-engine/Storages/Parquet/ColumnIndexFilter.cpp
+++ b/cpp-ch/local-engine/Storages/Parquet/ColumnIndexFilter.cpp
@@ -18,6 +18,7 @@
#if USE_PARQUET
#include <ranges>
+#include <Interpreters/PreparedSets.h>
#include <Interpreters/Set.h>
#include <Interpreters/misc.h>
#include <Storages/MergeTree/KeyCondition.h>
diff --git a/cpp-ch/local-engine/Storages/Parquet/ParquetConverter.h
b/cpp-ch/local-engine/Storages/Parquet/ParquetConverter.h
index 10923b1bac..24dbbc90ad 100644
--- a/cpp-ch/local-engine/Storages/Parquet/ParquetConverter.h
+++ b/cpp-ch/local-engine/Storages/Parquet/ParquetConverter.h
@@ -17,6 +17,7 @@
#pragma once
#include <Columns/ColumnDecimal.h>
#include <Columns/ColumnString.h>
+#include <Columns/ColumnVector.h>
#include <Core/Field.h>
#include <base/Decimal_fwd.h>
#include <parquet/schema.h>
diff --git a/cpp-ch/local-engine/Storages/Serializations/ExcelStringReader.cpp
b/cpp-ch/local-engine/Storages/Serializations/ExcelStringReader.cpp
index 8977a4240b..52ef66bd42 100644
--- a/cpp-ch/local-engine/Storages/Serializations/ExcelStringReader.cpp
+++ b/cpp-ch/local-engine/Storages/Serializations/ExcelStringReader.cpp
@@ -16,21 +16,25 @@
*/
#include "ExcelStringReader.h"
-#include <bit>
-#include <IO/Operators.h>
#include <IO/PeekableReadBuffer.h>
+#include <IO/ReadHelpers.h>
#include <Common/PODArray.h>
#ifdef __SSE2__
-# include <emmintrin.h>
+#include <emmintrin.h>
#endif
#if defined(__aarch64__) && defined(__ARM_NEON)
-# include <arm_neon.h>
-# pragma clang diagnostic ignored "-Wreserved-identifier"
+#include <arm_neon.h>
+#pragma clang diagnostic ignored "-Wreserved-identifier"
#endif
+namespace DB::ErrorCodes
+{
+extern const int INCORRECT_DATA;
+}
+
namespace local_engine
{
using namespace DB;
diff --git a/cpp-ch/local-engine/tests/gtest_parquet_columnindex.cpp
b/cpp-ch/local-engine/tests/gtest_parquet_columnindex.cpp
index e5ac3966f1..d65a0dc265 100644
--- a/cpp-ch/local-engine/tests/gtest_parquet_columnindex.cpp
+++ b/cpp-ch/local-engine/tests/gtest_parquet_columnindex.cpp
@@ -17,13 +17,13 @@
#include "config.h"
#if USE_PARQUET
#include <charconv>
+#include <future>
#include <ranges>
#include <string>
#include <Columns/ColumnString.h>
#include <IO/ReadBufferFromFile.h>
#include <Interpreters/ActionsVisitor.h>
#include <Interpreters/Context.h>
-#include <Interpreters/ExpressionActions.h>
#include <Parsers/ExpressionListParsers.h>
#include <Storages/Parquet/ArrowUtils.h>
#include <Storages/Parquet/ColumnIndexFilter.h>
diff --git a/cpp-ch/local-engine/tests/gtest_write_pipeline.cpp
b/cpp-ch/local-engine/tests/gtest_write_pipeline.cpp
index 07249575ef..7cedb38ebb 100644
--- a/cpp-ch/local-engine/tests/gtest_write_pipeline.cpp
+++ b/cpp-ch/local-engine/tests/gtest_write_pipeline.cpp
@@ -16,16 +16,15 @@
*/
#include <incbin.h>
-
-#include "Interpreters/ExpressionActions.h"
-
#include <testConfig.h>
#include <Core/Settings.h>
#include <Disks/ObjectStorages/HDFS/HDFSObjectStorage.h>
#include <Interpreters/Context.h>
+#include <Interpreters/ExpressionActions.h>
#include <Parser/LocalExecutor.h>
#include <Parser/RelParsers/WriteRelParser.h>
#include <Parser/TypeParser.h>
+#include <Parsers/ASTCreateQuery.h>
#include <Parsers/ParserCreateQuery.h>
#include <Parsers/parseQuery.h>
#include <Processors/Chunk.h>
diff --git a/cpp-ch/local-engine/tests/utils/ReaderTestBase.cpp
b/cpp-ch/local-engine/tests/utils/ReaderTestBase.cpp
index b81a44f2b3..69def2f0c1 100644
--- a/cpp-ch/local-engine/tests/utils/ReaderTestBase.cpp
+++ b/cpp-ch/local-engine/tests/utils/ReaderTestBase.cpp
@@ -29,6 +29,7 @@
#include <Storages/SubstraitSource/FileReader.h>
#include <Storages/SubstraitSource/SubstraitFileSource.h>
#include <base/demangle.h>
+#include <Poco/Path.h>
#include <Poco/URI.h>
#include <Common/DebugUtils.h>
#include <Common/QueryContext.h>
diff --git a/cpp-ch/local-engine/tests/utils/gluten_test_util.cpp
b/cpp-ch/local-engine/tests/utils/gluten_test_util.cpp
index b9136756a7..22f88724fc 100644
--- a/cpp-ch/local-engine/tests/utils/gluten_test_util.cpp
+++ b/cpp-ch/local-engine/tests/utils/gluten_test_util.cpp
@@ -21,6 +21,7 @@
#include <IO/ReadBuffer.h>
#include <IO/ReadBufferFromFile.h>
#include <Interpreters/ActionsVisitor.h>
+#include <Interpreters/PreparedSets.h>
#include <Parser/LocalExecutor.h>
#include <Parser/ParserContext.h>
#include <Parser/SerializedPlanParser.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
