Merge pull request #233 from opsmill/wvd-20240110-fix-issue-parallel-…

…query fix issue with batch execution of queries not considering filters
opsmill · Jan 13, 2025 · e47a240 · e47a240
2 parents b0f592d + 4947c70
commit e47a240
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/changelog/query-parallel.fixed.md b/changelog/query-parallel.fixed.md
@@ -0,0 +1 @@
+fixes issue where using `parallel` query execution could lead to excessive and unneeded GraphQL queries
diff --git a/infrahub_sdk/client.py b/infrahub_sdk/client.py
@@ -786,7 +786,7 @@ async def process_batch() -> tuple[list[InfrahubNode], list[InfrahubNode]]:
             nodes = []
             related_nodes = []
             batch_process = await self.create_batch()
-            count = await self.count(kind=schema.kind)
+            count = await self.count(kind=schema.kind, **filters)
             total_pages = (count + pagination_size - 1) // pagination_size
 
             for page_number in range(1, total_pages + 1):
@@ -1930,7 +1930,7 @@ def process_batch() -> tuple[list[InfrahubNodeSync], list[InfrahubNodeSync]]:
             related_nodes = []
             batch_process = self.create_batch()
 
-            count = self.count(kind=schema.kind)
+            count = self.count(kind=schema.kind, **filters)
             total_pages = (count + pagination_size - 1) // pagination_size
 
             for page_number in range(1, total_pages + 1):
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		fixes issue where using `parallel` query execution could lead to excessive and unneeded GraphQL queries