for.of instead of foreach

max-ostapenko · max-ostapenko · commit 31cd18152718 · 2024-12-11T01:24:14.000+01:00
diff --git a/infra/dataform-export/firestore.js b/infra/dataform-export/firestore.js
@@ -83,23 +83,22 @@ export class FirestoreBatch {
     }
 
     while (true) {
-      const snapshot = await collectionQuery.limit(100000).get()
+      const snapshot = await collectionQuery.limit(this.batchSize * this.maxConcurrentBatches).get()
       if (snapshot.empty) {
         break
       }
 
-      snapshot.forEach(async (doc) => {
+      for await (const doc of snapshot.docs) {
         this.currentBatch.push(doc)
 
         if (this.currentBatch.length >= this.batchSize) {
           this.queueBatch('delete')
         }
-
         if (this.batchPromises.length >= this.maxConcurrentBatches) {
           await this.commitBatches()
         }
         totalDocsDeleted++
-      })
+      }
     }
     await this.finalFlush('delete')
 

Original file line number	Diff line number	Diff line change
`@@ -83,23 +83,22 @@ export class FirestoreBatch {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`while (true) {`
`86`		`- const snapshot = await collectionQuery.limit(100000).get()`
	`86`	`+ const snapshot = await collectionQuery.limit(this.batchSize * this.maxConcurrentBatches).get()`
`87`	`87`	`if (snapshot.empty) {`
`88`	`88`	`break`
`89`	`89`	`}`
`90`	`90`
`91`		`- snapshot.forEach(async (doc) => {`
	`91`	`+ for await (const doc of snapshot.docs) {`
`92`	`92`	`this.currentBatch.push(doc)`
`93`	`93`
`94`	`94`	`if (this.currentBatch.length >= this.batchSize) {`
`95`	`95`	`this.queueBatch('delete')`
`96`	`96`	`}`
`97`		`-`
`98`	`97`	`if (this.batchPromises.length >= this.maxConcurrentBatches) {`
`99`	`98`	`await this.commitBatches()`
`100`	`99`	`}`
`101`	`100`	`totalDocsDeleted++`
`102`		`- })`
	`101`	`+ }`
`103`	`102`	`}`
`104`	`103`	`await this.finalFlush('delete')`
`105`	`104`