Merge remote-tracking branch 'origin/CBG-5144-prep-test' into CBG-5144-prep-test

torcolvin · torcolvin · commit 1f8d61512d98 · 2026-02-06T10:32:52.000-05:00
diff --git a/db/attachment_compaction.go b/db/attachment_compaction.go
@@ -430,7 +430,7 @@ func attachmentCompactSweepPhase(ctx context.Context, dataStore base.DataStore,
 	return purgedAttachmentCount.Value(), dcpClient.GetMetadataKeyPrefix(), err
 }
 
-// attachmentCompactCleanupPhase runs a DCP feed to clean up all documents with	an attachment compaction xattr. Returns
+// attachmentCompactCleanupPhase runs a DCP feed to clean up all documents with an attachment compaction xattr. Returns
 // the DCP checkpoint prefix and any error encountered.
 func attachmentCompactCleanupPhase(ctx context.Context, dataStore base.DataStore, collectionID uint32, db *Database, compactionID string, vbUUIDs []uint64, terminator *base.SafeTerminator) (string, error) {
 	base.InfofCtx(ctx, base.KeyAll, "Starting third phase of attachment compaction (cleanup phase) with compactionID: %q", compactionID)

Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,7 @@ func attachmentCompactSweepPhase(ctx context.Context, dataStore base.DataStore,`
`430`	`430`	`return purgedAttachmentCount.Value(), dcpClient.GetMetadataKeyPrefix(), err`
`431`	`431`	`}`
`432`	`432`
`433`		`-// attachmentCompactCleanupPhase runs a DCP feed to clean up all documents with an attachment compaction xattr. Returns`
	`433`	`+// attachmentCompactCleanupPhase runs a DCP feed to clean up all documents with an attachment compaction xattr. Returns`
`434`	`434`	`// the DCP checkpoint prefix and any error encountered.`
`435`	`435`	`func attachmentCompactCleanupPhase(ctx context.Context, dataStore base.DataStore, collectionID uint32, db Database, compactionID string, vbUUIDs []uint64, terminator base.SafeTerminator) (string, error) {`
`436`	`436`	`base.InfofCtx(ctx, base.KeyAll, "Starting third phase of attachment compaction (cleanup phase) with compactionID: %q", compactionID)`