@@ -72,20 +72,21 @@ export const updateHamtDirectory = async (context, links, bucket, options) => {
7272}
7373
7474/**
75+ * @param {MfsContext } context
7576 * @param {PBLink[] } links
7677 * @param {Bucket<any> } rootBucket
7778 * @param {Bucket<any> } parentBucket
7879 * @param {number } positionAtParent
7980 */
80- export const recreateHamtLevel = async ( links , rootBucket , parentBucket , positionAtParent ) => {
81+ export const recreateHamtLevel = async ( context , links , rootBucket , parentBucket , positionAtParent ) => {
8182 // recreate this level of the HAMT
8283 const bucket = new Bucket ( {
8384 hash : rootBucket . _options . hash ,
8485 bits : rootBucket . _options . bits
8586 } , parentBucket , positionAtParent )
8687 parentBucket . _putObjectAt ( positionAtParent , bucket )
8788
88- await addLinksToHamtBucket ( links , bucket , rootBucket )
89+ await addLinksToHamtBucket ( context , links , bucket , rootBucket )
8990
9091 return bucket
9192}
@@ -99,28 +100,57 @@ export const recreateInitialHamtLevel = async (links) => {
99100 bits : hamtBucketBits
100101 } )
101102
102- await addLinksToHamtBucket ( links , bucket , bucket )
103+ // populate sub bucket but do not recurse as we do not want to pull whole shard in
104+ await Promise . all (
105+ links . map ( async link => {
106+ const linkName = ( link . Name || '' )
107+
108+ if ( linkName . length === 2 ) {
109+ const pos = parseInt ( linkName , 16 )
110+
111+ const subBucket = new Bucket ( {
112+ hash : bucket . _options . hash ,
113+ bits : bucket . _options . bits
114+ } , bucket , pos )
115+ bucket . _putObjectAt ( pos , subBucket )
116+
117+ return Promise . resolve ( )
118+ }
119+
120+ return bucket . put ( linkName . substring ( 2 ) , {
121+ size : link . Tsize ,
122+ cid : link . Hash
123+ } )
124+ } )
125+ )
103126
104127 return bucket
105128}
106129
107130/**
131+ * @param {MfsContext } context
108132 * @param {PBLink[] } links
109133 * @param {Bucket<any> } bucket
110134 * @param {Bucket<any> } rootBucket
111135 */
112- export const addLinksToHamtBucket = async ( links , bucket , rootBucket ) => {
136+ export const addLinksToHamtBucket = async ( context , links , bucket , rootBucket ) => {
113137 await Promise . all (
114- links . map ( link => {
138+ links . map ( async link => {
115139 const linkName = ( link . Name || '' )
116140
117141 if ( linkName . length === 2 ) {
142+ log ( 'Populating sub bucket' , linkName )
118143 const pos = parseInt ( linkName , 16 )
144+ const block = await context . repo . blocks . get ( link . Hash )
145+ const node = dagPB . decode ( block )
119146
120- bucket . _putObjectAt ( pos , new Bucket ( {
147+ const subBucket = new Bucket ( {
121148 hash : rootBucket . _options . hash ,
122149 bits : rootBucket . _options . bits
123- } , bucket , pos ) )
150+ } , bucket , pos )
151+ bucket . _putObjectAt ( pos , subBucket )
152+
153+ await addLinksToHamtBucket ( context , node . Links , subBucket , rootBucket )
124154
125155 return Promise . resolve ( )
126156 }
@@ -213,7 +243,7 @@ export const generatePath = async (context, fileName, rootNode) => {
213243 if ( ! path [ i + 1 ] ) {
214244 log ( `Loaded new subshard ${ segment . prefix } )
215245
216- await recreateHamtLevel ( node . Links , rootBucket , segment . bucket , parseInt ( segment . prefix , 16 ) )
246+ await recreateHamtLevel ( context , node . Links , rootBucket , segment . bucket , parseInt ( segment . prefix , 16 ) )
217247 const position = await rootBucket . _findNewBucketAndPos ( fileName )
218248
219249 // i--
@@ -229,7 +259,7 @@ export const generatePath = async (context, fileName, rootNode) => {
229259 const nextSegment = path [ i + 1 ]
230260
231261 // add intermediate links to bucket
232- await addLinksToHamtBucket ( node . Links , nextSegment . bucket , rootBucket )
262+ await addLinksToHamtBucket ( context , node . Links , nextSegment . bucket , rootBucket )
233263
234264 nextSegment . node = node
235265 }
0 commit comments