Skip to content
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

[Peristence] Fix TxIndexer to index sender and recipient transactions with height and index suffixes #677

Merged
merged 3 commits into from
Apr 14, 2023
Merged

[Peristence] Fix TxIndexer to index sender and recipient transactions with height and index suffixes #677

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd521a0
Add height and index suffix to sender and recipient indexes
h5law Apr 14, 2023
0e4762a
Address naming issues
h5law Apr 14, 2023
ce2e203
Update CHANGELOG.md
h5law Apr 14, 2023
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
33 changes: 25 additions & 8 deletions persistence/indexer/indexer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ func (indexer *txIndexer) Index(result *coreTypes.TxResult) error {
if err := indexer.indexByHeightAndIndex(result.GetHeight(), result.GetIndex(), hashKey); err != nil {
return err
}
if err := indexer.indexBySender(result.GetSignerAddr(), hashKey); err != nil {
if err := indexer.indexBySenderHeightAndBlockIndex(result.GetSignerAddr(), result.GetHeight(), result.GetIndex(), hashKey); err != nil {
return err
}
if err := indexer.indexByRecipient(result.GetRecipientAddr(), hashKey); err != nil {
if err := indexer.indexByRecipientHeightAndBlockIndex(result.GetRecipientAddr(), result.GetHeight(), result.GetIndex(), hashKey); err != nil {
return err
}
return nil
Expand Down Expand Up @@ -148,15 +148,18 @@ func (indexer *txIndexer) indexByHeightAndIndex(height int64, index int32, bz []
return indexer.db.Set(indexer.heightAndIndexKey(height, index), bz)
}

func (indexer *txIndexer) indexBySender(sender string, bz []byte) error {
return indexer.db.Set(indexer.senderKey(sender), bz)
func (indexer *txIndexer) indexBySenderHeightAndBlockIndex(sender string, height int64, blockIndex int32, bz []byte) error {
if sender == "" {
return nil
}
return indexer.db.Set(indexer.senderHeightAndBlockIndexKey(sender, height, blockIndex), bz)
}

func (indexer *txIndexer) indexByRecipient(recipient string, bz []byte) error {
func (indexer *txIndexer) indexByRecipientHeightAndBlockIndex(recipient string, height int64, blockIndex int32, bz []byte) error {
if recipient == "" {
return nil
}
return indexer.db.Set(indexer.recipientKey(recipient), bz)
return indexer.db.Set(indexer.recipientHeightAndBlockIndexKey(recipient, height, blockIndex), bz)
}

// key helper functions
Expand All @@ -174,11 +177,25 @@ func (indexer *txIndexer) heightKey(height int64) []byte {
}

func (indexer *txIndexer) senderKey(address string) []byte {
return indexer.key(senderPrefix, address)
return indexer.key(senderPrefix, address+"/")
}

func (indexer *txIndexer) senderHeightAndBlockIndexKey(address string, height int64, blockIndex int32) []byte {
key := indexer.senderKey(address)
key = append(key, []byte(elenEncoder.EncodeInt(int(height))+"/")...)
key = append(key, []byte(elenEncoder.EncodeInt(int(blockIndex)))...)
return key
}

func (indexer *txIndexer) recipientKey(address string) []byte {
return indexer.key(recipientPrefix, address)
return indexer.key(recipientPrefix, address+"/")
}

func (indexer *txIndexer) recipientHeightAndBlockIndexKey(address string, height int64, blockIndex int32) []byte {
key := indexer.recipientKey(address)
key = append(key, []byte(elenEncoder.EncodeInt(int(height))+"/")...)
key = append(key, []byte(elenEncoder.EncodeInt(int(blockIndex)))...)
return key
}

func (indexer *txIndexer) key(prefix rune, postfix string) []byte {
Expand Down