swarm/storage/localstore: writeGCSize function with leveldb batch

swarm/storage/localstore/gc.go

@@ -148,7 +148,7 @@ func (db *DB) writeGCSizeWorker() {
 	for {
 		select {
 		case <-db.writeGCSizeTrigger:
-			err := db.writeGCSize()
+			err := db.writeGCSize(atomic.LoadInt64(&db.gcSize))
 			if err != nil {
 				log.Error("localstore write gc size", "err", err)
 			}
@@ -167,15 +167,33 @@ func (db *DB) writeGCSizeWorker() {
 // It removes all hashes from gcUncountedHashesIndex
 // not to include them on the next database initialization
 // when gcSize is counted.
-func (db *DB) writeGCSize() (err error) {
+func (db *DB) writeGCSize(gcSize int64) (err error) {
-	gcSize := atomic.LoadInt64(&db.gcSize)
+	const maxBatchSize = 1000
-	err = db.storedGCSize.Put(uint64(gcSize))
+
+	batch := new(leveldb.Batch)
+	db.storedGCSize.PutInBatch(batch, uint64(gcSize))
+	batchSize := 1
+
+	// use only one iterator as it acquires its snapshot
+	// not to remove hashes from index that are added
+	// after stored gc size is written
+	err = db.gcUncountedHashesIndex.IterateAll(func(item shed.Item) (stop bool, err error) {
+		db.gcUncountedHashesIndex.DeleteInBatch(batch, item)
+		batchSize++
+		if batchSize >= maxBatchSize {
+			err = db.shed.WriteBatch(batch)
+			if err != nil {
+				return false, err
+			}
+			batch.Reset()
+			batchSize = 0
+		}
+		return false, nil
+	})
 	if err != nil {
 		return err
 	}
-	return db.gcUncountedHashesIndex.IterateAll(func(item shed.Item) (stop bool, err error) {
+	return db.shed.WriteBatch(batch)
-		return false, db.gcUncountedHashesIndex.Delete(item)
-	})
 }
 
 // testHookCollectGarbage is a hook that can provide

swarm/storage/localstore/localstore.go

@@ -325,15 +325,9 @@ func New(path string, baseKey []byte, o *Options) (db *DB, err error) {
 		return nil, err
 	}
 	gcSize += uint64(gcUncountedSize)
-	// remove uncounted hashes from the index
+	// remove uncounted hashes from the index and
-	err = db.gcUncountedHashesIndex.IterateAll(func(item shed.Item) (stop bool, err error) {
-		return false, db.gcUncountedHashesIndex.Delete(item)
-	})
-	if err != nil {
-		return nil, err
-	}
 	// save the total gcSize after uncounted hashes are removed
-	err = db.storedGCSize.Put(gcSize)
+	err = db.writeGCSize(int64(gcSize))
 	if err != nil {
 		return nil, err
 	}