Improvement/use latest pilosa (#449)

* Revert "pilosa: use different holder per db/table pair"

This reverts commit 144b824.

Keeps the test to load multiple indexes.

Signed-off-by: Javi Fontan <[email protected]>

* travis: upgrade pilosa library for testing

Lets reopen holder.

Signed-off-by: Javi Fontan <[email protected]>
(cherry picked from commit 8c2fc22)

Author: jfontan

.travis.yml

@@ -20,7 +20,7 @@ services:
 install:
   - go get -u github.com/golang/dep/cmd/dep
   - touch Gopkg.toml
-  - dep ensure -v -add "github.com/pilosa/pilosa@1.1.0" "github.com/moovweb/rubex@b3d9ff6ad7d9b14f94a91c8271cd9ad9e77132e5"
+  - dep ensure -v -add "github.com/pilosa/pilosa@f62dbc00b96f596a1f2ef8b4e87ba8ec847eda37" "github.com/moovweb/rubex@b3d9ff6ad7d9b14f94a91c8271cd9ad9e77132e5"
   - make dependencies
 
 before_script:

sql/index/pilosa/driver.go

@@ -67,22 +67,19 @@ type (
 		timeMapping time.Duration
 	}
 
-	tableMap map[string]*pilosa.Holder
-	dbMap    map[string]tableMap
-
 	// Driver implements sql.IndexDriver interface.
 	Driver struct {
-		root    string
-		holders dbMap
+		root   string
+		holder *pilosa.Holder
 	}
 )
 
 // NewDriver returns a new instance of pilosa.Driver
 // which satisfies sql.IndexDriver interface
 func NewDriver(root string) *Driver {
 	return &Driver{
-		root:    root,
-		holders: make(dbMap),
+		root:   root,
+		holder: pilosa.NewHolder(),
 	}
 }
 
@@ -117,9 +114,8 @@ func (d *Driver) Create(
 		return nil, err
 	}
 
-	holder := d.holder(db, table)
-	holder.Path = d.pilosaDirPath(db, table)
-	idx, err := holder.CreateIndexIfNotExists(
+	d.holder.Path = d.pilosaDirPath(db, table)
+	idx, err := d.holder.CreateIndexIfNotExists(
 		indexName(db, table),
 		pilosa.IndexOptions{},
 	)
@@ -148,20 +144,19 @@ func (d *Driver) LoadAll(db, table string) ([]sql.Index, error) {
 		root    = filepath.Join(d.root, db, table)
 	)
 
-	holder := d.holder(db, table)
-	holder.Path = d.pilosaDirPath(db, table)
-	if _, err := os.Stat(holder.Path); err != nil {
+	d.holder.Path = d.pilosaDirPath(db, table)
+	if _, err := os.Stat(d.holder.Path); err != nil {
 		if os.IsNotExist(err) {
 			return indexes, nil
 		}
 		return nil, err
 	}
 
-	err := holder.Open()
+	err := d.holder.Open()
 	if err != nil {
 		return nil, err
 	}
-	defer holder.Close()
+	defer d.holder.Close()
 
 	dirs, err := ioutil.ReadDir(root)
 	if err != nil {
@@ -190,27 +185,9 @@ func (d *Driver) LoadAll(db, table string) ([]sql.Index, error) {
 	return indexes, nil
 }
 
-func (d *Driver) holder(db, table string) *pilosa.Holder {
-	tables, ok := d.holders[db]
-	if !ok {
-		tables = make(tableMap)
-		d.holders[db] = tables
-	}
-
-	holder, ok := tables[table]
-	if !ok {
-		holder = pilosa.NewHolder()
-		tables[table] = holder
-		d.holders[db] = tables
-	}
-
-	return holder
-}
-
 func (d *Driver) loadIndex(db, table, id string) (*pilosaIndex, error) {
 	name := indexName(db, table)
-	holder := d.holder(db, table)
-	idx := holder.Index(name)
+	idx := d.holder.Index(name)
 	if idx == nil {
 		return nil, errLoadingIndex.New(name)
 	}