@@ -77,9 +77,11 @@ type (
77
77
// NewDriver returns a new instance of pilosa.Driver
78
78
// which satisfies sql.IndexDriver interface
79
79
func NewDriver (root string ) * Driver {
80
+ h := pilosa .NewHolder ()
81
+ h .Path = filepath .Join (root , "." + DriverID )
80
82
return & Driver {
81
83
root : root ,
82
- holder : pilosa . NewHolder () ,
84
+ holder : h ,
83
85
}
84
86
}
85
87
@@ -114,7 +116,6 @@ func (d *Driver) Create(
114
116
return nil , err
115
117
}
116
118
117
- d .holder .Path = d .pilosaDirPath (db , table )
118
119
idx , err := d .holder .CreateIndexIfNotExists (
119
120
indexName (db , table ),
120
121
pilosa.IndexOptions {},
@@ -144,20 +145,6 @@ func (d *Driver) LoadAll(db, table string) ([]sql.Index, error) {
144
145
root = filepath .Join (d .root , db , table )
145
146
)
146
147
147
- d .holder .Path = d .pilosaDirPath (db , table )
148
- if _ , err := os .Stat (d .holder .Path ); err != nil {
149
- if os .IsNotExist (err ) {
150
- return indexes , nil
151
- }
152
- return nil , err
153
- }
154
-
155
- err := d .holder .Open ()
156
- if err != nil {
157
- return nil , err
158
- }
159
- defer d .holder .Close ()
160
-
161
148
dirs , err := ioutil .ReadDir (root )
162
149
if err != nil {
163
150
if os .IsNotExist (err ) {
@@ -359,11 +346,6 @@ func (d *Driver) Save(
359
346
}
360
347
361
348
pilosaIndex := idx .index
362
- if err = pilosaIndex .Open (); err != nil {
363
- return err
364
- }
365
- defer pilosaIndex .Close ()
366
-
367
349
var rows uint64
368
350
for {
369
351
p , kviter , err := iter .Next ()
@@ -408,12 +390,6 @@ func (d *Driver) Delete(i sql.Index, partitions sql.PartitionIter) error {
408
390
return err
409
391
}
410
392
411
- err := idx .index .Open ()
412
- if err != nil {
413
- return err
414
- }
415
- defer idx .index .Close ()
416
-
417
393
for {
418
394
p , err := partitions .Next ()
419
395
if err != nil {
@@ -547,10 +523,6 @@ func mkdir(elem ...string) (string, error) {
547
523
return path , os .MkdirAll (path , 0750 )
548
524
}
549
525
550
- func (d * Driver ) pilosaDirPath (db , table string ) string {
551
- return filepath .Join (d .root , db , table , "." + DriverID )
552
- }
553
-
554
526
func (d * Driver ) configFilePath (db , table , id string ) string {
555
527
return filepath .Join (d .root , db , table , id , ConfigFileName )
556
528
}
0 commit comments