Skip to content

fix(issues): fix optimized adjacent queries #79904

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

fix(issues): fix optimized adjacent queries #79904

Show file tree
Hide file tree
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
27 changes: 24 additions & 3 deletions src/sentry/eventstore/snuba/backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
Limit,
Offset,
Op,
Or,
OrderBy,
Query,
Request,
Expand Down Expand Up @@ -494,7 +495,16 @@ def make_prev_timestamp_conditions(event):
Op.LT,
event.datetime + timedelta(seconds=1),
),
Condition(Column("event_id"), Op.LT, event.event_id),
Or(
conditions=[
Condition(
Column(DATASETS[dataset][Columns.TIMESTAMP.value.alias]),
Op.LT,
event.datetime,
),
Condition(Column("event_id"), Op.LT, event.event_id),
],
),
]

def make_next_timestamp_conditions(event):
Expand All @@ -505,9 +515,20 @@ def make_next_timestamp_conditions(event):
event.datetime + timedelta(days=100),
),
Condition(
Column(DATASETS[dataset][Columns.TIMESTAMP.value.alias]), Op.GTE, event.datetime
Column(DATASETS[dataset][Columns.TIMESTAMP.value.alias]),
Op.GTE,
event.datetime,
),
Or(
conditions=[
Condition(Column("event_id"), Op.GT, event.event_id),
Condition(
Column(DATASETS[dataset][Columns.TIMESTAMP.value.alias]),
Op.GT,
event.datetime,
),
],
),
Condition(Column("event_id"), Op.GT, event.event_id),
]

def make_request(is_prev):
Expand Down
43 changes: 43 additions & 0 deletions tests/sentry/eventstore/snuba/test_backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,49 @@ def test_get_adjacent_event_ids_snql(self):
assert prev_ids == (str(event1.project_id), event1.event_id)
assert next_ids == (str(event3.project_id), event3.event_id)

def test_get_adjacent_event_ids_snql_order_of_event_ids(self):
project = self.create_project()
event1 = self.store_event(
data={
"event_id": "c" * 32,
"type": "default",
"platform": "python",
"fingerprint": ["group"],
"timestamp": self.two_min_ago,
},
project_id=project.id,
)
event2 = self.store_event(
data={
"event_id": "b" * 32,
"type": "default",
"platform": "python",
"fingerprint": ["group"],
"timestamp": self.min_ago,
},
project_id=project.id,
)
event3 = self.store_event(
data={
"event_id": "a" * 32,
"type": "default",
"platform": "python",
"fingerprint": ["group"],
"timestamp": before_now(minutes=0).isoformat(),
},
project_id=project.id,
)
prev_ids, next_ids = self.eventstore.get_adjacent_event_ids_snql(
organization_id=event2.organization.id,
project_id=event2.project_id,
group_id=event2.group_id,
environments=[],
event=event2,
)

assert prev_ids == (str(event1.project_id), event1.event_id)
assert next_ids == (str(event3.project_id), event3.event_id)

def test_adjacent_event_ids_same_timestamp_snql(self):
project = self.create_project()
event1 = self.store_event(
Expand Down
Loading