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 36bc21bb71 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250211)
(#8698)
36bc21bb71 is described below
commit 36bc21bb71938ec6e151905e6b15f618a6c5684a
Author: Kyligence Git <[email protected]>
AuthorDate: Tue Feb 11 02:48:12 2025 -0600
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20250211) (#8698)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250211)
* Fix build due to https://github.com/ClickHouse/ClickHouse/pull/75730
* to latest
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 ++--
cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.cpp | 1 +
cpp-ch/local-engine/Storages/Output/NormalFileWriter.cpp | 1 +
cpp-ch/local-engine/Storages/Parquet/ColumnIndexFilter.cpp | 1 +
cpp-ch/local-engine/Storages/Parquet/ParquetConverter.h | 1 +
cpp-ch/local-engine/tests/gtest_parquet_read.cpp | 2 +-
6 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index 0b7d9646e4..e357c1c491 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20250210
-CH_COMMIT=289b325208a
+CH_BRANCH=rebase_ch/20250211
+CH_COMMIT=b2f4c14af91
diff --git a/cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.cpp
b/cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.cpp
index 471899d933..334be41b08 100644
--- a/cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.cpp
+++ b/cpp-ch/local-engine/Storages/Kafka/GlutenKafkaSource.cpp
@@ -20,6 +20,7 @@
#include <Core/Settings.h>
#include <DataTypes/DataTypeNullable.h>
#include <Formats/FormatFactory.h>
+#include <IO/ReadHelpers.h>
#include <Processors/Executors/StreamingFormatExecutor.h>
#include <Storages/Kafka/GlutenKafkaUtils.h>
#include <Storages/Kafka/KafkaConfigLoader.h>
diff --git a/cpp-ch/local-engine/Storages/Output/NormalFileWriter.cpp
b/cpp-ch/local-engine/Storages/Output/NormalFileWriter.cpp
index 546a29be71..34dd188b91 100644
--- a/cpp-ch/local-engine/Storages/Output/NormalFileWriter.cpp
+++ b/cpp-ch/local-engine/Storages/Output/NormalFileWriter.cpp
@@ -20,6 +20,7 @@
#include <Columns/ColumnConst.h>
#include <Columns/ColumnMap.h>
#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnsCommon.h>
#include <Interpreters/castColumn.h>
#include <QueryPipeline/QueryPipeline.h>
#include <Poco/URI.h>
diff --git a/cpp-ch/local-engine/Storages/Parquet/ColumnIndexFilter.cpp
b/cpp-ch/local-engine/Storages/Parquet/ColumnIndexFilter.cpp
index 19b68f1456..c236650736 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/Set.h>
#include <Interpreters/misc.h>
#include <Storages/MergeTree/KeyCondition.h>
#include <Storages/MergeTree/RPNBuilder.h>
diff --git a/cpp-ch/local-engine/Storages/Parquet/ParquetConverter.h
b/cpp-ch/local-engine/Storages/Parquet/ParquetConverter.h
index df301e3ce6..10923b1bac 100644
--- a/cpp-ch/local-engine/Storages/Parquet/ParquetConverter.h
+++ b/cpp-ch/local-engine/Storages/Parquet/ParquetConverter.h
@@ -16,6 +16,7 @@
*/
#pragma once
#include <Columns/ColumnDecimal.h>
+#include <Columns/ColumnString.h>
#include <Core/Field.h>
#include <base/Decimal_fwd.h>
#include <parquet/schema.h>
diff --git a/cpp-ch/local-engine/tests/gtest_parquet_read.cpp
b/cpp-ch/local-engine/tests/gtest_parquet_read.cpp
index c47ec6d05d..98c3eab9fc 100644
--- a/cpp-ch/local-engine/tests/gtest_parquet_read.cpp
+++ b/cpp-ch/local-engine/tests/gtest_parquet_read.cpp
@@ -21,6 +21,7 @@
#include <ranges>
#include <incbin.h>
+#include <Columns/ColumnNullable.h>
#include <Core/Range.h>
#include <DataTypes/DataTypeArray.h>
#include <DataTypes/DataTypeDateTime.h>
@@ -30,7 +31,6 @@
#include <IO/ReadBufferFromFile.h>
#include <Interpreters/ActionsDAG.h>
#include <Interpreters/ActionsVisitor.h>
-#include <Interpreters/ExpressionActions.h>
#include <Parser/LocalExecutor.h>
#include <Processors/Executors/PullingPipelineExecutor.h>
#include <Processors/Formats/Impl/ArrowColumnToCHColumn.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
