aboutsummaryrefslogtreecommitdiffstats
path: root/storage/filesystem/object_test.go
diff options
context:
space:
mode:
Diffstat (limited to 'storage/filesystem/object_test.go')
-rw-r--r--storage/filesystem/object_test.go339
1 files changed, 27 insertions, 312 deletions
diff --git a/storage/filesystem/object_test.go b/storage/filesystem/object_test.go
index 142bad9..99266ab 100644
--- a/storage/filesystem/object_test.go
+++ b/storage/filesystem/object_test.go
@@ -1,21 +1,10 @@
package filesystem
import (
- "fmt"
- "io"
- "io/ioutil"
- "os"
- "path/filepath"
- "reflect"
- "sort"
-
"gopkg.in/src-d/go-git.v4/core"
- "gopkg.in/src-d/go-git.v4/formats/packfile"
+ "gopkg.in/src-d/go-git.v4/fixtures"
"gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit"
- "gopkg.in/src-d/go-git.v4/storage/memory"
- "gopkg.in/src-d/go-git.v4/utils/fs"
- "github.com/alcortesm/tgz"
. "gopkg.in/check.v1"
)
@@ -23,318 +12,44 @@ type FsSuite struct{}
var _ = Suite(&FsSuite{})
-var fixtures map[string]string // id to git dir paths (see initFixtures below)
-
-func fixture(id string, c *C) string {
- path, ok := fixtures[id]
- c.Assert(ok, Equals, true, Commentf("fixture %q not found", id))
-
- return path
-}
-
-var initFixtures = [...]struct {
- id string
- tgz string
-}{
- {
- id: "binary-relations",
- tgz: "internal/dotgit/fixtures/alcortesm-binary-relations.tgz",
- }, {
- id: "binary-relations-no-idx",
- tgz: "internal/dotgit/fixtures/alcortesm-binary-relations-no-idx.tgz",
- }, {
- id: "ref-deltas-no-idx",
- tgz: "internal/dotgit/fixtures/ref-deltas-no-idx.tgz",
- },
-}
-
func (s *FsSuite) SetUpSuite(c *C) {
- fixtures = make(map[string]string, len(initFixtures))
- for _, init := range initFixtures {
- path, err := tgz.Extract(init.tgz)
- c.Assert(err, IsNil, Commentf("error extracting %s\n", init.tgz))
- fixtures[init.id] = path
- }
-}
-
-func (s *FsSuite) TearDownSuite(c *C) {
- for _, v := range fixtures {
- err := os.RemoveAll(v)
- c.Assert(err, IsNil, Commentf("error removing fixture %q\n", v))
- }
+ fixtures.RootFolder = "../../fixtures"
}
-func (s *FsSuite) TestWriter(c *C) {
- r, err := os.Open("../../formats/packfile/fixtures/git-fixture.ofs-delta")
+func (s *FsSuite) TestGetFromObjectFile(c *C) {
+ fs := fixtures.ByTag(".git").ByTag("unpacked").DotGit()
+ o, err := newObjectStorage(dotgit.New(fs))
c.Assert(err, IsNil)
- o := &ObjectStorage{}
- w, err := o.Writer()
+ expected := core.NewHash("f3dfe29d268303fc6e1bbce268605fc99573406e")
+ obj, err := o.Get(core.AnyObject, expected)
c.Assert(err, IsNil)
-
- n, err := io.Copy(w, r)
- c.Assert(err, IsNil)
- c.Check(n, Equals, int64(85300))
-
- c.Assert(o.index, HasLen, 28)
- c.Assert(w.Close(), IsNil)
-}
-
-func (s *FsSuite) TestHashNotFound(c *C) {
- sto := s.newObjectStorage(c, "binary-relations")
- types := []core.ObjectType{core.AnyObject, core.TagObject, core.CommitObject, core.BlobObject, core.TreeObject}
- for t := range types {
- _, err := sto.Get(core.ObjectType(t), core.ZeroHash)
- c.Assert(err, Equals, core.ErrObjectNotFound)
- }
+ c.Assert(obj.Hash(), Equals, expected)
}
-func (s *FsSuite) newObjectStorage(c *C, fixtureName string) core.ObjectStorage {
- path := fixture(fixtureName, c)
- fs := fs.NewOS(filepath.Join(path, ".git/"))
-
- store, err := NewStorage(fs)
+func (s *FsSuite) TestGetFromPackfile(c *C) {
+ fs := fixtures.Basic().ByTag(".git").DotGit()
+ o, err := newObjectStorage(dotgit.New(fs))
c.Assert(err, IsNil)
- return store.ObjectStorage()
-}
-
-func (s *FsSuite) TestGetCompareWithMemoryStorage(c *C) {
- for i, fixId := range [...]string{
- "binary-relations",
- "binary-relations-no-idx",
- "ref-deltas-no-idx",
- } {
- path := fixture(fixId, c)
- com := Commentf("at subtest %d, (fixture id = %q, extracted to %q)",
- i, fixId, path)
-
- gitPath := filepath.Join(path, ".git/")
- fs := fs.NewOS(gitPath)
-
- memSto, err := memStorageFromGitDir(fs, gitPath)
- c.Assert(err, IsNil, com)
-
- filesystemSto := s.newObjectStorage(c, fixId)
-
- equal, reason, err := equalsStorages(memSto, filesystemSto)
- c.Assert(err, IsNil, com)
- c.Assert(equal, Equals, true,
- Commentf("%s - %s\n", com.CheckCommentString(), reason))
- }
-}
-
-func memStorageFromGitDir(fs fs.Filesystem, path string) (core.ObjectStorage, error) {
- dir := dotgit.New(fs)
- packs, err := dir.ObjectsPacks()
- if err != nil {
- return nil, err
- }
-
- if len(packs) == 0 {
- return nil, nil
- }
-
- fmt.Println(packs[0].Name())
- f, _, err := dir.ObjectPack(packs[0].Name())
- if err != nil {
- return nil, err
- }
-
- sto := memory.NewStorage()
- r := packfile.NewScanner(f)
- d := packfile.NewDecoder(r, sto.ObjectStorage())
-
- _, err = d.Decode()
- if err != nil {
- return nil, err
- }
-
- err = f.Close()
- if err != nil {
- return nil, err
- }
-
- return sto.ObjectStorage(), nil
-}
-
-func equalsStorages(a, b core.ObjectStorage) (bool, string, error) {
- for _, typ := range [...]core.ObjectType{
- core.CommitObject,
- core.TreeObject,
- core.BlobObject,
- core.TagObject,
- } {
- iter, err := a.Iter(typ)
- if err != nil {
- return false, "", fmt.Errorf("cannot get iterator: %s", err)
- }
-
- for {
- ao, err := iter.Next()
- if err != nil {
- iter.Close()
- break
- }
-
- bo, err := b.Get(core.AnyObject, ao.Hash())
- if err != nil {
- return false, "", fmt.Errorf("getting object with hash %s: %s",
- ao.Hash(), err)
- }
-
- equal, reason, err := equalsObjects(ao, bo)
- if !equal || err != nil {
- return equal, reason, fmt.Errorf("comparing objects: %s", err)
- }
- }
- }
-
- return true, "", nil
-}
-
-func equalsObjects(a, b core.Object) (bool, string, error) {
- ah := a.Hash()
- bh := b.Hash()
- if ah != bh {
- return false, fmt.Sprintf("object hashes differ: %s and %s\n",
- ah, bh), nil
- }
-
- atyp := a.Type()
- btyp := b.Type()
- if atyp != btyp {
- return false, fmt.Sprintf("object types differ: %d and %d\n",
- atyp, btyp), nil
- }
-
- asz := a.Size()
- bsz := b.Size()
- if asz != bsz {
- return false, fmt.Sprintf("object sizes differ: %d and %d\n",
- asz, bsz), nil
- }
-
- r, _ := b.Reader()
- ac, _ := ioutil.ReadAll(r)
- if ac != nil {
- r, _ := b.Reader()
- bc, _ := ioutil.ReadAll(r)
-
- if !reflect.DeepEqual(ac, bc) {
- return false, fmt.Sprintf("object contents differ"), nil
- }
- }
-
- return true, "", nil
-}
-
-func (s *FsSuite) TestIterCompareWithMemoryStorage(c *C) {
- for i, fixId := range [...]string{
- "binary-relations",
- "binary-relations-no-idx",
- "ref-deltas-no-idx",
- } {
-
- path := fixture(fixId, c)
- com := Commentf("at subtest %d, (fixture id = %q, extracted to %q)",
- i, fixId, path)
-
- gitPath := filepath.Join(path, ".git/")
- fs := fs.NewOS(gitPath)
-
- memSto, err := memStorageFromDirPath(fs, gitPath)
- c.Assert(err, IsNil, com)
-
- filesystemSto := s.newObjectStorage(c, fixId)
-
- for _, typ := range [...]core.ObjectType{
- core.CommitObject,
- core.TreeObject,
- core.BlobObject,
- core.TagObject,
- } {
-
- memObjs, err := iterToSortedSlice(memSto, typ)
- c.Assert(err, IsNil, com)
-
- filesystemObjs, err := iterToSortedSlice(filesystemSto, typ)
- c.Assert(err, IsNil, com)
-
- for i, o := range memObjs {
- c.Assert(filesystemObjs[i].Hash(), Equals, o.Hash(), com)
- }
- }
- }
-}
-
-func memStorageFromDirPath(fs fs.Filesystem, path string) (core.ObjectStorage, error) {
- dir := dotgit.New(fs)
- packs, err := dir.ObjectsPacks()
- if err != nil {
- fmt.Println("errr", err)
- return nil, err
- }
-
- if len(packs) == 0 {
- return nil, nil
- }
-
- f, _, err := dir.ObjectPack(packs[0].Name())
- if err != nil {
- return nil, err
- }
-
- sto := memory.NewStorage()
-
- r := packfile.NewScanner(f)
- d := packfile.NewDecoder(r, sto.ObjectStorage())
- _, err = d.Decode()
- if err != nil {
- return nil, err
- }
-
- if err = f.Close(); err != nil {
- return nil, err
- }
-
- return sto.ObjectStorage(), nil
-}
-
-func iterToSortedSlice(storage core.ObjectStorage, typ core.ObjectType) ([]core.Object,
- error) {
-
- iter, err := storage.Iter(typ)
- if err != nil {
- return nil, err
- }
-
- r := make([]core.Object, 0)
- for {
- obj, err := iter.Next()
- if err != nil {
- iter.Close()
- break
- }
- r = append(r, obj)
- }
-
- sort.Sort(byHash(r))
-
- return r, nil
+ expected := core.NewHash("6ecf0ef2c2dffb796033e5a02219af86ec6584e5")
+ obj, err := o.Get(core.AnyObject, expected)
+ c.Assert(err, IsNil)
+ c.Assert(obj.Hash(), Equals, expected)
}
-type byHash []core.Object
-
-func (a byHash) Len() int { return len(a) }
-func (a byHash) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
-func (a byHash) Less(i, j int) bool {
- return a[i].Hash().String() < a[j].Hash().String()
-}
+func (s *FsSuite) TestGetFromPackfileMultiplePackfiles(c *C) {
+ fs := fixtures.ByTag(".git").ByTag("multi-packfile").DotGit()
+ o, err := newObjectStorage(dotgit.New(fs))
+ c.Assert(err, IsNil)
-func (s *FsSuite) TestSet(c *C) {
- sto := s.newObjectStorage(c, "binary-relations")
+ expected := core.NewHash("8d45a34641d73851e01d3754320b33bb5be3c4d3")
+ obj, err := o.getFromPackfile(expected)
+ c.Assert(err, IsNil)
+ c.Assert(obj.Hash(), Equals, expected)
- _, err := sto.Set(&core.MemoryObject{})
- c.Assert(err, ErrorMatches, "not implemented yet")
+ expected = core.NewHash("e9cfa4c9ca160546efd7e8582ec77952a27b17db")
+ obj, err = o.getFromPackfile(expected)
+ c.Assert(err, IsNil)
+ c.Assert(obj.Hash(), Equals, expected)
}
generated by cgit (git 2.34.1) at 2024-09-21 00:01:24 +0000