39ca1bd78c · krz/gitbay

internal/control/suggestion.go +18 −8

 // listing: one ls-tree per (commit, path), and every blob through one
 // cat-file --batch process started on first use, so a merge request with
 // many suggestions on a file costs no more processes than one with a
-// single suggestion.
+// single suggestion. Blobs are kept by id up to cacheCap bytes in all;
+// past that one is read again through the same process.
 type anchoredFiles struct {
-	dir     string
+	dir      string
-	entries map[[2]string]anchoredEntry
+	entries  map[[2]string]anchoredEntry
-	blobs   map[string][]byte
+	blobs    map[string][]byte
-	batch   *gitutil.BlobBatch
+	cached   int64
-	spawned int // git processes started, for the test that bounds it
+	cacheCap int64
+	batch    *gitutil.BlobBatch
+	spawned  int // git processes started, for the test that bounds it
 }
+// anchoredCacheCap bounds the blobs one render keeps.
+const anchoredCacheCap = 8 << 20
 type anchoredEntry struct {
 	e  gitutil.TreeEntry
 	ok bool
 }
 func newAnchoredFiles(dir string) *anchoredFiles {
-	return &anchoredFiles{dir: dir, entries: map[[2]string]anchoredEntry{}, blobs: map[string][]byte{}}
+	return &anchoredFiles{dir: dir, entries: map[[2]string]anchoredEntry{}, blobs: map[string][]byte{},
+		cacheCap: anchoredCacheCap}
 }
 func (f *anchoredFiles) close() {
 	if err != nil {
 		return nil, "", "", err
 	}
-	f.blobs[e.SHA] = content
+	if f.cached+int64(len(content)) <= f.cacheCap {
+		f.blobs[e.SHA] = content
+		f.cached += int64(len(content))
+	}
 	return content, e.Mode, e.SHA, nil
 }

internal/control/suggestion_test.go +13 −2

 }
 // Reading suggestions costs git processes per file and commit, not per
-// thread: six suggestions on one file read it as one does.
+// thread: six suggestions on one file read it as one does, whether or
+// not the blobs fit the cache.
 func TestSuggestionsProcessCountPerFile(t *testing.T) {
 	f := newSuggestFixture(t, nil)
-	spawned := func() int {
+	spawnedWith := func(cacheCap int64) int {
 		t.Helper()
 		comments, err := f.st.ListDiffComments(f.mr().ID, f.alice.ID)
 		if err != nil {
 			t.Fatal(err)
 		}
 		files := newAnchoredFiles(f.dir)
+		files.cacheCap = cacheCap
 		defer files.close()
 		got := suggestionsWith(files, func() bool { return false }, f.mr(), comments)
 		for _, s := range got {
 				t.Fatalf("suggestion outdated: %+v", s)
 			}
 		}
+		if files.cached > cacheCap {
+			t.Fatalf("cached %d bytes past a cap of %d", files.cached, cacheCap)
+		}
 		return files.spawned
 	}
+	spawned := func() int { return spawnedWith(anchoredCacheCap) }
 	f.suggest(f.alice, "lib.txt", 1, 1, "ONE")
 	one := spawned()
 	for i := 2; i <= 5; i++ {
 	if six := spawned(); six != one || one > 2 {
 		t.Fatalf("git processes: %d for one suggestion, %d for six on the same file", one, six)
 	}
+	// With no room to cache, blobs are read again through the same
+	// process, and every suggestion still reads right.
+	if none := spawnedWith(0); none != one {
+		t.Fatalf("git processes with no cache: %d, want %d", none, one)
+	}
 }
 // A server-side write stops at the owner's storage quota as a push does:

internal/gitutil/batch.go +11 −6

 	if err != nil {
 		return nil, fmt.Errorf("cat-file %s: %s", oid, strings.TrimSpace(head))
 	}
+	// A refused object is still on the stream, with its trailing
+	// newline; skipping it keeps the next Read in step.
+	if f[1] != "blob" || size > limit {
+		if _, err := io.CopyN(io.Discard, b.out, size+1); err != nil {
+			return nil, err
+		}
+		if f[1] != "blob" {
+			return nil, fmt.Errorf("%s is a %s, not a blob", oid, f[1])
+		}
+		return nil, fmt.Errorf("%s is larger than %d bytes", oid, limit)
+	}
 	data := make([]byte, size+1) // the object and its trailing newline
 	if _, err := io.ReadFull(b.out, data); err != nil {
 		return nil, err
 	}
-	if f[1] != "blob" {
-		return nil, fmt.Errorf("%s is a %s, not a blob", oid, f[1])
-	}
-	if size > limit {
-		return nil, fmt.Errorf("%s is larger than %d bytes", oid, limit)
-	}
 	return data[:size], nil
 }

internal/gitutil/batch_test.go +3

 	if _, err := batch.Read(a, 3); err == nil {
 		t.Error("a blob over the limit was read")
 	}
+	if got, err := batch.Read(b, 100); err != nil || string(got) != "" {
+		t.Fatalf("read after a blob over the limit = %q, %v", got, err)
+	}
 	if _, err := batch.Read(tree, 100); err == nil {
 		t.Error("a tree was read as a blob")
 	}

internal/web/static/style.css +2

	@@ -1295,6 +1295,8 @@ a.authorlink:hover { color: var(--link); }
1295	form.threadact { margin: var(--sp-1) 0 0; padding: 0 var(--sp-3) var(--sp-2); }	1295	form.threadact { margin: var(--sp-1) 0 0; padding: 0 var(--sp-3) var(--sp-2); }
1296	.thread .suggestion { margin: var(--sp-2) 0 0; }	1296	.thread .suggestion { margin: var(--sp-2) 0 0; }
1297	.thread .suggestion table.difftable { margin: var(--sp-1) 0 0; }	1297	.thread .suggestion table.difftable { margin: var(--sp-1) 0 0; }
		1298	.thread .suggestion table.difftable tr.add td,
		1299	.thread .suggestion table.difftable tr.del td { display: table-cell; }
1298		1300
1299	nav.subtabs {	1301	nav.subtabs {
1300	display: flex;	1302	display: flex;

internal/web/templates/layout.html +1

	@@ -219,6 +219,7 @@
219	<input type="hidden" name="path" value="{{.Path}}">	219	<input type="hidden" name="path" value="{{.Path}}">
220	<input type="hidden" name="line" value="{{if eq .Class "del"}}{{.OldLine}}{{else}}{{.NewLine}}{{end}}">	220	<input type="hidden" name="line" value="{{if eq .Class "del"}}{{.OldLine}}{{else}}{{.NewLine}}{{end}}">
221	<input type="hidden" name="side" value="{{if eq .Class "del"}}old{{else}}new{{end}}">	221	<input type="hidden" name="side" value="{{if eq .Class "del"}}old{{else}}new{{end}}">
		222	{{if ne .Class "del"}}<p><label>From line <input type="number" name="start_line" min="1" max="{{.NewLine}}" placeholder="{{.NewLine}}"></label> to {{.NewLine}}; a <code>```suggestion</code> block proposes replacement lines</p>{{end}}
222	<p><textarea name="body" aria-label="Comment on {{.Path}}" rows="3" placeholder="Comment on this line" autofocus></textarea></p>	223	<p><textarea name="body" aria-label="Comment on {{.Path}}" rows="3" placeholder="Comment on this line" autofocus></textarea></p>
223	<p><button type="submit" class="btn">Comment</button>	224	<p><button type="submit" class="btn">Comment</button>
224	<button type="submit" name="pending" value="on" class="btn">Add to review</button>	225	<button type="submit" name="pending" value="on" class="btn">Add to review</button>

Commit 39ca1bd78c

Commit `39ca1bd78c`