Fix build

antonio2368 · antonio2368 · commit b341dd447ab6 · 2026-01-22T10:45:42.000+01:00
diff --git a/src/Core/BackgroundSchedulePoolTaskHolder.cpp b/src/Core/BackgroundSchedulePoolTaskHolder.cpp
@@ -39,39 +39,39 @@ BackgroundSchedulePoolTaskInfoPtr BackgroundSchedulePoolTaskHolder::getTaskInfoP
     return task_info;
 }
 
-BackgroundSchedulePoolTaskHolder & PausableTask::getTask()
+BackgroundSchedulePoolTaskHolder & BackgroundSchedulePoolPausableTask::getTask()
 {
     return task;
 }
 
-PausableTask::PausableTask(BackgroundSchedulePoolTaskHolder task_)
+BackgroundSchedulePoolPausableTask::BackgroundSchedulePoolPausableTask(BackgroundSchedulePoolTaskHolder task_)
     : task(std::move(task_))
 {
 }
 
-void PausableTask::pause()
+void BackgroundSchedulePoolPausableTask::pause()
 {
     std::lock_guard lock(pause_mutex);
     pause_count++;
     if (pause_count == 1)
         task->deactivate();
 }
 
-void PausableTask::resume()
+void BackgroundSchedulePoolPausableTask::resume()
 {
     std::lock_guard lock(pause_mutex);
     pause_count--;
     if (pause_count == 0)
         task->activateAndSchedule();
 }
 
-PausableTask::PauseHolder::PauseHolder(PausableTask & task_)
+BackgroundSchedulePoolPausableTask::PauseHolder::PauseHolder(BackgroundSchedulePoolPausableTask & task_)
     : task(task_)
 {
     task.pause();
 }
 
-PausableTask::PauseHolder::~PauseHolder()
+BackgroundSchedulePoolPausableTask::PauseHolder::~PauseHolder()
 {
     task.resume();
 }
diff --git a/src/Core/BackgroundSchedulePoolTaskHolder.h b/src/Core/BackgroundSchedulePoolTaskHolder.h
@@ -37,15 +37,15 @@ class BackgroundSchedulePoolTaskHolder
 
 /// RAII guard that pauses parts check and reactivates it on destruction.
 /// Safe to destroy from any thread.
-class PausableTask
+class BackgroundSchedulePoolPausableTask
 {
 public:
-    explicit PausableTask(BackgroundSchedulePoolTaskHolder task_);
+    explicit BackgroundSchedulePoolPausableTask(BackgroundSchedulePoolTaskHolder task_);
 
-    PausableTask(const PausableTask &) = delete;
-    PausableTask & operator=(const PausableTask &) = delete;
-    PausableTask(PausableTask &&) = delete;
-    PausableTask & operator=(PausableTask &&) = delete;
+    BackgroundSchedulePoolPausableTask(const BackgroundSchedulePoolPausableTask &) = delete;
+    BackgroundSchedulePoolPausableTask & operator=(const BackgroundSchedulePoolPausableTask &) = delete;
+    BackgroundSchedulePoolPausableTask(BackgroundSchedulePoolPausableTask &&) = delete;
+    BackgroundSchedulePoolPausableTask & operator=(BackgroundSchedulePoolPausableTask &&) = delete;
 
     BackgroundSchedulePoolTaskHolder & getTask();
 
@@ -54,11 +54,11 @@ class PausableTask
 
     struct PauseHolder
     {
-        explicit PauseHolder(PausableTask & task_);
+        explicit PauseHolder(BackgroundSchedulePoolPausableTask & task_);
         ~PauseHolder();
 
-        private:
-            PausableTask & task;
+    private:
+        BackgroundSchedulePoolPausableTask & task;
     };
 
     using PauseHolderPtr = std::unique_ptr<PauseHolder>;
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
@@ -82,9 +82,9 @@ BackgroundSchedulePoolTaskHolder & ReplicatedMergeTreePartCheckThread::getTask()
     return pausable_task.getTask();
 }
 
-PausableTask::PauseHolderPtr ReplicatedMergeTreePartCheckThread::temporaryPause()
+BackgroundSchedulePoolPausableTask::PauseHolderPtr ReplicatedMergeTreePartCheckThread::temporaryPause()
 {
-    return std::make_unique<PausableTask::PauseHolder>(pausable_task);
+    return std::make_unique<BackgroundSchedulePoolPausableTask::PauseHolder>(pausable_task);
 }
 
 void ReplicatedMergeTreePartCheckThread::cancelRemovedPartsCheck(const MergeTreePartInfo & drop_range_info)
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h
@@ -69,7 +69,7 @@ class ReplicatedMergeTreePartCheckThread
 
     /// Pause parts check in a thread-safe way.
     /// The returned guard can be safely destroyed from any thread.
-    PausableTask::PauseHolderPtr temporaryPause();
+    BackgroundSchedulePoolPausableTask::PauseHolderPtr temporaryPause();
 
     /// Can be called only while holding a TemporaryPause guard.
     void cancelRemovedPartsCheck(const MergeTreePartInfo & drop_range_info);
@@ -112,7 +112,7 @@ class ReplicatedMergeTreePartCheckThread
     std::mutex start_stop_mutex;
     std::atomic<bool> need_stop { false };
 
-    PausableTask pausable_task;
+    BackgroundSchedulePoolPausableTask pausable_task;
 };
 
 }
diff --git a/src/Storages/StorageReplicatedMergeTree.h b/src/Storages/StorageReplicatedMergeTree.h
@@ -1014,7 +1014,7 @@ class StorageReplicatedMergeTree final : public MergeTreeData
 
     struct DataValidationTasks : public IStorage::DataValidationTasksBase
     {
-        explicit DataValidationTasks(DataPartsVector && parts_, ReplicatedMergeTreePartCheckThread::PausableTask::PauseHolderPtr && pause_)
+        explicit DataValidationTasks(DataPartsVector && parts_, BackgroundSchedulePoolPausableTask::PauseHolderPtr && pause_)
             : pause(std::move(pause_)), parts(std::move(parts_)), it(parts.begin())
         {}
 
@@ -1034,7 +1034,7 @@ class StorageReplicatedMergeTree final : public MergeTreeData
 
         /// Pauses the part check thread while this object exists.
         /// Safe to destroy from any thread (unlike unique_lock which has thread affinity).
-        ReplicatedMergeTreePartCheckThread::PausableTask::PauseHolderPtr pause;
+        BackgroundSchedulePoolPausableTask::PauseHolderPtr pause;
 
         mutable std::mutex mutex;
         DataPartsVector parts;

Original file line number	Diff line number	Diff line change
`@@ -39,39 +39,39 @@ BackgroundSchedulePoolTaskInfoPtr BackgroundSchedulePoolTaskHolder::getTaskInfoP`
`39`	`39`	`return task_info;`
`40`	`40`	`}`
`41`	`41`
`42`		`-BackgroundSchedulePoolTaskHolder & PausableTask::getTask()`
	`42`	`+BackgroundSchedulePoolTaskHolder & BackgroundSchedulePoolPausableTask::getTask()`
`43`	`43`	`{`
`44`	`44`	`return task;`
`45`	`45`	`}`
`46`	`46`
`47`		`-PausableTask::PausableTask(BackgroundSchedulePoolTaskHolder task_)`
	`47`	`+BackgroundSchedulePoolPausableTask::BackgroundSchedulePoolPausableTask(BackgroundSchedulePoolTaskHolder task_)`
`48`	`48`	`: task(std::move(task_))`
`49`	`49`	`{`
`50`	`50`	`}`
`51`	`51`
`52`		`-void PausableTask::pause()`
	`52`	`+void BackgroundSchedulePoolPausableTask::pause()`
`53`	`53`	`{`
`54`	`54`	`std::lock_guard lock(pause_mutex);`
`55`	`55`	`pause_count++;`
`56`	`56`	`if (pause_count == 1)`
`57`	`57`	`task->deactivate();`
`58`	`58`	`}`
`59`	`59`
`60`		`-void PausableTask::resume()`
	`60`	`+void BackgroundSchedulePoolPausableTask::resume()`
`61`	`61`	`{`
`62`	`62`	`std::lock_guard lock(pause_mutex);`
`63`	`63`	`pause_count--;`
`64`	`64`	`if (pause_count == 0)`
`65`	`65`	`task->activateAndSchedule();`
`66`	`66`	`}`
`67`	`67`
`68`		`-PausableTask::PauseHolder::PauseHolder(PausableTask & task_)`
	`68`	`+BackgroundSchedulePoolPausableTask::PauseHolder::PauseHolder(BackgroundSchedulePoolPausableTask & task_)`
`69`	`69`	`: task(task_)`
`70`	`70`	`{`
`71`	`71`	`task.pause();`
`72`	`72`	`}`
`73`	`73`
`74`		`-PausableTask::PauseHolder::~PauseHolder()`
	`74`	`+BackgroundSchedulePoolPausableTask::PauseHolder::~PauseHolder()`
`75`	`75`	`{`
`76`	`76`	`task.resume();`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,9 +82,9 @@ BackgroundSchedulePoolTaskHolder & ReplicatedMergeTreePartCheckThread::getTask()`
`82`	`82`	`return pausable_task.getTask();`
`83`	`83`	`}`
`84`	`84`
`85`		`-PausableTask::PauseHolderPtr ReplicatedMergeTreePartCheckThread::temporaryPause()`
	`85`	`+BackgroundSchedulePoolPausableTask::PauseHolderPtr ReplicatedMergeTreePartCheckThread::temporaryPause()`
`86`	`86`	`{`
`87`		`- return std::make_unique<PausableTask::PauseHolder>(pausable_task);`
	`87`	`+ return std::make_unique<BackgroundSchedulePoolPausableTask::PauseHolder>(pausable_task);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`void ReplicatedMergeTreePartCheckThread::cancelRemovedPartsCheck(const MergeTreePartInfo & drop_range_info)`