remove WrappedPointer Size, since it embeds Pointer

This commit is contained in:
risk danger olson 2016-11-17 17:55:06 -07:00
parent b3ea95b304
commit c9162b6915
5 changed files with 4 additions and 8 deletions

@ -111,7 +111,6 @@ func scanPointer(r *bufio.Reader) (*WrappedPointer, error) {
if err == nil {
pointer = &WrappedPointer{
Sha1: string(fields[0]),
Size: p.Size,
Pointer: p,
}
}

@ -150,7 +150,7 @@ func parseLogOutputToPointers(log io.Reader, dir LogDiffDirection,
if currentFileIncluded {
p, err := DecodePointer(&pointerData)
if err == nil {
results <- &WrappedPointer{Name: currentFilename, Size: p.Size, Pointer: p}
results <- &WrappedPointer{Name: currentFilename, Pointer: p}
} else {
tracerx.Printf("Unable to parse pointer from log: %v", err)
}

@ -63,7 +63,6 @@ func catFileBatchTree(treeblobs *TreeBlobChannelWrapper) (*PointerChannelWrapper
if err == nil {
pointers <- &WrappedPointer{
Sha1: string(fields[0]),
Size: p.Size,
Pointer: p,
Name: t.Filename,
}

@ -31,7 +31,6 @@ type WrappedPointer struct {
Sha1 string
Name string
SrcName string
Size int64
Status string
*Pointer
}
@ -195,7 +194,6 @@ func ScanIndex(ref string) ([]*WrappedPointer, error) {
Name: file.Name,
SrcName: file.SrcName,
Status: file.Status,
Size: p.Size,
Pointer: p.Pointer,
})
}

@ -168,9 +168,9 @@ func TestScanPreviousVersions(t *testing.T) {
// folder/nested2.txt [-diff at 3 ie 0]
// others are either on diff branches, before this window, or unchanged
expected := []*WrappedPointer{
{Name: "folder/nested.txt", Size: outputs[3].Files[0].Size, Pointer: outputs[3].Files[0]},
{Name: "folder/nested.txt", Size: outputs[0].Files[2].Size, Pointer: outputs[0].Files[2]},
{Name: "folder/nested2.txt", Size: outputs[0].Files[3].Size, Pointer: outputs[0].Files[3]},
{Name: "folder/nested.txt", Pointer: outputs[3].Files[0]},
{Name: "folder/nested.txt", Pointer: outputs[0].Files[2]},
{Name: "folder/nested2.txt", Pointer: outputs[0].Files[3]},
}
// Need to sort to compare equality
sort.Sort(test.WrappedPointersByOid(expected))