Remove key_size() method from ledger-tool analyze_storage()

We iterate through key-value pairs anyways, so just get the key size
from there.

ledger-tool/src/main.rs

@@ -743,25 +743,31 @@ fn analyze_column<
     db: &Database,
     name: &str,
 ) {
+    let mut key_len: u64 = 0;
     let mut key_tot: u64 = 0;
     let mut val_hist = histogram::Histogram::new();
     let mut val_tot: u64 = 0;
     let mut row_hist = histogram::Histogram::new();
-    let a = C::key_size() as u64;
-    for (_x, y) in db.iter::<C>(blockstore_db::IteratorMode::Start).unwrap() {
-        let b = y.len() as u64;
-        key_tot += a;
-        val_hist.increment(b).unwrap();
-        val_tot += b;
-        row_hist.increment(a + b).unwrap();
+    for (key, val) in db.iter::<C>(blockstore_db::IteratorMode::Start).unwrap() {
+        // Key length is fixed, only need to calculate it once
+        if key_len == 0 {
+            key_len = C::key(key).len() as u64;
+        }
+        let val_len = val.len() as u64;
+
+        key_tot += key_len;
+        val_hist.increment(val_len).unwrap();
+        val_tot += val_len;
+
+        row_hist.increment(key_len + val_len).unwrap();
     }
 
     let json_result = if val_hist.entries() > 0 {
         json!({
             "column":name,
             "entries":val_hist.entries(),
             "key_stats":{
-                "max":a,
+                "max":key_len,
                 "total_bytes":key_tot,
             },
             "val_stats":{
@@ -790,7 +796,7 @@ fn analyze_column<
         "column":name,
         "entries":val_hist.entries(),
         "key_stats":{
-            "max":a,
+            "max":key_len,
             "total_bytes":0,
         },
         "val_stats":{