Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Matrix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Operate
Environments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Matrix
Commits
b6b0132a
Commit
b6b0132a
authored
8 years ago
by
Mark Haines
Browse files
Options
Downloads
Patches
Plain Diff
Make get_events_around more efficient on sqlite3
parent
d44d11d8
No related branches found
Branches containing commit
Tags
v0.12.0-rc3
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
synapse/storage/stream.py
+49
-13
49 additions, 13 deletions
synapse/storage/stream.py
with
49 additions
and
13 deletions
synapse/storage/stream.py
+
49
−
13
View file @
b6b0132a
...
...
@@ -40,7 +40,7 @@ from synapse.util.caches.descriptors import cached
from
synapse.api.constants
import
EventTypes
from
synapse.types
import
RoomStreamToken
from
synapse.util.logcontext
import
preserve_fn
from
synapse.storage.engines
import
PostgresEngine
from
synapse.storage.engines
import
PostgresEngine
,
Sqlite3Engine
import
logging
...
...
@@ -614,19 +614,55 @@ class StreamStore(SQLBaseStore):
results
[
"
stream_ordering
"
],
)
query_before
=
(
"
SELECT topological_ordering, stream_ordering, event_id FROM events
"
"
WHERE room_id = ? AND %s
"
"
ORDER BY topological_ordering DESC, stream_ordering DESC LIMIT ?
"
)
%
(
upper_bound
(
token
,
self
.
database_engine
,
inclusive
=
False
),)
if
isinstance
(
self
.
database_engine
,
Sqlite3Engine
):
# SQLite3 doesn't optimise ``(x < a) OR (x = a AND y < b)``
# So we give pass it to SQLite3 as the UNION ALL of the two queries.
query_before
=
(
"
SELECT topological_ordering, stream_ordering, event_id FROM events
"
"
WHERE room_id = ? AND topological_ordering < ?
"
"
UNION ALL
"
"
SELECT topological_ordering, stream_ordering, event_id FROM events
"
"
WHERE room_id = ? AND topological_ordering = ? AND stream_ordering < ?
"
"
ORDER BY topological_ordering DESC, stream_ordering DESC LIMIT ?
"
)
before_args
=
(
room_id
,
token
.
topological
,
room_id
,
token
.
topological
,
token
.
stream
,
before_limit
,
)
query_after
=
(
"
SELECT topological_ordering, stream_ordering, event_id FROM events
"
"
WHERE room_id = ? AND topological_ordering > ?
"
"
UNION ALL
"
"
SELECT topological_ordering, stream_ordering, event_id FROM events
"
"
WHERE room_id = ? AND topological_ordering = ? AND stream_ordering > ?
"
"
ORDER BY topological_ordering ASC, stream_ordering ASC LIMIT ?
"
)
after_args
=
(
room_id
,
token
.
topological
,
room_id
,
token
.
topological
,
token
.
stream
,
after_limit
,
)
else
:
query_before
=
(
"
SELECT topological_ordering, stream_ordering, event_id FROM events
"
"
WHERE room_id = ? AND %s
"
"
ORDER BY topological_ordering DESC, stream_ordering DESC LIMIT ?
"
)
%
(
upper_bound
(
token
,
self
.
database_engine
,
inclusive
=
False
),)
before_args
=
(
room_id
,
before_limit
),
query_after
=
(
"
SELECT topological_ordering, stream_ordering, event_id FROM events
"
"
WHERE room_id = ? AND %s
"
"
ORDER BY topological_ordering ASC, stream_ordering ASC LIMIT ?
"
)
%
(
lower_bound
(
token
,
self
.
database_engine
,
inclusive
=
False
),)
query_after
=
(
"
SELECT topological_ordering, stream_ordering, event_id FROM events
"
"
WHERE room_id = ? AND %s
"
"
ORDER BY topological_ordering ASC, stream_ordering ASC LIMIT ?
"
)
%
(
lower_bound
(
token
,
self
.
database_engine
,
inclusive
=
False
),)
after_args
=
(
room_id
,
after_limit
)
txn
.
execute
(
query_before
,
(
room_id
,
before_
limit
)
)
txn
.
execute
(
query_before
,
before_
args
)
rows
=
self
.
cursor_to_dict
(
txn
)
events_before
=
[
r
[
"
event_id
"
]
for
r
in
rows
]
...
...
@@ -642,7 +678,7 @@ class StreamStore(SQLBaseStore):
token
.
stream
-
1
,
))
txn
.
execute
(
query_after
,
(
room_id
,
after_limit
)
)
txn
.
execute
(
query_after
,
after_args
)
rows
=
self
.
cursor_to_dict
(
txn
)
events_after
=
[
r
[
"
event_id
"
]
for
r
in
rows
]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment