From 98fc3dfbad2369825ed1b86e26472f3ca2eb4c73 Mon Sep 17 00:00:00 2001
From: Asim Aslam <asim@aslam.me>
Date: Wed, 8 Apr 2020 09:57:51 +0100
Subject: [PATCH] use single data bucket

---
 store/file/file.go      | 15 +++++++++------
 store/file/file_test.go | 10 +++++-----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/store/file/file.go b/store/file/file.go
index 2a62207d..cddcaf80 100644
--- a/store/file/file.go
+++ b/store/file/file.go
@@ -22,6 +22,9 @@ var (
 	DefaultTable = "micro"
 	// DefaultDir is the default directory for bbolt files
 	DefaultDir = os.TempDir()
+
+	// bucket used for data storage
+	dataBucket = "data"
 )
 
 // NewStore returns a memory store
@@ -49,7 +52,7 @@ type record struct {
 
 func (m *fileStore) delete(key string) error {
 	return m.db.Update(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte(m.options.Table))
+		b := tx.Bucket([]byte(dataBucket))
 		if b == nil {
 			return nil
 		}
@@ -100,7 +103,7 @@ func (m *fileStore) init(opts ...store.Option) error {
 
 	// create the table
 	return db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucketIfNotExists([]byte(m.options.Table))
+		_, err := tx.CreateBucketIfNotExists([]byte(dataBucket))
 		return err
 	})
 }
@@ -109,7 +112,7 @@ func (m *fileStore) list(limit, offset uint) []string {
 	var allItems []string
 
 	m.db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte(m.options.Table))
+		b := tx.Bucket([]byte(dataBucket))
 		// nothing to read
 		if b == nil {
 			return nil
@@ -164,7 +167,7 @@ func (m *fileStore) get(k string) (*store.Record, error) {
 
 	m.db.View(func(tx *bolt.Tx) error {
 		// @todo this is still very experimental...
-		b := tx.Bucket([]byte(m.options.Table))
+		b := tx.Bucket([]byte(dataBucket))
 		if b == nil {
 			return nil
 		}
@@ -211,10 +214,10 @@ func (m *fileStore) set(r *store.Record) error {
 	data, _ := json.Marshal(item)
 
 	return m.db.Update(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte(m.options.Table))
+		b := tx.Bucket([]byte(dataBucket))
 		if b == nil {
 			var err error
-			b, err = tx.CreateBucketIfNotExists([]byte(m.options.Table))
+			b, err = tx.CreateBucketIfNotExists([]byte(dataBucket))
 			if err != nil {
 				return err
 			}
diff --git a/store/file/file_test.go b/store/file/file_test.go
index b3466b9a..6dd58c64 100644
--- a/store/file/file_test.go
+++ b/store/file/file_test.go
@@ -15,7 +15,7 @@ import (
 
 func cleanup(db string, s store.Store) {
 	s.Close()
-	dir := filepath.Join(DefaultDir, db + "/")
+	dir := filepath.Join(DefaultDir, db+"/")
 	os.RemoveAll(dir)
 }
 
@@ -249,19 +249,19 @@ func fileTest(s store.Store, t *testing.T) {
 		t.Error(err)
 	} else {
 		if len(results) != 5 {
-			t.Error("Expected 5 results, got ", len(results))
+			t.Fatal("Expected 5 results, got ", len(results))
 		}
 		if !strings.HasPrefix(results[0].Key, "a") {
-			t.Errorf("Expected a prefix, got %s", results[0].Key)
+			t.Fatalf("Expected a prefix, got %s", results[0].Key)
 		}
 	}
 
 	// read the rest back
 	if results, err := s.Read("a", store.ReadLimit(30), store.ReadOffset(5), store.ReadPrefix()); err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	} else {
 		if len(results) != 5 {
-			t.Error("Expected 5 results, got ", len(results))
+			t.Fatal("Expected 5 results, got ", len(results))
 		}
 	}
 }