Skip to content

Commit fc2e4cc

Browse files
committed
Fixes key-value storage interface
1 parent 4e2171d commit fc2e4cc

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

transform/company_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func TestNewCompany(t *testing.T) {
117117
if err != nil {
118118
t.Errorf("expected no error creating badger, got %s", err)
119119
}
120-
defer kv.close()
120+
defer kv.close(false)
121121
lookups, err := newLookups(testdata)
122122
if err != nil {
123123
t.Errorf("expected no errors creating look up tables, got %v", err)
@@ -273,7 +273,7 @@ func TestNewCompany(t *testing.T) {
273273
if err != nil {
274274
t.Errorf("expected no error creating badger, got %s", err)
275275
}
276-
defer kv.close()
276+
defer kv.close(false)
277277
lookups, err := newLookups(testdata)
278278
if err != nil {
279279
t.Errorf("expected no errors creating look up tables, got %v", err)

transform/kv.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ func (kv *badgerStorage) enrichCompany(c *company) error {
164164

165165
func (b *badgerStorage) close(k bool) error {
166166
b.db.Close()
167-
if !k && b.path != "" {
167+
if !k {
168168
if err := os.RemoveAll(b.path); err != nil {
169169
return fmt.Errorf("error cleaning up badger storage directory: %w", err)
170170
}

transform/kv_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func TestBadgerStorageClose(t *testing.T) {
1919
if err != nil {
2020
t.Errorf("expected no error creating badger storage, got %s", err)
2121
}
22-
if err := kv.close(); err != nil {
22+
if err := kv.close(false); err != nil {
2323
t.Errorf("expected no error closing badger storage, got %s", err)
2424
}
2525
if _, err := os.Stat(kv.path); err == nil || !os.IsNotExist(err) {
@@ -74,7 +74,7 @@ func TestLoad(t *testing.T) {
7474
if err != nil {
7575
t.Fatalf("could not create badger storage: %s", err)
7676
}
77-
defer kv.close()
77+
defer kv.close(false)
7878
if err := kv.load(testdata, &l); err != nil {
7979
t.Errorf("expected no error loading data, got %s", err)
8080
}
@@ -103,7 +103,7 @@ func TestEnrichCompany(t *testing.T) {
103103
if err != nil {
104104
t.Fatalf("could not create badger storage: %s", err)
105105
}
106-
defer kv.close()
106+
defer kv.close(false)
107107
if err := kv.load(testdata, &l); err != nil {
108108
t.Errorf("expected no error loading data, got %s", err)
109109
}

transform/transform.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ type database interface {
3333
type kvStorage interface {
3434
load(string, *lookups) error
3535
enrichCompany(*company) error
36-
close() error
36+
close(bool) error
3737
}
3838

3939
type mode int

transform/venues_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func TestTaskRun(t *testing.T) {
1818
if err != nil {
1919
t.Errorf("expected no error creating badger, got %s", err)
2020
}
21-
defer kv.close()
21+
defer kv.close(false)
2222
lookups, err := newLookups(testdata)
2323
if err != nil {
2424
t.Errorf("expected no errors creating look up tables, got %v", err)

0 commit comments

Comments
 (0)