Introduce simplifyCount to summarize counts in magnitudes of 10^3

All sizes are still simplified with `simplifySize`.

All offsets are not simplified.

Author: max-ipinfo

lib/cmd_metadata.go

@@ -131,8 +131,8 @@ func CmdMetadata(f CmdMetadataFlags, args []string, printHelp func()) error {
 		printline("Binary Format", binaryFmt, "")
 		printline("Database Type", mdFromLib.DatabaseType, "")
 		printline("IP Version", strconv.Itoa(int(mdFromLib.IPVersion)), "")
-		printline("Record Size", strconv.Itoa(int(mdFromLib.RecordSize)), simplifySize(int64(mdFromLib.RecordSize)))
-		printline("Node Count", strconv.Itoa(int(mdFromLib.NodeCount)), "")
+		printline("Record Size", strconv.Itoa(int(mdFromLib.RecordSize)), "")
+		printline("Node Count", strconv.Itoa(int(mdFromLib.NodeCount)), simplifyCount(int64(mdFromLib.NodeCount)))
 		printline("Tree Size", strconv.Itoa(treeSize), simplifySize(int64(treeSize)))
 		printline("Data Section Size", strconv.Itoa(dataSectionSize), simplifySize(int64(dataSectionSize)))
 		if f.DataTypes {
@@ -146,13 +146,13 @@ func CmdMetadata(f CmdMetadataFlags, args []string, printHelp func()) error {
 			typeSizePrintline("Signed 32-bit Integer Size", strconv.Itoa(int(typeSizes.Signed32bitIntSize)), simplifySize(typeSizes.Signed32bitIntSize))
 			typeSizePrintline("Unsigned 64-bit Integer Size", strconv.Itoa(int(typeSizes.Unsigned64bitIntSize)), simplifySize(typeSizes.Unsigned64bitIntSize))
 			typeSizePrintline("Unsigned 128-bit Integer Size", strconv.Itoa(int(typeSizes.Unsigned128bitIntSize)), simplifySize(typeSizes.Unsigned128bitIntSize))
-			typeSizePrintline("Map Key-Value Pair Count", strconv.Itoa(int(typeSizes.MapKeyValueCount)), simplifySize(typeSizes.MapKeyValueCount))
-			typeSizePrintline("Array Length", strconv.Itoa(int(typeSizes.ArrayLength)), simplifySize(typeSizes.ArrayLength))
+			typeSizePrintline("Map Key-Value Pair Count", strconv.Itoa(int(typeSizes.MapKeyValueCount)), simplifyCount(typeSizes.MapKeyValueCount))
+			typeSizePrintline("Array Length", strconv.Itoa(int(typeSizes.ArrayLength)), simplifyCount(typeSizes.ArrayLength))
 			typeSizePrintline("Float Size", strconv.Itoa(int(typeSizes.FloatSize)), simplifySize(typeSizes.FloatSize))
 		}
-		printline("Data Section Start Offset", strconv.Itoa(dataSectionStartOffset), simplifySize(int64(dataSectionStartOffset)))
-		printline("Data Section End Offset", strconv.Itoa(dataSectionEndOffset), simplifySize(int64(dataSectionEndOffset)))
-		printline("Metadata Section Start Offset", strconv.Itoa(metadataSectionStartOffset), simplifySize(int64(metadataSectionStartOffset)))
+		printline("Data Section Start Offset", strconv.Itoa(dataSectionStartOffset), "")
+		printline("Data Section End Offset", strconv.Itoa(dataSectionEndOffset), "")
+		printline("Metadata Section Start Offset", strconv.Itoa(metadataSectionStartOffset), "")
 		printline("Description", "", "")
 		descKeys, descVals := sortedMapKeysAndVals(mdFromLib.Description)
 		longestDescKeyLen := strconv.Itoa(len(longestStrInStringSlice(descKeys)))

lib/utils.go

@@ -112,7 +112,27 @@ func simplifySize(size int64) string {
 	} else {
 		return ""
 	}
+}
+
+func simplifyCount(size int64) string {
+	const (
+		K = 1e3
+		M = 1e6
+		G = 1e9
+		T = 1e12
+	)
 
+	if size >= T {
+		return fmt.Sprintf("(%.2f T)", float64(size)/float64(T))
+	} else if size >= G {
+		return fmt.Sprintf("(%.2f G)", float64(size)/float64(G))
+	} else if size >= M {
+		return fmt.Sprintf("(%.2f M)", float64(size)/float64(M))
+	} else if size >= K {
+		return fmt.Sprintf("(%.2f K)", float64(size)/float64(K))
+	} else {
+		return ""
+	}
 }
 
 type TypeSizes struct {