fix go vet issues in hamt sharding PR

License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>
ipfs · Mar 24, 2017 · 5e8347c · 5e8347c
1 parent bd3637a
commit 5e8347c
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 23 deletions.
diff --git a/hamt/hamt.go b/hamt/hamt.go
@@ -351,17 +351,17 @@ func (ds *HamtShard) getValue(ctx context.Context, hv *hashBits, key string, cb
 	return os.ErrNotExist
 }
 
-func (ds *HamtShard) EnumLinks() ([]*node.Link, error) {
+func (ds *HamtShard) EnumLinks(ctx context.Context) ([]*node.Link, error) {
 	var links []*node.Link
-	err := ds.ForEachLink(func(l *node.Link) error {
+	err := ds.ForEachLink(ctx, func(l *node.Link) error {
 		links = append(links, l)
 		return nil
 	})
 	return links, err
 }
 
-func (ds *HamtShard) ForEachLink(f func(*node.Link) error) error {
-	return ds.walkTrie(func(sv *shardValue) error {
+func (ds *HamtShard) ForEachLink(ctx context.Context, f func(*node.Link) error) error {
+	return ds.walkTrie(ctx, func(sv *shardValue) error {
 		lnk, err := node.MakeLink(sv.val)
 		if err != nil {
 			return err
@@ -373,7 +373,7 @@ func (ds *HamtShard) ForEachLink(f func(*node.Link) error) error {
 	})
 }
 
-func (ds *HamtShard) walkTrie(cb func(*shardValue) error) error {
+func (ds *HamtShard) walkTrie(ctx context.Context, cb func(*shardValue) error) error {
 	for i := 0; i < ds.tableSize; i++ {
 		if ds.bitfield.Bit(i) == 0 {
 			continue
@@ -382,7 +382,7 @@ func (ds *HamtShard) walkTrie(cb func(*shardValue) error) error {
 		idx := ds.indexForBitPos(i)
 		// NOTE: an optimized version could simply iterate over each
 		//       element in the 'children' array.
-		c, err := ds.getChild(context.TODO(), idx)
+		c, err := ds.getChild(ctx, idx)
 		if err != nil {
 			return err
 		}
@@ -395,7 +395,7 @@ func (ds *HamtShard) walkTrie(cb func(*shardValue) error) error {
 			}
 
 		case *HamtShard:
-			err := c.walkTrie(cb)
+			err := c.walkTrie(ctx, cb)
 			if err != nil {
 				return err
 			}

diff --git a/hamt/hamt_test.go b/hamt/hamt_test.go
@@ -72,6 +72,8 @@ func assertLink(s *HamtShard, name string, found bool) error {
 }
 
 func assertSerializationWorks(ds dag.DAGService, s *HamtShard) error {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	nd, err := s.Node()
 	if err != nil {
 		return err
@@ -82,12 +84,12 @@ func assertSerializationWorks(ds dag.DAGService, s *HamtShard) error {
 		return err
 	}
 
-	linksA, err := s.EnumLinks()
+	linksA, err := s.EnumLinks(ctx)
 	if err != nil {
 		return err
 	}
 
-	linksB, err := nds.EnumLinks()
+	linksB, err := nds.EnumLinks(ctx)
 	if err != nil {
 		return err
 	}
@@ -160,7 +162,8 @@ func TestDirBuilding(t *testing.T) {
 func TestShardReload(t *testing.T) {
 	ds := mdtest.Mock()
 	s, _ := NewHamtShard(ds, 256)
-	ctx := context.Background()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 
 	_, s, err := makeDir(ds, 200)
 	if err != nil {
@@ -177,7 +180,7 @@ func TestShardReload(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	lnks, err := nds.EnumLinks()
+	lnks, err := nds.EnumLinks(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -270,7 +273,7 @@ func TestSetAfterMarshal(t *testing.T) {
 		}
 	}
 
-	links, err := nds.EnumLinks()
+	links, err := nds.EnumLinks(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -301,7 +304,7 @@ func TestDuplicateAddShard(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	lnks, err := dir.EnumLinks()
+	lnks, err := dir.EnumLinks(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -393,7 +396,7 @@ func TestRemoveElemsAfterMarshal(t *testing.T) {
 		}
 	}
 
-	links, err := nds.EnumLinks()
+	links, err := nds.EnumLinks(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/io/dagreader_test.go b/io/dagreader_test.go
@@ -169,7 +169,10 @@ func TestMetadataNode(t *testing.T) {
 	ctx, closer := context.WithCancel(context.Background())
 	defer closer()
 
-	data, err := unixfs.BytesForMetadata(&unixfs.Metadata{"text", 125})
+	data, err := unixfs.BytesForMetadata(&unixfs.Metadata{
+		MimeType: "text",
+		Size:     125,
+	})
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/io/dirbuilder.go b/io/dirbuilder.go
@@ -119,7 +119,7 @@ func (d *Directory) switchToSharding(ctx context.Context) error {
 	return nil
 }
 
-func (d *Directory) ForEachLink(f func(*node.Link) error) error {
+func (d *Directory) ForEachLink(ctx context.Context, f func(*node.Link) error) error {
 	if d.shard == nil {
 		for _, l := range d.dirnode.Links() {
 			if err := f(l); err != nil {
@@ -129,15 +129,15 @@ func (d *Directory) ForEachLink(f func(*node.Link) error) error {
 		return nil
 	}
 
-	return d.shard.ForEachLink(f)
+	return d.shard.ForEachLink(ctx, f)
 }
 
-func (d *Directory) Links() ([]*node.Link, error) {
+func (d *Directory) Links(ctx context.Context) ([]*node.Link, error) {
 	if d.shard == nil {
 		return d.dirnode.Links(), nil
 	}
 
-	return d.shard.EnumLinks()
+	return d.shard.EnumLinks(ctx)
 }
 
 func (d *Directory) Find(ctx context.Context, name string) (node.Node, error) {

diff --git a/io/dirbuilder_test.go b/io/dirbuilder_test.go
@@ -38,7 +38,7 @@ func TestDirectoryGrowth(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	links, err := dir.Links()
+	links, err := dir.Links(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -86,7 +86,7 @@ func TestDuplicateAddDir(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	lnks, err := dir.Links()
+	lnks, err := dir.Links(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -121,7 +121,7 @@ func TestDirBuilder(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	links, err := dir.Links()
+	links, err := dir.Links(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -135,7 +135,7 @@ func TestDirBuilder(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	links, err = adir.Links()
+	links, err = adir.Links(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}