Merge 8cfb070 into bc77d99

ydb-platform · Jul 7, 2024 · 81bd260 · 81bd260
2 parents bc77d99 + 8cfb070
commit 81bd260
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/ydb/core/tx/columnshard/blobs_action/abstract/blob_set.h b/ydb/core/tx/columnshard/blobs_action/abstract/blob_set.h
@@ -47,7 +47,7 @@ class TTabletByBlob {
 
 class TBlobsByGenStep {
 private:
-    struct Comparator {
+    struct TGenStepFromLogoBlobIdComparator {
         bool operator()(const TLogoBlobID& l, const TLogoBlobID& r) const {
             TGenStep gsl(l);
             TGenStep gsr(r);
@@ -58,7 +58,7 @@ class TBlobsByGenStep {
             }
         }
     };
-    std::set<TLogoBlobID, Comparator> Blobs;
+    std::set<TLogoBlobID, TGenStepFromLogoBlobIdComparator> Blobs;
 public:
     [[nodiscard]] bool Add(const TLogoBlobID& blobId) {
         return Blobs.emplace(blobId).second;
@@ -69,7 +69,7 @@ class TBlobsByGenStep {
     bool IsEmpty() const {
         return Blobs.empty();
     }
-    ui32 GetSize() const {
+    size_t GetSize() const {
         return Blobs.size();
     }
 
@@ -79,11 +79,12 @@ class TBlobsByGenStep {
     }
 
     template <class TActor>
-    bool ExtractTo(const TGenStep includeBorder, const ui32 countLimit, const TActor& actor) {
+    requires std::invocable<TActor&, const TGenStep&, const TLogoBlobID&>
+    bool ExtractTo(const TGenStep& lessOrEqualThan, const ui32 countLimit, const TActor& actor) {
         ui32 idx = 0;
         for (auto it = Blobs.begin(); it != Blobs.end(); ++it) {
             TGenStep gs(*it);
-            if (includeBorder < gs) {
+            if (lessOrEqualThen < gs) {
                 Blobs.erase(Blobs.begin(), it);
                 return true;
             }