OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Rename method name to not clash with other ones in storage.

paul/schema_breaking_changes
Erik Johnston 2014-08-15 16:47:48 +01:00
parent 6efc688917
commit 0e938b1ff7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/state.py
View File

@ -86,7 +86,7 @@ class StateHandler(object):
else: else:
event.depth = 0 event.depth = 0
current_state = yield self.store.get_current_state( current_state = yield self.store.get_current_state_pdu(
key.context, key.type, key.state_key key.context, key.type, key.state_key
) )

6
synapse/storage/pdu.py
View File

@ -580,7 +580,7 @@ class StatePduStore(SQLBaseStore):
txn.execute(query, query_args) txn.execute(query, query_args)
def get_current_state(self, context, pdu_type, state_key): def get_current_state_pdu(self, context, pdu_type, state_key):
"""For a given context, pdu_type, state_key 3-tuple, return what is """For a given context, pdu_type, state_key 3-tuple, return what is
currently considered the current state. currently considered the current state.
@ -595,10 +595,10 @@ class StatePduStore(SQLBaseStore):
""" """
return self._db_pool.runInteraction( return self._db_pool.runInteraction(
self._get_current_state, context, pdu_type, state_key self._get_current_state_pdu, context, pdu_type, state_key
) )
def _get_current_state(self, txn, context, pdu_type, state_key): def _get_current_state_pdu(self, txn, context, pdu_type, state_key):
return self._get_current_interaction(txn, context, pdu_type, state_key) return self._get_current_interaction(txn, context, pdu_type, state_key)
def _get_current_interaction(self, txn, context, pdu_type, state_key): def _get_current_interaction(self, txn, context, pdu_type, state_key):