mirrors/tar-split
1
0
Fork 1
mirror of https://github.com/vbatts/tar-split.git synced 2025-07-22 23:10:27 +00:00
Code Releases Activity

archive/tar: beginning effort to prune the vendored archive/tar

Browse source 
NOTE: I'm not sure this is really the route I want to go here, but it
would need benchmarking to show if it's actually beneficial.
It would still be nicer to get something like this upstreamed instead.

trim down anything not used directly by tar-split.

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
This commit is contained in:
Vincent Batts 2023-04-27 14:01:09 -04:00
parent 58175ba396
commit d97b8009bb
Signed by: vbatts
GPG key ID: E30EFAA812C6E5ED
6 changed files with 58 additions and 2053 deletions
Download patch file Download diff file Expand all files Collapse all files

45
archive/tar/tar_test.go
View file

@ -5,7 +5,9 @@
package tar
import (
realtar "archive/tar" // the stdlib one!
"bytes"
"encoding/gob"
"errors"
"fmt"
"io"
@ -300,15 +302,15 @@ func TestRoundTrip(t *testing.T) {
data := []byte("some file contents")
var b bytes.Buffer
tw := NewWriter(&b)
hdr := &Header{
tw := realtar.NewWriter(&b)
hdr := &realtar.Header{
Name: "file.txt",
Uid: 1 << 21, // Too big for 8 octal digits
Size: int64(len(data)),
ModTime: time.Now().Round(time.Second),
PAXRecords: map[string]string{"uid": "2097152"},
Format: FormatPAX,
Typeflag: TypeReg,
Format: realtar.FormatPAX,
Typeflag: realtar.TypeReg,
}
if err := tw.WriteHeader(hdr); err != nil {
t.Fatalf("tw.WriteHeader: %v", err)
@ -326,8 +328,21 @@ func TestRoundTrip(t *testing.T) {
if err != nil {
t.Fatalf("tr.Next: %v", err)
}
if !reflect.DeepEqual(rHdr, hdr) {
t.Errorf("Header mismatch.\n got %+v\nwant %+v", rHdr, hdr)
// HACK let's marshal this from ours to realtar to another
buf := bytes.NewBuffer(nil)
enc := gob.NewEncoder(buf)
if err := enc.Encode(hdr); err != nil {
t.Fatalf("failed to encode header: %s", err)
}
dec := gob.NewDecoder(buf)
var nHdr Header
if err := dec.Decode(&nHdr); err != nil {
t.Fatalf("failed to encode header: %s", err)
}
if !reflect.DeepEqual(rHdr, &nHdr) {
t.Errorf("Header mismatch.\n got %+v\nwant %+v", rHdr, &nHdr)
}
rData, err := ioutil.ReadAll(tr)
if err != nil {
@ -765,7 +780,7 @@ func TestHeaderAllowedFormats(t *testing.T) {
func Benchmark(b *testing.B) {
type file struct {
hdr *Header
hdr *realtar.Header
body []byte
}
@ -775,28 +790,28 @@ func Benchmark(b *testing.B) {
}{{
"USTAR",
[]file{{
&Header{Name: "bar", Mode: 0640, Size: int64(3)},
&realtar.Header{Name: "bar", Mode: 0640, Size: int64(3)},
[]byte("foo"),
}, {
&Header{Name: "world", Mode: 0640, Size: int64(5)},
&realtar.Header{Name: "world", Mode: 0640, Size: int64(5)},
[]byte("hello"),
}},
}, {
"GNU",
[]file{{
&Header{Name: "bar", Mode: 0640, Size: int64(3), Devmajor: -1},
&realtar.Header{Name: "bar", Mode: 0640, Size: int64(3), Devmajor: -1},
[]byte("foo"),
}, {
&Header{Name: "world", Mode: 0640, Size: int64(5), Devmajor: -1},
&realtar.Header{Name: "world", Mode: 0640, Size: int64(5), Devmajor: -1},
[]byte("hello"),
}},
}, {
"PAX",
[]file{{
&Header{Name: "bar", Mode: 0640, Size: int64(3), Xattrs: map[string]string{"foo": "bar"}},
&realtar.Header{Name: "bar", Mode: 0640, Size: int64(3), Xattrs: map[string]string{"foo": "bar"}},
[]byte("foo"),
}, {
&Header{Name: "world", Mode: 0640, Size: int64(5), Xattrs: map[string]string{"foo": "bar"}},
&realtar.Header{Name: "world", Mode: 0640, Size: int64(5), Xattrs: map[string]string{"foo": "bar"}},
[]byte("hello"),
}},
}}
@ -808,7 +823,7 @@ func Benchmark(b *testing.B) {
for i := 0; i < b.N; i++ {
// Writing to ioutil.Discard because we want to
// test purely the writer code and not bring in disk performance into this.
tw := NewWriter(ioutil.Discard)
tw := realtar.NewWriter(ioutil.Discard)
for _, file := range v.files {
if err := tw.WriteHeader(file.hdr); err != nil {
b.Errorf("unexpected WriteHeader error: %v", err)
@ -831,7 +846,7 @@ func Benchmark(b *testing.B) {
var r bytes.Reader
// Write the archive to a byte buffer.
tw := NewWriter(&buf)
tw := realtar.NewWriter(&buf)
for _, file := range v.files {
_ = tw.WriteHeader(file.hdr)
_, _ = tw.Write(file.body)