Merge 4118243 into 99d530f

Author: ivanmorozov333

ydb/core/tx/columnshard/data_accessor/manager.cpp

@@ -2,12 +2,14 @@
 
 #include <ydb/core/tx/columnshard/hooks/abstract/abstract.h>
 
+#include <ydb/library/accessor/positive_integer.h>
+
 namespace NKikimr::NOlap::NDataAccessorControl {
 
 void TLocalManager::DrainQueue() {
     std::optional<ui64> lastPathId;
     IGranuleDataAccessor* lastDataAccessor = nullptr;
-    ui32 countToFlight = 0;
+    TPositiveControlInteger countToFlight;
     while (PortionsAskInFlight + countToFlight < NYDBTest::TControllers::GetColumnShardController()->GetLimitForPortionsMetadataAsk() &&
            PortionsAsk.size()) {
         THashMap<ui64, std::vector<TPortionInfo::TConstPtr>> portionsToAsk;
@@ -63,7 +65,6 @@ void TLocalManager::DrainQueue() {
                     }
                 }
                 RequestsByPortion.erase(it);
-                AFL_VERIFY(countToFlight);
                 --countToFlight;
             }
             if (dataAnalyzed.GetPortionsToAsk().size()) {
@@ -72,7 +73,7 @@ void TLocalManager::DrainQueue() {
             }
         }
     }
-    PortionsAskInFlight += countToFlight;
+    PortionsAskInFlight.Add(countToFlight);
     Counters.FetchingCount->Set(PortionsAskInFlight);
     Counters.QueueSize->Set(PortionsAsk.size());
 }
@@ -119,7 +120,6 @@ void TLocalManager::DoAddPortion(const TPortionDataAccessor& accessor) {
             for (auto&& i : it->second) {
                 i->AddAccessor(accessor);
             }
-            AFL_VERIFY(PortionsAskInFlight);
             --PortionsAskInFlight;
         }
         RequestsByPortion.erase(it);

ydb/core/tx/columnshard/data_accessor/manager.h

@@ -134,7 +134,7 @@ class TLocalManager: public IDataAccessorsManager {
     };
 
     std::deque<TPortionToAsk> PortionsAsk;
-    ui64 PortionsAskInFlight = 0;
+    TPositiveControlInteger PortionsAskInFlight;
 
     void DrainQueue();
 

ydb/core/tx/columnshard/engines/changes/abstract/compaction_info.cpp

@@ -5,12 +5,7 @@
 namespace NKikimr::NOlap {
 
 bool TPlanCompactionInfo::Finish() {
-    if (Count > 0) {
-        return --Count == 0;
-    } else {
-        AFL_VERIFY(false);
-        return false;
-    }
+    return --Count == 0;
 }
 
 }   // namespace NKikimr::NOlap

ydb/core/tx/columnshard/engines/changes/abstract/compaction_info.h

@@ -1,8 +1,11 @@
 #pragma once
+#include <ydb/library/accessor/positive_integer.h>
+#include <ydb/library/actors/core/monotonic.h>
+
 #include <util/generic/string.h>
-#include <util/system/yassert.h>
 #include <util/stream/output.h>
-#include <ydb/library/actors/core/monotonic.h>
+#include <util/system/yassert.h>
+
 #include <memory>
 
 namespace NKikimr::NOlap {
@@ -12,7 +15,7 @@ class TPlanCompactionInfo {
 private:
     ui64 PathId = 0;
     TMonotonic StartTime = TMonotonic::Now();
-    ui32 Count = 0;
+    TPositiveControlInteger Count;
 
 public:
     void Start() {
@@ -28,12 +31,11 @@ class TPlanCompactionInfo {
 
     TPlanCompactionInfo(const ui64 pathId)
         : PathId(pathId) {
-
     }
 
     ui64 GetPathId() const {
         return PathId;
     }
 };
 
-}
+}   // namespace NKikimr::NOlap

ydb/core/tx/columnshard/engines/storage/optimizer/lcbuckets/planner/abstract.h

@@ -116,7 +116,7 @@ class TPortionsChain {
 class TCompactionTaskData {
 private:
     YDB_ACCESSOR_DEF(std::vector<TPortionInfo::TConstPtr>, Portions);
-    const ui64 TargetCompactionLevel = 0;
+    const TPositiveControlInteger TargetCompactionLevel;
     std::shared_ptr<NCompaction::TGeneralCompactColumnEngineChanges::IMemoryPredictor> Predictor =
         NCompaction::TGeneralCompactColumnEngineChanges::BuildMemoryPredictor();
     ui64 MemoryUsage = 0;
@@ -135,12 +135,7 @@ class TCompactionTaskData {
 public:
     ui64 GetTargetCompactionLevel() const {
         if (MemoryUsage > ((ui64)1 << 30)) {
-            if (TargetCompactionLevel) {
-                return TargetCompactionLevel - 1;
-            } else {
-                AFL_VERIFY(false);
-                return 0;
-            }
+            return TargetCompactionLevel.GetDec();
         } else {
             return TargetCompactionLevel;
         }

ydb/core/tx/limiter/grouped_memory/usage/abstract.h

@@ -2,6 +2,7 @@
 #include <ydb/core/tx/limiter/grouped_memory/service/counters.h>
 
 #include <ydb/library/accessor/accessor.h>
+#include <ydb/library/accessor/positive_integer.h>
 #include <ydb/library/actors/core/actor.h>
 #include <ydb/library/actors/core/actorid.h>
 #include <ydb/library/actors/core/log.h>
@@ -75,23 +76,6 @@ class TAllocationGuard {
     ~TAllocationGuard();
 };
 
-class TPositiveControlInteger {
-private:
-    ui64 Value = 0;
-
-public:
-    void Add(const ui64 value) {
-        Value += value;
-    }
-    void Sub(const ui64 value) {
-        AFL_VERIFY(value <= Value)("base", Value)("delta", value);
-        Value -= value;
-    }
-    ui64 Val() const {
-        return Value;
-    }
-};
-
 class TStageFeatures {
 private:
     YDB_READONLY_DEF(TString, Name);
@@ -130,9 +114,9 @@ class TStageFeatures {
         if (HardLimit < Usage.Val() + volume) {
             Counters->OnCannotAllocate();
             AFL_DEBUG(NKikimrServices::GROUPED_MEMORY_LIMITER)("name", Name)("event", "cannot_allocate")("limit", HardLimit)(
-                "usage", Usage.Val())(
-                "delta", volume);
-            return TConclusionStatus::Fail(TStringBuilder() << Name << "::(limit:" << HardLimit << ";val:" << Usage.Val() << ";delta=" << volume << ");");
+                "usage", Usage.Val())("delta", volume);
+            return TConclusionStatus::Fail(
+                TStringBuilder() << Name << "::(limit:" << HardLimit << ";val:" << Usage.Val() << ";delta=" << volume << ");");
         }
         Usage.Add(volume);
         AFL_DEBUG(NKikimrServices::GROUPED_MEMORY_LIMITER)("name", Name)("event", "allocate")("usage", Usage.Val())("delta", volume);

ydb/core/tx/tiering/manager.cpp

@@ -197,7 +197,6 @@ TTiersManager::TTierRefGuard::~TTierRefGuard() {
     if (Owner) {
         auto findTier = Owner->TierRefCount.FindPtr(TierName);
         AFL_VERIFY(findTier);
-        AFL_VERIFY(*findTier);
         --*findTier;
         if (!*findTier) {
             AFL_VERIFY(Owner->TierRefCount.erase(TierName));

ydb/core/tx/tiering/manager.h

@@ -7,6 +7,7 @@
 #include <ydb/core/tx/tiering/tier/object.h>
 
 #include <ydb/public/sdk/cpp/client/ydb_types/s3_settings.h>
+#include <ydb/library/accessor/positive_integer.h>
 #include <ydb/services/metadata/secret/snapshot.h>
 #include <ydb/services/metadata/service.h>
 
@@ -77,7 +78,7 @@ class TTiersManager: public ITiersManager {
     IActor* Actor = nullptr;
     TManagers Managers;
 
-    using TTierRefCount = THashMap<TString, ui64>;
+    using TTierRefCount = THashMap<TString, TPositiveControlInteger>;
     using TTierRefsByPathId = THashMap<ui64, std::vector<TTierRefGuard>>;
     YDB_READONLY_DEF(TTierRefCount, TierRefCount);
     YDB_READONLY_DEF(TTierRefsByPathId, UsedTiers);

ydb/library/accessor/positive_integer.cpp

@@ -0,0 +1,38 @@
+#include "positive_integer.h"
+#include <ydb/library/actors/core/log.h>
+
+namespace NKikimr {
+
+TPositiveControlInteger::TPositiveControlInteger(const i64 value)
+    : Value(value) {
+    AFL_VERIFY(0 <= value);
+}
+
+ui64 TPositiveControlInteger::Add(const ui64 value) {
+    Value += value;
+    return Value;
+}
+
+ui64 TPositiveControlInteger::Sub(const ui64 value) {
+    if (value <= Value) {
+        Value -= value;
+    } else {
+        AFL_VERIFY(false)("base", Value)("delta", value);
+    }
+    return Value;
+}
+
+ui64 TPositiveControlInteger::GetDec() const {
+    if (Value) {
+        return Value - 1;
+    } else {
+        AFL_VERIFY(false);
+    }
+    return 0;
+}
+
+ui64 TPositiveControlInteger::Val() const {
+    return Value;
+}
+
+}

ydb/library/accessor/positive_integer.h

@@ -0,0 +1,40 @@
+#pragma once
+#include <util/system/types.h>
+
+namespace NKikimr {
+
+class TPositiveControlInteger {
+private:
+    ui64 Value = 0;
+public:
+    TPositiveControlInteger() = default;
+    TPositiveControlInteger(const ui64 value)
+        : Value(value) {
+
+    }
+    TPositiveControlInteger(const i64 value);
+    ui64 Add(const ui64 value);
+    ui64 Sub(const ui64 value);
+    ui64 Inc() {
+        return Add(1);
+    }
+    ui64 Dec() {
+        return Sub(1);
+    }
+    ui64 GetDec() const;
+    ui64 Val() const;
+    bool operator!() const {
+        return !Value;
+    }
+    operator ui64() const {
+        return Value;
+    }
+    ui64 operator++() {
+        return Inc();
+    }
+    ui64 operator--() {
+        return Dec();
+    }
+};
+
+}