Skip to content

Git designed for AI agents.

graft-resolve: bench mine resumes per repository

Federico Elia9ed067341daf
diff --git a/tools/graft-agents/cmd/graft-resolve/bench.go b/tools/graft-agents/cmd/graft-resolve/bench.go
index 10a1926..8910074 100644
--- a/tools/graft-agents/cmd/graft-resolve/bench.go
+++ b/tools/graft-agents/cmd/graft-resolve/bench.go
@@ -3,11 +3,14 @@ package main
import (
"context"
"encoding/json"
+ "errors"
"flag"
"fmt"
"io"
"os"
"os/signal"
+ "path/filepath"
+ "strings"
"syscall"
"github.com/feder-cr/git-ai/tools/graft-agents/resolve/bench"
@@ -57,19 +60,41 @@ func benchMine(ctx context.Context, args []string, stdout, stderr io.Writer) int
return 1
}
+ // Each repository's cases are kept in a part of their own as soon as it is mined, so a run
+ // that is stopped resumes with the next repository.
+ partsDir := *manifestPath + ".parts"
+ if err := os.MkdirAll(partsDir, 0o755); err != nil {
+ fmt.Fprintf(stderr, "graft-resolve bench mine: %v\n", err)
+ return 1
+ }
+
manifest := bench.Manifest{Version: bench.ManifestVersion, Stats: map[string]bench.MineStats{}}
for _, repo := range corpus.Repos {
- dir, err := bench.EnsureClone(ctx, *clones, repo)
+ partPath := filepath.Join(partsDir, strings.ReplaceAll(repo.Name, "/", "__")+"@"+repo.Commit+".json")
+ part, err := bench.LoadManifest(partPath)
if err != nil {
- fmt.Fprintf(stderr, "graft-resolve bench mine: %s: %v\n", repo.Name, err)
- return 1
- }
- cases, stats, err := bench.Mine(ctx, repo, dir, bench.MineOptions{MaxCases: *maxCases})
- if err != nil {
- fmt.Fprintf(stderr, "graft-resolve bench mine: %s: %v\n", repo.Name, err)
- return 1
+ if !errors.Is(err, os.ErrNotExist) {
+ fmt.Fprintf(stderr, "graft-resolve bench mine: %s: %v\n", repo.Name, err)
+ return 1
+ }
+ dir, err := bench.EnsureClone(ctx, *clones, repo)
+ if err != nil {
+ fmt.Fprintf(stderr, "graft-resolve bench mine: %s: %v\n", repo.Name, err)
+ return 1
+ }
+ cases, stats, err := bench.Mine(ctx, repo, dir, bench.MineOptions{MaxCases: *maxCases})
+ if err != nil {
+ fmt.Fprintf(stderr, "graft-resolve bench mine: %s: %v\n", repo.Name, err)
+ return 1
+ }
+ part = bench.Manifest{Version: bench.ManifestVersion, Cases: cases, Stats: map[string]bench.MineStats{repo.Name: stats}}
+ if err := bench.SaveManifest(partPath, part); err != nil {
+ fmt.Fprintf(stderr, "graft-resolve bench mine: %v\n", err)
+ return 1
+ }
}
- manifest.Cases = append(manifest.Cases, cases...)
+ stats := part.Stats[repo.Name]
+ manifest.Cases = append(manifest.Cases, part.Cases...)
manifest.Stats[repo.Name] = stats
fmt.Fprintf(stdout, "%s: %d merges, %d conflicting, %d conflicting files, %d kept\n",
repo.Name, stats.Merges, stats.ConflictingMerges, stats.ConflictingFiles, stats.Kept)
diff --git a/tools/graft-agents/cmd/graft-resolve/bench_test.go b/tools/graft-agents/cmd/graft-resolve/bench_test.go
index 89594bd..ccd59b4 100644
--- a/tools/graft-agents/cmd/graft-resolve/bench_test.go
+++ b/tools/graft-agents/cmd/graft-resolve/bench_test.go
@@ -68,6 +68,25 @@ func TestBenchMineAndRun(t *testing.T) {
t.Fatalf("mine output: %s", stdout.String())
}
+ // A second run takes the repository from its part, without the clone.
+ moved := filepath.Join(work, "moved")
+ if err := os.Rename(clones, moved); err != nil {
+ t.Fatal(err)
+ }
+ stdout.Reset()
+ if code := run([]string{"bench", "mine", "--corpus", corpus, "--clones", clones, "--manifest", manifest}, nil, &stdout, &stderr); code != 0 {
+ t.Fatalf("resumed mine exited %d: %s", code, stderr.String())
+ }
+ if !strings.Contains(stdout.String(), "1 cases in") {
+ t.Fatalf("resumed mine output: %s", stdout.String())
+ }
+ if _, err := os.Stat(clones); !os.IsNotExist(err) {
+ t.Fatalf("resumed mine cloned again: %v", err)
+ }
+ if err := os.Rename(moved, clones); err != nil {
+ t.Fatal(err)
+ }
+
stdout.Reset()
stderr.Reset()
jsonOut := filepath.Join(work, "report.json")
diff --git a/tools/graft-agents/resolve/bench/clone.go b/tools/graft-agents/resolve/bench/clone.go
index 1c433b7..4a7a987 100644
--- a/tools/graft-agents/resolve/bench/clone.go
+++ b/tools/graft-agents/resolve/bench/clone.go
@@ -24,8 +24,17 @@ func EnsureClone(ctx context.Context, root string, repo Repo) (string, error) {
if err := os.MkdirAll(root, 0o755); err != nil {
return "", err
}
+ // The clone is made under a temporary name and renamed once complete, so an interrupted
+ // clone is never taken for a complete one; a left-over temporary clone is started again.
+ tmp := dir + ".partial"
+ if err := os.RemoveAll(tmp); err != nil {
+ return "", err
+ }
g := gitRepo{dir: root}
- if _, _, err := g.run(ctx, nil, nil, "clone", "--bare", "--quiet", repo.URL, dir); err != nil {
+ if _, _, err := g.run(ctx, nil, nil, "clone", "--bare", "--quiet", repo.URL, tmp); err != nil {
+ return "", err
+ }
+ if err := os.Rename(tmp, dir); err != nil {
return "", err
}
} else if err != nil {
diff --git a/tools/graft-agents/resolve/bench/corpus.go b/tools/graft-agents/resolve/bench/corpus.go
index 8e4e45b..3a5038f 100644
--- a/tools/graft-agents/resolve/bench/corpus.go
+++ b/tools/graft-agents/resolve/bench/corpus.go
@@ -138,7 +138,13 @@ func SaveManifest(file string, m Manifest) error {
if err != nil {
return err
}
- return os.WriteFile(file, append(data, '\n'), 0o644)
+ // Written under a temporary name and renamed, so that a stopped run never leaves a truncated
+ // manifest (bench mine resumes from the manifests of the repositories already mined).
+ tmp := file + ".tmp"
+ if err := os.WriteFile(tmp, append(data, '\n'), 0o644); err != nil {
+ return err
+ }
+ return os.Rename(tmp, file)
}
// LoadManifest reads a manifest.