vendor: pull in latest changes for goleveldb (#15090)

This commit is contained in:
Péter Szilágyi
2017-09-05 16:04:32 +03:00
committed by Felix Lange
parent c91f7beb53
commit cd6c861dc5
8 changed files with 68 additions and 35 deletions

View File

@ -7,6 +7,7 @@
package leveldb
import (
"errors"
"sync/atomic"
"time"
@ -15,6 +16,10 @@ import (
"github.com/syndtr/goleveldb/leveldb/storage"
)
var (
errHasFrozenMem = errors.New("has frozen mem")
)
type memDB struct {
db *DB
*memdb.DB
@ -126,7 +131,7 @@ func (db *DB) newMem(n int) (mem *memDB, err error) {
defer db.memMu.Unlock()
if db.frozenMem != nil {
panic("still has frozen mem")
return nil, errHasFrozenMem
}
if db.journal == nil {