Skip to content

Commit ab79219

Browse files
authored
Merge pull request #5 from optimism-java/bench
feat: add bench test for storage
2 parents 123a66e + 8cb6157 commit ab79219

File tree

9 files changed

+203
-526
lines changed

9 files changed

+203
-526
lines changed

beacon/storage.go

+4
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ func (bs *Storage) Radius() *uint256.Int {
134134
return storage2.MaxDistance
135135
}
136136

137+
func (bs *Storage) Close() error {
138+
return bs.db.Close()
139+
}
140+
137141
func (bs *Storage) getContentValue(contentId []byte) ([]byte, error) {
138142
res := make([]byte, 0)
139143
err := bs.db.QueryRowContext(context.Background(), ContentValueLookupQueryBeacon, contentId).Scan(&res)

cmd/shisui/main.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import (
3939
"github.com/optimism-java/shisui2/portalwire"
4040
"github.com/optimism-java/shisui2/state"
4141
"github.com/optimism-java/shisui2/storage"
42+
"github.com/optimism-java/shisui2/storage/sqlite"
4243
"github.com/optimism-java/shisui2/web3"
4344
"github.com/protolambda/zrnt/eth2/configs"
4445
"github.com/urfave/cli/v2"
@@ -378,11 +379,11 @@ func doPortMapping(natm nat.Interface, ln *enode.LocalNode, addr *net.UDPAddr) {
378379

379380
func initHistory(config Config, server *rpc.Server, conn discover.UDPConn, localNode *enode.LocalNode, discV5 *discover.UDPv5, utp *portalwire.PortalUtp) (*history.Network, error) {
380381
networkName := portalwire.History.Name()
381-
db, err := history.NewDB(config.DataDir, networkName)
382+
db, err := sqlite.NewDB(config.DataDir, networkName)
382383
if err != nil {
383384
return nil, err
384385
}
385-
contentStorage, err := history.NewHistoryStorage(storage.PortalStorageConfig{
386+
contentStorage, err := sqlite.NewHistoryStorage(storage.PortalStorageConfig{
386387
StorageCapacityMB: config.DataCapacity,
387388
DB: db,
388389
NodeId: localNode.ID(),
@@ -472,11 +473,11 @@ func initBeacon(config Config, server *rpc.Server, conn discover.UDPConn, localN
472473

473474
func initState(config Config, server *rpc.Server, conn discover.UDPConn, localNode *enode.LocalNode, discV5 *discover.UDPv5, utp *portalwire.PortalUtp) (*state.Network, error) {
474475
networkName := portalwire.State.Name()
475-
db, err := history.NewDB(config.DataDir, networkName)
476+
db, err := sqlite.NewDB(config.DataDir, networkName)
476477
if err != nil {
477478
return nil, err
478479
}
479-
contentStorage, err := history.NewHistoryStorage(storage.PortalStorageConfig{
480+
contentStorage, err := sqlite.NewHistoryStorage(storage.PortalStorageConfig{
480481
StorageCapacityMB: config.DataCapacity,
481482
DB: db,
482483
NodeId: localNode.ID(),

history/history.sqlite

-12 KB
Binary file not shown.

0 commit comments

Comments
 (0)