aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlberto Cortés <alberto@sourced.tech>2016-01-21 03:29:57 +0100
committerAlberto Cortés <alberto@sourced.tech>2016-01-21 03:29:57 +0100
commitfec62175e8de8ca8daa40683359706c926d9dc2e (patch)
treec6f0e9bdaeeee1da29424a3f6dc764d94244c2a7
parent07e4c4368921f73048578f22a14a1c671ec3ba46 (diff)
downloadgo-git-fec62175e8de8ca8daa40683359706c926d9dc2e.tar.gz
performance increase for repos with many files and directories
-rw-r--r--objects_test.go6
-rw-r--r--tree.go20
2 files changed, 14 insertions, 12 deletions
diff --git a/objects_test.go b/objects_test.go
index 1ead65d..bc83cb7 100644
--- a/objects_test.go
+++ b/objects_test.go
@@ -53,9 +53,9 @@ func (s *ObjectsSuite) TestParseTree(c *C) {
c.Assert(err, IsNil)
c.Assert(tree.Entries, HasLen, 8)
- c.Assert(tree.Entries[0].Name, Equals, ".gitignore")
- c.Assert(tree.Entries[0].Mode.String(), Equals, "-rw-r--r--")
- c.Assert(tree.Entries[0].Hash.String(), Equals, "32858aad3c383ed1ff0a0f9bdf231d54a00c9e88")
+ c.Assert(tree.Entries[".gitignore"].Name, Equals, ".gitignore")
+ c.Assert(tree.Entries[".gitignore"].Mode.String(), Equals, "-rw-r--r--")
+ c.Assert(tree.Entries[".gitignore"].Hash.String(), Equals, "32858aad3c383ed1ff0a0f9bdf231d54a00c9e88")
count := 0
ch := tree.Files()
diff --git a/tree.go b/tree.go
index 232bfc2..053f5c1 100644
--- a/tree.go
+++ b/tree.go
@@ -15,7 +15,7 @@ import (
// Tree is basically like a directory - it references a bunch of other trees
// and/or blobs (i.e. files and sub-directories)
type Tree struct {
- Entries []TreeEntry
+ Entries map[string]TreeEntry
Hash core.Hash
r *Repository
@@ -97,13 +97,12 @@ func (t *Tree) dir(baseName string) (*Tree, error) {
var errEntryNotFound = errors.New("entry not found")
func (t *Tree) entry(baseName string) (*TreeEntry, error) {
- for _, entry := range t.Entries {
- if entry.Name == baseName {
- return &entry, nil
- }
+ entry, ok := t.Entries[baseName]
+ if !ok {
+ return nil, errEntryNotFound
}
- return nil, errEntryNotFound
+ return &entry, nil
}
func (t *Tree) Files() chan *File {
@@ -145,6 +144,8 @@ func (t *Tree) Decode(o core.Object) error {
return nil
}
+ t.Entries = make(map[string]TreeEntry)
+
r := bufio.NewReader(o.Reader())
for {
mode, err := r.ReadString(' ')
@@ -172,11 +173,12 @@ func (t *Tree) Decode(o core.Object) error {
return err
}
- t.Entries = append(t.Entries, TreeEntry{
+ baseName := name[:len(name)-1]
+ t.Entries[baseName] = TreeEntry{
Hash: hash,
Mode: os.FileMode(fm),
- Name: name[:len(name)-1],
- })
+ Name: baseName,
+ }
}
return nil