Merge PR #6219: Different db support

This commit is contained in:
Riccardo Montagnin 2020-05-14 15:41:05 +02:00 committed by GitHub
parent 48aebed2ea
commit bd90d6b344
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions

View File

@ -12,8 +12,15 @@ import (
var ( var (
// This is set at compile time. Could be cleveldb, defaults is goleveldb. // This is set at compile time. Could be cleveldb, defaults is goleveldb.
DBBackend = "" DBBackend = ""
backend = dbm.GoLevelDBBackend
) )
func init() {
if len(DBBackend) != 0 {
backend = dbm.BackendType(DBBackend)
}
}
// SortedJSON takes any JSON and returns it sorted by keys. Also, all white-spaces // SortedJSON takes any JSON and returns it sorted by keys. Also, all white-spaces
// are removed. // are removed.
// This method can be used to canonicalize JSON to be returned by GetSignBytes, // This method can be used to canonicalize JSON to be returned by GetSignBytes,
@ -79,10 +86,6 @@ func ParseTimeBytes(bz []byte) (time.Time, error) {
// NewLevelDB instantiate a new LevelDB instance according to DBBackend. // NewLevelDB instantiate a new LevelDB instance according to DBBackend.
func NewLevelDB(name, dir string) (db dbm.DB, err error) { func NewLevelDB(name, dir string) (db dbm.DB, err error) {
backend := dbm.GoLevelDBBackend
if DBBackend == string(dbm.CLevelDBBackend) {
backend = dbm.CLevelDBBackend
}
defer func() { defer func() {
if r := recover(); r != nil { if r := recover(); r != nil {
err = fmt.Errorf("couldn't create db: %v", r) err = fmt.Errorf("couldn't create db: %v", r)