go test updates to compile

dolthub · Jan 7, 2025 · 16be518 · 16be518
1 parent a5ab0f1
commit 16be518
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 15 deletions.
diff --git a/go/libraries/doltcore/remotestorage/map_chunk_cache_test.go b/go/libraries/doltcore/remotestorage/map_chunk_cache_test.go
@@ -27,8 +27,8 @@ import (
 	"github.com/dolthub/dolt/go/store/nbs"
 )
 
-func genRandomChunks(rng *rand.Rand, n int) (hash.HashSet, []nbs.CompressedChunk) {
-	chks := make([]nbs.CompressedChunk, n)
+func genRandomChunks(rng *rand.Rand, n int) (hash.HashSet, []nbs.ToChunker) {
+	chks := make([]nbs.ToChunker, n)
 	hashes := make(hash.HashSet)
 	for i := 0; i < n; i++ {
 		size := int(rng.Int31n(99) + 1)
@@ -88,7 +88,7 @@ func TestMapChunkCache(t *testing.T) {
 
 	toFlush = mapChunkCache.GetAndClearChunksToFlush()
 
-	expected := map[hash.Hash]nbs.CompressedChunk{moreChks[0].Hash(): moreChks[0]}
+	expected := map[hash.Hash]nbs.ToChunker{moreChks[0].Hash(): moreChks[0]}
 	eq := reflect.DeepEqual(toFlush, expected)
 	assert.True(t, eq, "Missing or unexpected chunks to flush (seed %d)", seed)
 }
diff --git a/go/store/datas/pull/pull_chunk_fetcher_test.go b/go/store/datas/pull/pull_chunk_fetcher_test.go
@@ -70,8 +70,12 @@ func TestPullChunkFetcher(t *testing.T) {
 			defer wg.Done()
 			cmp, err := f.Recv(context.Background())
 			assert.NoError(t, err)
-			assert.Equal(t, cmp.H, gm.C.H)
-			assert.Equal(t, cmp.FullCompressedChunk, gm.C.FullCompressedChunk)
+			assert.Equal(t, cmp.Hash(), gm.C.H)
+
+			cc, ok := cmp.(nbs.CompressedChunk)
+			assert.True(t, ok)
+
+			assert.Equal(t, cc.FullCompressedChunk, gm.C.FullCompressedChunk)
 			_, err = f.Recv(context.Background())
 			assert.ErrorIs(t, err, io.EOF)
 			assert.NoError(t, f.Close())
@@ -92,8 +96,11 @@ func TestPullChunkFetcher(t *testing.T) {
 			defer wg.Done()
 			cmp, err := f.Recv(context.Background())
 			assert.NoError(t, err)
-			assert.Equal(t, cmp.H, h)
-			assert.Nil(t, cmp.FullCompressedChunk)
+			assert.Equal(t, cmp.Hash(), h)
+
+			cc, ok := cmp.(nbs.CompressedChunk)
+			assert.True(t, ok)
+			assert.Nil(t, cc.FullCompressedChunk)
 			_, err = f.Recv(context.Background())
 			assert.ErrorIs(t, err, io.EOF)
 			assert.NoError(t, f.Close())
@@ -136,15 +143,15 @@ func TestPullChunkFetcher(t *testing.T) {
 type emptyGetManyer struct {
 }
 
-func (emptyGetManyer) GetManyCompressed(ctx context.Context, hashes hash.HashSet, found func(context.Context, nbs.CompressedChunk)) error {
+func (emptyGetManyer) GetManyCompressed(ctx context.Context, hashes hash.HashSet, found func(context.Context, nbs.ToChunker)) error {
 	return nil
 }
 
 type deliveringGetManyer struct {
 	C nbs.CompressedChunk
 }
 
-func (d deliveringGetManyer) GetManyCompressed(ctx context.Context, hashes hash.HashSet, found func(context.Context, nbs.CompressedChunk)) error {
+func (d deliveringGetManyer) GetManyCompressed(ctx context.Context, hashes hash.HashSet, found func(context.Context, nbs.ToChunker)) error {
 	for _ = range hashes {
 		found(ctx, d.C)
 	}
@@ -155,7 +162,7 @@ type blockingGetManyer struct {
 	block chan struct{}
 }
 
-func (b blockingGetManyer) GetManyCompressed(ctx context.Context, hashes hash.HashSet, found func(context.Context, nbs.CompressedChunk)) error {
+func (b blockingGetManyer) GetManyCompressed(ctx context.Context, hashes hash.HashSet, found func(context.Context, nbs.ToChunker)) error {
 	<-b.block
 	return nil
 }
@@ -165,6 +172,6 @@ type errorGetManyer struct {
 
 var getManyerErr = fmt.Errorf("always return an error")
 
-func (errorGetManyer) GetManyCompressed(ctx context.Context, hashes hash.HashSet, found func(context.Context, nbs.CompressedChunk)) error {
+func (errorGetManyer) GetManyCompressed(ctx context.Context, hashes hash.HashSet, found func(context.Context, nbs.ToChunker)) error {
 	return getManyerErr
 }
diff --git a/go/store/nbs/archive_test.go b/go/store/nbs/archive_test.go
@@ -676,7 +676,7 @@ func (tcs *testChunkSource) getMany(ctx context.Context, eg *errgroup.Group, req
 	panic("never used")
 }
 
-func (tcs *testChunkSource) getManyCompressed(ctx context.Context, eg *errgroup.Group, reqs []getRecord, found func(context.Context, CompressedChunk), stats *Stats) (bool, error) {
+func (tcs *testChunkSource) getManyCompressed(ctx context.Context, eg *errgroup.Group, reqs []getRecord, found func(context.Context, ToChunker), stats *Stats) (bool, error) {
 	panic("never used")
 }
 

diff --git a/go/store/nbs/cmp_chunk_table_writer_test.go b/go/store/nbs/cmp_chunk_table_writer_test.go
@@ -48,10 +48,10 @@ func TestCmpChunkTableWriter(t *testing.T) {
 	}
 
 	reqs := toGetRecords(hashes)
-	found := make([]CompressedChunk, 0)
+	found := make([]ToChunker, 0)
 
 	eg, egCtx := errgroup.WithContext(ctx)
-	_, err = tr.getManyCompressed(egCtx, eg, reqs, func(ctx context.Context, c CompressedChunk) { found = append(found, c) }, &Stats{})
+	_, err = tr.getManyCompressed(egCtx, eg, reqs, func(ctx context.Context, c ToChunker) { found = append(found, c) }, &Stats{})
 	require.NoError(t, err)
 	require.NoError(t, eg.Wait())
 

diff --git a/go/store/nbs/mem_table_test.go b/go/store/nbs/mem_table_test.go
@@ -299,7 +299,7 @@ func (crg chunkReaderGroup) getMany(ctx context.Context, eg *errgroup.Group, req
 	return true, nil
 }
 
-func (crg chunkReaderGroup) getManyCompressed(ctx context.Context, eg *errgroup.Group, reqs []getRecord, found func(context.Context, CompressedChunk), stats *Stats) (bool, error) {
+func (crg chunkReaderGroup) getManyCompressed(ctx context.Context, eg *errgroup.Group, reqs []getRecord, found func(context.Context, ToChunker), stats *Stats) (bool, error) {
 	for _, haver := range crg {
 		remaining, err := haver.getManyCompressed(ctx, eg, reqs, found, stats)
 		if err != nil {