WIP

Author: ryanmorphl2

Diff for: cmd/geth/dbcmd.go

@@ -746,6 +746,11 @@ func hbss2pbss(ctx *cli.Context) error {
 		log.Error("Prune Hash trie node in database failed", "error", err)
 		return err
 	}
+	err = h2p.Compact()
+	if err != nil {
+		log.Error("Compact trie node failed", "error", err)
+		return err
+	}
 
 	return nil
 }

Diff for: core/rawdb/database.go

@@ -473,6 +473,8 @@ func PruneHashTrieNodeInDataBase(db ethdb.Database) error {
 	it := db.NewIterator([]byte{}, []byte{})
 	defer it.Release()
 
+	start := time.Now()
+	logged := time.Now()
 	total_num := 0
 	for it.Next() {
 		var key = it.Key()
@@ -481,12 +483,16 @@ func PruneHashTrieNodeInDataBase(db ethdb.Database) error {
 			db.Delete(key)
 			total_num++
 			if total_num%100000 == 0 {
-				log.Info("Pruning hash-base state trie nodes", "Complete progress: ", total_num)
+				log.Info("Pruning hash-base state trie nodes", "Complete progress: ", total_num, "elapsed", common.PrettyDuration(time.Since(start)))
 			}
 		default:
+			if time.Since(logged) > 8*time.Second {
+				log.Info("Pruning hash-base state trie nodes", "Complete progress: ", total_num, "elapsed", common.PrettyDuration(time.Since(start)))
+				logged = time.Now()
+			}
 			continue
 		}
 	}
-	log.Info("Pruning hash-base state trie nodes", "Complete progress", total_num)
+	log.Info("Pruning hash-base state trie nodes", "Complete progress", total_num, "elapsed", common.PrettyDuration(time.Since(start)))
 	return nil
 }

Diff for: trie/database.go

@@ -1126,7 +1126,6 @@ func (db *Database) GetFrom(root, key []byte) ([]byte, error) {
 			return n, nil
 		}
 
-		log.Info("pathdb get node reader is nil", "root", r.Hex())
 		return nil, errors.New("reader is nil")
 	}
 	return nil, nil

Diff for: trie/hbss2pbss.go

@@ -108,6 +108,27 @@ func (h2p *Hbss2Pbss) handleGenesis() error {
 	return nil
 }
 
+func (h2p *Hbss2Pbss) Compact() error {
+	cstart := time.Now()
+	for b := 0x00; b <= 0xf0; b += 0x10 {
+		var (
+			start = []byte{byte(b)}
+			end   = []byte{byte(b + 0x10)}
+		)
+		if b == 0xf0 {
+			end = nil
+		}
+		log.Info("Compacting database", "range", fmt.Sprintf("%#x-%#x", start, end), "elapsed", common.PrettyDuration(time.Since(cstart)))
+		if err := h2p.db.Compact(start, end); err != nil {
+			log.Error("Database compaction failed", "error", err)
+			return err
+		}
+	}
+	log.Info("Database compaction finished", "elapsed", common.PrettyDuration(time.Since(cstart)))
+
+	return nil
+}
+
 func (h2p *Hbss2Pbss) writeNode(pathKey []bool, n *zktrie.Node, owner common.Hash) {
 	if owner == (common.Hash{}) {
 		h, _ := n.NodeHash()