minor fixes

Author: swalrus1

ydb/core/tx/columnshard/background_controller.cpp

@@ -27,23 +27,13 @@ void TBackgroundController::CheckDeadlinesIndexation() {
 }
 
 TInstant TBackgroundController::GetLastCompactionFinishInstant(ui64 pathId) const {
-    auto findInstant = LastCompactionFinishInstants.find(pathId);
+    auto findInstant = LastCompactionFinishByPathId.find(pathId);
     if (findInstant.IsEnd()) {
         return TInstant::Zero();
     }
     return findInstant->second;
 }
 
-TInstant TBackgroundController::GetLastCompactionFinishInstant() const {
-    TInstant maxInstant = TInstant::Zero();
-    for (const auto& [pathId, instant] : LastCompactionFinishInstants) {
-        if (maxInstant < instant) {
-            maxInstant = instant;
-        }
-    }
-    return maxInstant;
-}
-
 void TBackgroundController::StartIndexing(const NOlap::TColumnEngineChanges& changes) {
     LastIndexationInstant = TMonotonic::Now();
     Y_ABORT_UNLESS(ActiveIndexationTasks.emplace(changes.GetTaskIdentifier(), TMonotonic::Now()).second);

ydb/core/tx/columnshard/background_controller.h

@@ -1,6 +1,7 @@
 #pragma once
 #include "engines/changes/abstract/compaction_info.h"
 #include "engines/portions/meta.h"
+#include <ydb/core/base/appdata.h>
 
 namespace NKikimr::NOlap {
 class TColumnEngineChanges;
@@ -14,7 +15,7 @@ class TBackgroundController {
 
     using TCurrentCompaction = THashMap<ui64, NOlap::TPlanCompactionInfo>;
     TCurrentCompaction ActiveCompactionInfo;
-    THashMap<ui64, TInstant> LastCompactionFinishInstants; // pathId to finish time
+    THashMap<ui64, TInstant> LastCompactionFinishByPathId;
 
     bool ActiveCleanupPortions = false;
     bool ActiveCleanupTables = false;
@@ -30,8 +31,8 @@ class TBackgroundController {
     bool StartCompaction(const NOlap::TPlanCompactionInfo& info);
     void FinishCompaction(const NOlap::TPlanCompactionInfo& info) {
         Y_ABORT_UNLESS(ActiveCompactionInfo.erase(info.GetPathId()));
-        TInstant& lastFinishInstant = LastCompactionFinishInstants[info.GetPathId()];
-        lastFinishInstant = std::max(lastFinishInstant, TInstant::Now());
+        TInstant& lastFinishInstant = LastCompactionFinishByPathId[info.GetPathId()];
+        lastFinishInstant = std::max(lastFinishInstant, TAppData::TimeProvider->Now());
     }
     const TCurrentCompaction& GetActiveCompaction() const {
         return ActiveCompactionInfo;
@@ -40,7 +41,6 @@ class TBackgroundController {
         return ActiveCompactionInfo.size();
     }
     TInstant GetLastCompactionFinishInstant(ui64 pathId) const;
-    TInstant GetLastCompactionFinishInstant() const;
 
     void StartIndexing(const NOlap::TColumnEngineChanges& changes);
     void FinishIndexing(const NOlap::TColumnEngineChanges& changes);

ydb/core/tx/columnshard/hooks/testing/ro_controller.h

@@ -82,10 +82,10 @@ class TReadOnlyController: public ICSController {
 
     void WaitIndexation(const TDuration d) const {
         TInstant start = TInstant::Now();
-        ui32 indexationStart = GetInsertStartedCounter().Val();
+        ui32 insertsStart = GetInsertStartedCounter().Val();
         while (Now() - start < d) {
-            if (indexationStart != GetInsertStartedCounter().Val()) {
-                indexationStart = GetInsertStartedCounter().Val();
+            if (insertsStart != GetInsertStartedCounter().Val()) {
+                insertsStart = GetInsertStartedCounter().Val();
                 start = TInstant::Now();
             }
             Cerr << "WAIT_INDEXATION: " << GetInsertStartedCounter().Val() << Endl;