Skip to content

Commit aef62c2

Browse files
authored
Fix max calls compilation (#7962)
1 parent d4a880d commit aef62c2

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

ydb/core/tablet/resource_broker.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ void TTaskQueue::UpdateRealResourceUsage(TInstant now)
284284

285285
// Find dominant resource consumption and update usage
286286
auto dom = GetDominantResourceComponentNormalized(QueueLimit.Used);
287-
auto usage = RealResourceUsage + dom * duration.MilliSeconds() / Max(1u, Weight);
287+
auto usage = RealResourceUsage + dom * duration.MilliSeconds() / Max<ui32>(1, Weight);
288288
RealResourceUsage = usage;
289289

290290
UsageTimestamp = now;
@@ -305,21 +305,21 @@ void TTaskQueue::UpdatePlannedResourceUsage(TTaskPtr task,
305305

306306
auto dom = GetDominantResourceComponentNormalized(task->RequiredResources);
307307
if (decrease) {
308-
PlannedResourceUsage -= dom * duration.MilliSeconds() / Max(1u, Weight);
308+
PlannedResourceUsage -= dom * duration.MilliSeconds() / Max<ui32>(1, Weight);
309309
PlannedResourceUsage = Max(PlannedResourceUsage, RealResourceUsage);
310310
} else {
311311
PlannedResourceUsage = Max(PlannedResourceUsage, RealResourceUsage);
312-
PlannedResourceUsage += dom * duration.MilliSeconds() / Max(1u, Weight);
312+
PlannedResourceUsage += dom * duration.MilliSeconds() / Max<ui32>(1, Weight);
313313
}
314314
}
315315

316316
double TTaskQueue::GetDominantResourceComponentNormalized(const TResourceValues &values)
317317
{
318318
std::array<double, RESOURCE_COUNT> norm;
319319
for (size_t i = 0; i < norm.size(); ++i)
320-
norm[i] = (double)QueueLimit.Used[i] / (double)Max(1lu, TotalLimit->Limit[i]);
320+
norm[i] = (double)QueueLimit.Used[i] / Max<double>(1, TotalLimit->Limit[i]);
321321
size_t i = MaxElement(norm.begin(), norm.end()) - norm.begin();
322-
return (double)values[i] / (double)Max(1lu, TotalLimit->Limit[i]);
322+
return (double)values[i] / Max<double>(1, TotalLimit->Limit[i]);
323323
}
324324

325325
void TTaskQueue::OutputState(IOutputStream &os, const TString &prefix) const

0 commit comments

Comments
 (0)