mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-19 10:22:23 +00:00
swarm: schemas and migrations
This commit is contained in:
parent
cc21928e12
commit
9fc36171d0
5 changed files with 62 additions and 7 deletions
|
|
@ -20,8 +20,6 @@ package storage
|
||||||
// no need for queueing/caching
|
// no need for queueing/caching
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/ethereum/go-ethereum/metrics"
|
"github.com/ethereum/go-ethereum/metrics"
|
||||||
"github.com/syndtr/goleveldb/leveldb"
|
"github.com/syndtr/goleveldb/leveldb"
|
||||||
"github.com/syndtr/goleveldb/leveldb/iterator"
|
"github.com/syndtr/goleveldb/leveldb/iterator"
|
||||||
|
|
@ -46,13 +44,10 @@ func NewLDBDatabase(file string) (*LDBDatabase, error) {
|
||||||
return database, nil
|
return database, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (db *LDBDatabase) Put(key []byte, value []byte) {
|
func (db *LDBDatabase) Put(key []byte, value []byte) error {
|
||||||
metrics.GetOrRegisterCounter("ldbdatabase.put", nil).Inc(1)
|
metrics.GetOrRegisterCounter("ldbdatabase.put", nil).Inc(1)
|
||||||
|
|
||||||
err := db.db.Put(key, value, nil)
|
return db.db.Put(key, value, nil)
|
||||||
if err != nil {
|
|
||||||
fmt.Println("Error put", err)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (db *LDBDatabase) Get(key []byte) ([]byte, error) {
|
func (db *LDBDatabase) Get(key []byte) ([]byte, error) {
|
||||||
|
|
|
||||||
|
|
@ -730,6 +730,28 @@ func (s *LDBStore) tryAccessIdx(ikey []byte, index *dpaDBIndex) bool {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *LDBStore) GetSchema() (string, error) {
|
||||||
|
s.lock.Lock()
|
||||||
|
defer s.lock.Unlock()
|
||||||
|
|
||||||
|
data, err := s.db.Get([]byte(`schema`))
|
||||||
|
if err != nil {
|
||||||
|
if err == leveldb.ErrNotFound {
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
return string(data), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *LDBStore) PutSchema(schema string) error {
|
||||||
|
s.lock.Lock()
|
||||||
|
defer s.lock.Unlock()
|
||||||
|
|
||||||
|
return s.db.Put([]byte(`schema`), []byte(schema))
|
||||||
|
}
|
||||||
|
|
||||||
func (s *LDBStore) Get(_ context.Context, addr Address) (chunk Chunk, err error) {
|
func (s *LDBStore) Get(_ context.Context, addr Address) (chunk Chunk, err error) {
|
||||||
metrics.GetOrRegisterCounter("ldbstore.get", nil).Inc(1)
|
metrics.GetOrRegisterCounter("ldbstore.get", nil).Inc(1)
|
||||||
log.Trace("ldbstore.get", "key", addr)
|
log.Trace("ldbstore.get", "key", addr)
|
||||||
|
|
|
||||||
|
|
@ -184,3 +184,30 @@ func (ls *LocalStore) Iterator(from uint64, to uint64, po uint8, f func(Address,
|
||||||
func (ls *LocalStore) Close() {
|
func (ls *LocalStore) Close() {
|
||||||
ls.DbStore.Close()
|
ls.DbStore.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (ls *LocalStore) Migrate() error {
|
||||||
|
schema, err := ls.DbStore.GetSchema()
|
||||||
|
if err != nil {
|
||||||
|
log.Error(err.Error())
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Debug("found schema", "schema", schema, "runtime-schema", CurrentDbSchema)
|
||||||
|
if schema != CurrentDbSchema {
|
||||||
|
// run migrations
|
||||||
|
|
||||||
|
if schema == "" {
|
||||||
|
log.Debug("running migrations for", "schema", schema, "runtime-schema", CurrentDbSchema)
|
||||||
|
|
||||||
|
ls.DbStore.Cleanup()
|
||||||
|
|
||||||
|
err := ls.DbStore.PutSchema(DbSchemaHive)
|
||||||
|
if err != nil {
|
||||||
|
log.Error(err.Error())
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
|
||||||
6
swarm/storage/schema.go
Normal file
6
swarm/storage/schema.go
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
package storage
|
||||||
|
|
||||||
|
// "hive" is the first formal schema of LevelDB we release together with Swarm 0.3.4
|
||||||
|
const DbSchemaHive = "hive"
|
||||||
|
|
||||||
|
const CurrentDbSchema = DbSchemaHive
|
||||||
|
|
@ -169,6 +169,11 @@ func NewSwarm(config *api.Config, mockStore *mock.NodeStore) (self *Swarm, err e
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
err = lstore.Migrate()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
self.netStore, err = storage.NewNetStore(lstore, nil)
|
self.netStore, err = storage.NewNetStore(lstore, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue