go: store/nbs: store.go: Fix GetManyCompressed to not redeliver chunk…

…s on waitForGC retry.
dolthub · Feb 22, 2025 · 4ce49e6 · 4ce49e6
1 parent e4a4b5d
commit 4ce49e6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/go/libraries/doltcore/doltdb/doltdb.go b/go/libraries/doltcore/doltdb/doltdb.go
@@ -1942,10 +1942,10 @@ type StoreSizes struct {
 	// but everything in it is in the old gen. In practice, given how we build
 	// oldgen references today, this will never be the case--there is always
 	// a little bit of data that only goes in the newgen.
-	NewGenBytes  uint64
+	NewGenBytes uint64
 	// This is the approximate total on-disk storage overhead of the store.
 	// It includes Journal and NewGenBytes, if there are any.
-	TotalBytes   uint64
+	TotalBytes uint64
 }
 
 func (ddb *DoltDB) StoreSizes(ctx context.Context) (StoreSizes, error) {
@@ -1964,13 +1964,13 @@ func (ddb *DoltDB) StoreSizes(ctx context.Context) (StoreSizes, error) {
 		if journal != nil {
 			return StoreSizes{
 				JournalBytes: uint64(journal.Size()),
-				NewGenBytes: newgenSz,
-				TotalBytes: totalSz,
+				NewGenBytes:  newgenSz,
+				TotalBytes:   totalSz,
 			}, nil
 		} else {
 			return StoreSizes{
 				NewGenBytes: newgenSz,
-				TotalBytes: totalSz,
+				TotalBytes:  totalSz,
 			}, nil
 		}
 	} else {

diff --git a/go/store/nbs/store.go b/go/store/nbs/store.go
@@ -955,10 +955,10 @@ func (nbs *NomsBlockStore) getManyWithFunc(
 		nbs.stats.ChunksPerGet.Sample(uint64(len(hashes)))
 	}()
 
+	reqs := toGetRecords(hashes)
+
 	const ioParallelism = 16
 	for {
-		reqs := toGetRecords(hashes)
-
 		nbs.mu.Lock()
 		keeper := nbs.keeperFunc
 		if gcDepMode == gcDependencyMode_NoDependency {

diff --git a/integration-tests/go-sql-server-driver/auto_gc_test.go b/integration-tests/go-sql-server-driver/auto_gc_test.go
@@ -131,7 +131,7 @@ cluster:
 	}
 
 	err = driver.WithFile{
-		Name: "server.yaml",
+		Name:     "server.yaml",
 		Contents: behaviorFragment + clusterFragment,
 	}.WriteAtDir(repo.Dir)
 	require.NoError(t, err)
@@ -183,7 +183,7 @@ cluster:
 	}
 
 	err = driver.WithFile{
-		Name: "server.yaml",
+		Name:     "server.yaml",
 		Contents: behaviorFragment + clusterFragment,
 	}.WriteAtDir(repo.Dir)
 	require.NoError(t, err)