Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions aw_datastore/storages/memory.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,10 @@ def has_bucket(self, bucket_id: str) -> bool:
return bucket_id in self.db

def iter_events(self, bucket_id):
# Only sort references; copy each event when it is consumed.
for event in sorted(self.db[bucket_id], key=lambda e: e.timestamp)[::-1]:
# Only sort references; copy each event when it is consumed. Same
# order as get_events: newest first, then shortest, then insertion.
events = sorted(self.db[bucket_id], key=lambda e: e.duration)
for event in sorted(events, key=lambda e: e.timestamp, reverse=True):
yield copy.deepcopy(event)

def get_event(
Expand Down
3 changes: 2 additions & 1 deletion aw_datastore/storages/peewee.py
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,8 @@ def buckets_with_last_updated(self) -> Dict[str, Dict[str, Any]]:
def iter_events(self, bucket_id):
cursor = self.db.execute_sql(
"SELECT id, timestamp, duration, datastr FROM eventmodel "
"WHERE bucket_id = ? ORDER BY timestamp DESC",
# Same order as get_events (aw-core#163), so exports match queries
"WHERE bucket_id = ? ORDER BY timestamp DESC, duration ASC, id ASC",
(self.bucket_keys[bucket_id],),
)
try:
Expand Down
Loading