summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2017-02-13 11:16:53 +0000
committerMark Haines <mark.haines@matrix.org>2017-02-13 11:16:53 +0000
commit3a46280ca3923d4f6e1103b9ee22bac0ddc2edf7 (patch)
tree55f95fff8a67aee7518167d2f522b090e6eaffd9
parentMerge pull request #1867 from matrix-org/erikj/member_index (diff)
downloadsynapse-3a46280ca3923d4f6e1103b9ee22bac0ddc2edf7.tar.xz
Add db functions needed for room initial sync to slave
-rw-r--r--synapse/app/synchrotron.py4
-rw-r--r--synapse/replication/slave/storage/account_data.py6
2 files changed, 10 insertions, 0 deletions
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py

index b3fb408cfd..3f29595256 100644 --- a/synapse/app/synchrotron.py +++ b/synapse/app/synchrotron.py
@@ -87,6 +87,10 @@ class SynchrotronSlavedStore( RoomMemberStore.__dict__["who_forgot_in_room"] ) + did_forget = ( + RoomMemberStore.__dict__["did_forget"] + ) + # XXX: This is a bit broken because we don't persist the accepted list in a # way that can be replicated. This means that we don't have a way to # invalidate the cache correctly. diff --git a/synapse/replication/slave/storage/account_data.py b/synapse/replication/slave/storage/account_data.py
index 735c03c7eb..77c64722c7 100644 --- a/synapse/replication/slave/storage/account_data.py +++ b/synapse/replication/slave/storage/account_data.py
@@ -46,6 +46,12 @@ class SlavedAccountDataStore(BaseSlavedStore): ) get_tags_for_user = TagsStore.__dict__["get_tags_for_user"] + get_tags_for_room = ( + DataStore.get_tags_for_room.__func__ + ) + get_account_data_for_room = ( + DataStore.get_account_data_for_room.__func__ + ) get_updated_tags = DataStore.get_updated_tags.__func__ get_updated_account_data_for_user = (