Skip to content

Commit 89699ef

Browse files
kyligence-gitkyligence-gitbaibaichen
authored
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20250215) (#8735)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250215) * Fix build due to ClickHouse/ClickHouse#75938 * Fix Ut due to ClickHouse/ClickHouse#74827 --------- Co-authored-by: kyligence-git <gluten@kyligence.io> Co-authored-by: Chang Chen <baibaichen@gmail.com>
1 parent eac2785 commit 89699ef

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

cpp-ch/clickhouse.version

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
CH_ORG=Kyligence
2-
CH_BRANCH=rebase_ch/20250214
3-
CH_COMMIT=e59f3c4ddc3
2+
CH_BRANCH=rebase_ch/20250215
3+
CH_COMMIT=ad96a5bf776

cpp-ch/local-engine/Common/CHUtil.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ extern const ServerSettingsString skipping_index_cache_policy;
8383
extern const ServerSettingsUInt64 skipping_index_cache_size;
8484
extern const ServerSettingsUInt64 skipping_index_cache_max_entries;
8585
extern const ServerSettingsDouble skipping_index_cache_size_ratio;
86+
extern const ServerSettingsUInt64 max_prefixes_deserialization_thread_pool_size;
87+
extern const ServerSettingsUInt64 max_prefixes_deserialization_thread_pool_free_size;
88+
extern const ServerSettingsUInt64 prefixes_deserialization_thread_pool_thread_pool_queue_size;
8689
}
8790
namespace Setting
8891
{
@@ -830,6 +833,11 @@ void BackendInitializerUtil::initContexts(DB::Context::ConfigurationPtr config)
830833
global_context->setSkippingIndexCache(
831834
skipping_index_cache_policy, skipping_index_cache_size, skipping_index_cache_max_entries, skipping_index_cache_size_ratio);
832835

836+
getMergeTreePrefixesDeserializationThreadPool().initialize(
837+
server_settings[ServerSetting::max_prefixes_deserialization_thread_pool_size],
838+
server_settings[ServerSetting::max_prefixes_deserialization_thread_pool_free_size],
839+
server_settings[ServerSetting::prefixes_deserialization_thread_pool_thread_pool_queue_size]);
840+
833841
size_t mmap_cache_size = config->getUInt64("mmap_cache_size", DEFAULT_MMAP_CACHE_MAX_SIZE);
834842
global_context->setMMappedFileCache(mmap_cache_size);
835843

cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ MergeTreeData::LoadPartResult SparkStorageMergeTree::loadDataPart(
289289
has_lightweight_delete_parts.store(true);
290290

291291
// without it "test mergetree optimize partitioned by one low card column" will log ERROR
292-
calculateColumnAndSecondaryIndexSizesImpl();
292+
calculateColumnAndSecondaryIndexSizesIfNeeded();
293293

294294
LOG_TRACE(log, "Finished loading {} part {} on disk {}", magic_enum::enum_name(to_state), part_name, part_disk_ptr->getName());
295295
return res;

0 commit comments

Comments
 (0)