Merge pull request #12238 from apoelstra/2025-01--unsorted-gc

edolstra · web-flow · commit a78f998cc786 · 2025-01-13T13:33:12.000+01:00
gc: replace ordered sets with unordered sets for in-memory caches
diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc
@@ -455,7 +455,7 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results)
     bool gcKeepOutputs = settings.gcKeepOutputs;
     bool gcKeepDerivations = settings.gcKeepDerivations;
 
-    StorePathSet roots, dead, alive;
+    std::unordered_set<StorePath> roots, dead, alive;
 
     struct Shared
     {
@@ -661,7 +661,7 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results)
         }
     };
 
-    std::map<StorePath, StorePathSet> referrersCache;
+    std::unordered_map<StorePath, StorePathSet> referrersCache;
 
     /* Helper function that visits all paths reachable from `start`
        via the referrers edges and optionally derivers and derivation

Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,7 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results)`
`455`	`455`	`bool gcKeepOutputs = settings.gcKeepOutputs;`
`456`	`456`	`bool gcKeepDerivations = settings.gcKeepDerivations;`
`457`	`457`
`458`		`- StorePathSet roots, dead, alive;`
	`458`	`+ std::unordered_set<StorePath> roots, dead, alive;`
`459`	`459`
`460`	`460`	`struct Shared`
`461`	`461`	`{`
`@@ -661,7 +661,7 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results)`
`661`	`661`	`}`
`662`	`662`	`};`
`663`	`663`
`664`		`- std::map<StorePath, StorePathSet> referrersCache;`
	`664`	`+ std::unordered_map<StorePath, StorePathSet> referrersCache;`
`665`	`665`
`666`	`666`	/* Helper function that visits all paths reachable from `start`
`667`	`667`	`via the referrers edges and optionally derivers and derivation`