Remove unused populate_previous_pdus

This commit is contained in:
Mark Haines 2014-08-27 11:34:31 +01:00
parent bf05218c4b
commit 474dcecb11
3 changed files with 1 additions and 27 deletions

View File

@ -48,25 +48,6 @@ class PduActions(object):
""" """
return self.store.mark_pdu_as_processed(pdu.pdu_id, pdu.origin) return self.store.mark_pdu_as_processed(pdu.pdu_id, pdu.origin)
@defer.inlineCallbacks
@log_function
def populate_previous_pdus(self, pdu):
""" Given an outgoing `Pdu` fill out its `prev_ids` key with the `Pdu`s
that we have received.
Returns:
Deferred
"""
results = yield self.store.get_latest_pdus_in_context(pdu.context)
pdu.prev_pdus = [(p_id, origin) for p_id, origin, _ in results]
vs = [int(v) for _, _, v in results]
if vs:
pdu.depth = max(vs) + 1
else:
pdu.depth = 0
@defer.inlineCallbacks @defer.inlineCallbacks
@log_function @log_function
def after_transaction(self, transaction_id, destination, origin): def after_transaction(self, transaction_id, destination, origin):

View File

@ -134,8 +134,6 @@ class ReplicationLayer(object):
logger.debug("[%s] Persisting PDU", pdu.pdu_id) logger.debug("[%s] Persisting PDU", pdu.pdu_id)
#yield self.pdu_actions.populate_previous_pdus(pdu)
# Save *before* trying to send # Save *before* trying to send
yield self.store.persist_event(pdu=pdu) yield self.store.persist_event(pdu=pdu)

View File

@ -276,7 +276,7 @@ class PduStore(SQLBaseStore):
(context, depth) (context, depth)
) )
def get_latest_pdus_in_context(self, context): def _get_latest_pdus_in_context(self, txn, context):
"""Get's a list of the most current pdus for a given context. This is """Get's a list of the most current pdus for a given context. This is
used when we are sending a Pdu and need to fill out the `prev_pdus` used when we are sending a Pdu and need to fill out the `prev_pdus`
key key
@ -285,11 +285,6 @@ class PduStore(SQLBaseStore):
txn txn
context context
""" """
return self._db_pool.runInteraction(
self._get_latest_pdus_in_context, context
)
def _get_latest_pdus_in_context(self, txn, context):
query = ( query = (
"SELECT p.pdu_id, p.origin, p.depth FROM %(pdus)s as p " "SELECT p.pdu_id, p.origin, p.depth FROM %(pdus)s as p "
"INNER JOIN %(forward)s as f ON p.pdu_id = f.pdu_id " "INNER JOIN %(forward)s as f ON p.pdu_id = f.pdu_id "