Merge pull request #550 from ChrisHines/windows-remove-lock

Delay clearing db.path until just before db.close returns.
master
Ben Johnson 2016-04-07 08:34:38 -06:00
commit 144418e147
1 changed files with 3 additions and 3 deletions

6
db.go
View File

@ -94,7 +94,7 @@ type DB struct {
path string path string
file *os.File file *os.File
lockfile *os.File // windows only lockfile *os.File // windows only
dataref []byte // mmap'ed readonly, write throws SEGV dataref []byte // mmap'ed readonly, write throws SEGV
data *[maxMapSize]byte data *[maxMapSize]byte
datasz int datasz int
filesz int // current on disk file size filesz int // current on disk file size
@ -383,11 +383,10 @@ func (db *DB) close() error {
if !db.opened { if !db.opened {
return nil return nil
} }
db.opened = false db.opened = false
db.freelist = nil db.freelist = nil
db.path = ""
// Clear ops. // Clear ops.
db.ops.writeAt = nil db.ops.writeAt = nil
@ -414,6 +413,7 @@ func (db *DB) close() error {
db.file = nil db.file = nil
} }
db.path = ""
return nil return nil
} }