From f63db069d5cc616f0e30b7682e5dc05bf1166e2c Mon Sep 17 00:00:00 2001 From: Matthew Ball Date: Fri, 20 Nov 2026 13:48:14 -0800 Subject: [PATCH] fix(pyamber): keep multi-queue priority groups sorted LinkedBlockingMultiQueue.add_sub_queue walked priority_groups to find the slot i where a new group belongs, then appended the group to the end instead of inserting it at i, so the list stayed sorted only when sub-queues were registered in increasing-priority order. get_next and peek iterate priority_groups in list order, so a data channel (priority 1) registered before a control channel (priority 0) was served before control. The new group is now inserted at i, keeping the list sorted regardless of registration order. test_linked_blocking_multi_queue adds a case that registers the lower-priority queue first and asserts the groups are ordered by priority and that the higher-priority item is served first. --- .../linked_blocking_multi_queue.py | 3 ++- .../test_linked_blocking_multi_queue.py | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/amber/src/main/python/core/util/customized_queue/linked_blocking_multi_queue.py b/amber/src/main/python/core/util/customized_queue/linked_blocking_multi_queue.py index 561b1680cf5..f9c9c9dbfec 100644 --- a/amber/src/main/python/core/util/customized_queue/linked_blocking_multi_queue.py +++ b/amber/src/main/python/core/util/customized_queue/linked_blocking_multi_queue.py @@ -420,7 +420,8 @@ def add_sub_queue(self, key: K, priority: int) -> Optional[SubQueue]: elif pg.priority > priority: new_pg = self.PriorityGroup(priority) new_pg.add_queue(sub_queue) - self.priority_groups.append(new_pg) + # Insert before the higher-priority-value group to keep the list sorted. + self.priority_groups.insert(i, new_pg) added = True break diff --git a/amber/src/test/python/core/util/customized_queue/test_linked_blocking_multi_queue.py b/amber/src/test/python/core/util/customized_queue/test_linked_blocking_multi_queue.py index 8096972c1d4..238e5a23d56 100644 --- a/amber/src/test/python/core/util/customized_queue/test_linked_blocking_multi_queue.py +++ b/amber/src/test/python/core/util/customized_queue/test_linked_blocking_multi_queue.py @@ -520,3 +520,17 @@ def test_len_matches_size(self, queue): queue.put("data", 1) queue.put("control", "s") assert len(queue) == queue.size() == 2 + + def test_sub_queues_registered_out_of_priority_order_are_served_by_priority(self): + # Register the lower-priority (higher number) queue first; priority must still win. + lbmq = LinkedBlockingMultiQueue() + lbmq.add_sub_queue("data", 1) + lbmq.add_sub_queue("control", 0) + assert [pg.priority for pg in lbmq.sub_queue_selection.priority_groups] == [ + 0, + 1, + ] + lbmq.put("data", "d") + lbmq.put("control", "c") + assert lbmq.get() == "c" + assert lbmq.get() == "d"