tests

dolthub · Mar 29, 2024 · 30427de · 30427de
1 parent ef4341b
commit 30427de
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 23 deletions.
diff --git a/go/store/chunks/chunk_store_common_test.go b/go/store/chunks/chunk_store_common_test.go
@@ -36,8 +36,10 @@ type ChunkStoreTestSuite struct {
 	Factory *memoryStoreFactory
 }
 
-func noopGetAddrs(ctx context.Context, c Chunk) (hash.HashSet, error) {
-	return nil, nil
+func noopGetAddrs(c Chunk) GetAddrsCurry {
+	return func(ctx context.Context, addrs hash.HashSet) error {
+		return nil
+	}
 }
 
 func (suite *ChunkStoreTestSuite) TestChunkStorePut() {
@@ -55,8 +57,11 @@ func (suite *ChunkStoreTestSuite) TestChunkStorePut() {
 	// Put chunk with dangling ref should error on Commit
 	data := []byte("bcd")
 	nc := NewChunk(data)
-	err = store.Put(ctx, nc, func(ctx context.Context, c Chunk) (hash.HashSet, error) {
-		return hash.NewHashSet(hash.Of([]byte("nonsense"))), nil
+	err = store.Put(ctx, nc, func(c Chunk) GetAddrsCurry {
+		return func(ctx context.Context, addrs hash.HashSet) error {
+			addrs.Insert(hash.Of([]byte("nonsense")))
+			return nil
+		}
 	})
 	suite.NoError(err)
 	root, err := store.Root(ctx)

diff --git a/go/store/nbs/block_store_test.go b/go/store/nbs/block_store_test.go
@@ -116,8 +116,10 @@ func (suite *BlockStoreSuite) TestChunkStoreNotDir() {
 	suite.Error(err)
 }
 
-func noopGetAddrs(ctx context.Context, c chunks.Chunk) (hash.HashSet, error) {
-	return nil, nil
+func noopGetAddrs(c chunks.Chunk) chunks.GetAddrsCurry {
+	return func(ctx context.Context, addrs hash.HashSet) error {
+		return nil
+	}
 }
 
 func (suite *BlockStoreSuite) TestChunkStorePut() {
@@ -159,8 +161,11 @@ func (suite *BlockStoreSuite) TestChunkStorePut() {
 
 	// Put chunk with dangling ref should error on Commit
 	nc := chunks.NewChunk([]byte("bcd"))
-	err = suite.store.Put(context.Background(), nc, func(ctx context.Context, c chunks.Chunk) (hash.HashSet, error) {
-		return hash.NewHashSet(hash.Of([]byte("lorem ipsum"))), nil
+	err = suite.store.Put(context.Background(), nc, func(c chunks.Chunk) chunks.GetAddrsCurry {
+		return func(ctx context.Context, addrs hash.HashSet) error {
+			addrs.Insert(hash.Of([]byte("lorem ipsum")))
+			return nil
+		}
 	})
 	suite.NoError(err)
 	root, err := suite.store.Root(context.Background())

diff --git a/go/store/nbs/root_tracker_test.go b/go/store/nbs/root_tracker_test.go
@@ -60,9 +60,7 @@ func TestChunkStoreVersion(t *testing.T) {
 
 	assert.Equal(constants.FormatLD1String, store.Version())
 	newChunk := chunks.NewChunk([]byte("new root"))
-	require.NoError(t, store.Put(context.Background(), newChunk, func(ctx context.Context, c chunks.Chunk) (hash.HashSet, error) {
-		return nil, nil
-	}))
+	require.NoError(t, store.Put(context.Background(), newChunk, noopGetAddrs))
 	newRoot := newChunk.Hash()
 
 	if assert.True(store.Commit(context.Background(), newRoot, hash.Hash{})) {
@@ -213,9 +211,7 @@ func TestChunkStoreCommitOptimisticLockFail(t *testing.T) {
 	require.NoError(t, err)
 
 	newChunk := chunks.NewChunk([]byte("new root 2"))
-	require.NoError(t, store.Put(context.Background(), newChunk, func(ctx context.Context, c chunks.Chunk) (hash.HashSet, error) {
-		return nil, nil
-	}))
+	require.NoError(t, store.Put(context.Background(), newChunk, noopGetAddrs))
 	newRoot2 := newChunk.Hash()
 	success, err := store.Commit(context.Background(), newRoot2, hash.Hash{})
 	require.NoError(t, err)

diff --git a/go/store/nbs/store_test.go b/go/store/nbs/store_test.go
@@ -204,7 +204,13 @@ func TestNBSPruneTableFiles(t *testing.T) {
 
 	// add a chunk and flush to trigger a conjoin
 	c := chunks.NewChunk([]byte("it's a boy!"))
-	ok, err := st.addChunk(ctx, c, hash.NewHashSet(), st.hasMany)
+	addrs := hash.NewHashSet()
+	ok, err := st.addChunk(ctx, c, func(c chunks.Chunk) chunks.GetAddrsCurry {
+		return func(ctx context.Context, _ hash.HashSet) error {
+			addrs.Insert(c.Hash())
+			return nil
+		}
+	}, st.hasMany)
 	require.NoError(t, err)
 	require.True(t, ok)
 	ok, err = st.Commit(ctx, st.upstream.root, st.upstream.root)

diff --git a/go/store/nbs/table_set.go b/go/store/nbs/table_set.go
@@ -289,13 +289,12 @@ func (ts tableSet) Size() int {
 // append adds a memTable to an existing tableSet, compacting |mt| and
 // returning a new tableSet with newly compacted table added.
 func (ts tableSet) append(ctx context.Context, mt *memTable, checker refCheck, hasCache *lru.TwoQueueCache[hash.Hash, struct{}], stats *Stats) (tableSet, error) {
-	if true {
-		addrs := hash.NewHashSet()
-		for _, getAddrs := range mt.getChildAddrs {
-			getAddrs(ctx, addrs)
-		}
-		mt.addChildRefs(addrs)
+	addrs := hash.NewHashSet()
+	for _, getAddrs := range mt.getChildAddrs {
+		getAddrs(ctx, addrs)
 	}
+	mt.addChildRefs(addrs)
+
 	for i := range mt.pendingRefs {
 		if !mt.pendingRefs[i].has && hasCache.Contains(*mt.pendingRefs[i].a) {
 			mt.pendingRefs[i].has = true

diff --git a/go/store/spec/spec_test.go b/go/store/spec/spec_test.go
@@ -475,8 +475,10 @@ func (t *testProtocol) NewDatabase(sp Spec) (datas.Database, error) {
 	return datas.NewDatabase(cs), nil
 }
 
-func noopGetAddrs(ctx context.Context, c chunks.Chunk) (hash.HashSet, error) {
-	return nil, nil
+func noopGetAddrs(c chunks.Chunk) chunks.GetAddrsCurry {
+	return func(ctx context.Context, addrs hash.HashSet) error {
+		return nil
+	}
 }
 
 func TestExternalProtocol(t *testing.T) {