From 51aa6e6875863b443602e7ed4fd2c299235ecac9 Mon Sep 17 00:00:00 2001 From: Tri Duong Date: Sat, 14 Nov 2026 14:00:42 +0700 Subject: [PATCH] INTEG-6317: Update to use iterative polling (while loop) instead of recursion cursor --- CHANGELOG.rst | 5 +++++ tdclient/cursor.py | 15 +++++++-------- tdclient/test/cursor_test.py | 22 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1cb399f..0af9950 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,11 @@ Version History =============== +v1.8.8 (2026-11-16) +-------------------- + +* Fix ``RecursionError`` in ``Cursor._do_execute()`` for long-running jobs by polling iteratively instead of recursively + v1.7.0 (2026-01-29) -------------------- diff --git a/tdclient/cursor.py b/tdclient/cursor.py index 03792ec..6551d90 100644 --- a/tdclient/cursor.py +++ b/tdclient/cursor.py @@ -75,7 +75,8 @@ def _check_executed(self) -> None: def _do_execute(self) -> None: self._check_executed() assert self._executed is not None - if self._rows is None: + # Poll iteratively (not recursively) so long-running jobs cannot exceed Python's recursion limit. + while self._rows is None: status = self._api.job_status(self._executed) if status == "success": self._rows = self._api.job_result(self._executed) @@ -85,14 +86,12 @@ def _do_execute(self) -> None: self._description = self._result_description( job.get("hive_result_schema", []) ) + elif status in ["error", "killed"]: + raise errors.InternalError(f"job error: {self._executed}: {status}") else: - if status in ["error", "killed"]: - raise errors.InternalError(f"job error: {self._executed}: {status}") - else: - time.sleep(self.wait_interval) - if callable(self.wait_callback): - self.wait_callback(self) - return self._do_execute() + time.sleep(self.wait_interval) + if callable(self.wait_callback): + self.wait_callback(self) def _result_description( self, result_schema: list[Any] | None diff --git a/tdclient/test/cursor_test.py b/tdclient/test/cursor_test.py index f2c61e0..2aa264e 100644 --- a/tdclient/test/cursor_test.py +++ b/tdclient/test/cursor_test.py @@ -230,3 +230,25 @@ def test_cursor_setoutputsize(): td = cursor.Cursor(mock.MagicMock()) with pytest.raises(errors.NotSupportedError) as error: td.setoutputsize(42) + + +def test_do_execute_wait_exceeds_recursion_limit(): + # Polling must be iterative: many polls must not hit RecursionError. + import sys + + polls = sys.getrecursionlimit() * 2 + td = cursor.Cursor( + mock.MagicMock(), + db="sample_datasets", + wait_interval=5, + wait_callback=mock.MagicMock(), + ) + td._executed = "42" + td.api.job_status = mock.MagicMock(side_effect=["running"] * polls + ["success"]) + td.api.job_result = mock.MagicMock(return_value=[["foo", 1]]) + td.api.show_job = mock.MagicMock(return_value={"hive_result_schema": []}) + with mock.patch("time.sleep") as t_sleep: + td._do_execute() + assert t_sleep.call_count == polls + assert td.wait_callback.call_count == polls + assert td._rowcount == 1