fix metadata fetch and gc

Author: fcharlie

modules/zeta/backend/pack-objects.go

@@ -194,6 +194,40 @@ func pruneObjects(ctx context.Context, opts *PackOptions, fo *fileStorer, object
 	return count
 }
 
+const (
+	MaxLooseObjects = 2048
+	MaxPacks        = 4
+	MinPackSize     = 200 << 20 // 200M
+)
+
+func hasTidyPacks(root string) bool {
+	packDir := filepath.Join(root, "pack")
+	entries, err := os.ReadDir(packDir)
+	if err != nil {
+		return false
+	}
+	var count int
+	var hasTidyPack bool
+	for _, e := range entries {
+		if e.IsDir() {
+			continue
+		}
+		name := e.Name()
+		if !strings.HasSuffix(name, ".pack") {
+			continue
+		}
+		count++
+		si, err := e.Info()
+		if err != nil {
+			return false
+		}
+		if si.Size() < MinPackSize {
+			hasTidyPack = true
+		}
+	}
+	return hasTidyPack && count > 1
+}
+
 func packObjectsInternal(ctx context.Context, opts *PackOptions, root string, meta bool) error {
 	fo := newFileStorer(root, "", opts.CompressionALGO)
 	packs, err := pack.NewScanner(root)
@@ -217,7 +251,7 @@ func packObjectsInternal(ctx context.Context, opts *PackOptions, root string, me
 		step = "metadata"
 	}
 
-	if len(looseObjects) == 0 {
+	if len(looseObjects) == 0 && !hasTidyPacks(root) {
 		// no small loose objects, skipped.
 		opts.Printf("Pack %s objects: no smaller loose object, skipping packing.\n", step)
 		return nil

pkg/serve/protocol/pack.go

@@ -329,15 +329,38 @@ func (p *Packer) WriteSparseTree(ctx context.Context, oid plumbing.Hash, m Spars
 	return nil
 }
 
-func (p *Packer) WriteDeepenMetadata(ctx context.Context, current *object.Commit, deepenFrom, have plumbing.Hash, deepen int) error {
-	if deepen == -1 {
-		deepen = math.MaxInt
-	}
+func (p *Packer) newCommitIter(ctx context.Context, current *object.Commit, deepenFrom, have plumbing.Hash) object.CommitIter {
 	haves := map[plumbing.Hash]bool{
 		deepenFrom: true,
 		have:       true,
 	}
-	iter := object.NewCommitIterBSF(current, haves, nil)
+	if !have.IsZero() {
+		if cc, err := p.Commit(ctx, have); err == nil {
+			if bases, err := current.MergeBase(ctx, cc); err == nil {
+				for _, b := range bases {
+					haves[b.Hash] = true
+				}
+			}
+		}
+	}
+	if !deepenFrom.IsZero() {
+		if cc, err := p.Commit(ctx, deepenFrom); err == nil {
+			if bases, err := current.MergeBase(ctx, cc); err == nil {
+				for _, b := range bases {
+					haves[b.Hash] = true
+				}
+
+			}
+		}
+	}
+	return object.NewCommitIterBSF(current, haves, nil)
+}
+
+func (p *Packer) WriteDeepenMetadata(ctx context.Context, current *object.Commit, deepenFrom, have plumbing.Hash, deepen int) error {
+	if deepen == -1 {
+		deepen = math.MaxInt
+	}
+	iter := p.newCommitIter(ctx, current, deepenFrom, have)
 	defer iter.Close()
 	for range deepen {
 		cc, err := iter.Next(ctx)
@@ -363,11 +386,7 @@ func (p *Packer) WriteDeepenSparseMetadata(ctx context.Context, current *object.
 		deepen = math.MaxInt
 	}
 	m := NewSparseTreeMatcher(paths)
-	haves := map[plumbing.Hash]bool{
-		deepenFrom: true,
-		have:       true,
-	}
-	iter := object.NewCommitIterBSF(current, haves, nil)
+	iter := p.newCommitIter(ctx, current, deepenFrom, have)
 	defer iter.Close()
 	for range deepen {
 		cc, err := iter.Next(ctx)

pkg/zeta/worktree_pull.go

@@ -71,13 +71,13 @@ func (w *Worktree) Pull(ctx context.Context, opts *PullOptions) error {
 		return nil
 	}
 
-	fasfForward, err := w.isFastForward(ctx, current.Hash(), fo.FETCH_HEAD, ignoreParents)
+	fastForward, err := w.isFastForward(ctx, current.Hash(), fo.FETCH_HEAD, ignoreParents)
 	if err != nil {
 		die_error("check fast-forward error: %v", err)
 		return err
 	}
 	branchName := currentName.BranchName()
-	if fasfForward {
+	if fastForward {
 		newRev := fo.FETCH_HEAD
 		if !opts.FF {
 			messagePrefix := fmt.Sprintf("Merge branch '%s of %s' into %s", branchName, w.cleanedRemote(), branchName)