Skip to content

Commit 0efc77a

Browse files
authored
Make dataDir required on config (#21)
This PR removes the WithDataDir() function, which implies that the datadirectory is optional and enforces it on NewDefaultConfig, since on its own, the NewDefaultConfig will not spin up a new modusDB instance. Addressed in https://linear.app/hypermode/issue/DGR-822/modusdb-newdefaultconfig-fails
1 parent ac15c46 commit 0efc77a

File tree

4 files changed

+9
-14
lines changed

4 files changed

+9
-14
lines changed

Diff for: config.go

+2-7
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,8 @@ type Config struct {
77
limitNormalizeNode int
88
}
99

10-
func NewDefaultConfig() Config {
11-
return Config{limitNormalizeNode: 10000}
12-
}
13-
14-
func (cc Config) WithDataDir(dir string) Config {
15-
cc.dataDir = dir
16-
return cc
10+
func NewDefaultConfig(dir string) Config {
11+
return Config{dataDir: dir, limitNormalizeNode: 10000}
1712
}
1813

1914
func (cc Config) WithLimitNormalizeNode(n int) Config {

Diff for: db_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
func TestRestart(t *testing.T) {
1717
dataDir := t.TempDir()
1818

19-
db, err := modusdb.New(modusdb.NewDefaultConfig().WithDataDir(dataDir))
19+
db, err := modusdb.New(modusdb.NewDefaultConfig(dataDir))
2020
require.NoError(t, err)
2121
defer func() { db.Close() }()
2222

@@ -47,7 +47,7 @@ func TestRestart(t *testing.T) {
4747
require.JSONEq(t, `{"me":[{"name":"A"}]}`, string(qresp.GetJson()))
4848

4949
db.Close()
50-
db, err = modusdb.New(modusdb.NewDefaultConfig().WithDataDir(dataDir))
50+
db, err = modusdb.New(modusdb.NewDefaultConfig(dataDir))
5151
require.NoError(t, err)
5252
qresp, err = db.Query(context.Background(), query)
5353
require.NoError(t, err)
@@ -57,7 +57,7 @@ func TestRestart(t *testing.T) {
5757
}
5858

5959
func TestSchemaQuery(t *testing.T) {
60-
db, err := modusdb.New(modusdb.NewDefaultConfig().WithDataDir(t.TempDir()))
60+
db, err := modusdb.New(modusdb.NewDefaultConfig(t.TempDir()))
6161
require.NoError(t, err)
6262
defer db.Close()
6363

@@ -86,7 +86,7 @@ func TestBasicVector(t *testing.T) {
8686
}
8787
vectBytes := buf.Bytes()
8888

89-
db, err := modusdb.New(modusdb.NewDefaultConfig().WithDataDir(t.TempDir()))
89+
db, err := modusdb.New(modusdb.NewDefaultConfig(t.TempDir()))
9090
require.NoError(t, err)
9191
defer db.Close()
9292

Diff for: live_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func TestLiveLoaderSmall(t *testing.T) {
4242
`
4343
)
4444

45-
db, err := modusdb.New(modusdb.NewDefaultConfig().WithDataDir(t.TempDir()))
45+
db, err := modusdb.New(modusdb.NewDefaultConfig(t.TempDir()))
4646
require.NoError(t, err)
4747
defer func() { db.Close() }()
4848

@@ -83,7 +83,7 @@ func TestLiveLoaderSmall(t *testing.T) {
8383
}
8484

8585
func TestLiveLoader1Million(t *testing.T) {
86-
db, err := modusdb.New(modusdb.NewDefaultConfig().WithDataDir(t.TempDir()))
86+
db, err := modusdb.New(modusdb.NewDefaultConfig(t.TempDir()))
8787
require.NoError(t, err)
8888
defer func() { db.Close() }()
8989

Diff for: vector_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const (
2020
)
2121

2222
func TestVectorDelete(t *testing.T) {
23-
db, err := modusdb.New(modusdb.NewDefaultConfig().WithDataDir(t.TempDir()))
23+
db, err := modusdb.New(modusdb.NewDefaultConfig(t.TempDir()))
2424
require.NoError(t, err)
2525
defer func() { db.Close() }()
2626

0 commit comments

Comments
 (0)