Skip to content

perf: find TokenTable index once #425

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

Open
dkharms wants to merge 1 commit into
base: main
Choose a base branch
from
Open

perf: find TokenTable index once #425

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 26 additions & 18 deletions frac/sealed/token/table_loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package token
import (
"encoding/binary"
"slices"
"sync"
"unsafe"

"go.uber.org/zap"
Expand All @@ -22,7 +23,9 @@ type TableLoader struct {
reader *storage.IndexReader
cache *cache.Cache[Table]

i uint32
once sync.Once
tableIndex uint32

buf []byte
}

Expand All @@ -47,6 +50,8 @@ func (l *TableLoader) Load() Table {
err error
)

l.advanceToTable()

if l.isLegacy {
blocks, err = l.loadBlocksLegacy()
} else {
Expand Down Expand Up @@ -98,29 +103,24 @@ func TableFromBlocks(blocks []TableBlock) Table {
}

func (l *TableLoader) readHeader() storage.IndexBlockHeader {
h, e := l.reader.GetBlockHeader(l.i)
h, e := l.reader.GetBlockHeader(l.tableIndex)
if e != nil {
logger.Panic("error reading block header", zap.Error(e))
}
l.i++
l.tableIndex++
return h
}

func (l *TableLoader) readBlock() ([]byte, error) {
block, _, err := l.reader.ReadIndexBlock(l.i, l.buf)
block, _, err := l.reader.ReadIndexBlock(l.tableIndex, l.buf)
l.buf = block
l.i++
l.tableIndex++
return block, err
}

func (l *TableLoader) loadBlocksLegacy() ([]TableBlock, error) {
l.i = 1 // Skip info block immediately.

for h := l.readHeader(); h.Len() > 0; h = l.readHeader() {
// Skip token blocks, go for token table.
}

blocks := make([]TableBlock, 0)

for blockData, err := l.readBlock(); len(blockData) > 0; blockData, err = l.readBlock() {
if err != nil {
return nil, err
Expand All @@ -134,19 +134,13 @@ func (l *TableLoader) loadBlocksLegacy() ([]TableBlock, error) {
}

func (l *TableLoader) loadBlocks() ([]TableBlock, error) {
l.i = 0

blocksCount, err := l.reader.BlocksCount()
if err != nil {
return nil, err
}

for h := l.readHeader(); h.Len() > 0; h = l.readHeader() {
// Skip token blocks, go for token table.
}

var blocks []TableBlock
for l.i < uint32(blocksCount) {
for l.tableIndex < uint32(blocksCount) {
data, err := l.readBlock()
if err != nil {
return nil, err
Expand All @@ -161,6 +155,20 @@ func (l *TableLoader) loadBlocks() ([]TableBlock, error) {
return blocks, nil
}

func (l *TableLoader) advanceToTable() {
l.once.Do(func() {
// This is correct for both legacy and non-legacy sealed fractions:
// - in legacy fractions we have following layout: [info][token][separator][token-table][...];
// - in non-legacy fraction we have following layout: [token][separator][token-table];
// As you can see, it is safe to start from 0-th block in both cases.
l.tableIndex = 0

for h := l.readHeader(); h.Len() > 0; h = l.readHeader() {
// Skip token blocks, go for token table.
}
})
}

// TableBlock represents how token.Table is stored on disk
type TableBlock struct {
FieldsTables []FieldTable
Expand Down
Loading