[GLUTEN-1632][CH]Daily Update Clickhouse Version (20230603) (#1837)

* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20230603) * Fix Build since ClickHouse/ClickHouse#50400 * Fix Build since ClickHouse/ClickHouse#49539 * Workaround protoc's issue(protocolbuffers/protobuf#9378). --------- Co-authored-by: kyligence-git <gluten@kyligence.io> Co-authored-by: Chang Chen <baibaichen@gmail.com>
apache · Jun 3, 2023 · 91160dd · 91160dd
1 parent 87fe315
commit 91160dd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
 CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20230530
-CH_COMMIT=ff9a20e31e2
+CH_BRANCH=rebase_ch/20230603
+CH_COMMIT=3d583de4d6e
diff --git a/cpp-ch/local-engine/CMakeLists.txt b/cpp-ch/local-engine/CMakeLists.txt
@@ -82,17 +82,18 @@ add_library(${LOCALENGINE_SHARED_LIB} SHARED
 target_compile_options(${LOCALENGINE_SHARED_LIB} PUBLIC -fPIC
         -Wno-shorten-64-to-32)
 
-target_link_libraries(${LOCALENGINE_SHARED_LIB} PUBLIC
-
+target_link_libraries(${LOCALENGINE_SHARED_LIB}
+PUBLIC
         clickhouse_new_delete
         clickhouse_common_config
         clickhouse_common_io
         clickhouse_parsers
         clickhouse_storages_system
-        substrait
         loggers
         gluten_clickhouse_backend_libs
         ch_contrib::protobuf
+PRIVATE
+        substrait
 )
 
 if (ENABLE_LOCAL_FORMATS)

diff --git a/cpp-ch/local-engine/Storages/SubstraitSource/ParquetFormatFile.cpp b/cpp-ch/local-engine/Storages/SubstraitSource/ParquetFormatFile.cpp
@@ -82,7 +82,7 @@ FormatFile::InputFormatPtr ParquetFormatFile::createInputFormat(const DB::Block
         std::back_inserter(skip_row_group_indices));
 
     format_settings.parquet.skip_row_groups = std::unordered_set<int>(skip_row_group_indices.begin(), skip_row_group_indices.end());
-    auto input_format = std::make_shared<DB::ParquetBlockInputFormat>(res->read_buffer.get(), nullptr, header, format_settings, 1, 8192);
+    auto input_format = std::make_shared<DB::ParquetBlockInputFormat>(*(res->read_buffer), header, format_settings, 1, 8192);
 // clang-format off
 #endif
     // clang-format on

diff --git a/cpp-ch/local-engine/proto/CMakeLists.txt b/cpp-ch/local-engine/proto/CMakeLists.txt
@@ -12,7 +12,7 @@ ENDFOREACH()
 
 add_custom_target(
         generate_substrait
-        COMMAND ${CMAKE_CURRENT_BINARY_DIR}/../../../contrib/protobuf-cmake/protoc -I${CMAKE_CURRENT_SOURCE_DIR} -I${ClickHouse_SOURCE_DIR}/contrib/protobuf/src --cpp_out=${CMAKE_CURRENT_BINARY_DIR}/ ${protobuf_files}
+        COMMAND ${CMAKE_CURRENT_BINARY_DIR}/../../../contrib/google-protobuf-cmake/protoc -I${CMAKE_CURRENT_SOURCE_DIR} -I${ClickHouse_SOURCE_DIR}/contrib/google-protobuf/src --cpp_out=${CMAKE_CURRENT_BINARY_DIR}/ ${protobuf_files}
         DEPENDS protoc
         COMMENT "Running cpp protocol buffer compiler"
         VERBATIM )
@@ -21,7 +21,7 @@ set_source_files_properties(${SUBSTRAIT_SRCS} PROPERTIES GENERATED TRUE)
 
 add_library(substrait ${SUBSTRAIT_SRCS})
 add_dependencies(substrait generate_substrait)
-target_compile_options(substrait PUBLIC -fPIC -Wno-reserved-identifier -Wno-deprecated)
+target_compile_options(substrait PUBLIC -fPIC -Wno-reserved-identifier -Wno-deprecated -Wno-shadow-field)
 target_include_directories(substrait SYSTEM BEFORE PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 target_link_libraries(substrait ch_contrib::protobuf)