Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix the crash.

pull/17/head v0.0.6
John Shahid 2013-11-05 13:19:47 -05:00
parent 37b2ab117b
commit 0ec1202672
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/datastore/leveldb_datastore.go
View File

@ -69,7 +69,6 @@ func NewLevelDbDatastore(dbDir string) (Datastore, error) {
} }
ro := levigo.NewReadOptions() ro := levigo.NewReadOptions()
defer ro.Close()
lastIdBytes, err2 := db.Get(ro, NEXT_ID_KEY) lastIdBytes, err2 := db.Get(ro, NEXT_ID_KEY)
if err2 != nil { if err2 != nil {
@ -149,6 +148,11 @@ func (self *LevelDbDatastore) ExecuteQuery(user common.User, database string, qu
func (self *LevelDbDatastore) Close() { func (self *LevelDbDatastore) Close() {
self.db.Close() self.db.Close()
self.db = nil
self.readOptions.Close()
self.readOptions = nil
self.writeOptions.Close()
self.writeOptions = nil
} }
func (self *LevelDbDatastore) DeleteRangeOfSeries(database, series string, startTime, endTime time.Time) error { func (self *LevelDbDatastore) DeleteRangeOfSeries(database, series string, startTime, endTime time.Time) error {
@ -159,8 +163,8 @@ func (self *LevelDbDatastore) DeleteRangeOfSeries(database, series string, start
} }
startTimeBytes, endTimeBytes := self.byteArraysForStartAndEndTimes(common.TimeToMicroseconds(startTime), common.TimeToMicroseconds(endTime)) startTimeBytes, endTimeBytes := self.byteArraysForStartAndEndTimes(common.TimeToMicroseconds(startTime), common.TimeToMicroseconds(endTime))
ro := levigo.NewReadOptions() ro := levigo.NewReadOptions()
ro.SetFillCache(false)
defer ro.Close() defer ro.Close()
ro.SetFillCache(false)
rangesToCompact := make([]*levigo.Range, 0) rangesToCompact := make([]*levigo.Range, 0)
for _, field := range fields { for _, field := range fields {
it := self.db.NewIterator(ro) it := self.db.NewIterator(ro)