From 4aa977f1190a9cddffe231e7a84f6d7be28aa256 Mon Sep 17 00:00:00 2001
From: zenground0 <ZenGround0@users.noreply.github.com>
Date: Tue, 27 Jun 2023 11:00:20 -0600
Subject: [PATCH] Touch up pathing

---
 cmd/lotus-shed/state-stats.go | 18 ++++++++++--------
 scripts/snapshot-summary.py   |  9 ++++++---
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/cmd/lotus-shed/state-stats.go b/cmd/lotus-shed/state-stats.go
index 0a7811828..74492cdc3 100644
--- a/cmd/lotus-shed/state-stats.go
+++ b/cmd/lotus-shed/state-stats.go
@@ -324,8 +324,10 @@ var statSnapshotCmd = &cli.Command{
 		resultCh := make(chan result)
 		cidCh := make(chan cidCall, numWorkers)
 		summary := make(map[string]api.ObjStat)
-		summary["/snapshot"] = api.ObjStat{Size: 0, Links: 0}       // snapshot root object has no additional bytes or links
-		summary["/snapshot/churn"] = api.ObjStat{Size: 0, Links: 0} // snapshot root object has no additional bytes or links
+		// snapshot root objects with no additional bytes or links
+		summary["/"] = api.ObjStat{Size: 0, Links: 0}
+		summary["/statetree"] = api.ObjStat{Size: 0, Links: 0}
+		summary["/statetree/churn"] = api.ObjStat{Size: 0, Links: 0} // XXX this will be calculated
 
 		combine := func(statsA, statsB api.ObjStat) api.ObjStat {
 			return api.ObjStat{
@@ -372,7 +374,7 @@ var statSnapshotCmd = &cli.Command{
 				if actType == "<unknown>" {
 					actType = act.Code.String()
 				}
-				jobCh <- job{c: act.Head, key: fmt.Sprintf("/snapshot/state/%s", actType)}
+				jobCh <- job{c: act.Head, key: fmt.Sprintf("/statetree/latest/%s", actType)}
 
 				return nil
 			})
@@ -442,7 +444,7 @@ var statSnapshotCmd = &cli.Command{
 		jobCh = make(chan job)
 		go func() {
 			defer close(jobCh)
-			jobCh <- job{c: ts.ParentState(), key: "/snapshot/state"}
+			jobCh <- job{c: ts.ParentState(), key: "/statetree"}
 		}()
 		go func() {
 			defer close(resultCh)
@@ -499,10 +501,10 @@ var statSnapshotCmd = &cli.Command{
 				}
 
 				// header directly to result channel
-				resultCh <- result{key: "snapshot/headers", stats: api.ObjStat{Size: uint64(len(nd.RawData())), Links: uint64(len(nd.Links()))}}
+				resultCh <- result{key: "/headers", stats: api.ObjStat{Size: uint64(len(nd.RawData())), Links: uint64(len(nd.Links()))}}
 				// message job
 				if b.Height > startHeight-snapshotStateLimit {
-					jobCh <- job{key: "snapshot/messages", c: b.Messages}
+					jobCh <- job{key: "/messages", c: b.Messages}
 				}
 
 				// state churn job
@@ -520,7 +522,7 @@ var statSnapshotCmd = &cli.Command{
 								if actType == "<unknown>" {
 									actType = act.Code.String()
 								}
-								jobCh <- job{c: act.Head, key: fmt.Sprintf("/snapshot/churn/%s", actType)}
+								jobCh <- job{c: act.Head, key: fmt.Sprintf("/statetree/churn/%s", actType)}
 							}
 
 							return nil
@@ -757,7 +759,7 @@ to reduce the number of decode operations performed by caching the decoded objec
 
 func collectSnapshotJobStats(ctx context.Context, in job, dag format.NodeGetter, visit func(c cid.Cid) bool) ([]result, error) {
 	// "state" and "churn" attempt further breakdown by actor type
-	if !(path.Dir(in.key) == "/snapshot/state") && !(path.Dir(in.key) == "/snapshot/churn") {
+	if !(path.Dir(in.key) == "/statetree/latest") && !(path.Dir(in.key) == "/statetree/churn") {
 		dsc := &dagStatCollector{
 			ds:   dag,
 			walk: carWalkFunc,
diff --git a/scripts/snapshot-summary.py b/scripts/snapshot-summary.py
index da75ee9a7..fd64da64f 100644
--- a/scripts/snapshot-summary.py
+++ b/scripts/snapshot-summary.py
@@ -1,5 +1,6 @@
 import plotly.express as px
 import sys, json
+import pathlib
 
 snapshot_data = json.load(sys.stdin)
 
@@ -12,9 +13,11 @@ names = []
 values = []
 
 for key in snapshot_data:
-    path = key.split('/')
-    name = path[len(path) - 1]
-    parent = path[len(path) - 2]
+    path = pathlib.Path(key)
+    name = key
+    parent = str(path.parent)
+    if key == '/':
+        parent = ''
     stats = snapshot_data[key]
     parents.append(parent)
     names.append(name)