diff options
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | delta_write_select.go | 50 | ||||
| -rw-r--r-- | packed_write_pack.go | 66 |
3 files changed, 8 insertions, 109 deletions
@@ -31,7 +31,6 @@ Furgit is a fast Git library in pure Go * Multi pack indexes * Repack * Better delta base selection strategy -* Delta reuse; delta islands * Reading reachability bitmaps * Writing reachability bitmaps when writing packfiles * [commit-graph](https://git-scm.com/docs/commit-graph) (in progress) diff --git a/delta_write_select.go b/delta_write_select.go index db6fc022..2911867d 100644 --- a/delta_write_select.go +++ b/delta_write_select.go @@ -6,11 +6,9 @@ type objectToPack struct { id Hash ty ObjectType body []byte - size int offset uint64 deltaDepth int inPack bool - preferred bool } type deltaContext struct { @@ -38,8 +36,6 @@ func pickDeltaBase(ctx *deltaContext, obj *objectToPack, seed uint64, minSavings } var bestBase *objectToPack var bestDelta []byte - var bestPreferred *objectToPack - var bestPreferredDelta []byte for i := len(ctx.candidates) - 1; i >= 0; i-- { base := ctx.candidates[i] if base.ty != ObjectTypeBlob { @@ -48,60 +44,14 @@ func pickDeltaBase(ctx *deltaContext, obj *objectToPack, seed uint64, minSavings if base.deltaDepth >= maxDepth { continue } - if !deltaSizeOk(base, obj, maxDepth) { - continue - } delta, ok := deltaTry(base.body, obj.body, seed, minSavings) - if base.preferred { - delta, ok = deltaTry(base.body, obj.body, seed, 0) - } if !ok { continue } - if base.preferred { - if bestPreferredDelta == nil || len(delta) < len(bestPreferredDelta) { - bestPreferredDelta = delta - bestPreferred = base - } - continue - } if bestDelta == nil || len(delta) < len(bestDelta) { bestDelta = delta bestBase = base } } - if bestPreferred != nil { - return bestPreferred, bestPreferredDelta - } return bestBase, bestDelta } - -func deltaSizeOk(base, target *objectToPack, maxDepth int) bool { - if base == nil || target == nil { - return false - } - if base.size <= 0 || target.size <= 0 { - return false - } - if maxDepth <= 0 { - maxDepth = 1 - } - if base.deltaDepth >= maxDepth { - return false - } - if target.size < base.size/32 { - return false - } - maxSize := target.size/2 - 32 - if maxSize <= 0 { - return false - } - sizediff := 0 - if base.size < target.size { - sizediff = target.size - base.size - } - if sizediff >= maxSize { - return false - } - return true -} diff --git a/packed_write_pack.go b/packed_write_pack.go index 2d3eb4f6..504c1087 100644 --- a/packed_write_pack.go +++ b/packed_write_pack.go @@ -5,7 +5,6 @@ import ( "encoding/binary" "hash" "io" - "sort" "codeberg.org/lindenii/furgit/internal/zlib" ) @@ -311,12 +310,7 @@ func (repo *Repository) packWrite(w io.Writer, objects []Hash, opts packWriteOpt return Hash{}, ErrInvalidObject } - objInfos, err := repo.packBuildObjectList(objects, opts.EnableDeltas) - if err != nil { - return Hash{}, err - } - - pw, err := newPackWriter(w, repo.hashAlgo, uint32(len(objInfos))) + pw, err := newPackWriter(w, repo.hashAlgo, uint32(len(objects))) if err != nil { return Hash{}, err } @@ -341,16 +335,15 @@ func (repo *Repository) packWrite(w io.Writer, objects []Hash, opts packWriteOpt } } - for _, info := range objInfos { - ty, body, err := repo.ReadObjectTypeRaw(info.id) + for _, id := range objects { + ty, body, err := repo.ReadObjectTypeRaw(id) if err != nil { return Hash{}, err } obj := &objectToPack{ - id: info.id, + id: id, ty: ty, body: body, - size: info.size, inPack: true, } startOffset := pw.bytesWritten @@ -421,59 +414,16 @@ func (repo *Repository) seedDeltaCandidatesFromHaves(ctx *deltaContext, haves [] return err } candidate := &objectToPack{ - id: obj.ID, - ty: ty, - body: body, - size: len(body), - inPack: false, - preferred: true, + id: obj.ID, + ty: ty, + body: body, + inPack: false, } ctx.addCandidate(candidate) } return walk.Err() } -type packObjectInfo struct { - id Hash - ty ObjectType - size int - index int -} - -func (repo *Repository) packBuildObjectList(objects []Hash, enableDeltas bool) ([]packObjectInfo, error) { - if repo == nil { - return nil, ErrInvalidObject - } - infos := make([]packObjectInfo, 0, len(objects)) - for i, id := range objects { - ty, size, err := repo.ReadObjectTypeSize(id) - if err != nil { - return nil, err - } - infos = append(infos, packObjectInfo{ - id: id, - ty: ty, - size: int(size), - index: i, - }) - } - if !enableDeltas { - return infos, nil - } - sort.SliceStable(infos, func(i, j int) bool { - ai := infos[i] - aj := infos[j] - if ai.ty != aj.ty { - return ai.ty < aj.ty - } - if ai.size != aj.size { - return ai.size > aj.size - } - return ai.index < aj.index - }) - return infos, nil -} - type packWriteOptions struct { EnableDeltas bool EnableThinPack bool |