From 3e42cb06a5c0986da12fa0e23103c21f7a33d307 Mon Sep 17 00:00:00 2001 From: Wenzheng Liu Date: Tue, 14 Nov 2023 21:31:12 +0800 Subject: [PATCH] [GLUTEN-1632][CH]Daily Update Clickhouse Version (20231114) (#3698) * [GLUTEN-1632][CH]Daily Update Clickhouse Version (20231114) * fix build due to https://github.com/ClickHouse/ClickHouse/pull/56657 * fix build due to https://github.com/ClickHouse/ClickHouse/pull/56660 --------- Co-authored-by: kyligence-git Co-authored-by: Chang Chen --- cpp-ch/clickhouse.version | 4 ++-- cpp-ch/local-engine/CMakeLists.txt | 1 + cpp-ch/local-engine/Common/GlutenSignalHandler.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version index 9385abe8af22..363b4fc2369b 100644 --- a/cpp-ch/clickhouse.version +++ b/cpp-ch/clickhouse.version @@ -1,3 +1,3 @@ CH_ORG=Kyligence -CH_BRANCH=rebase_ch/20231112 -CH_COMMIT=04fb51332e1 +CH_BRANCH=rebase_ch/20231114 +CH_COMMIT=274cf420c07 diff --git a/cpp-ch/local-engine/CMakeLists.txt b/cpp-ch/local-engine/CMakeLists.txt index a93a9eaf710f..8d1725925389 100644 --- a/cpp-ch/local-engine/CMakeLists.txt +++ b/cpp-ch/local-engine/CMakeLists.txt @@ -56,6 +56,7 @@ include_directories( ${ClickHouse_SOURCE_DIR}/src ${ClickHouse_SOURCE_DIR}/base ${ClickHouse_SOURCE_DIR}/contrib/orc/c++/include + ${ClickHouse_SOURCE_DIR}/contrib/arrow-cmake/cpp/src/orc/c++/include ${CMAKE_BINARY_DIR}/contrib/orc/c++/include ${ClickHouse_SOURCE_DIR}/contrib/azure/sdk/storage/azure-storage-blobs/inc ${ClickHouse_SOURCE_DIR}/contrib/azure/sdk/core/azure-core/inc diff --git a/cpp-ch/local-engine/Common/GlutenSignalHandler.cpp b/cpp-ch/local-engine/Common/GlutenSignalHandler.cpp index 67c27961a7f4..a19fe3ec8611 100644 --- a/cpp-ch/local-engine/Common/GlutenSignalHandler.cpp +++ b/cpp-ch/local-engine/Common/GlutenSignalHandler.cpp @@ -32,7 +32,7 @@ #include #include -#include "config_version.h" +#include using namespace local_engine;