From 9dcea9de6530d3c99e7802e174290839c6a4c947 Mon Sep 17 00:00:00 2001
From: Tinu280 <satria.agan@gmail.com>
Date: Wed, 19 Nov 2025 16:33:04 +0700
Subject: [PATCH] cleanup: restore dbcmd.go and rawdb files, remove tablewriter
 dependency

---
 cmd/geth/dbcmd.go                         | 17 ++++++-----------
 core/rawdb/database.go                    | 20 +++++---------------
 core/rawdb/database_tablewriter_tinygo.go |  8 --------
 core/rawdb/database_tablewriter_unix.go   | 16 +++++++++-------
 4 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/cmd/geth/dbcmd.go b/cmd/geth/dbcmd.go
index 9a895b4930..c57add0656 100644
--- a/cmd/geth/dbcmd.go
+++ b/cmd/geth/dbcmd.go
@@ -41,6 +41,7 @@ import (
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/ethereum/go-ethereum/trie"
 	"github.com/ethereum/go-ethereum/triedb"
+	"github.com/olekukonko/tablewriter"
 	"github.com/urfave/cli/v2"
 )
 
@@ -759,17 +760,11 @@ func showMetaData(ctx *cli.Context) error {
 		data = append(data, []string{"headHeader.Root", fmt.Sprintf("%v", h.Root)})
 		data = append(data, []string{"headHeader.Number", fmt.Sprintf("%d (%#x)", h.Number, h.Number)})
 	}
-	table.SetHeader([]string{"Key", "Value"})
-
-for key, value := range stats {
-        table.Append([]string{key, fmt.Sprintf("%v", value)})
-}
-
-fmt.Println("Key\tValue")
-for key, value := range stats {
-    fmt.Printf("%s\t%v\n", key, value)
-}
-return nil
+	table := tablewriter.NewWriter(os.Stdout)
+	table.SetHeader([]string{"Field", "Value"})
+	table.AppendBulk(data)
+	table.Render()
+	return nil
 }
 
 func inspectAccount(db *triedb.Database, start uint64, end uint64, address common.Address, raw bool) error {
diff --git a/core/rawdb/database.go b/core/rawdb/database.go
index c26a6b4f18..d5c0f0aab2 100644
--- a/core/rawdb/database.go
+++ b/core/rawdb/database.go
@@ -650,21 +650,11 @@ func InspectDatabase(db ethdb.Database, keyPrefix, keyStart []byte) error {
 		total.Add(uint64(ancient.size()))
 	}
 
-// Print header
-fmt.Println("Database\tCategory\tSize\tItems")
-
-// Print table rows (stats is [][]string)
-for _, row := range stats {
-    if len(row) == 4 {
-        fmt.Printf("%s\t%s\t%s\t%s\n", row[0], row[1], row[2], row[3])
-    }
-}
-
-// Print footer summary
-fmt.Printf("\nTotal\t\t%s\t%d\n",
-    common.StorageSize(total.Load()).String(),
-    count.Load(),
-)
+	table := newTableWriter(os.Stdout)
+	table.SetHeader([]string{"Database", "Category", "Size", "Items"})
+	table.SetFooter([]string{"", "Total", common.StorageSize(total.Load()).String(), fmt.Sprintf("%d", count.Load())})
+	table.AppendBulk(stats)
+	table.Render()
 
 	if !unaccounted.empty() {
 		log.Error("Database contains unaccounted data", "size", unaccounted.sizeString(), "count", unaccounted.countString())
diff --git a/core/rawdb/database_tablewriter_tinygo.go b/core/rawdb/database_tablewriter_tinygo.go
index 50bdd11aa4..2f8e456fd5 100644
--- a/core/rawdb/database_tablewriter_tinygo.go
+++ b/core/rawdb/database_tablewriter_tinygo.go
@@ -206,11 +206,3 @@ func (t *Table) printRow(row []string, widths []int) {
 	}
 	fmt.Fprintln(t.out)
 }
-package rawdb
-
-import "io"
-
-// TinyGo doesn't support table formatting; use minimal placeholder.
-type Table struct{}
-
-func NewTableWriter(w io.Writer) *Table { return &Table{} }
diff --git a/core/rawdb/database_tablewriter_unix.go b/core/rawdb/database_tablewriter_unix.go
index d407eb02e6..8bec5396e8 100644
--- a/core/rawdb/database_tablewriter_unix.go
+++ b/core/rawdb/database_tablewriter_unix.go
@@ -19,13 +19,15 @@
 
 package rawdb
 
-import "io"
+import (
+	"io"
 
-// Table is a placeholder struct for manual table rendering.
-type Table struct {
-    w io.Writer
-}
+	"github.com/olekukonko/tablewriter"
+)
 
-func NewTableWriter(w io.Writer) *Table {
-    return &Table{w: w}
+// Re-export the real tablewriter types and functions
+type Table = tablewriter.Table
+
+func newTableWriter(w io.Writer) *Table {
+	return tablewriter.NewWriter(w)
 }