Exclude total field from Pyxis request's projection

The requests in find_images_by_installed_rpms API are very inefficient, including the `total` field can make the query performance much worse.
qixiang · Sep 18, 2023 · 0ced85a · 0ced85a
1 parent e2f31bd
commit 0ced85a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/freshmaker/pyxis_gql.py b/freshmaker/pyxis_gql.py
@@ -492,7 +492,6 @@ def find_images_by_installed_rpms(
                 ),
                 ds.ContainerImagePaginatedResponse.page,
                 ds.ContainerImagePaginatedResponse.page_size,
-                ds.ContainerImagePaginatedResponse.total,
                 ds.ContainerImagePaginatedResponse.data.select(*self._get_image_projection()),
             )
 
@@ -510,8 +509,8 @@ def find_images_by_installed_rpms(
                 ]
             images.extend(data)
 
-            # If page_size >= total, means all results have been fetched in the first page
-            if result["find_images"]["page_size"] >= result["find_images"]["total"]:
+            # This page has less items than the page size, it's the last page
+            if len(data) < result["find_images"]["page_size"]:
                 break
             page_num += 1
 

diff --git a/freshmaker/pyxis_gql_async.py b/freshmaker/pyxis_gql_async.py
@@ -513,7 +513,6 @@ async def find_images_by_installed_rpms(
                 ),
                 ds.ContainerImagePaginatedResponse.page,
                 ds.ContainerImagePaginatedResponse.page_size,
-                ds.ContainerImagePaginatedResponse.total,
                 ds.ContainerImagePaginatedResponse.data.select(*self._get_image_projection()),
             )
 
@@ -531,8 +530,8 @@ async def find_images_by_installed_rpms(
                 ]
             images.extend(data)
 
-            # If page_size >= total, means all results have been fetched in the first page
-            if result["find_images"]["page_size"] >= result["find_images"]["total"]:  # type: ignore[index]
+            # This page has less items than the page size, it's the last page
+            if len(data) < result["find_images"]["page_size"]:  # type: ignore[index]
                 break
             page_num += 1