Merge pull request #256 from cuducos/fix-badger-in-between-steps

Fecha adequadamente o banco de dados de chave-valor entre os passos 1 e 2

go.mod

@@ -49,5 +49,3 @@ require (
 	google.golang.org/grpc v1.65.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 )
-
-// +heroku goVersion go1.22

transform/company_test.go

@@ -108,7 +108,7 @@ func TestNewCompany(t *testing.T) {
 	}
 
 	t.Run("with privacy", func(t *testing.T) {
-		tmp, err := os.MkdirTemp("", fmt.Sprintf("%s-%s", badgerFilePrefix, time.Now().Format("20060102150405")))
+		tmp, err := os.MkdirTemp("", fmt.Sprintf("minha-receita-%s-*", time.Now().Format("20060102150405")))
 		if err != nil {
 			t.Fatal("error creating temporary key-value storage: %w", err)
 		}
@@ -264,7 +264,7 @@ func TestNewCompany(t *testing.T) {
 		}
 	})
 	t.Run("without privacy", func(t *testing.T) {
-		tmp, err := os.MkdirTemp("", fmt.Sprintf("%s-%s", badgerFilePrefix, time.Now().Format("20060102150405")))
+		tmp, err := os.MkdirTemp("", fmt.Sprintf("minha-receita-%s-*", time.Now().Format("20060102150405")))
 		if err != nil {
 			t.Fatal("error creating temporary key-value storage: %w", err)
 		}

transform/kv.go

@@ -163,30 +163,24 @@ func (kv *badgerStorage) enrichCompany(c *company) error {
 }
 
 func (b *badgerStorage) close() error {
-	b.db.Close()
-	if b.path != "" {
-		if err := os.RemoveAll(b.path); err != nil {
-			return fmt.Errorf("error cleaning up badger storage directory: %w", err)
-		}
-	}
-	return nil
+	return b.db.Close()
 }
 
-type badgerLogger struct{}
+type noLogger struct{}
 
-func (*badgerLogger) Errorf(string, ...interface{})   {}
-func (*badgerLogger) Warningf(string, ...interface{}) {}
-func (*badgerLogger) Infof(string, ...interface{})    {}
-func (*badgerLogger) Debugf(string, ...interface{})   {}
+func (*noLogger) Errorf(string, ...interface{})   {}
+func (*noLogger) Warningf(string, ...interface{}) {}
+func (*noLogger) Infof(string, ...interface{})    {}
+func (*noLogger) Debugf(string, ...interface{})   {}
 
 func newBadgerStorage(dir string) (*badgerStorage, error) {
-	var err error
-	var opt badger.Options
+	opt := badger.DefaultOptions(dir)
 	if os.Getenv("DEBUG") != "" {
 		log.Output(1, fmt.Sprintf("Creating temporary key-value storage at %s", dir))
+	} else {
+		opt = opt.WithLogger(&noLogger{})
 	}
-	opt = badger.DefaultOptions(dir)
-	db, err := badger.Open(opt.WithLogger(&badgerLogger{}))
+	db, err := badger.Open(opt)
 	if err != nil {
 		return nil, fmt.Errorf("error creating badger key-value object: %w", err)
 	}

transform/kv_test.go

@@ -10,7 +10,7 @@ import (
 )
 
 func TestBadgerStorageClose(t *testing.T) {
-	tmp, err := os.MkdirTemp("", fmt.Sprintf("%s-%s", badgerFilePrefix, time.Now().Format("20060102150405")))
+	tmp, err := os.MkdirTemp("", fmt.Sprintf("minha-receita-%s-*", time.Now().Format("20060102150405")))
 	if err != nil {
 		t.Fatal("error creating temporary key-value storage: %w", err)
 	}
@@ -22,9 +22,6 @@ func TestBadgerStorageClose(t *testing.T) {
 	if err := kv.close(); err != nil {
 		t.Errorf("expected no error closing badger storage, got %s", err)
 	}
-	if _, err := os.Stat(kv.path); err == nil || !os.IsNotExist(err) {
-		t.Errorf("expected %s to be gone, but got %s when opening it", kv.path, err)
-	}
 }
 
 func TestNewItem(t *testing.T) {
@@ -65,7 +62,7 @@ func TestLoad(t *testing.T) {
 	if err != nil {
 		t.Fatalf("could not create lookups: %s", err)
 	}
-	tmp, err := os.MkdirTemp("", fmt.Sprintf("%s-%s", badgerFilePrefix, time.Now().Format("20060102150405")))
+	tmp, err := os.MkdirTemp("", fmt.Sprintf("minha-receita-%s-*", time.Now().Format("20060102150405")))
 	if err != nil {
 		t.Fatal("error creating temporary key-value storage: %w", err)
 	}
@@ -94,7 +91,7 @@ func TestEnrichCompany(t *testing.T) {
 	if err != nil {
 		t.Fatalf("could not create lookups: %s", err)
 	}
-	tmp, err := os.MkdirTemp("", fmt.Sprintf("%s-%s", badgerFilePrefix, time.Now().Format("20060102150405")))
+	tmp, err := os.MkdirTemp("", fmt.Sprintf("minha-receita-%s-*", time.Now().Format("20060102150405")))
 	if err != nil {
 		t.Fatal("error creating temporary key-value storage: %w", err)
 	}

transform/transform.go

@@ -19,8 +19,6 @@ const (
 	// BatchSize determines the size of the batches used to create the initial JSON
 	// data in the database.
 	BatchSize = 8192
-
-	badgerFilePrefix = "minha-receita-badger-"
 )
 
 type database interface {
@@ -75,32 +73,24 @@ func saveUpdatedAt(db database, dir string) error {
 	return db.MetaSave("updated-at", string(v))
 }
 
-func runStepOne(dir string, l lookups, isolated bool) (string, error) {
-	tmp, err := os.MkdirTemp("", fmt.Sprintf("%s-%s", badgerFilePrefix, time.Now().Format("20060102150405")))
-	if err != nil {
-		return "", fmt.Errorf("error creating temporary key-value storage: %w", err)
-	}
-	kv, err := newBadgerStorage(tmp)
+func runStepOne(dir string, pth string, l lookups) error {
+	kv, err := newBadgerStorage(pth)
 	if err != nil {
-		return "", fmt.Errorf("could not create badger storage: %w", err)
+		return fmt.Errorf("could not create badger storage: %w", err)
 	}
+	defer kv.close()
 	if err := kv.load(dir, &l); err != nil {
-		return "", fmt.Errorf("error loading data to badger: %w", err)
-	}
-	if isolated {
-		fmt.Println(kv.path)
+		return fmt.Errorf("error loading data to badger: %w", err)
 	}
-	return kv.path, nil
+	return nil
 }
 
-func runStepTwo(dir string, tmp string, db database, l lookups, maxParallelDBQueries, batchSize int, privacy, isolated bool) error {
-	kv, err := newBadgerStorage(tmp)
+func runStepTwo(dir string, pth string, db database, l lookups, maxParallelDBQueries, batchSize int, privacy bool) error {
+	kv, err := newBadgerStorage(pth)
 	if err != nil {
 		return fmt.Errorf("could not create badger storage: %w", err)
 	}
-	if !isolated {
-		defer kv.close()
-	}
+	defer kv.close()
 	j, err := createJSONRecordsTask(dir, db, &l, kv, batchSize, privacy)
 	if err != nil {
 		return fmt.Errorf("error creating new task for venues in %s: %w", dir, err)
@@ -113,27 +103,38 @@ func runStepTwo(dir string, tmp string, db database, l lookups, maxParallelDBQue
 
 // Transform the downloaded files for company venues creating a database record
 // per CNPJ
-func Transform(dir string, db database, maxParallelDBQueries, batchSize int, privacy, s1 bool, s2 string) error {
+func Transform(dir string, db database, max, s int, p, s1 bool, s2 string) error {
 	m, err := transformMode(s1, s2)
 	if err != nil {
 		return fmt.Errorf("error determining transform mode: %w", err)
 	}
-	var tmp string
+	var pth string
+	if m == stepTwo {
+		pth = s2
+	} else {
+		pth, err = os.MkdirTemp("", fmt.Sprintf("minha-receita-%s-*", time.Now().Format("20060102150405")))
+	}
+	if err != nil {
+		return fmt.Errorf("error creating temporary key-value storage: %w", err)
+	}
+	defer os.RemoveAll(pth)
 	l, err := newLookups(dir)
 	if err != nil {
 		return fmt.Errorf("error creating look up tables from %s: %w", dir, err)
 	}
-	if m != stepTwo {
-		tmp, err = runStepOne(dir, l, m == stepOne)
-		if err != nil {
-			return fmt.Errorf("error creating key-value storage: %w", err)
+	switch m {
+	case stepOne:
+		if err := runStepOne(dir, pth, l); err != nil {
+			return err
 		}
-	}
-	if m != stepOne {
-		if s2 != "" {
-			tmp = s2
+		fmt.Println(pth)
+	case stepTwo:
+		return runStepTwo(dir, pth, db, l, max, s, p)
+	case both:
+		if err := runStepOne(dir, pth, l); err != nil {
+			return err
 		}
-		return runStepTwo(dir, tmp, db, l, maxParallelDBQueries, batchSize, privacy, m == stepTwo)
+		return runStepTwo(dir, pth, db, l, max, s, p)
 	}
 	return nil
 }

transform/venues_test.go

@@ -9,7 +9,7 @@ import (
 
 func TestTaskRun(t *testing.T) {
 	db := newTestDB(t)
-	tmp, err := os.MkdirTemp("", fmt.Sprintf("%s-%s", badgerFilePrefix, time.Now().Format("20060102150405")))
+	tmp, err := os.MkdirTemp("", fmt.Sprintf("minha-receita-%s-*", time.Now().Format("20060102150405")))
 	if err != nil {
 		t.Fatal("error creating temporary key-value storage: %w", err)
 	}