fixup! Move DB pool and helper functions into dedicated Database class

erikjohnston · erikjohnston · commit 2ddde4af2c52 · 2019-12-04T17:25:45.000Z
diff --git a/synapse/storage/data_stores/main/events.py b/synapse/storage/data_stores/main/events.py
@@ -2029,7 +2029,7 @@ def delete_expired_event_txn(txn):
                 txn, "_get_event_cache", (event.event_id,)
             )
 
-        yield self.runInteraction("delete_expired_event", delete_expired_event_txn)
+        yield self.db.runInteraction("delete_expired_event", delete_expired_event_txn)
 
     def _delete_event_expiry_txn(self, txn, event_id):
         """Delete the expiry timestamp associated with an event ID without deleting the
@@ -2063,7 +2063,7 @@ def get_next_event_to_expire_txn(txn):
 
             return txn.fetchone()
 
-        return self.runInteraction(
+        return self.db.runInteraction(
             desc="get_next_event_to_expire", func=get_next_event_to_expire_txn
         )
 

Original file line number	Diff line number	Diff line change
`@@ -2029,7 +2029,7 @@ def delete_expired_event_txn(txn):`
`2029`	`2029`	`txn, "_get_event_cache", (event.event_id,)`
`2030`	`2030`	`)`
`2031`	`2031`
`2032`		`- yield self.runInteraction("delete_expired_event", delete_expired_event_txn)`
	`2032`	`+ yield self.db.runInteraction("delete_expired_event", delete_expired_event_txn)`
`2033`	`2033`
`2034`	`2034`	`def _delete_event_expiry_txn(self, txn, event_id):`
`2035`	`2035`	`"""Delete the expiry timestamp associated with an event ID without deleting the`
`@@ -2063,7 +2063,7 @@ def get_next_event_to_expire_txn(txn):`
`2063`	`2063`
`2064`	`2064`	`return txn.fetchone()`
`2065`	`2065`
`2066`		`- return self.runInteraction(`
	`2066`	`+ return self.db.runInteraction(`
`2067`	`2067`	`desc="get_next_event_to_expire", func=get_next_event_to_expire_txn`
`2068`	`2068`	`)`
`2069`	`2069`