status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-01-12 21:34:33 +00:00
Code Issues Projects Releases Wiki Activity

era: speed up index reading (#2202)

Browse Source
This commit is contained in:
Jacek Sieka 2024-05-22 09:27:23 +02:00 committed by GitHub
parent e566e89d03
commit 308bd51bbd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
fluffy/eth_data/era1.nim
View File

@ -99,30 +99,35 @@ proc appendRecord(f: IoHandle, index: BlockIndex): Result[int64, string] =
f.appendIndex(index.startNumber, index.offsets) f.appendIndex(index.startNumber, index.offsets)
proc readBlockIndex*(f: IoHandle): Result[BlockIndex, string] = proc readBlockIndex*(f: IoHandle): Result[BlockIndex, string] =
var
buf: seq[byte]
pos: int
let let
startPos = ?f.getFilePos().mapErr(toString) startPos = ?f.getFilePos().mapErr(toString)
fileSize = ?f.getFileSize().mapErr(toString) fileSize = ?f.getFileSize().mapErr(toString)
header = ?f.readHeader() header = ?f.readRecord(buf)
if header.typ != E2BlockIndex: if header.typ != E2BlockIndex:
return err("not an index") return err("not an index")
if header.len < 16: if buf.len < 16:
return err("index entry too small") return err("index entry too small")
if header.len mod 8 != 0: if buf.len mod 8 != 0:
return err("index length invalid") return err("index length invalid")
var buf: array[8, byte]
?f.readFileExact(buf)
let let
blockNumber = uint64.fromBytesLE(buf) blockNumber = uint64.fromBytesLE(buf.toOpenArray(pos, pos + 7))
count = header.len div 8 - 2 count = buf.len div 8 - 2
pos += 8
# technically not an error, but we'll throw this sanity check in here..
if blockNumber > int32.high().uint64:
return err("fishy block number")
var offsets = newSeqUninitialized[int64](count) var offsets = newSeqUninitialized[int64](count)
for i in 0 ..< count: for i in 0 ..< count:
?f.readFileExact(buf)
let let
offset = uint64.fromBytesLE(buf) offset = uint64.fromBytesLE(buf.toOpenArray(pos, pos + 7))
absolute = absolute =
if offset == 0: if offset == 0:
0'i64 0'i64
@ -131,17 +136,13 @@ proc readBlockIndex*(f: IoHandle): Result[BlockIndex, string] =
cast[int64](cast[uint64](startPos) + offset) cast[int64](cast[uint64](startPos) + offset)
if absolute < 0 or absolute > fileSize: if absolute < 0 or absolute > fileSize:
return err("Invalid offset") return err("invalid offset")
offsets[i] = absolute offsets[i] = absolute
pos += 8
?f.readFileExact(buf) if uint64(count) != uint64.fromBytesLE(buf.toOpenArray(pos, pos + 7)):
if uint64(count) != uint64.fromBytesLE(buf):
return err("invalid count") return err("invalid count")
# technically not an error, but we'll throw this sanity check in here..
if blockNumber > int32.high().uint64:
return err("fishy block number")
ok(BlockIndex(startNumber: blockNumber, offsets: offsets)) ok(BlockIndex(startNumber: blockNumber, offsets: offsets))
proc skipRecord*(f: IoHandle): Result[void, string] = proc skipRecord*(f: IoHandle): Result[void, string] =