Skip to content

fix(indexes): Fix wrong order in MemoryTxGroupIndex #977

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
1 commit merged into from
Mar 15, 2024
Merged

fix(indexes): Fix wrong order in MemoryTxGroupIndex #977

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
11 changes: 6 additions & 5 deletions hathor/indexes/memory_tx_group_index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class MemoryTxGroupIndex(TxGroupIndex[KT]):
"""Memory implementation of the TxGroupIndex. This class is abstract and cannot be used directly.
"""

index: defaultdict[KT, set[bytes]]
index: defaultdict[KT, set[tuple[int, bytes]]]

def __init__(self) -> None:
self.force_clear()
Expand All @@ -40,7 +40,7 @@ def force_clear(self) -> None:
self.index = defaultdict(set)

def _add_tx(self, key: KT, tx: BaseTransaction) -> None:
self.index[key].add(not_none(tx.hash))
self.index[key].add((tx.timestamp, not_none(tx.hash)))

@abstractmethod
def _extract_keys(self, tx: BaseTransaction) -> Iterable[KT]:
Expand All @@ -57,13 +57,14 @@ def remove_tx(self, tx: BaseTransaction) -> None:
assert tx.hash is not None

for key in self._extract_keys(tx):
self.index[key].discard(tx.hash)
self.index[key].discard((tx.timestamp, tx.hash))

def _get_from_key(self, key: KT) -> Iterable[bytes]:
yield from self.index[key]
for _, h in self.index[key]:
yield h

def _get_sorted_from_key(self, key: KT) -> Iterable[bytes]:
return sorted(self.index[key])
return [h for _, h in sorted(self.index[key])]

def _is_key_empty(self, key: KT) -> bool:
return not bool(self.index[key])