[GLUTEN-1632][Gluten-3769][CH]Daily Update Clickhouse Version (202311…

…22) (#3802) * [GLUTEN-1632][CH]Daily Update Clickhouse Version (20231122) * fix build due to ClickHouse/ClickHouse#52918 * [Gluten-3769] Revert Fix due to 20231117(#3756) upgrade --------- Co-authored-by: kyligence-git <[email protected]> Co-authored-by: Chang Chen <[email protected]>
apache · Nov 22, 2023 · 35756a1 · 35756a1
1 parent c799238
commit 35756a1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
 CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20231117
-CH_COMMIT=61782b56dc4
+CH_BRANCH=rebase_ch/20231122
+CH_COMMIT=b8ba0ae7ba0
diff --git a/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp b/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp
@@ -419,7 +419,7 @@ class S3FileReadBufferBuilder : public ReadBufferBuilder
                 /* restricted_seek */ true);
         };
 
-        DB::StoredObjects stored_objects{DB::StoredObject{key, object_size}};
+        DB::StoredObjects stored_objects{DB::StoredObject{key, "", object_size}};
         auto s3_impl = std::make_unique<DB::ReadBufferFromRemoteFSGather>(
             std::move(read_buffer_creator), stored_objects, new_settings, /* cache_log */ nullptr, /* use_external_buffer */ true);
 

diff --git a/cpp-ch/local-engine/proto/CMakeLists.txt b/cpp-ch/local-engine/proto/CMakeLists.txt
@@ -42,9 +42,7 @@ add_library(substrait ${SUBSTRAIT_SRCS})
 add_dependencies(substrait generate_substrait)
 target_compile_options(substrait PUBLIC -fPIC
         -Wno-reserved-identifier
-        -Wno-deprecated
-        -Wno-extra-semi-stmt
-        -Wno-used-but-marked-unused)
+        -Wno-deprecated)
 target_include_directories(substrait SYSTEM BEFORE PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 target_link_libraries(substrait ch_contrib::protobuf)