@@ -696,9 +696,19 @@ var (
696
696
table .Bytes ("sstsz" , 6 , table .AlignRight , func (m * LevelMetrics ) uint64 { return m .TableBytesFlushed + m .TableBytesCompacted }),
697
697
table .Bytes ("blobsz" , 6 , table .AlignRight , func (m * LevelMetrics ) uint64 { return m .BlobBytesFlushed + m .BlobBytesCompacted }),
698
698
)
699
- compactionKindTable = table .Define [pair [string , int64 ]](
700
- table .String ("kind" , 5 , table .AlignRight , func (p pair [string , int64 ]) string { return p .k }),
701
- table .Count ("count" , 5 , table .AlignRight , func (p pair [string , int64 ]) int64 { return p .v }),
699
+ compactionKindTable = table .Define [* Metrics ](
700
+ table .String ("kind" , 5 , table .AlignRight , func (m * Metrics ) string { return "count" }),
701
+ table .Div (),
702
+ table .Int64 ("default" , 7 , table .AlignRight , func (m * Metrics ) int64 { return m .Compact .DefaultCount }),
703
+ table .Int64 ("delete" , 7 , table .AlignRight , func (m * Metrics ) int64 { return m .Compact .DeleteOnlyCount }),
704
+ table .Int64 ("elision" , 8 , table .AlignRight , func (m * Metrics ) int64 { return m .Compact .ElisionOnlyCount }),
705
+ table .Int64 ("move" , 5 , table .AlignRight , func (m * Metrics ) int64 { return m .Compact .MoveCount }),
706
+ table .Int64 ("read" , 5 , table .AlignRight , func (m * Metrics ) int64 { return m .Compact .ReadCount }),
707
+ table .Int64 ("tomb" , 5 , table .AlignRight , func (m * Metrics ) int64 { return m .Compact .TombstoneDensityCount }),
708
+ table .Int64 ("rewrite" , 8 , table .AlignRight , func (m * Metrics ) int64 { return m .Compact .RewriteCount }),
709
+ table .Int64 ("copy" , 5 , table .AlignRight , func (m * Metrics ) int64 { return m .Compact .CopyCount }),
710
+ table .Int64 ("multi" , 6 , table .AlignRight , func (m * Metrics ) int64 { return m .Compact .MultiLevelCount }),
711
+ table .Int64 ("blob" , 5 , table .AlignRight , func (m * Metrics ) int64 { return m .Compact .BlobFileRewriteCount }),
702
712
)
703
713
commitPipelineInfoTableTopHeader = `COMMIT PIPELINE`
704
714
commitPipelineInfoTableSubHeader = ` wals | memtables | ingestions`
@@ -880,11 +890,6 @@ func makeCompressionInfo(algorithm string, table, blob CompressionStatsForSettin
880
890
return i
881
891
}
882
892
883
- type pair [k , v any ] struct {
884
- k k
885
- v v
886
- }
887
-
888
893
// String pretty-prints the metrics.
889
894
//
890
895
// See testdata/metrics for an example.
@@ -921,19 +926,9 @@ func (m *Metrics) String() string {
921
926
cur .Offset (- 1 , 0 ).WriteString ("total" )
922
927
923
928
cur = cur .NewlineReturn ()
924
- compactionKindContents := []pair [string , int64 ]{
925
- {k : "default" , v : m .Compact .DefaultCount },
926
- {k : "delete" , v : m .Compact .DeleteOnlyCount },
927
- {k : "elision" , v : m .Compact .ElisionOnlyCount },
928
- {k : "move" , v : m .Compact .MoveCount },
929
- {k : "read" , v : m .Compact .ReadCount },
930
- {k : "tomb" , v : m .Compact .TombstoneDensityCount },
931
- {k : "rewrite" , v : m .Compact .RewriteCount },
932
- {k : "copy" , v : m .Compact .CopyCount },
933
- {k : "multi" , v : m .Compact .MultiLevelCount },
934
- {k : "blob" , v : m .Compact .BlobFileRewriteCount },
935
- }
936
- cur = compactionKindTable .Render (cur , table.RenderOptions {Orientation : table .Horizontally }, compactionKindContents ... )
929
+ cur = compactionKindTable .Render (cur , table.RenderOptions {
930
+ HorizontalDividers : table.HorizontalDividers {},
931
+ }, m )
937
932
cur = cur .NewlineReturn ()
938
933
939
934
commitPipelineInfoContents := commitPipelineInfo {
0 commit comments