Change signature

Signed-off-by: Jakub Sztandera <[email protected]>

Author: Kubuxu

mapreduce.go

@@ -9,7 +9,9 @@ import (
 	"sync"
 
 	cid "github.com/ipfs/go-cid"
+	cbor "github.com/ipfs/go-ipld-cbor"
 	cbg "github.com/whyrusleeping/cbor-gen"
+	xerrors "golang.org/x/xerrors"
 )
 
 type cacheEntry[T any] struct {
@@ -107,11 +109,13 @@ func NewCachedMapReduce[T any, PT interface {
 }
 
 // MapReduce applies the map reduce function to the given root node.
-func (cmr *CachedMapReduce[T, PT, U]) MapReduce(ctx context.Context, root *Node) (U, error) {
+func (cmr *CachedMapReduce[T, PT, U]) MapReduce(ctx context.Context, cs cbor.IpldStore, c cid.Cid, options ...Option) (U, error) {
 	var res U
-	if root == nil {
-		return res, errors.New("root is nil")
+	root, err := LoadNode(ctx, cs, c, options...)
+	if err != nil {
+		return res, xerrors.Errorf("failed to load root node: %w", err)
 	}
+
 	ce, err := cmr.mapReduceInternal(ctx, root)
 	if err != nil {
 		return res, err

mapreduce_test.go

@@ -25,26 +25,24 @@ func TestMapReduceSimple(t *testing.T) {
 	ctx := context.Background()
 	opts := []Option{UseTreeBitWidth(5)}
 	cs := &readCounterStore{cbor.NewCborStore(newMockBlocks()), 0}
-	begn, err := NewNode(cs, opts...)
-	require.NoError(t, err)
 
-	golden := make(map[string]string)
 	N := 50000
-	for range N {
-		k := randKey()
-		v := randValue()
-		golden[k] = string([]byte(*v))
-		begn.Set(ctx, k, v)
-	}
-
-	reLoadNode := func(node *Node) *Node {
-		c, err := node.Write(ctx)
+	var rootCid cid.Cid
+	golden := make(map[string]string)
+	{
+		begn, err := NewNode(cs, opts...)
 		require.NoError(t, err)
-		res, err := LoadNode(ctx, cs, c, opts...)
+
+		for range N {
+			k := randKey()
+			v := randValue()
+			golden[k] = string([]byte(*v))
+			begn.Set(ctx, k, v)
+		}
+
+		rootCid, err = begn.Write(ctx)
 		require.NoError(t, err)
-		return res
 	}
-	begn = reLoadNode(begn)
 
 	type kv struct {
 		k string
@@ -70,14 +68,13 @@ func TestMapReduceSimple(t *testing.T) {
 	require.NoError(t, err)
 
 	cs.readCount = 0
-	res, err := cmr.MapReduce(ctx, begn)
+	res, err := cmr.MapReduce(ctx, cs, rootCid, opts...)
 	require.NoError(t, err)
 	require.Equal(t, len(golden), len(res))
 	t.Logf("fresh readCount: %d", cs.readCount)
 
-	begn = reLoadNode(begn)
 	cs.readCount = 0
-	res, err = cmr.MapReduce(ctx, begn)
+	res, err = cmr.MapReduce(ctx, cs, rootCid, opts...)
 	require.NoError(t, err)
 	t.Logf("fresh re-readCount: %d", cs.readCount)
 	require.Less(t, cs.readCount, 200)
@@ -94,39 +91,42 @@ func TestMapReduceSimple(t *testing.T) {
 	verifyConsistency(res)
 
 	{
+		begn, err := LoadNode(ctx, cs, rootCid, opts...)
+		require.NoError(t, err)
 		// add new key
 		k := randKey()
 		v := randValue()
 		golden[k] = string([]byte(*v))
 		begn.Set(ctx, k, v)
 
-		begn = reLoadNode(begn)
+		rootCid, err = begn.Write(ctx)
+		require.NoError(t, err)
 	}
 
 	cs.readCount = 0
-	res, err = cmr.MapReduce(ctx, begn)
+	res, err = cmr.MapReduce(ctx, cs, rootCid, opts...)
 	require.NoError(t, err)
 	verifyConsistency(res)
 	t.Logf("new key readCount: %d", cs.readCount)
 	require.Less(t, cs.readCount, 200)
 
-	begn = reLoadNode(begn)
 	cs.readCount = 0
-	res, err = cmr.MapReduce(ctx, begn)
+	res, err = cmr.MapReduce(ctx, cs, rootCid, opts...)
 	require.NoError(t, err)
 	verifyConsistency(res)
 	t.Logf("repeat readCount: %d", cs.readCount)
 	require.Less(t, cs.readCount, 200)
 
-	begn = reLoadNode(begn)
 	cs.readCount = 0
-	res, err = cmr.MapReduce(ctx, begn)
+	res, err = cmr.MapReduce(ctx, cs, rootCid, opts...)
 	require.NoError(t, err)
 	verifyConsistency(res)
 	t.Logf("repeat readCount: %d", cs.readCount)
 	require.Less(t, cs.readCount, 200)
 
 	{
+		begn, err := LoadNode(ctx, cs, rootCid, opts...)
+		require.NoError(t, err)
 		// add two new keys
 		k := randKey()
 		v := randValue()
@@ -137,11 +137,12 @@ func TestMapReduceSimple(t *testing.T) {
 		golden[k] = string([]byte(*v))
 		begn.Set(ctx, k, v)
 
-		begn = reLoadNode(begn)
+		rootCid, err = begn.Write(ctx)
+		require.NoError(t, err)
 	}
 
 	cs.readCount = 0
-	res, err = cmr.MapReduce(ctx, begn)
+	res, err = cmr.MapReduce(ctx, cs, rootCid, opts...)
 	require.NoError(t, err)
 	verifyConsistency(res)
 	t.Logf("new two keys readCount: %d", cs.readCount)