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 015cae0605 [GLUTEN-1632][CH]Daily Update Clickhouse Version (20241224)
(#8312)
015cae0605 is described below
commit 015cae0605c66c828cbd3153443813d55ece1756
Author: Kyligence Git <[email protected]>
AuthorDate: Tue Dec 24 02:01:41 2024 -0600
[GLUTEN-1632][CH]Daily Update Clickhouse Version (20241224) (#8312)
* [GLUTEN-1632][CH]Daily Update Clickhouse Version (20241224)
* Fix Build due to https://github.com/ClickHouse/ClickHouse/pull/69654 and
https://github.com/ClickHouse/ClickHouse/pull/66053
since ch bump llvm to 18, which cause building CurrentMemoryTracker.h is
failed, I remove two unecessary commits:
- https://github.com/Kyligence/ClickHouse/pull/488
-
https://github.com/Kyligence/ClickHouse/commit/1922234403d2d54ac3e73a4905a7afdc52e8496a
---------
Co-authored-by: kyligence-git <[email protected]>
Co-authored-by: Chang Chen <[email protected]>
---
cpp-ch/clickhouse.version | 4 ++--
cpp-ch/local-engine/Common/GlutenSignalHandler.cpp | 5 +++--
cpp-ch/local-engine/Storages/Cache/JobScheduler.cpp | 3 +++
cpp-ch/local-engine/Storages/Cache/JobScheduler.h | 5 +++--
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
index 3b14d5e1d2..85b0902663 100644
--- a/cpp-ch/clickhouse.version
+++ b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
CH_ORG=Kyligence
-CH_BRANCH=rebase_ch/20241219
-CH_COMMIT=8049b398dd0
+CH_BRANCH=rebase_ch/20241224
+CH_COMMIT=b38537577c5
diff --git a/cpp-ch/local-engine/Common/GlutenSignalHandler.cpp
b/cpp-ch/local-engine/Common/GlutenSignalHandler.cpp
index c4dcbfa364..6120eac9e9 100644
--- a/cpp-ch/local-engine/Common/GlutenSignalHandler.cpp
+++ b/cpp-ch/local-engine/Common/GlutenSignalHandler.cpp
@@ -376,8 +376,6 @@ private:
namespace local_engine
{
-SignalHandler::SignalHandler() = default;
-SignalHandler::~SignalHandler() = default;
struct SignalHandler::Impl
{
@@ -446,4 +444,7 @@ void SignalHandler::init()
LOG_WARNING(log, "LD_PRELOAD is not set, SignalHandler is disabled");
}
}
+
+SignalHandler::SignalHandler() = default;
+SignalHandler::~SignalHandler() = default;
}
diff --git a/cpp-ch/local-engine/Storages/Cache/JobScheduler.cpp
b/cpp-ch/local-engine/Storages/Cache/JobScheduler.cpp
index add3648f91..e1c43a6974 100644
--- a/cpp-ch/local-engine/Storages/Cache/JobScheduler.cpp
+++ b/cpp-ch/local-engine/Storages/Cache/JobScheduler.cpp
@@ -42,6 +42,9 @@ namespace local_engine
{
std::shared_ptr<JobScheduler> global_job_scheduler = nullptr;
+JobScheduler::JobScheduler() = default;
+JobScheduler::~JobScheduler() = default;
+
void JobScheduler::initialize(const DB::ContextPtr & context)
{
auto config = GlutenJobSchedulerConfig::loadFromContext(context);
diff --git a/cpp-ch/local-engine/Storages/Cache/JobScheduler.h
b/cpp-ch/local-engine/Storages/Cache/JobScheduler.h
index 379d5cf5f4..72fa0cedd9 100644
--- a/cpp-ch/local-engine/Storages/Cache/JobScheduler.h
+++ b/cpp-ch/local-engine/Storages/Cache/JobScheduler.h
@@ -102,7 +102,7 @@ public:
class JobScheduler
{
public:
- static JobScheduler& instance()
+ static JobScheduler & instance()
{
static JobScheduler global_job_scheduler;
return global_job_scheduler;
@@ -119,8 +119,9 @@ public:
void addFinishedJob(const JobId& job_id);
void cleanFinishedJobs();
+ ~JobScheduler();
private:
- JobScheduler() = default;
+ JobScheduler();
std::unique_ptr<ThreadPool> thread_pool;
std::unordered_map<JobId, JobContext> job_details;
std::mutex job_details_mutex;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
