rebuildnodes: Refactor uuidMap in to a separate sub-package

1 files changed, 6 insertions, 45 deletions

diff --git a/lib/btrfsprogs/btrfsinspect/rebuildnodes/scan.go b/lib/btrfsprogs/btrfsinspect/rebuildnodes/scan.go
index 40ace46..9174035 100644
--- a/lib/btrfsprogs/btrfsinspect/rebuildnodes/scan.go
+++ b/lib/btrfsprogs/btrfsinspect/rebuildnodes/scan.go
@@ -10,18 +10,17 @@ import (
 	"github.com/datawire/dlib/dlog"
 
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
-	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem"
-	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsprim"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfstree"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect/rebuildnodes/graph"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect/rebuildnodes/uuidmap"
 	"git.lukeshu.com/btrfs-progs-ng/lib/containers"
 	"git.lukeshu.com/btrfs-progs-ng/lib/maps"
 )
 
 type scanResult struct {
-	uuidMap
+	uuidMap   *uuidmap.UUIDMap
 	nodeGraph *graph.Graph
 }
 
@@ -46,23 +45,10 @@ func ScanDevices(ctx context.Context, fs *btrfs.FS, scanResults btrfsinspect.Sca
 	}
 
 	ret := &scanResult{
-		uuidMap: uuidMap{
-			ObjID2UUID: make(map[btrfsprim.ObjID]btrfsprim.UUID),
-			UUID2ObjID: make(map[btrfsprim.UUID]btrfsprim.ObjID),
-			TreeParent: make(map[btrfsprim.ObjID]btrfsprim.UUID),
-
-			SeenTrees: make(containers.Set[btrfsprim.ObjID]),
-		},
+		uuidMap:   uuidmap.New(),
 		nodeGraph: graph.New(*sb),
 	}
 
-	// These 4 trees are mentioned directly in the superblock, so
-	// they are always seen.
-	ret.SeenTrees.Insert(btrfsprim.ROOT_TREE_OBJECTID)
-	ret.SeenTrees.Insert(btrfsprim.CHUNK_TREE_OBJECTID)
-	ret.SeenTrees.Insert(btrfsprim.TREE_LOG_OBJECTID)
-	ret.SeenTrees.Insert(btrfsprim.BLOCK_GROUP_TREE_OBJECTID)
-
 	progress(done, total)
 	for _, devResults := range scanResults {
 		for laddr := range devResults.FoundNodes {
@@ -73,35 +59,10 @@ func ScanDevices(ctx context.Context, fs *btrfs.FS, scanResults btrfsinspect.Sca
 				return nil, err
 			}
 
-			// UUID map rebuilding
-			for _, item := range nodeRef.Data.BodyLeaf {
-				switch itemBody := item.Body.(type) {
-				case btrfsitem.Root:
-					if err := maybeSet("ObjID2UUID", ret.ObjID2UUID, item.Key.ObjectID, itemBody.UUID); err != nil {
-						return nil, err
-					}
-					if itemBody.UUID != (btrfsprim.UUID{}) {
-						if err := maybeSet("UUID2ObjID", ret.UUID2ObjID, itemBody.UUID, item.Key.ObjectID); err != nil {
-							return nil, err
-						}
-					}
-					if err := maybeSet("ParentUUID", ret.TreeParent, item.Key.ObjectID, itemBody.ParentUUID); err != nil {
-						return nil, err
-					}
-					ret.SeenTrees.Insert(item.Key.ObjectID)
-				case btrfsitem.UUIDMap:
-					uuid := btrfsitem.KeyToUUID(item.Key)
-					if err := maybeSet("ObjID2UUID", ret.ObjID2UUID, itemBody.ObjID, uuid); err != nil {
-						return nil, err
-					}
-					if err := maybeSet("UUID2ObjID", ret.UUID2ObjID, uuid, itemBody.ObjID); err != nil {
-						return nil, err
-					}
-				}
+			if err := ret.uuidMap.InsertNode(nodeRef); err != nil {
+				return nil, err
 			}
-			ret.SeenTrees.Insert(nodeRef.Data.Head.Owner)
 
-			// graph building
 			ret.nodeGraph.InsertNode(nodeRef)
 
 			done++
@@ -113,7 +74,7 @@ func ScanDevices(ctx context.Context, fs *btrfs.FS, scanResults btrfsinspect.Sca
 		panic("should not happen")
 	}
 
-	missing := ret.missingRootItems()
+	missing := ret.uuidMap.MissingRootItems()
 	if len(missing) > 0 {
 		dlog.Errorf(ctx, "... could not find root items for %d trees: %v", len(missing), maps.SortedKeys(missing))
 	}