diff --git a/go/performance/kvbench/prolly_store.go b/go/performance/kvbench/prolly_store.go index f31f9a6006..71cf3860da 100644 --- a/go/performance/kvbench/prolly_store.go +++ b/go/performance/kvbench/prolly_store.go @@ -39,7 +39,7 @@ func newMemoryProllyStore() keyValStore { func newNBSProllyStore(dir string) keyValStore { ctx := context.Background() verStr := types.Format_Default.VersionString() - cs, err := nbs.NewLocalStore(ctx, verStr, dir, defaultMemTableSize, nbs.NewUnlimitedMemQuotaProvider()) + cs, err := nbs.NewLocalStore(ctx, verStr, dir, defaultMemTableSize, nbs.NewUnlimitedMemQuotaProvider(), false) if err != nil { panic(err) } diff --git a/go/store/cmd/noms/noms_ds_test.go b/go/store/cmd/noms/noms_ds_test.go index d91bd3d57d..db9f16728c 100644 --- a/go/store/cmd/noms/noms_ds_test.go +++ b/go/store/cmd/noms/noms_ds_test.go @@ -45,7 +45,7 @@ type nomsDsTestSuite struct { func (s *nomsDsTestSuite) TestEmptyNomsDs() { dir := s.DBDir - cs, err := nbs.NewLocalStore(context.Background(), types.Format_Default.VersionString(), dir, clienttest.DefaultMemTableSize, nbs.NewUnlimitedMemQuotaProvider()) + cs, err := nbs.NewLocalStore(context.Background(), types.Format_Default.VersionString(), dir, clienttest.DefaultMemTableSize, nbs.NewUnlimitedMemQuotaProvider(), false) s.NoError(err) ds := datas.NewDatabase(cs) @@ -59,7 +59,7 @@ func (s *nomsDsTestSuite) TestEmptyNomsDs() { func (s *nomsDsTestSuite) TestNomsDs() { dir := s.DBDir - cs, err := nbs.NewLocalStore(context.Background(), types.Format_Default.VersionString(), dir, clienttest.DefaultMemTableSize, nbs.NewUnlimitedMemQuotaProvider()) + cs, err := nbs.NewLocalStore(context.Background(), types.Format_Default.VersionString(), dir, clienttest.DefaultMemTableSize, nbs.NewUnlimitedMemQuotaProvider(), false) var golden1, golden2 string switch types.Format_Default { diff --git a/go/store/datas/pull/puller_test.go b/go/store/datas/pull/puller_test.go index ff9ac099b4..bdf59dd65c 100644 --- a/go/store/datas/pull/puller_test.go +++ b/go/store/datas/pull/puller_test.go @@ -44,7 +44,7 @@ func TestNbsPuller(t *testing.T) { nbf := types.Format_Default.VersionString() q := nbs.NewUnlimitedMemQuotaProvider() - st, err := nbs.NewLocalStore(ctx, nbf, dir, clienttest.DefaultMemTableSize, q) + st, err := nbs.NewLocalStore(ctx, nbf, dir, clienttest.DefaultMemTableSize, q, false) require.NoError(t, err) ns := tree.NewNodeStore(st) @@ -62,7 +62,7 @@ func TestChunkJournalPuller(t *testing.T) { nbf := types.Format_Default.VersionString() q := nbs.NewUnlimitedMemQuotaProvider() - st, err := nbs.NewLocalJournalingStore(ctx, nbf, dir, q) + st, err := nbs.NewLocalJournalingStore(ctx, nbf, dir, q, false) require.NoError(t, err) ns := tree.NewNodeStore(st) @@ -95,7 +95,7 @@ func TestPuller(t *testing.T) { nbf := types.Format_Default.VersionString() q := nbs.NewUnlimitedMemQuotaProvider() - st, err := nbs.NewLocalJournalingStore(ctx, nbf, dir, q) + st, err := nbs.NewLocalJournalingStore(ctx, nbf, dir, q, false) require.NoError(t, err) plr, err := NewPuller(ctx, t.TempDir(), 1<<20, gs, st, waf, []hash.Hash{ghost}, statsCh) diff --git a/go/store/nbs/benchmarks/main.go b/go/store/nbs/benchmarks/main.go index ec2eb0c993..2dfddf8e82 100644 --- a/go/store/nbs/benchmarks/main.go +++ b/go/store/nbs/benchmarks/main.go @@ -109,7 +109,7 @@ func main() { d.PanicIfError(err) }() open = func() (chunks.ChunkStore, error) { - return nbs.NewLocalStore(context.Background(), types.Format_Default.VersionString(), dir, bufSize, nbs.NewUnlimitedMemQuotaProvider()) + return nbs.NewLocalStore(context.Background(), types.Format_Default.VersionString(), dir, bufSize, nbs.NewUnlimitedMemQuotaProvider(), false) } reset = func() { err := file.RemoveAll(dir) @@ -164,7 +164,7 @@ func main() { } else { if *useNBS != "" { open = func() (chunks.ChunkStore, error) { - return nbs.NewLocalStore(context.Background(), types.Format_Default.VersionString(), *useNBS, bufSize, nbs.NewUnlimitedMemQuotaProvider()) + return nbs.NewLocalStore(context.Background(), types.Format_Default.VersionString(), *useNBS, bufSize, nbs.NewUnlimitedMemQuotaProvider(), false) } } else if *useAWS != "" { cfg, err := config.LoadDefaultConfig(context.Background(), config.WithRegion("us-west-2")) diff --git a/go/store/nbs/block_store_test.go b/go/store/nbs/block_store_test.go index a97af07212..bcdf046f0e 100644 --- a/go/store/nbs/block_store_test.go +++ b/go/store/nbs/block_store_test.go @@ -49,7 +49,7 @@ func TestLocalStoreSuite(t *testing.T) { fn := func(ctx context.Context, dir string) (*NomsBlockStore, error) { nbf := constants.FormatDefaultString qp := NewUnlimitedMemQuotaProvider() - return NewLocalStore(ctx, nbf, dir, testMemTableSize, qp) + return NewLocalStore(ctx, nbf, dir, testMemTableSize, qp, false) } suite.Run(t, &BlockStoreSuite{factory: fn}) } @@ -102,7 +102,7 @@ func (suite *BlockStoreSuite) TearDownTest() { func (suite *BlockStoreSuite) TestChunkStoreMissingDir() { newDir := filepath.Join(suite.dir, "does-not-exist") - _, err := NewLocalStore(context.Background(), constants.FormatDefaultString, newDir, testMemTableSize, NewUnlimitedMemQuotaProvider()) + _, err := NewLocalStore(context.Background(), constants.FormatDefaultString, newDir, testMemTableSize, NewUnlimitedMemQuotaProvider(), false) suite.Error(err) } @@ -112,7 +112,7 @@ func (suite *BlockStoreSuite) TestChunkStoreNotDir() { suite.NoError(err) defer f.Close() - _, err = NewLocalStore(context.Background(), constants.FormatDefaultString, existingFile, testMemTableSize, NewUnlimitedMemQuotaProvider()) + _, err = NewLocalStore(context.Background(), constants.FormatDefaultString, existingFile, testMemTableSize, NewUnlimitedMemQuotaProvider(), false) suite.Error(err) } diff --git a/go/store/nbs/frag/main.go b/go/store/nbs/frag/main.go index e75549a39c..e2a62d7fb4 100644 --- a/go/store/nbs/frag/main.go +++ b/go/store/nbs/frag/main.go @@ -69,7 +69,7 @@ func main() { var store *nbs.NomsBlockStore if *dir != "" { var err error - store, err = nbs.NewLocalStore(ctx, types.Format_Default.VersionString(), *dir, memTableSize, nbs.NewUnlimitedMemQuotaProvider()) + store, err = nbs.NewLocalStore(ctx, types.Format_Default.VersionString(), *dir, memTableSize, nbs.NewUnlimitedMemQuotaProvider(), false) d.PanicIfError(err) *dbName = *dir diff --git a/go/store/nbs/stats_test.go b/go/store/nbs/stats_test.go index ef8326d2f1..1668e7ea7d 100644 --- a/go/store/nbs/stats_test.go +++ b/go/store/nbs/stats_test.go @@ -45,7 +45,7 @@ func TestStats(t *testing.T) { dir, err := os.MkdirTemp("", "") require.NoError(t, err) defer file.RemoveAll(dir) - store, err := NewLocalStore(context.Background(), constants.FormatDefaultString, dir, testMemTableSize, NewUnlimitedMemQuotaProvider()) + store, err := NewLocalStore(context.Background(), constants.FormatDefaultString, dir, testMemTableSize, NewUnlimitedMemQuotaProvider(), false) require.NoError(t, err) defer store.Close() diff --git a/go/store/prolly/benchmark/benchmark_batch_writes_test.go b/go/store/prolly/benchmark/benchmark_batch_writes_test.go index 090ba42421..3ab151bcdb 100644 --- a/go/store/prolly/benchmark/benchmark_batch_writes_test.go +++ b/go/store/prolly/benchmark/benchmark_batch_writes_test.go @@ -87,7 +87,7 @@ func BenchmarkImportDolt(b *testing.B) { path, err := os.MkdirTemp("", "*") require.NoError(b, err) - cs, err := nbs.NewLocalStore(ctx, nbf.VersionString(), path, memtable, quota) + cs, err := nbs.NewLocalStore(ctx, nbf.VersionString(), path, memtable, quota, false) require.NoError(b, err) desc := val.NewTupleDescriptor(val.Type{Enc: val.Uint64Enc}) diff --git a/go/store/spec/spec_test.go b/go/store/spec/spec_test.go index 68dff67cb9..3e85a8775c 100644 --- a/go/store/spec/spec_test.go +++ b/go/store/spec/spec_test.go @@ -174,7 +174,7 @@ func TestNBSDatabaseSpec(t *testing.T) { store1 := filepath.Join(tmpDir, "store1") os.Mkdir(store1, 0777) func() { - cs, err := nbs.NewLocalStore(context.Background(), types.Format_Default.VersionString(), store1, 8*(1<<20), nbs.NewUnlimitedMemQuotaProvider()) + cs, err := nbs.NewLocalStore(context.Background(), types.Format_Default.VersionString(), store1, 8*(1<<20), nbs.NewUnlimitedMemQuotaProvider(), false) assert.NoError(err) vrw := types.NewValueStore(cs) db := datas.NewTypesDatabase(vrw, tree.NewNodeStore(cs)) diff --git a/go/store/store_test.go b/go/store/store_test.go index 6b1547e90e..a4faaa835f 100644 --- a/go/store/store_test.go +++ b/go/store/store_test.go @@ -42,7 +42,7 @@ func poe(err error) { } func getDBAtDir(ctx context.Context, dir string) (datas.Database, types.ValueReadWriter) { - cs, err := nbs.NewLocalStore(ctx, types.Format_Default.VersionString(), dir, 1<<28, nbs.NewUnlimitedMemQuotaProvider()) + cs, err := nbs.NewLocalStore(ctx, types.Format_Default.VersionString(), dir, 1<<28, nbs.NewUnlimitedMemQuotaProvider(), false) poe(err) csm := nbs.NewNBSMetricWrapper(cs) diff --git a/go/utils/remotesrv/cscache.go b/go/utils/remotesrv/cscache.go index 1ec1aece23..e430bc0d59 100644 --- a/go/utils/remotesrv/cscache.go +++ b/go/utils/remotesrv/cscache.go @@ -62,7 +62,7 @@ func (cache *LocalCSCache) Get(ctx context.Context, repopath, nbfVerStr string) return nil, err } - newCS, err := nbs.NewLocalStore(ctx, nbfVerStr, path, defaultMemTableSize, nbs.NewUnlimitedMemQuotaProvider()) + newCS, err := nbs.NewLocalStore(ctx, nbfVerStr, path, defaultMemTableSize, nbs.NewUnlimitedMemQuotaProvider(), false) if err != nil { return nil, err }