Skip to content

ObjectDatabase cleanup #1598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlexeyAkhunov merged 2 commits into from
Mar 24, 2021
Merged

ObjectDatabase cleanup #1598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94e653f
ObjectDatabase cleanup
vorot93 Mar 24, 2021
19c35ff
Remove ObjectDatabase::WarmUp
vorot93 Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions ethdb/id.go
View file
Open in desktop

This file was deleted.

35 changes: 2 additions & 33 deletions ethdb/object_db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"context"
"fmt"
"strings"
"time"

"github.com/google/btree"
"github.com/ledgerwatch/lmdb-go/lmdb"
Expand All @@ -38,18 +37,13 @@ type DbCopier interface {

// ObjectDatabase - is an object-style interface of DB accessing
type ObjectDatabase struct {
kv KV
log log.Logger
id uint64
kv KV
}

// NewObjectDatabase returns a AbstractDB wrapper.
func NewObjectDatabase(kv KV) *ObjectDatabase {
logger := log.New("database", "object")
return &ObjectDatabase{
kv: kv,
log: logger,
id: id(),
kv: kv,
}
}

Expand Down Expand Up @@ -425,28 +419,3 @@ func NewDatabaseWithFreezer(db *ObjectDatabase, dir, suffix string) (*ObjectData
// FIXME: implement freezer in Turbo-Geth
return db, nil
}

func WarmUp(tx Tx, bucket string, logEvery *time.Ticker, quit <-chan struct{}) error {
count := 0
c := tx.Cursor(bucket)
totalKeys, errCount := c.Count()
if errCount != nil {
return errCount
}
for k, _, err := c.First(); k != nil; k, _, err = c.Next() {
if err != nil {
return err
}
count++

select {
default:
case <-quit:
return common.ErrStopped
case <-logEvery.C:
log.Info("Warmed up state", "progress", fmt.Sprintf("%.2fM/%.2fM", float64(count)/1_000_000, float64(totalKeys)/1_000_000))
}
}

return nil
}