Skip to content

Commit 4689efb

Browse files
committed
Minor refactors
1 parent 4ce81f9 commit 4689efb

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

download/mirror.go

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99

1010
const mirrorURL = "https://mirror.minhareceita.org"
1111

12-
// TODO: do we need to export these structs?
1312
type MirrorFile struct {
1413
URL string `json:"url"`
1514
Size uint `json:"size"`

transform/kv.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,9 @@ func newBadgerStorage(m bool) (*badgerStorage, error) {
183183
var dir string
184184
var err error
185185
var opt badger.Options
186-
if !m {
186+
if m {
187+
opt = badger.DefaultOptions("").WithInMemory(m)
188+
} else {
187189
dir, err = os.MkdirTemp("", badgerFilePrefix)
188190
if err != nil {
189191
return nil, fmt.Errorf("error creating temporary key-value storage: %w", err)
@@ -192,8 +194,6 @@ func newBadgerStorage(m bool) (*badgerStorage, error) {
192194
log.Output(1, fmt.Sprintf("Creating temporary key-value storage at %s", dir))
193195
}
194196
opt = badger.DefaultOptions(dir)
195-
} else {
196-
opt = badger.DefaultOptions("").WithInMemory(m)
197197
}
198198
db, err := badger.Open(opt.WithLogger(&badgerLogger{}))
199199
if err != nil {

transform/transform.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ func saveUpdatedAt(db database, dir string) error {
4343
// Transform the downloaded files for company venues creating a database record
4444
// per CNPJ
4545
func Transform(dir string, db database, maxParallelDBQueries, batchSize int, privacy, mem bool) error {
46-
if err := saveUpdatedAt(db, dir); err != nil {
47-
return fmt.Errorf("error saving the update at date: %w", err)
48-
}
4946
l, err := newLookups(dir)
5047
if err != nil {
5148
return fmt.Errorf("error creating look up tables from %s: %w", dir, err)
@@ -62,5 +59,8 @@ func Transform(dir string, db database, maxParallelDBQueries, batchSize int, pri
6259
if err != nil {
6360
return fmt.Errorf("error creating new task for venues in %s: %w", dir, err)
6461
}
65-
return j.run(maxParallelDBQueries)
62+
if err := j.run(maxParallelDBQueries); err != nil {
63+
return fmt.Errorf("error writing venues to database: %w", err)
64+
}
65+
return saveUpdatedAt(db, dir)
6666
}

0 commit comments

Comments
 (0)