From ae510e2fdbbd1bba436dd8d7d7e35caa03a5e4ad Mon Sep 17 00:00:00 2001 From: Wenzheng Liu Date: Sat, 16 Dec 2023 15:17:58 +0800 Subject: [PATCH] [GLUTEN-1632][CH]Daily Update Clickhouse Version (20231216) (#4068) * [GLUTEN-1632][CH]Daily Update Clickhouse Version (20231216) * fix build due to https://github.com/ClickHouse/ClickHouse/pull/57578 Pass a empty config_path to FileCacheFactory::getOrCreate, see https://github.com/ClickHouse/ClickHouse/blob/12ed9952c4009a52183a88b50292e781db7f1641/src/Disks/ObjectStorages/Cached/registerDiskCache.cpp#L67 --------- Co-authored-by: kyligence-git Co-authored-by: Chang Chen --- cpp-ch/clickhouse.version | 4 ++-- .../Storages/SubstraitSource/ReadBufferBuilder.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version index 313612fc558c..7991d8ba449f 100644 --- a/cpp-ch/clickhouse.version +++ b/cpp-ch/clickhouse.version @@ -1,3 +1,3 @@ CH_ORG=Kyligence -CH_BRANCH=rebase_ch/20231206 -CH_COMMIT=6bd969f2c79 +CH_BRANCH=rebase_ch/20231216 +CH_COMMIT=7d51b116eb2 diff --git a/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp b/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp index b9b293da10aa..90bb4463f374 100644 --- a/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp +++ b/cpp-ch/local-engine/Storages/SubstraitSource/ReadBufferBuilder.cpp @@ -363,7 +363,7 @@ class S3FileReadBufferBuilder : public ReadBufferBuilder fs::create_directories(cache_base_path); file_cache_settings.base_path = cache_base_path; - file_cache = DB::FileCacheFactory::instance().getOrCreate("s3_local_cache", file_cache_settings); + file_cache = DB::FileCacheFactory::instance().getOrCreate("s3_local_cache", file_cache_settings, ""); file_cache->initialize(); new_settings.remote_fs_cache = file_cache;