fix build

Signed-off-by: xufei <[email protected]>
pingcap · Sep 28, 2022 · 9e124c9 · 9e124c9
1 parent 7a8085a
commit 9e124c9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/dbms/src/Flash/Mpp/MinTSOScheduler.cpp b/dbms/src/Flash/Mpp/MinTSOScheduler.cpp
@@ -69,22 +69,22 @@ 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())
     {
         LOG_WARNING(log, "{} is scheduled with miss or abort.", id.toString());
         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
@@ -35,7 +35,7 @@ using MPPQueryTaskSetPtr = std::shared_ptr<MPPQueryTaskSet>;
 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