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 cac13caefa [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250213)
(#8717)
cac13caefa is described below
commit cac13caefa4d1027613eaaee7f46a121bb48229f
Author: Kyligence Git <[email protected]>
AuthorDate: Thu Feb 13 01:09:34 2025 -0600
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20250213) (#8717)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250213)
- Fix build due to https://github.com/ClickHouse/ClickHouse/pull/75721
- Fix build due to https://github.com/ClickHouse/ClickHouse/pull/75738
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 ++--
cpp-ch/local-engine/Parser/RelParsers/JoinRelParser.cpp | 1 +
cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.cpp | 1 +
cpp-ch/local-engine/Storages/MergeTree/SparkMergeTreeMeta.cpp | 1 +
cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.h | 2 ++
5 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index e357c1c491..5c68df3d9b 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20250211
-CH_COMMIT=b2f4c14af91
+CH_BRANCH=rebase_ch/20250213
+CH_COMMIT=dcb72ec9fa4
diff --git a/cpp-ch/local-engine/Parser/RelParsers/JoinRelParser.cpp
b/cpp-ch/local-engine/Parser/RelParsers/JoinRelParser.cpp
index 3db111b6d4..95e695c19c 100644
--- a/cpp-ch/local-engine/Parser/RelParsers/JoinRelParser.cpp
+++ b/cpp-ch/local-engine/Parser/RelParsers/JoinRelParser.cpp
@@ -20,6 +20,7 @@
#include <Core/Settings.h>
#include <Functions/FunctionFactory.h>
#include <Interpreters/CollectJoinOnKeysVisitor.h>
+#include <Interpreters/ExpressionActions.h>
#include <Interpreters/FullSortingMergeJoin.h>
#include <Interpreters/GraceHashJoin.h>
#include <Interpreters/HashJoin/HashJoin.h>
diff --git a/cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.cpp
b/cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.cpp
index 334be41b08..196c2dd560 100644
--- a/cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.cpp
+++ b/cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.cpp
@@ -21,6 +21,7 @@
#include <DataTypes/DataTypeNullable.h>
#include <Formats/FormatFactory.h>
#include <IO/ReadHelpers.h>
+#include <Interpreters/ExpressionActions.h>
#include <Processors/Executors/StreamingFormatExecutor.h>
#include <Storages/Kafka/GlutenKafkaUtils.h>
#include <Storages/Kafka/KafkaConfigLoader.h>
diff --git a/cpp-ch/local-engine/Storages/MergeTree/SparkMergeTreeMeta.cpp
b/cpp-ch/local-engine/Storages/MergeTree/SparkMergeTreeMeta.cpp
index cbac37cd03..ef4d5504ff 100644
--- a/cpp-ch/local-engine/Storages/MergeTree/SparkMergeTreeMeta.cpp
+++ b/cpp-ch/local-engine/Storages/MergeTree/SparkMergeTreeMeta.cpp
@@ -18,6 +18,7 @@
#include <IO/ReadBufferFromString.h>
#include <IO/ReadHelpers.h>
+#include <Interpreters/ExpressionActions.h>
#include <Parser/SubstraitParserUtils.h>
#include <Parser/TypeParser.h>
#include <Parsers/ASTExpressionList.h>
diff --git a/cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.h
b/cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.h
index 7b4a10a242..852ca42560 100644
--- a/cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.h
+++ b/cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.h
@@ -110,6 +110,8 @@ protected:
void movePartitionToTable(const DB::StoragePtr & dest_table, const
DB::ASTPtr & partition, DB::ContextPtr context) override;
bool partIsAssignedToBackgroundOperation(const DataPartPtr & part) const
override;
void attachRestoredParts(MutableDataPartsVector && /*parts*/) override {
throw std::runtime_error("not implement"); }
+ UInt64 getNumberOnFlyDataMutations() const override { throw
std::runtime_error("not implement"); }
+ UInt64 getNumberOnFlyMetadataMutations() const override { throw
std::runtime_error("not implement"); }
public:
MutationsSnapshotPtr getMutationsSnapshot(const IMutationsSnapshot::Params
& /*params*/) const override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
