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 f898bc2425 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250201)
(#8647)
f898bc2425 is described below
commit f898bc242576043c3f40d2a233854fc84f723c88
Author: Kyligence Git <[email protected]>
AuthorDate: Sat Feb 1 03:00:41 2025 -0600
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20250201) (#8647)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250201)
* Fix build due to https://github.com/ClickHouse/ClickHouse/pull/74705
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 ++--
cpp-ch/local-engine/Join/StorageJoinFromReadBuffer.cpp | 4 ++--
cpp-ch/local-engine/Parser/RelParsers/StreamKafkaRelParser.cpp | 1 +
cpp-ch/local-engine/Storages/MergeTree/SparkMergeTreeSink.cpp | 1 +
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index c7b830751d..c887227fbb 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20250124
-CH_COMMIT=6d716e92afe
+CH_BRANCH=rebase_ch/20250201
+CH_COMMIT=6a77c5fc048
diff --git a/cpp-ch/local-engine/Join/StorageJoinFromReadBuffer.cpp
b/cpp-ch/local-engine/Join/StorageJoinFromReadBuffer.cpp
index 8f7c804d38..710e12950a 100644
--- a/cpp-ch/local-engine/Join/StorageJoinFromReadBuffer.cpp
+++ b/cpp-ch/local-engine/Join/StorageJoinFromReadBuffer.cpp
@@ -21,6 +21,7 @@
#include <Interpreters/TableJoin.h>
#include <Common/CHUtil.h>
#include <Common/Exception.h>
+#include <Common/ThreadPool.h>
#include <Common/logger_useful.h>
namespace DB
@@ -102,7 +103,6 @@ StorageJoinFromReadBuffer::StorageJoinFromReadBuffer(
void StorageJoinFromReadBuffer::buildJoin(Blocks & data, const Block header,
std::shared_ptr<DB::TableJoin> analyzed_join)
{
-
auto build_join = [&]
{
join = std::make_shared<HashJoin>(analyzed_join, header, overwrite,
row_count);
@@ -133,7 +133,7 @@ void StorageJoinFromReadBuffer::buildJoinLazily(DB::Block
header, std::shared_pt
if (join)
return;
join = std::make_shared<HashJoin>(analyzed_join, header, overwrite,
row_count);
- while(!input_blocks.empty())
+ while (!input_blocks.empty())
{
auto & block = *input_blocks.begin();
DB::ColumnsWithTypeAndName columns;
diff --git a/cpp-ch/local-engine/Parser/RelParsers/StreamKafkaRelParser.cpp
b/cpp-ch/local-engine/Parser/RelParsers/StreamKafkaRelParser.cpp
index 0771b481d7..70572ef36e 100644
--- a/cpp-ch/local-engine/Parser/RelParsers/StreamKafkaRelParser.cpp
+++ b/cpp-ch/local-engine/Parser/RelParsers/StreamKafkaRelParser.cpp
@@ -20,6 +20,7 @@
#include <Parser/SubstraitParserUtils.h>
#include <Parser/TypeParser.h>
#include <Storages/Kafka/ReadFromGlutenStorageKafka.h>
+#include <Common/logger_useful.h>
namespace DB
{
diff --git a/cpp-ch/local-engine/Storages/MergeTree/SparkMergeTreeSink.cpp
b/cpp-ch/local-engine/Storages/MergeTree/SparkMergeTreeSink.cpp
index c370de6028..d1066b4143 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 <IO/copyData.h>
#include <Interpreters/MergeTreeTransaction.h>
#include <Storages/MergeTree/MetaDataHelper.h>
#include <Common/QueryContext.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
