From f6754a6b47c3980160fa78b990fbcf31eb788390 Mon Sep 17 00:00:00 2001 From: SuperRobin <106210907+xs1997zju@users.noreply.github.com> Date: Wed, 4 Nov 2026 08:25:34 +0000 Subject: [PATCH 1/2] [Fix] Avoid recursion limits in rollout trace trie traversal --- tests/rl/test_trace_store.py | 36 +++++++++++++++++++++++++++++ xtuner/v1/rl/rollout/trace_store.py | 29 ++++++++++++----------- 2 files changed, 51 insertions(+), 14 deletions(-) diff --git a/tests/rl/test_trace_store.py b/tests/rl/test_trace_store.py index 51ad063362..f15de8d610 100644 --- a/tests/rl/test_trace_store.py +++ b/tests/rl/test_trace_store.py @@ -8,6 +8,7 @@ from xtuner.v1.rl.rollout import trace_store as trace_store_module from xtuner.v1.rl.rollout.trace_store import ( RolloutTraceStore, + Trie, _free_ray_refs, get_existing_store, release_and_discard_rollout_groups, @@ -15,6 +16,41 @@ ) +class TestDeepTrie(unittest.TestCase): + def test_long_conversation_keys_and_release(self) -> None: + trie = Trie() + count = 1600 + for index in range(1, count + 1): + trie.insert("x" * index, index) + self.assertEqual(trie.keys(), ["x" * index for index in range(1, count + 1)]) + with patch.object(trace_store_module, "_free_ray_refs") as free: + trie.release() + self.assertEqual(free.call_count, count) + self.assertEqual([call.args[0] for call in free.call_args_list], list(range(count, 0, -1))) + self.assertEqual(trie.keys(), []) + trie.release() + + def test_partial_release_preserves_branch_values_and_key_order(self) -> None: + trie = Trie() + for key in ("a", "ab", "abc", "ax", "z"): + trie.insert(key, key) + self.assertEqual(trie.keys(), ["a", "ab", "abc", "ax", "z"]) + with patch.object(trace_store_module, "_free_ray_refs") as free: + trie.release("ab") + free.assert_called_once_with("ab") + self.assertEqual(trie.keys(), ["a", "abc", "ax", "z"]) + with patch.object(trace_store_module, "_free_ray_refs"): + trie.release("abc") + self.assertEqual(trie.keys(), ["a", "ax", "z"]) + self.assertNotIn("b", trie.root.children["a"].children) + with patch.object(trace_store_module, "_free_ray_refs") as free: + trie.release() + self.assertEqual([call.args[0] for call in free.call_args_list], ["ax", "a", "z"]) + self.assertEqual(trie.keys(), []) + trie.insert("new", "new") + self.assertEqual(trie.keys(), ["new"]) + + class TestRolloutTraceCleanup(unittest.TestCase): def test_release_and_discard_detaches_only_trace_owned_refs(self): trace_owned_ref = object() diff --git a/xtuner/v1/rl/rollout/trace_store.py b/xtuner/v1/rl/rollout/trace_store.py index 36ba406e0a..62e2dcec76 100644 --- a/xtuner/v1/rl/rollout/trace_store.py +++ b/xtuner/v1/rl/rollout/trace_store.py @@ -141,13 +141,12 @@ def keys(self) -> List[str]: """Get all keys (i.e., strings) stored in the Trie.""" result = [] - def _collect(node: TreeNode, path: List[str]): + stack: List[Tuple[TreeNode, Tuple[str, ...]]] = [(self.root, ())] + while stack: + node, path = stack.pop() if node.value is not None: result.append("".join(path)) - for token, child in node.children.items(): - _collect(child, path + [token]) - - _collect(self.root, []) + stack.extend((child, (*path, token)) for token, child in reversed(list(node.children.items()))) return result def insert(self, key: str, value: Any) -> None: @@ -220,16 +219,18 @@ def release(self, key: str | None = None): If None, releases the entire tree. """ - def _free_subtree(node: TreeNode): - for child in node.children.values(): - _free_subtree(child) - if node.value is not None: - _free_ray_refs(node.value) - node.value = None - node.children.clear() - if key is None: - _free_subtree(self.root) + stack = [(self.root, False)] + while stack: + node, visited = stack.pop() + if visited: + if node.value is not None: + _free_ray_refs(node.value) + node.value = None + node.children.clear() + else: + stack.append((node, True)) + stack.extend((child, False) for child in reversed(list(node.children.values()))) return node = self.root From 8c7b266dfc996c9700b3826524da24e60fb87328 Mon Sep 17 00:00:00 2001 From: SuperRobin <106210907+xs1997zju@users.noreply.github.com> Date: Wed, 4 Nov 2026 08:31:39 +0000 Subject: [PATCH 2/2] [Fix] Simplify trie key traversal and cover root values --- tests/rl/test_trace_store.py | 13 ++++++++----- xtuner/v1/rl/rollout/trace_store.py | 6 +++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/tests/rl/test_trace_store.py b/tests/rl/test_trace_store.py index f15de8d610..38cd204f48 100644 --- a/tests/rl/test_trace_store.py +++ b/tests/rl/test_trace_store.py @@ -28,24 +28,27 @@ def test_long_conversation_keys_and_release(self) -> None: self.assertEqual(free.call_count, count) self.assertEqual([call.args[0] for call in free.call_args_list], list(range(count, 0, -1))) self.assertEqual(trie.keys(), []) + self.assertEqual(trie.root.children, {}) trie.release() def test_partial_release_preserves_branch_values_and_key_order(self) -> None: trie = Trie() - for key in ("a", "ab", "abc", "ax", "z"): + self.assertEqual(trie.keys(), []) + trie.release() + for key in ("z", "", "a", "ab", "abc", "ax"): trie.insert(key, key) - self.assertEqual(trie.keys(), ["a", "ab", "abc", "ax", "z"]) + self.assertEqual(trie.keys(), ["", "z", "a", "ab", "abc", "ax"]) with patch.object(trace_store_module, "_free_ray_refs") as free: trie.release("ab") free.assert_called_once_with("ab") - self.assertEqual(trie.keys(), ["a", "abc", "ax", "z"]) + self.assertEqual(trie.keys(), ["", "z", "a", "abc", "ax"]) with patch.object(trace_store_module, "_free_ray_refs"): trie.release("abc") - self.assertEqual(trie.keys(), ["a", "ax", "z"]) + self.assertEqual(trie.keys(), ["", "z", "a", "ax"]) self.assertNotIn("b", trie.root.children["a"].children) with patch.object(trace_store_module, "_free_ray_refs") as free: trie.release() - self.assertEqual([call.args[0] for call in free.call_args_list], ["ax", "a", "z"]) + self.assertEqual([call.args[0] for call in free.call_args_list], ["z", "ax", "a", ""]) self.assertEqual(trie.keys(), []) trie.insert("new", "new") self.assertEqual(trie.keys(), ["new"]) diff --git a/xtuner/v1/rl/rollout/trace_store.py b/xtuner/v1/rl/rollout/trace_store.py index 62e2dcec76..66aa0916d1 100644 --- a/xtuner/v1/rl/rollout/trace_store.py +++ b/xtuner/v1/rl/rollout/trace_store.py @@ -141,12 +141,12 @@ def keys(self) -> List[str]: """Get all keys (i.e., strings) stored in the Trie.""" result = [] - stack: List[Tuple[TreeNode, Tuple[str, ...]]] = [(self.root, ())] + stack: List[Tuple[TreeNode, str]] = [(self.root, "")] while stack: node, path = stack.pop() if node.value is not None: - result.append("".join(path)) - stack.extend((child, (*path, token)) for token, child in reversed(list(node.children.items()))) + result.append(path) + stack.extend((child, path + token) for token, child in reversed(list(node.children.items()))) return result def insert(self, key: str, value: Any) -> None: