Tidy up in heap iterator a little (#6510)

Author: alexvru

ydb/core/blobstorage/vdisk/hulldb/base/hullds_heap_it.h

@@ -1,15 +1,11 @@
 #pragma once
+
 #include "defs.h"
-#include <algorithm>
-#include "hullds_ut.h"
-#include "hullds_generic_it.h"
-#include <ydb/core/blobstorage/vdisk/hulldb/generic/hullds_sstslice_it.h>
-#include <ydb/core/blobstorage/vdisk/hulldb/generic/hullds_idxsnap_it.h>
-#include <ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_segment_impl.h>
-#include <ydb/core/blobstorage/vdisk/hulldb/generic/hullds_idxsnap_it.h>
+#include <ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_segment.h>
 #include <ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_appendix.h>
 #include <ydb/core/blobstorage/vdisk/hulldb/generic/hullds_sst_it.h>
 #include <ydb/core/blobstorage/vdisk/hulldb/generic/hullds_sstvec_it.h>
+#include <algorithm>
 
 namespace NKikimr {
 
@@ -146,19 +142,17 @@ namespace NKikimr {
             }
         }
 
-        template<typename TMerger>
-        void Walk(TKey key, TMerger merger, std::function<bool(const TKey&, TMerger)> callback) {
-            for (int idx = 0; idx < HeapItems; idx++) {
-                auto *iter = Heap[idx];
-                iter->Seek(key);
-                while (iter->Valid()) {
-                    iter->PutToMerger(&merger);
-                    if (!callback(iter->GetCurKey(), merger)) {
-                        break;
-                    }
-                    merger.Clear();
-                    Move(nullptr);
+        template<typename TMerger, typename TCallback>
+        void Walk(TKey key, TMerger merger, TCallback&& callback) {
+            Seek(key);
+            while (Valid()) {
+                const TKey key = GetCurKey();
+                PutToMergerAndAdvance(merger);
+                merger->Finish();
+                if (!callback(key, merger)) {
+                    break;
                 }
+                merger->Clear();
             }
         }
 
@@ -168,4 +162,4 @@ namespace NKikimr {
         }
     };
 
-} // NKikimr
+} // NKikimr

ydb/core/blobstorage/vdisk/hulldb/base/hullds_heap_it_ut.cpp

@@ -3,7 +3,9 @@
 #include "hullds_heap_it.h"
 #include "hullds_ut.h"
 #include <library/cpp/testing/unittest/registar.h>
+#include <ydb/core/blobstorage/vdisk/hulldb/generic/hullds_idxsnap_it.h>
 #include <ydb/core/blobstorage/vdisk/hulldb/generic/hullds_sst_it_all_ut.h>
+#include <ydb/core/blobstorage/vdisk/hulldb/generic/hullds_sstslice_it.h>
 
 #include <util/stream/null.h>