NONEVM-3304: Add deterministic tiebreakers to log query ORDER BY clause #505
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adds deterministic tiebreakers (tx_lt, msg_index) to log query ORDER BY clauses to ensure consistent query ordering across PostgreSQL instances. The tiebreakers inherit their sort direction from the last explicit sort field.
Key Changes:
- Modified
addOrderByto appendtx_ltandmsg_indextiebreakers when explicit sort fields are provided - Tiebreakers use the same direction (ASC/DESC) as the last sort field to maintain consistent ordering
- Added comprehensive tests for timestamp sorting with tiebreakers
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| pkg/logpoller/store/postgres/queryparser.go | Refactored addOrderBy to append tiebreaker fields and added helper function for direction conversion |
| pkg/logpoller/store/postgres/queryparser_test.go | Updated existing test expectation and added new test cases for timestamp sorting with ASC/DESC directions |
| integration-tests/logpoller/pg_logs_test.go | Refactored existing test and added test case for timestamp collision scenarios with tiebreaker verification |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
patricios-space
previously approved these changes
Jan 6, 2026
| // Check exact SQL with ORDER BY | ||
| expectedSQL := `SELECT id, filter_id, chain_id, address, event_sig, data_header, data_payload, tx_hash, tx_lt, msg_index, tx_timestamp, block_workchain, block_shard, block_seqno, block_root_hash, block_file_hash, master_block_seqno, msg_lt, created_at FROM ton.log_poller_logs WHERE chain_id = :chain_id AND address = :address AND event_sig = :event_sig ORDER BY tx_lt DESC` | ||
| // Check exact SQL with ORDER BY - includes msg_index tiebreaker (tx_lt already primary sort) | ||
| expectedSQL := `SELECT id, filter_id, chain_id, address, event_sig, data_header, data_payload, tx_hash, tx_lt, msg_index, tx_timestamp, block_workchain, block_shard, block_seqno, block_root_hash, block_file_hash, master_block_seqno, msg_lt, created_at FROM ton.log_poller_logs WHERE chain_id = :chain_id AND address = :address AND event_sig = :event_sig ORDER BY tx_lt DESC, msg_index DESC` |
Collaborator
There was a problem hiding this comment.
All these test cases could be refactored to use TableDrivenTests pattern. This would make the test cases clearer. If not, it would be great to at least extract the repeated string of the expectedSQL to a constant.
Collaborator
Author
There was a problem hiding this comment.
Yeah good point! didn't see that opportunity.
patricios-space
approved these changes
Jan 7, 2026
jadepark-dev
deleted the
NONEVM-3304-Non-Deterministic-Timestamp-Sorting-in-Commit-Report-Queries
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ensures consistent query ordering by appending deterministic tiebreakers (tx_lt, msg_index) to ORDER BY clauses.
Changes
tx_ltandmsg_indexas tiebreakers when explicit sort fields are provided