Merge pull request #451 from kuba--/pilosa-holder

One pilosa holder

sql/index/pilosa/driver.go

@@ -77,9 +77,11 @@ type (
 // NewDriver returns a new instance of pilosa.Driver
 // which satisfies sql.IndexDriver interface
 func NewDriver(root string) *Driver {
+	h := pilosa.NewHolder()
+	h.Path = filepath.Join(root, "."+DriverID)
 	return &Driver{
 		root:   root,
-		holder: pilosa.NewHolder(),
+		holder: h,
 	}
 }
 
@@ -114,7 +116,6 @@ func (d *Driver) Create(
 		return nil, err
 	}
 
-	d.holder.Path = d.pilosaDirPath(db, table)
 	idx, err := d.holder.CreateIndexIfNotExists(
 		indexName(db, table),
 		pilosa.IndexOptions{},
@@ -144,20 +145,6 @@ func (d *Driver) LoadAll(db, table string) ([]sql.Index, error) {
 		root    = filepath.Join(d.root, db, table)
 	)
 
-	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 := d.holder.Open()
-	if err != nil {
-		return nil, err
-	}
-	defer d.holder.Close()
-
 	dirs, err := ioutil.ReadDir(root)
 	if err != nil {
 		if os.IsNotExist(err) {
@@ -359,11 +346,6 @@ func (d *Driver) Save(
 	}
 
 	pilosaIndex := idx.index
-	if err = pilosaIndex.Open(); err != nil {
-		return err
-	}
-	defer pilosaIndex.Close()
-
 	var rows uint64
 	for {
 		p, kviter, err := iter.Next()
@@ -408,12 +390,6 @@ func (d *Driver) Delete(i sql.Index, partitions sql.PartitionIter) error {
 		return err
 	}
 
-	err := idx.index.Open()
-	if err != nil {
-		return err
-	}
-	defer idx.index.Close()
-
 	for {
 		p, err := partitions.Next()
 		if err != nil {
@@ -547,10 +523,6 @@ func mkdir(elem ...string) (string, error) {
 	return path, os.MkdirAll(path, 0750)
 }
 
-func (d *Driver) pilosaDirPath(db, table string) string {
-	return filepath.Join(d.root, db, table, "."+DriverID)
-}
-
 func (d *Driver) configFilePath(db, table, id string) string {
 	return filepath.Join(d.root, db, table, id, ConfigFileName)
 }