This repository was archived by the owner on Sep 11, 2020. It is now read-only.
format/packfile: implement delta encoding #172
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
ajnavarro
commented
Dec 9, 2016
ajnavarro
commented
- Added all the logic to the encoder to be able to encode ref-delta and offset-delta objects
- Created plumbing.ObjectToPack to handle deltas and standard objects when we are writting them into a packfile
- Added specific encoder delta tests, one standard object and one delta, and one standard object and two deltas
Current coverage is 77.27% (diff: 82.14%)@@ master #172 diff @@
==========================================
Files 91 92 +1
Lines 5823 5892 +69
Methods 0 0
Messages 0 0
Branches 0 0
==========================================
+ Hits 4527 4553 +26
- Misses 816 859 +43
Partials 480 480
|
mcuadros
suggested changes
Dec 12, 2016
| func GetDelta(base, target plumbing.Object) ([]byte, error) { | ||
| // GetOfsDelta returns an offset delta that knows the way of how to transform | ||
| // base object to target object | ||
| func GetOfsDelta(base, target plumbing.Object) (*plumbing.ObjectToPack, error) { |
There was a problem hiding this comment.
OFS should be capital leters
| @@ -35,7 +51,17 @@ func GetDelta(base, target plumbing.Object) ([]byte, error) { | |||
| return nil, err | |||
| } | |||
|
|
|||
| return DiffDelta(baseBuf, targetBuf), nil | |||
| deltaBuf := DiffDelta(baseBuf, targetBuf) | |||
There was a problem hiding this comment.
a very long variable name to this such small scope
| return err | ||
| } | ||
|
|
||
| if o.IsDelta() { |
There was a problem hiding this comment.
very long function maybe you can split it
| @@ -90,6 +115,20 @@ func (e *Encoder) entry(o plumbing.Object) error { | |||
| return e.zw.Close() | |||
| } | |||
|
|
|||
| func (e *Encoder) writeRefDeltaHeader(source plumbing.Hash) error { | |||
| return binary.Write(e.w, source) | |||
| } | |||
|
|
||
| func (ow *offsetWriter) Write(p []byte) (n int, err error) { | ||
| n, err = ow.w.Write(p) | ||
| ow.offset = ow.offset + int64(n) |
| @@ -81,6 +81,8 @@ func (s *EncoderSuite) TestMaxObjectSize(c *C) { | |||
|
|
|||
| func (s *EncoderSuite) TestDecodeEncodeDecode(c *C) { | |||
| fixtures.Basic().ByTag("packfile").Test(c, func(f *fixtures.Fixture) { | |||
| c.Logf("Executing test case with repository %s "+ | |||
There was a problem hiding this comment.
this information is already logged by the fixture package
| // ObjectToPack is a representation of an object that is going to be into a | ||
| // pack file. If it is a delta, Source is the delta source and Original is the | ||
| // delta target | ||
| type ObjectToPack struct { |
There was a problem hiding this comment.
I really don't understand the goal of this struct, is this struct useful for non-delta objects?
| Original Object | ||
| } | ||
|
|
||
| func NewObjectToPack(o Object) *ObjectToPack { |
There was a problem hiding this comment.
all this functions are not tested
| @@ -17,6 +17,20 @@ func Write(w io.Writer, data ...interface{}) error { | |||
| return nil | |||
| } | |||
|
|
|||
| func WriteVariableWidthInt(w io.Writer, n int64) error { | |||
There was a problem hiding this comment.
not tested (or something wrong with codecov)
- Added all the logic to the encoder to be able to encode ref-delta and offset-delta objects - Created plumbing.ObjectToPack to handle deltas and standard objects when we are writting them into a packfile - Added specific encoder delta tests, one standard object and one delta, and one standard object and two deltas
smola
suggested changes
Dec 13, 2016
| @@ -12,6 +12,46 @@ var ( | |||
| ErrInvalidType = errors.New("invalid object type") | |||
| ) | |||
|
|
|||
| // ObjectToPack is a representation of an object that is going to be into a | |||
| // pack file. If it is a delta, Base is the object that this delta is based on | |||
There was a problem hiding this comment.
Decide each field (Object, Base, Original, Depth) in their declaration, not in the common ObjectToPack docs.
mcuadros
approved these changes
Dec 14, 2016
smola
approved these changes
Dec 14, 2016
mcuadros
pushed a commit
that referenced
this pull request
Jan 31, 2017
* format/packfile: implement delta encoding - Added all the logic to the encoder to be able to encode ref-delta and offset-delta objects - Created plumbing.ObjectToPack to handle deltas and standard objects when we are writting them into a packfile - Added specific encoder delta tests, one standard object and one delta, and one standard object and two deltas * Requested changes. * Requested changes
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.