Skip to content

Commit 7b0df3a

Browse files
committed
cherry-pick ES size param fix from develop into prerelease branch
1 parent c8642f8 commit 7b0df3a

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

swirl/connectors/elastic.py

+11-2
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,10 @@ def construct_query(self):
6767
self.error(f"elastic_query unexpectedly blank")
6868

6969
self.query_to_provider = elastic_query
70+
logger.debug(f"Constructed query_to_provider: {self.query_to_provider}")
7071
return
7172

72-
def execute_search(self, session=None):
73+
def execute_search(self, size, session=None):
7374

7475
logger.debug(f"{self}: execute_search()")
7576

@@ -129,10 +130,18 @@ def execute_search(self, session=None):
129130
else:
130131
self.status = "ERR_NO_QUERY_SPECIFIED"
131132
return
133+
134+
# Extract size (int) - Optional
135+
size_pattern = r"size=(\d+)"
136+
match = re.search(size_pattern, self.query_to_provider)
137+
if match:
138+
size = int(match.group(1))
139+
else:
140+
size = 10 # Default size if not specified
132141

133142
response = None
134143
try:
135-
response = es.search(index=index, query=query)
144+
response = es.search(index=index, query=query, size=size)
136145
except ConnectionError as err:
137146
self.error(f"es.search reports: {err}")
138147
except NotFoundError:

0 commit comments

Comments
 (0)