ref: 3fe07dd316bde2ea625166176b2285bf0c631889
parent: c3731c4eff12cc9e6636f89128948d86596ad860
author: Runxi Yu <me@runxiyu.org>
date: Sun Mar 8 13:53:45 EDT 2026
*: Fix lints
--- a/format/pack/ingest/idx_write.go
+++ b/format/pack/ingest/idx_write.go
@@ -40,8 +40,11 @@
return nil
}
- var scratch [8]byte
- var fanout [256]uint32
+ var (
+ scratch [8]byte
+ fanout [256]uint32
+ )
+
writeProgress(state, "writing index fanout...\r")
for _, recordIdx := range order {@@ -51,6 +54,7 @@
binary.BigEndian.PutUint32(scratch[:4], idxMagicV2)
binary.BigEndian.PutUint32(scratch[4:8], idxVersionV2)
+
err = write(scratch[:8])
if err != nil {return err
@@ -66,9 +70,11 @@
return err
}
}
+
writeProgress(state, "writing index fanout: done.\n")
largeOffsetCount := 0
+
for idx := range state.records { if state.records[idx].offset >= 0x80000000 {largeOffsetCount++
@@ -81,6 +87,7 @@
Title: "writing index object ids",
Total: uint64(len(order)),
})
+
var oidDone uint64
for _, recordIdx := range order {@@ -94,6 +101,7 @@
oidDone++
oidMeter.Set(oidDone, 0)
}
+
if oidDone > 0 { oidMeter.Stop("done")}
@@ -104,6 +112,7 @@
Title: "writing index crc32",
Total: uint64(len(order)),
})
+
var crcDone uint64
for _, recordIdx := range order {@@ -117,6 +126,7 @@
crcDone++
crcMeter.Set(crcDone, 0)
}
+
if crcDone > 0 { crcMeter.Stop("done")}
@@ -128,6 +138,7 @@
Title: "writing index offsets",
Total: uint64(len(order)),
})
+
var offsetDone uint64
for _, recordIdx := range order {@@ -155,6 +166,7 @@
offsetDone++
offsetMeter.Set(offsetDone, 0)
}
+
if offsetDone > 0 { offsetMeter.Stop("done")}
@@ -165,7 +177,9 @@
Title: "writing index large offsets",
Total: uint64(largeOffsetCount),
})
+
var largeOffsetDone uint64
+
for _, off := range largeOffsets {binary.BigEndian.PutUint64(scratch[:8], off)
@@ -177,6 +191,7 @@
largeOffsetDone++
largeOffsetMeter.Set(largeOffsetDone, 0)
}
+
if largeOffsetDone > 0 { largeOffsetMeter.Stop("done")}
@@ -199,6 +214,7 @@
if err != nil {return err
}
+
writeProgress(state, "writing index trailer: done.\n")
return nil
--- a/format/pack/ingest/progress_write.go
+++ b/format/pack/ingest/progress_write.go
@@ -4,6 +4,7 @@
func writeProgress(state *ingestState, format string, args ...any) {utils.BestEffortFprintf(state.opts.Progress, format, args...)
+
if state.opts.ProgressFlush != nil {_ = state.opts.ProgressFlush()
}
--- a/format/pack/ingest/rev_write.go
+++ b/format/pack/ingest/rev_write.go
@@ -34,6 +34,7 @@
}
var scratch [8]byte
+
writeProgress(state, "writing reverse index header...\r")
binary.BigEndian.PutUint32(scratch[:4], revMagic)
@@ -55,6 +56,7 @@
if err != nil {return err
}
+
writeProgress(state, "writing reverse index header: done.\n")
entriesMeter := progress.New(progress.Options{@@ -63,6 +65,7 @@
Title: "writing reverse index entries",
Total: uint64(len(packOrder)),
})
+
var entriesDone uint64
for _, recordIdx := range packOrder {@@ -77,9 +80,11 @@
if err != nil {return err
}
+
entriesDone++
entriesMeter.Set(entriesDone, 0)
}
+
if entriesDone > 0 { entriesMeter.Stop("done")}
@@ -102,6 +107,7 @@
if err != nil {return err
}
+
writeProgress(state, "writing reverse index trailer: done.\n")
return nil
--- a/internal/progress/humanize.go
+++ b/internal/progress/humanize.go
@@ -9,6 +9,7 @@
}
value := float64(n)
+
units := []string{"KiB", "MiB", "GiB", "TiB", "PiB"} for i := range units {value /= unit
--- a/internal/progress/render.go
+++ b/internal/progress/render.go
@@ -15,10 +15,12 @@
meter.refreshThroughput(now)
counters := meter.renderCounters()
+
clear := 0
if len(counters) < meter.lastCounterW {clear = meter.lastCounterW - len(counters) + 1
}
+
meter.lastCounterW = len(counters)
line := meter.title + ": " + counters
@@ -25,9 +27,11 @@
if clear > 0 { line += strings.Repeat(" ", clear)}
+
line += eol
utils.BestEffortFprintf(meter.writer, "%s", line)
+
if meter.flush != nil {_ = meter.flush()
}
--- a/internal/progress/set.go
+++ b/internal/progress/set.go
@@ -17,6 +17,7 @@
forced := meter.consumeUpdateTick(now)
percentChanged := false
+
if meter.total > 0 {percent := int(done * 100 / meter.total)
percentChanged = percent != meter.lastPercent
--- a/objectstore/packed/idx_candidates_mru.go
+++ b/objectstore/packed/idx_candidates_mru.go
@@ -88,6 +88,7 @@
}
node.prev = nil
+
node.next = store.mruHead
if store.mruHead != nil {store.mruHead.prev = node
--- a/receivepack/receivepack.go
+++ b/receivepack/receivepack.go
@@ -89,6 +89,7 @@
progressWriter := protoSession.ProgressWriter()
progressFlush := base.FlushIO
+
if req.Capabilities.Quiet {progressWriter = io.Discard
progressFlush = nil
--
⑨