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 525b028109 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250515)
(#9643)
525b028109 is described below
commit 525b02810930fd80d4f354754d0c9847510b9126
Author: Kyligence Git <[email protected]>
AuthorDate: Thu May 15 00:26:09 2025 -0500
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20250515) (#9643)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250515)
* Fix build due to https://github.com/ClickHouse/ClickHouse/pull/80035
* Fix build due to https://github.com/ClickHouse/ClickHouse/pull/80050
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 ++--
cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp | 5 ++++-
cpp-ch/local-engine/tests/gtest_parquet_write.cpp | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index 1e675b3fe4..c83ddde9c3 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20250507
-CH_COMMIT=a3178a828fa
+CH_BRANCH=rebase_ch/20250515
+CH_COMMIT=508f05e8493
diff --git a/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp
b/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp
index dadb852442..595ed6cf95 100644
--- a/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp
+++ b/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp
@@ -79,6 +79,8 @@ extern const SettingsMaxThreads max_download_threads;
extern const SettingsUInt64 max_download_buffer_size;
extern const SettingsBool input_format_allow_seeks;
extern const SettingsUInt64 max_read_buffer_size;
+extern const SettingsBool s3_slow_all_threads_after_network_error;
+extern const SettingsBool enable_s3_requests_logging;
}
namespace ErrorCodes
{
@@ -552,7 +554,8 @@ private:
context->getRemoteHostFilter(),
static_cast<unsigned>(context->getSettingsRef()[DB::Setting::s3_max_redirects]),
static_cast<unsigned>(context->getSettingsRef()[DB::Setting::s3_retry_attempts]),
- false,
+
context->getSettingsRef()[DB::Setting::s3_slow_all_threads_after_network_error],
+ context->getSettingsRef()[DB::Setting::enable_s3_requests_logging],
false,
nullptr,
nullptr);
diff --git a/cpp-ch/local-engine/tests/gtest_parquet_write.cpp
b/cpp-ch/local-engine/tests/gtest_parquet_write.cpp
index 3f33e29616..18f86a9ba6 100644
--- a/cpp-ch/local-engine/tests/gtest_parquet_write.cpp
+++ b/cpp-ch/local-engine/tests/gtest_parquet_write.cpp
@@ -209,7 +209,7 @@ TEST(ParquetWrite, ComplexTypes)
ch2arrow.chChunkToArrowTable(arrow_table, input_chunks, header.columns());
/// Convert Arrow Table to CH Block
- ArrowColumnToCHColumn arrow2ch(header, "Parquet", true, true,
FormatSettings::DateTimeOverflowBehavior::Ignore);
+ ArrowColumnToCHColumn arrow2ch(header, "Parquet", true, true,
FormatSettings::DateTimeOverflowBehavior::Ignore, false);
Chunk output_chunk = arrow2ch.arrowTableToCHChunk(arrow_table,
arrow_table->num_rows(), nullptr, nullptr);
/// Compare input and output columns
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
