Merge branch 'main' into consistent-hash

apache · Dec 18, 2024 · 99f6a18 · 99f6a18
2 parents 23a585e + 6f3a453
commit 99f6a18
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
 CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20241213
-CH_COMMIT=8539932ca13
+CH_BRANCH=rebase_ch/20241218
+CH_COMMIT=1e83b45a997
diff --git a/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp b/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp
@@ -429,8 +429,7 @@ class S3FileReadBufferBuilder : public ReadBufferBuilder
         if (object_size > 0)
             buffer_size = std::min(object_size, buffer_size);
         auto async_reader
-            = std::make_unique<DB::AsynchronousBoundedReadBuffer>(std::move(s3_impl), pool_reader, read_settings, buffer_size);
-
+            = std::make_unique<DB::AsynchronousBoundedReadBuffer>(std::move(s3_impl), pool_reader, read_settings, buffer_size,read_settings.remote_read_min_bytes_for_seek);
         if (read_settings.remote_fs_prefetch)
             async_reader->prefetch(Priority{});