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 13cd8b1bf7 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250521)
(#9711)
13cd8b1bf7 is described below
commit 13cd8b1bf73f6076d7346bc7ead37066e5508c15
Author: Kyligence Git <[email protected]>
AuthorDate: Wed May 21 02:10:40 2025 -0500
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20250521) (#9711)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250521)
* Fix Build due to https://github.com/ClickHouse/ClickHouse/pull/80388
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 ++--
cpp-ch/local-engine/Disks/ObjectStorages/GlutenDiskHDFS.cpp | 1 +
cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.cpp | 2 +-
cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.h | 1 +
cpp-ch/local-engine/Storages/Kafka/ReadFromGlutenStorageKafka.cpp | 2 +-
cpp-ch/local-engine/Storages/MergeTree/MergeSparkMergeTreeTask.cpp | 3 ++-
cpp-ch/local-engine/Storages/MergeTree/MetaDataHelper.cpp | 3 ++-
.../Storages/SubstraitSource/Iceberg/EqualityDeleteFileReader.cpp | 1 +
cpp-ch/local-engine/tests/gtest_ch_join.cpp | 2 +-
9 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index 9ee9bc4fef..d30cccecc1 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20250520
-CH_COMMIT=dd2904640be
+CH_BRANCH=rebase_ch/20250521
+CH_COMMIT=4b92cf76f00
diff --git a/cpp-ch/local-engine/Disks/ObjectStorages/GlutenDiskHDFS.cpp
b/cpp-ch/local-engine/Disks/ObjectStorages/GlutenDiskHDFS.cpp
index fed23d7eef..0eb79541af 100644
--- a/cpp-ch/local-engine/Disks/ObjectStorages/GlutenDiskHDFS.cpp
+++ b/cpp-ch/local-engine/Disks/ObjectStorages/GlutenDiskHDFS.cpp
@@ -18,6 +18,7 @@
#include "GlutenDiskHDFS.h"
#include <ranges>
#include <Disks/ObjectStorages/CompactObjectStorageDiskTransaction.h>
+#include <Interpreters/Context.h>
#include <Common/QueryContext.h>
#include <Common/Throttler.h>
diff --git a/cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.cpp
b/cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.cpp
index 077685120f..05bba99878 100644
--- a/cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.cpp
+++ b/cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.cpp
@@ -22,6 +22,7 @@
#include <DataTypes/DataTypeNullable.h>
#include <Formats/FormatFactory.h>
#include <IO/ReadHelpers.h>
+#include <Interpreters/Context.h>
#include <Interpreters/ExpressionActions.h>
#include <Processors/Executors/StreamingFormatExecutor.h>
#include <Storages/Kafka/GlutenKafkaUtils.h>
@@ -31,7 +32,6 @@
#include <boost/algorithm/string/replace.hpp>
#include <Common/NamedCollections/NamedCollectionsFactory.h>
-
namespace ProfileEvents
{
extern const Event KafkaMessagesRead;
diff --git a/cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.h
b/cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.h
index 7763b136c5..1c208a1522 100644
--- a/cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.h
+++ b/cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.h
@@ -18,6 +18,7 @@
#pragma once
+#include <Interpreters/Context_fwd.h>
#include <Processors/ISource.h>
#include <Storages/Kafka/KafkaConsumer.h>
#include <Storages/Kafka/KafkaSettings.h>
diff --git a/cpp-ch/local-engine/Storages/Kafka/ReadFromGlutenStorageKafka.cpp
b/cpp-ch/local-engine/Storages/Kafka/ReadFromGlutenStorageKafka.cpp
index 7e304a1894..eaebeedabd 100644
--- a/cpp-ch/local-engine/Storages/Kafka/ReadFromGlutenStorageKafka.cpp
+++ b/cpp-ch/local-engine/Storages/Kafka/ReadFromGlutenStorageKafka.cpp
@@ -17,10 +17,10 @@
#include "GlutenKafkaSource.h"
#include <Core/Settings.h>
+#include <Interpreters/Context.h>
#include <QueryPipeline/QueryPipelineBuilder.h>
#include <Storages/Kafka/ReadFromGlutenStorageKafka.h>
-
namespace DB
{
namespace Setting
diff --git a/cpp-ch/local-engine/Storages/MergeTree/MergeSparkMergeTreeTask.cpp
b/cpp-ch/local-engine/Storages/MergeTree/MergeSparkMergeTreeTask.cpp
index 58e43dc12e..b10a382b89 100644
--- a/cpp-ch/local-engine/Storages/MergeTree/MergeSparkMergeTreeTask.cpp
+++ b/cpp-ch/local-engine/Storages/MergeTree/MergeSparkMergeTreeTask.cpp
@@ -16,6 +16,7 @@
*/
#include "MergeSparkMergeTreeTask.h"
+#include <Interpreters/Context.h>
#include <Interpreters/TransactionLog.h>
#include <Storages/MergeTree/Compaction/CompactionStatistics.h>
#include <Storages/MergeTree/MergeTreeData.h>
@@ -24,7 +25,6 @@
#include <Common/ProfileEvents.h>
#include <Common/ProfileEventsScope.h>
#include <Common/ThreadFuzzer.h>
-using namespace DB;
namespace DB
{
@@ -34,6 +34,7 @@ extern const int LOGICAL_ERROR;
}
}
+using namespace DB;
namespace local_engine
{
StorageID MergeSparkMergeTreeTask::getStorageID() const
diff --git a/cpp-ch/local-engine/Storages/MergeTree/MetaDataHelper.cpp
b/cpp-ch/local-engine/Storages/MergeTree/MetaDataHelper.cpp
index 402932f5d7..d87a3ddee6 100644
--- a/cpp-ch/local-engine/Storages/MergeTree/MetaDataHelper.cpp
+++ b/cpp-ch/local-engine/Storages/MergeTree/MetaDataHelper.cpp
@@ -18,6 +18,7 @@
#include <filesystem>
#include <Core/Settings.h>
#include <Disks/ObjectStorages/MetadataStorageFromDisk.h>
+#include <Interpreters/Context.h>
#include <Storages/MergeTree/MergeSparkMergeTreeTask.h>
#include <Poco/StringTokenizer.h>
#include <Common/QueryContext.h>
@@ -268,7 +269,7 @@ MergeTreeDataPartPtr mergeParts(
future_part, DB::CurrentlyMergingPartsTaggerPtr{},
std::make_shared<DB::MutationCommands>());
// Copying a vector of columns `deduplicate by columns.
- DB::IExecutableTask::TaskResultCallback f = [](bool) {};
+ DB::IExecutableTask::TaskResultCallback f = [](bool) { };
const auto task = std::make_shared<MergeSparkMergeTreeTask>(
storage, storage.getInMemoryMetadataPtr(), false,
std::vector<std::string>{}, false, entry, DB::TableLockHolder{}, f);
diff --git
a/cpp-ch/local-engine/Storages/SubstraitSource/Iceberg/EqualityDeleteFileReader.cpp
b/cpp-ch/local-engine/Storages/SubstraitSource/Iceberg/EqualityDeleteFileReader.cpp
index 8455d60bc4..8f2a7a83c5 100644
---
a/cpp-ch/local-engine/Storages/SubstraitSource/Iceberg/EqualityDeleteFileReader.cpp
+++
b/cpp-ch/local-engine/Storages/SubstraitSource/Iceberg/EqualityDeleteFileReader.cpp
@@ -21,6 +21,7 @@
#include <Columns/ColumnSet.h>
#include <DataTypes/DataTypeSet.h>
#include <Functions/FunctionFactory.h>
+#include <Interpreters/Context.h>
#include <Interpreters/ExpressionActions.h>
#include <Processors/Formats/Impl/ParquetBlockInputFormat.h>
#include <Storages/SubstraitSource/Iceberg/SimpleParquetReader.h>
diff --git a/cpp-ch/local-engine/tests/gtest_ch_join.cpp
b/cpp-ch/local-engine/tests/gtest_ch_join.cpp
index 045d8d33c1..74b04d5def 100644
--- a/cpp-ch/local-engine/tests/gtest_ch_join.cpp
+++ b/cpp-ch/local-engine/tests/gtest_ch_join.cpp
@@ -17,9 +17,9 @@
#include <Core/Settings.h>
#include <DataTypes/DataTypeFactory.h>
#include <Functions/FunctionFactory.h>
+#include <Interpreters/Context.h>
#include <Interpreters/HashJoin/HashJoin.h>
#include <Interpreters/TableJoin.h>
-#include <Join/StorageJoinFromReadBuffer.h>
#include <Parsers/ASTIdentifier.h>
#include <Processors/Executors/PipelineExecutor.h>
#include <Processors/Executors/PullingPipelineExecutor.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
