From 580189ee3e43d5595a8700ee21b8900b0dd5389d Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Tue, 15 Nov 2022 20:57:04 -0700
Subject: Delete 'inspect visualize-nodes'

---
 .../btrfsinspect/rebuildnodes/uuidmap.go           | 73 ----------------------
 1 file changed, 73 deletions(-)

(limited to 'lib/btrfsprogs/btrfsinspect/rebuildnodes/uuidmap.go')

diff --git a/lib/btrfsprogs/btrfsinspect/rebuildnodes/uuidmap.go b/lib/btrfsprogs/btrfsinspect/rebuildnodes/uuidmap.go
index 7be903a..4d93916 100644
--- a/lib/btrfsprogs/btrfsinspect/rebuildnodes/uuidmap.go
+++ b/lib/btrfsprogs/btrfsinspect/rebuildnodes/uuidmap.go
@@ -5,12 +5,8 @@
 package rebuildnodes
 
 import (
-	"fmt"
-	"strings"
-
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsprim"
 	"git.lukeshu.com/btrfs-progs-ng/lib/containers"
-	"git.lukeshu.com/btrfs-progs-ng/lib/maps"
 )
 
 type uuidMap struct {
@@ -57,72 +53,3 @@ func (m uuidMap) ParentTree(tree btrfsprim.ObjID) (btrfsprim.ObjID, bool) {
 	}
 	return parentObjID, true
 }
-
-type fullAncestorLister struct {
-	uuidMap       uuidMap
-	treeAncestors map[btrfsprim.ObjID]containers.Set[btrfsprim.ObjID]
-
-	memos map[btrfsprim.ObjID]containers.Set[btrfsprim.ObjID]
-}
-
-func newFullAncestorLister(uuidMap uuidMap, treeAncestors map[btrfsprim.ObjID]containers.Set[btrfsprim.ObjID]) fullAncestorLister {
-	return fullAncestorLister{
-		uuidMap:       uuidMap,
-		treeAncestors: treeAncestors,
-		memos:         make(map[btrfsprim.ObjID]containers.Set[btrfsprim.ObjID]),
-	}
-}
-
-type loopError []btrfsprim.ObjID
-
-func (le loopError) Error() string {
-	var buf strings.Builder
-	buf.WriteString("loop: ")
-	for i, treeID := range le {
-		if i > 0 {
-			buf.WriteString("->")
-		}
-		fmt.Fprintf(&buf, "%d", treeID)
-	}
-	return buf.String()
-}
-
-func (fa fullAncestorLister) GetFullAncestors(child btrfsprim.ObjID) containers.Set[btrfsprim.ObjID] {
-	if memoized, ok := fa.memos[child]; ok {
-		if memoized == nil {
-			panic(loopError{child})
-		}
-		return memoized
-	}
-	fa.memos[child] = nil
-	defer func() {
-		if r := recover(); r != nil {
-			if le, ok := r.(loopError); ok {
-				r = append(loopError{child}, le...)
-			}
-			panic(r)
-		}
-	}()
-
-	ret := make(containers.Set[btrfsprim.ObjID])
-	defer func() {
-		fa.memos[child] = ret
-	}()
-
-	// Try to use '.uuidMap' instead of '.treeAncestors' if possible.
-	knownAncestors := make(containers.Set[btrfsprim.ObjID])
-	if parent, ok := fa.uuidMap.ParentTree(child); ok {
-		if parent == 0 {
-			return ret
-		}
-		knownAncestors.Insert(parent)
-	} else {
-		knownAncestors.InsertFrom(fa.treeAncestors[child])
-	}
-
-	for _, ancestor := range maps.SortedKeys(knownAncestors) {
-		ret.Insert(ancestor)
-		ret.InsertFrom(fa.GetFullAncestors(ancestor))
-	}
-	return ret
-}
-- 
cgit v1.2.3-2-g168b


From 182bab3aa8b8e08d6a35d344c32d93a4293a36f4 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Tue, 29 Nov 2022 14:42:30 -0700
Subject: rebuildnodes: Refactor uuidMap in to a separate sub-package

---
 .../btrfsinspect/rebuildnodes/uuidmap.go           | 55 ----------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 lib/btrfsprogs/btrfsinspect/rebuildnodes/uuidmap.go

(limited to 'lib/btrfsprogs/btrfsinspect/rebuildnodes/uuidmap.go')

diff --git a/lib/btrfsprogs/btrfsinspect/rebuildnodes/uuidmap.go b/lib/btrfsprogs/btrfsinspect/rebuildnodes/uuidmap.go
deleted file mode 100644
index 4d93916..0000000
--- a/lib/btrfsprogs/btrfsinspect/rebuildnodes/uuidmap.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (C) 2022  Luke Shumaker <lukeshu@lukeshu.com>
-//
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package rebuildnodes
-
-import (
-	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsprim"
-	"git.lukeshu.com/btrfs-progs-ng/lib/containers"
-)
-
-type uuidMap struct {
-	ObjID2UUID map[btrfsprim.ObjID]btrfsprim.UUID
-	UUID2ObjID map[btrfsprim.UUID]btrfsprim.ObjID
-	TreeParent map[btrfsprim.ObjID]btrfsprim.UUID
-
-	SeenTrees containers.Set[btrfsprim.ObjID]
-}
-
-func (m uuidMap) missingRootItems() containers.Set[btrfsprim.ObjID] {
-	missing := make(containers.Set[btrfsprim.ObjID])
-	for treeID := range m.SeenTrees {
-		if _, ok := m.ObjID2UUID[treeID]; !ok && treeID != btrfsprim.ROOT_TREE_OBJECTID {
-			missing.Insert(treeID)
-			continue
-		}
-		if _, ok := m.TreeParent[treeID]; !ok && treeID >= btrfsprim.FIRST_FREE_OBJECTID && treeID <= btrfsprim.LAST_FREE_OBJECTID {
-			missing.Insert(treeID)
-		}
-	}
-	return missing
-}
-
-// ParentTree implements btrfstree.NodeFile.
-func (m uuidMap) ParentTree(tree btrfsprim.ObjID) (btrfsprim.ObjID, bool) {
-	if tree < btrfsprim.FIRST_FREE_OBJECTID || tree > btrfsprim.LAST_FREE_OBJECTID {
-		// no parent
-		return 0, true
-	}
-	parentUUID, ok := m.TreeParent[tree]
-	if !ok {
-		// could not look up parent info
-		return 0, false
-	}
-	if parentUUID == (btrfsprim.UUID{}) {
-		// no parent
-		return 0, true
-	}
-	parentObjID, ok := m.UUID2ObjID[parentUUID]
-	if !ok {
-		// could not look up parent info
-		return 0, false
-	}
-	return parentObjID, true
-}
-- 
cgit v1.2.3-2-g168b