beads/cmd/bd/compact_proxied_server.go
Vishnu J fb43d97220
fix(compact): replay cherry-picks in commit_order, not commit date (#6644)
bd compact --days N replayed the preserved commits in commit-date order.
Dolt does not require dates to be monotonic along the parent chain, so a
child dated before its parent was cherry-picked first and conflicted on
any shared row (#6516).

Log now also surfaces dolt_log.commit_order (CommitInfo.CommitOrder), and
both compact paths (embedded/server and proxied-server) share a new
planCompaction helper that sorts the recent commits by commit_order
ascending. Old/recent partition, initialHash and boundaryHash selection
are unchanged (still date-based).

Adds unit tests for the planner and an embedded-Dolt regression test that
reproduces the issue (child dated 20 min before its parent).

Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
2026-09-27 02:06:57 -07:00

169 lines
4.9 KiB
Go

package main
import (
"context"
"database/sql"
"fmt"
"time"
"github.com/steveyegge/beads/internal/metrics"
"github.com/steveyegge/beads/internal/storage"
"github.com/steveyegge/beads/internal/storage/versioncontrolops"
)
func runCompactProxiedServer(ctx context.Context) error {
evt := metrics.NewCommandEvent("compact")
defer func() {
if c := metrics.Global(); c != nil {
c.CloseEventAndAdd(evt)
}
}()
if !compactDoltDryRun {
CheckReadonly("compact")
}
start := time.Now()
if compactDoltDays < 0 {
return HandleError("--days must be non-negative")
}
var logEntries []storage.CommitInfo
if err := runProxiedNonTx(ctx, func(ctx context.Context, conn *sql.Conn) error {
var err error
logEntries, err = versioncontrolops.Log(ctx, conn, 0)
return err
}); err != nil {
return HandleError("failed to read commit log: %v", err)
}
totalCommits := len(logEntries)
if totalCommits <= 1 {
if jsonOutput {
return outputJSON(map[string]interface{}{
"success": true,
"message": "nothing to compact",
"total_commits": totalCommits,
})
}
fmt.Printf("Only %d commit(s). Nothing to compact.\n", totalCommits)
return nil
}
cutoff := time.Now().AddDate(0, 0, -compactDoltDays)
plan := planCompaction(logEntries, cutoff)
oldCommits, recentHashes := plan.oldCommits, plan.recentHashes
initialHash, boundaryHash := plan.initialHash, plan.boundaryHash
recentCommits := len(recentHashes)
if compactDoltDryRun {
if jsonOutput {
return outputJSON(map[string]interface{}{
"dry_run": true,
"total_commits": totalCommits,
"old_commits": oldCommits,
"recent_commits": recentCommits,
"cutoff_days": compactDoltDays,
"cutoff_date": cutoff.Format("2006-01-02"),
"initial_hash": initialHash,
"boundary_hash": boundaryHash,
})
}
fmt.Printf("DRY RUN — Compact preview\n\n")
fmt.Printf(" Total commits: %d\n", totalCommits)
fmt.Printf(" Old (>%d days): %d (would be squashed into 1)\n", compactDoltDays, oldCommits)
fmt.Printf(" Recent: %d (preserved)\n", recentCommits)
fmt.Printf(" Cutoff date: %s\n", cutoff.Format("2006-01-02"))
if oldCommits <= 1 {
fmt.Printf("\n Nothing to compact (0-1 old commits).\n")
} else {
fmt.Printf("\n Result: %d commits → %d commits\n", totalCommits, recentCommits+1)
fmt.Printf(" Run with --force to proceed.\n")
}
return nil
}
if oldCommits <= 1 {
if jsonOutput {
return outputJSON(map[string]interface{}{
"success": true,
"message": "nothing to compact",
"total_commits": totalCommits,
"old_commits": oldCommits,
})
}
fmt.Printf("Only %d old commit(s). Nothing to compact.\n", oldCommits)
return nil
}
if boundaryHash == "" {
return HandleError("could not find boundary commit for compaction")
}
if !compactDoltForce {
return HandleErrorWithHint(
fmt.Sprintf("would squash %d old commits into 1, preserving %d recent commits",
oldCommits, recentCommits),
"Use --force to confirm or --dry-run to preview.")
}
if !jsonOutput {
fmt.Printf("Compacting: %d old commits → 1, preserving %d recent\n",
oldCommits, recentCommits)
}
var pruned, tags []string
if err := runProxiedNonTx(ctx, func(ctx context.Context, conn *sql.Conn) error {
if err := versioncontrolops.Compact(ctx, conn, initialHash, boundaryHash, oldCommits, recentHashes); err != nil {
return err
}
var perr error
if pruned, perr = versioncontrolops.PruneRemoteRefs(ctx, conn); perr != nil {
WarnError("pruning remote-tracking refs before GC: %v (GC may reclaim little)", perr)
}
if tags, perr = versioncontrolops.ListTags(ctx, conn); perr != nil {
WarnError("listing tags before GC: %v", perr)
}
// Full pass: the squash orphans a commit chain that any earlier GC
// already promoted to the old generation, which a default pass never
// revisits.
if !jsonOutput {
fmt.Println(" Running full Dolt GC (all generations; can take minutes on large stores)...")
}
if perr := versioncontrolops.DoltGCFull(ctx, conn); perr != nil {
WarnError("dolt gc after compact failed: %v", perr)
}
return nil
}); err != nil {
return HandleError("compact failed: %v", err)
}
elapsed := time.Since(start)
resultCommits := recentCommits + 1
if !jsonOutput {
printPruneReport(pruned, tags)
}
if jsonOutput {
return outputJSON(map[string]interface{}{
"success": true,
"commits_before": totalCommits,
"commits_after": resultCommits,
"old_squashed": oldCommits,
"recent_kept": recentCommits,
"remote_refs_pruned": pruned,
"tags_anchoring": tags,
"gc_mode": gcModeFull,
"elapsed_ms": elapsed.Milliseconds(),
})
}
fmt.Printf("✓ Compacted %d commits → %d\n", totalCommits, resultCommits)
fmt.Printf(" Squashed: %d old commits → 1 base\n", oldCommits)
fmt.Printf(" Preserved: %d recent commits\n", recentCommits)
fmt.Printf(" Time: %v\n", elapsed.Round(time.Millisecond))
return nil
}