From 405515ecc7ef021b78d91ea6db030c7db1118048 Mon Sep 17 00:00:00 2001
From: Runxi Yu
Date: Wed, 24 Jun 2026 04:53:05 +0000
Subject: object/store/packed/internal/ingest: Use new progrss meter

---
 object/store/packed/internal/ingest/resolve.go | 2 +-
 object/store/packed/internal/ingest/scan.go    | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/object/store/packed/internal/ingest/resolve.go b/object/store/packed/internal/ingest/resolve.go
index ac040aca..0f745c4f 100644
--- a/object/store/packed/internal/ingest/resolve.go
+++ b/object/store/packed/internal/ingest/resolve.go
@@ -162,7 +162,7 @@ func (ingestion *ingestion) resolveOneChild(index int, baseType typ.Type, baseCo
 	ingestion.baseCache.Add(baseCacheKey{offset: rec.offset}, cachedContent{objectType: baseType, content: content})
 
 	ingestion.deltasResolved++
-	meter.Set(ingestion.deltasResolved, 0)
+	meter.Add(1, 0)
 
 	return nil
 }
diff --git a/object/store/packed/internal/ingest/scan.go b/object/store/packed/internal/ingest/scan.go
index 86cf7023..dc8041c1 100644
--- a/object/store/packed/internal/ingest/scan.go
+++ b/object/store/packed/internal/ingest/scan.go
@@ -295,7 +295,9 @@ func (ingestion *ingestion) streamAndScan() error {
 		Throughput: true,
 	})
 
-	for done := range ingestion.headerCount {
+	prevConsumed := ingestion.scanner.consumed
+
+	for range ingestion.headerCount {
 		err := ingestion.ctx.Err()
 		if err != nil {
 			return fmt.Errorf("object/store/packed/internal/ingest: %w", err)
@@ -306,7 +308,9 @@ func (ingestion *ingestion) streamAndScan() error {
 			return err
 		}
 
-		meter.Set(done+1, ingestion.scanner.consumed)
+		consumed := ingestion.scanner.consumed
+		meter.Add(1, int64(consumed-prevConsumed))
+		prevConsumed = consumed
 	}
 
 	meter.Stop("done")
-- 
cgit v1.3.1-10-gc9f91