This is an automated email from the ASF dual-hosted git repository.
changchen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 8514f1bbdd [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250304)
(#8887)
8514f1bbdd is described below
commit 8514f1bbdda0fbe5476557ebb91d4626cd47c7b1
Author: Kyligence Git <[email protected]>
AuthorDate: Tue Mar 4 07:04:05 2025 -0600
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20250304) (#8887)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20250304)
* Fix ut due to https://github.com/ClickHouse/ClickHouse/pull/69236
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 ++--
cpp-ch/local-engine/Common/CHUtil.cpp | 15 +++++++--------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index aeea25d758..67e86b3630 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20250301
-CH_COMMIT=ff66eceae51
+CH_BRANCH=rebase_ch/20250304
+CH_COMMIT=6be5cc2a06c
diff --git a/cpp-ch/local-engine/Common/CHUtil.cpp
b/cpp-ch/local-engine/Common/CHUtil.cpp
index 2371a6560e..efd21100b1 100644
--- a/cpp-ch/local-engine/Common/CHUtil.cpp
+++ b/cpp-ch/local-engine/Common/CHUtil.cpp
@@ -87,6 +87,10 @@ extern const ServerSettingsDouble
skipping_index_cache_size_ratio;
extern const ServerSettingsUInt64
max_prefixes_deserialization_thread_pool_size;
extern const ServerSettingsUInt64
max_prefixes_deserialization_thread_pool_free_size;
extern const ServerSettingsUInt64
prefixes_deserialization_thread_pool_thread_pool_queue_size;
+extern const ServerSettingsUInt64 max_thread_pool_size;
+extern const ServerSettingsUInt64 thread_pool_queue_size;
+extern const ServerSettingsUInt64 max_io_thread_pool_size;
+extern const ServerSettingsUInt64 io_thread_pool_queue_size;
}
namespace Setting
{
@@ -106,14 +110,6 @@ extern const int UNKNOWN_TYPE;
extern const int CANNOT_PARSE_PROTOBUF_SCHEMA;
}
-namespace ServerSetting
-{
-extern const ServerSettingsUInt64 max_thread_pool_size;
-extern const ServerSettingsUInt64 thread_pool_queue_size;
-extern const ServerSettingsUInt64 max_io_thread_pool_size;
-extern const ServerSettingsUInt64 io_thread_pool_queue_size;
-}
-
extern void
registerAggregateFunctionUniqHyperLogLogPlusPlus(AggregateFunctionFactory &);
}
@@ -840,6 +836,9 @@ void
BackendInitializerUtil::initContexts(DB::Context::ConfigurationPtr config)
/// Initialize a dummy query cache.
global_context->setQueryCache(0, 0, 0, 0);
+ /// Initialize a dummy query condition cache.
+
global_context->setQueryConditionCache(DEFAULT_QUERY_CONDITION_CACHE_POLICY, 0,
0);
+
// We must set the application type to CLIENT to avoid
ServerUUID::get() throw exception
global_context->setApplicationType(Context::ApplicationType::CLIENT);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
