From 9e124c98e1595b7e8f0b639867890f560c611246 Mon Sep 17 00:00:00 2001 From: xufei Date: Wed, 28 Sep 2022 11:33:54 +0800 Subject: [PATCH] fix build Signed-off-by: xufei --- dbms/src/Flash/Mpp/MinTSOScheduler.cpp | 6 +++--- dbms/src/Flash/Mpp/MinTSOScheduler.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dbms/src/Flash/Mpp/MinTSOScheduler.cpp b/dbms/src/Flash/Mpp/MinTSOScheduler.cpp index b2b4680c5ad..a754df437d0 100644 --- a/dbms/src/Flash/Mpp/MinTSOScheduler.cpp +++ b/dbms/src/Flash/Mpp/MinTSOScheduler.cpp @@ -69,14 +69,14 @@ MinTSOScheduler::MinTSOScheduler(UInt64 soft_limit, UInt64 hard_limit, UInt64 ac } } -bool MinTSOScheduler::tryToSchedule(MPPTaskScheduleEntry & scheduler_entry, MPPTaskManager & task_manager) +bool MinTSOScheduler::tryToSchedule(MPPTaskScheduleEntry & schedule_entry, MPPTaskManager & task_manager) { /// check whether this schedule is disabled or not if (isDisabled()) { return true; } - const auto & id = scheduler_entry.getMPPTaskId(); + const auto & id = schedule_entry.getMPPTaskId(); auto query_task_set = task_manager.getQueryTaskSetWithoutLock(id.start_ts); if (nullptr == query_task_set || !query_task_set->isInNormalState()) { @@ -84,7 +84,7 @@ bool MinTSOScheduler::tryToSchedule(MPPTaskScheduleEntry & scheduler_entry, MPPT return true; } bool has_error = false; - return scheduleImp(id.start_ts, query_task_set, scheduler_entry, false, has_error); + return scheduleImp(id.start_ts, query_task_set, schedule_entry, false, has_error); } /// after finishing the query, there would be no threads released soon, so the updated min-tso query with waiting tasks should be scheduled. diff --git a/dbms/src/Flash/Mpp/MinTSOScheduler.h b/dbms/src/Flash/Mpp/MinTSOScheduler.h index 59fca88483e..8553a35e26c 100644 --- a/dbms/src/Flash/Mpp/MinTSOScheduler.h +++ b/dbms/src/Flash/Mpp/MinTSOScheduler.h @@ -35,7 +35,7 @@ using MPPQueryTaskSetPtr = std::shared_ptr; class MinTSOScheduler : private boost::noncopyable { public: - MinTSOScheduler(UInt64 soft_limit, UInt64 hard_limit, UInt64 active_set_hard_limit); + MinTSOScheduler(UInt64 soft_limit, UInt64 hard_limit, UInt64 active_set_hard_limit_); ~MinTSOScheduler() = default; /// try to schedule this task if it is the min_tso query or there are enough threads, otherwise put it into the waiting set. /// NOTE: call tryToSchedule under the lock protection of MPPTaskManager