Update tests.

This commit is contained in:
Nick Tobey
2025-07-25 02:14:16 -07:00
parent cb79e2dc56
commit b4403f0191
11 changed files with 17 additions and 17 deletions

View File

@@ -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)
}

View File

@@ -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 {

View File

@@ -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)

View File

@@ -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"))

View File

@@ -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)
}

View File

@@ -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

View File

@@ -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()

View File

@@ -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})

View File

@@ -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))

View File

@@ -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)

View File

@@ -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
}