Fix-up calls to end_to_end_keys.

Author: clokep

synapse/storage/database.py

@@ -405,7 +405,7 @@ def execute_batch(self, sql: str, args: Iterable[Iterable[Any]]) -> None:
     def execute_values(
         self,
         sql: str,
-        values: Iterable[Iterable[Any]],
+        values: Collection[Iterable[Any]],
         template: Optional[str] = None,
         fetch: bool = True,
     ) -> List[Tuple]:
@@ -420,6 +420,10 @@ def execute_values(
         """
         assert isinstance(self.database_engine, PostgresEngine)
 
+        # If there's no work to do, skip.
+        if not len(values):
+            return []
+
         if isinstance(self.database_engine, Psycopg2Engine):
             from psycopg2.extras import execute_values
 
@@ -2431,7 +2435,7 @@ def simple_delete_many_batch_txn(
             values: for each row, a list of values in the same order as `keys`
         """
 
-        if isinstance(txn.database_engine, PostgresEngine):
+        if isinstance(txn.database_engine, Psycopg2Engine):
             # We use `execute_values` as it can be a lot faster than `execute_batch`,
             # but it's only available on postgres.
             sql = "DELETE FROM %s WHERE (%s) IN (VALUES ?)" % (

synapse/storage/databases/main/end_to_end_keys.py

@@ -57,7 +57,7 @@
     make_tuple_in_list_sql_clause,
 )
 from synapse.storage.databases.main.cache import CacheInvalidationWorkerStore
-from synapse.storage.engines import PostgresEngine
+from synapse.storage.engines import PostgresEngine, Psycopg2Engine
 from synapse.storage.util.id_generators import MultiWriterIdGenerator
 from synapse.types import JsonDict, JsonMapping
 from synapse.util import json_decoder, json_encoder
@@ -1134,7 +1134,7 @@ async def claim_e2e_one_time_keys(
         """
         results: Dict[str, Dict[str, Dict[str, JsonDict]]] = {}
         missing: List[Tuple[str, str, str, int]] = []
-        if isinstance(self.database_engine, PostgresEngine):
+        if isinstance(self.database_engine, Psycopg2Engine):
             # If we can use execute_values we can use a single batch query
             # in autocommit mode.
             unfulfilled_claim_counts: Dict[Tuple[str, str, str], int] = {}
@@ -1197,7 +1197,7 @@ async def claim_e2e_fallback_keys(
         Returns:
             A map of user ID -> a map device ID -> a map of key ID -> JSON.
         """
-        if isinstance(self.database_engine, PostgresEngine):
+        if isinstance(self.database_engine, Psycopg2Engine):
             return await self.db_pool.runInteraction(
                 "_claim_e2e_fallback_keys_bulk",
                 self._claim_e2e_fallback_keys_bulk_txn,
@@ -1230,7 +1230,7 @@ def _claim_e2e_fallback_keys_bulk_txn(
             SET used = used OR mark_as_used
             FROM claims
             WHERE (k.user_id, k.device_id, k.algorithm) = (claims.user_id, claims.device_id, claims.algorithm)
-            RETURNING k.user_id, k.device_id, k.algorithm, k.key_id, k.key_json;
+            RETURNING k.user_id, k.device_id, k.algorithm, k.key_id, k.key_json
         """
         claimed_keys = cast(
             List[Tuple[str, str, str, str, str]],