From e6d5a448ba038c482fde064074587fb86ba6891c Mon Sep 17 00:00:00 2001
From: Itai Gilo <itai.gilo@treeverse.io>
Date: Thu, 20 Mar 2025 09:57:56 +0000
Subject: [PATCH] Remove StorageID from committed.iterator

---
 pkg/graveler/committed/iterator.go           | 4 +---
 pkg/graveler/committed/iterator_test.go      | 4 ++--
 pkg/graveler/committed/meta_range_manager.go | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkg/graveler/committed/iterator.go b/pkg/graveler/committed/iterator.go
index 34287e431b6..87faf2d9b00 100644
--- a/pkg/graveler/committed/iterator.go
+++ b/pkg/graveler/committed/iterator.go
@@ -16,18 +16,16 @@ type iterator struct {
 	rng         *Range                 // Decoded value at which rangeIt point
 	it          graveler.ValueIterator // nil at start of range
 	err         error
-	storageID   StorageID
 	namespace   Namespace
 	beforeRange bool
 }
 
-func NewIterator(ctx context.Context, manager RangeManager, storageID StorageID, namespace Namespace, rangesIt ValueIterator) Iterator {
+func NewIterator(ctx context.Context, manager RangeManager, namespace Namespace, rangesIt ValueIterator) Iterator {
 	return &iterator{
 		ctx:       ctx,
 		manager:   manager,
 		namespace: namespace,
 		rangesIt:  rangesIt,
-		storageID: storageID,
 	}
 }
 
diff --git a/pkg/graveler/committed/iterator_test.go b/pkg/graveler/committed/iterator_test.go
index df0a3269fb6..9ee186a3679 100644
--- a/pkg/graveler/committed/iterator_test.go
+++ b/pkg/graveler/committed/iterator_test.go
@@ -176,7 +176,7 @@ func TestIterator(t *testing.T) {
 				lastKey = key
 			}
 			rangesIt := testutil.NewCommittedValueIteratorFake(makeRangeRecords(tt.PK))
-			pvi := committed.NewIterator(ctx, manager, "", namespace, rangesIt)
+			pvi := committed.NewIterator(ctx, manager, namespace, rangesIt)
 			defer pvi.Close()
 			assert.Equal(t, tt.PK, keysByRanges(t, pvi))
 			assert.False(t, pvi.NextRange())
@@ -201,7 +201,7 @@ func TestIterator(t *testing.T) {
 				lastKey = key
 			}
 			rangesIt := testutil.NewCommittedValueIteratorFake(makeRangeRecords(tt.PK))
-			pvi := committed.NewIterator(ctx, manager, "", namespace, rangesIt)
+			pvi := committed.NewIterator(ctx, manager, namespace, rangesIt)
 			defer pvi.Close()
 
 			if len(tt.PK) == 0 {
diff --git a/pkg/graveler/committed/meta_range_manager.go b/pkg/graveler/committed/meta_range_manager.go
index 7ee9e72054e..9e3eca0fcc0 100644
--- a/pkg/graveler/committed/meta_range_manager.go
+++ b/pkg/graveler/committed/meta_range_manager.go
@@ -110,7 +110,7 @@ func (m *metaRangeManager) NewMetaRangeIterator(ctx context.Context, ns graveler
 	if err != nil {
 		return nil, fmt.Errorf("manage metarange %s: %w", metaRangeID, err)
 	}
-	return NewIterator(ctx, m.rangeManager, StorageID(m.storageID), Namespace(ns), rangesIt), nil
+	return NewIterator(ctx, m.rangeManager, Namespace(ns), rangesIt), nil
 }
 
 func (m *metaRangeManager) GetMetaRangeURI(ctx context.Context, id graveler.MetaRangeID) (string, error) {