Remove some DB todos

conan/internal/cache/db/cache_database.py

@@ -22,9 +22,7 @@ def __init__(self, filename):
             self._packages.create_table()
 
     def exists_prev(self, ref):
-        # TODO: This logic could be done directly against DB
-        matching_prevs = self.get_package_revisions_references(ref)
-        return len(matching_prevs) > 0
+        return self._packages.get_package_revisions_reference_exists(ref)
 
     def get_latest_package_reference(self, ref):
         prevs = self.get_package_revisions_references(ref, True)
@@ -61,11 +59,9 @@ def remove_build_id(self, pref):
         self._packages.remove_build_id(pref)
 
     def get_matching_build_id(self, ref, build_id):
-        # TODO: This can also be done in a single query in DB
-        for d in self._packages.get_package_references(ref):
-            existing_build_id = d["build_id"]
-            if existing_build_id == build_id:
-                return d["pref"]
+        result = self._packages.get_package_references_with_build_id_match(ref, build_id)
+        if result:
+            return result["pref"]
         return None
 
     def get_recipe(self, ref: RecipeReference):

conan/internal/cache/db/packages_table.py

@@ -171,6 +171,22 @@ def get_package_revisions_references(self, pref: PkgReference, only_latest_prev=
             for row in r.fetchall():
                 yield self._as_dict(self.row_type(*row))
 
+    def get_package_revisions_reference_exists(self, pref: PkgReference):
+        assert pref.ref.revision, "To check package revision existence you must provide a recipe revision."
+        assert pref.package_id, "To check package revisions existence you must provide a package id."
+        check_prev = f"AND {self.columns.prev} = '{pref.revision}' " if pref.revision else ""
+        query = f'SELECT 1 FROM {self.table_name} ' \
+                f"WHERE {self.columns.rrev} = '{pref.ref.revision}' " \
+                f"AND {self.columns.reference} = '{str(pref.ref)}' " \
+                f"AND {self.columns.pkgid} = '{pref.package_id}' " \
+                f'{check_prev} ' \
+                f'AND {self.columns.prev} IS NOT NULL ' \
+                'LIMIT 1 '
+        with self.db_connection() as conn:
+            r = conn.execute(query)
+            row = r.fetchone()
+            return bool(row)
+
     def get_package_references(self, ref: RecipeReference, only_latest_prev=True):
         # Return the latest revisions
         assert ref.revision, "To search for package id's you must provide a recipe revision."
@@ -198,3 +214,28 @@ def get_package_references(self, ref: RecipeReference, only_latest_prev=True):
             r = conn.execute(query)
             for row in r.fetchall():
                 yield self._as_dict(self.row_type(*row))
+
+    def get_package_references_with_build_id_match(self, ref: RecipeReference, build_id):
+        # Return the latest revisions
+        assert ref.revision, "To search for package id's you must provide a recipe revision."
+        # we select the latest prev for each package_id
+        query = f'SELECT {self.columns.reference}, ' \
+                f'{self.columns.rrev}, ' \
+                f'{self.columns.pkgid}, ' \
+                f'{self.columns.prev}, ' \
+                f'{self.columns.path}, ' \
+                f'MAX({self.columns.timestamp}), ' \
+                f'{self.columns.build_id}, ' \
+                f'{self.columns.lru} ' \
+                f'FROM {self.table_name} ' \
+                f"WHERE {self.columns.rrev} = '{ref.revision}' " \
+                f"AND {self.columns.reference} = '{str(ref)}' " \
+                f"AND {self.columns.build_id} = '{build_id}' " \
+                f'GROUP BY {self.columns.pkgid} '
+
+        with self.db_connection() as conn:
+            r = conn.execute(query)
+            row = r.fetchone()
+            if row:
+                return self._as_dict(self.row_type(*row))
+            return None