Skip to content

Reduce meta key length using byte version database id #294

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
leventeliu merged 3 commits into from
Mar 28, 2019
+12 −6
Merged

Reduce meta key length using byte version database id #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f706027
Reduce meta key length using byte version database id
Mar 27, 2019
2e93401
Fix database test case using valid database id
Mar 27, 2019
988da9f
Merge branch 'beta' into bugfix/beta_chain_db_key_prefix
Mar 27, 2019
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
12 changes: 9 additions & 3 deletions sqlchain/chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,12 @@ func NewChainWithContext(ctx context.Context, c *Config) (chain *Chain, err erro
return
}

metaKeyPrefix, err := c.DatabaseID.AccountAddress()
if err != nil {
err = errors.Wrap(err, "failed to generate database meta prefix")
return
}

// Create chain state
chain = &Chain{
bi: newBlockIndex(),
Expand All @@ -199,9 +205,9 @@ func NewChainWithContext(ctx context.Context, c *Config) (chain *Chain, err erro

pk: pk,
addr: &addr,
metaBlockIndex: utils.ConcatAll([]byte(c.DatabaseID), metaBlockIndex[:]),
metaResponseIndex: utils.ConcatAll([]byte(c.DatabaseID), metaResponseIndex[:]),
metaAckIndex: utils.ConcatAll([]byte(c.DatabaseID), metaAckIndex[:]),
metaBlockIndex: utils.ConcatAll(metaKeyPrefix[:], metaBlockIndex[:]),
metaResponseIndex: utils.ConcatAll(metaKeyPrefix[:], metaResponseIndex[:]),
metaAckIndex: utils.ConcatAll(metaKeyPrefix[:], metaAckIndex[:]),
}
le = le.WithField("peer", chain.rt.getPeerInfoString())

Expand Down
6 changes: 3 additions & 3 deletions worker/db_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func TestSingleDatabase(t *testing.T) {

// create file
cfg := &DBConfig{
DatabaseID: "TEST",
DatabaseID: "00000bef611d346c0cbe1beaa76e7f0ed705a194fdf9ac3a248ec70e9c198bf9",
DataDir: rootDir,
KayakMux: kayakMuxService,
ChainMux: chainMuxService,
Expand Down Expand Up @@ -409,7 +409,7 @@ func TestInitFailed(t *testing.T) {

// create file
cfg := &DBConfig{
DatabaseID: "TEST",
DatabaseID: "00000bef611d346c0cbe1beaa76e7f0ed705a194fdf9ac3a248ec70e9c198bf9",
DataDir: rootDir,
KayakMux: kayakMuxService,
ChainMux: chainMuxService,
Expand Down Expand Up @@ -464,7 +464,7 @@ func TestDatabaseRecycle(t *testing.T) {

// create file
cfg := &DBConfig{
DatabaseID: "TEST",
DatabaseID: "00000bef611d346c0cbe1beaa76e7f0ed705a194fdf9ac3a248ec70e9c198bf9",
DataDir: rootDir,
KayakMux: kayakMuxService,
ChainMux: chainMuxService,
Expand Down