This is an automated email from the ASF dual-hosted git repository.

Caideyipi pushed a commit to branch 
codex/stabilize-query-cancellation-ut-20261102
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit a717a68912d5e04d9ab94fbe4ee46ab63dd49fb0
Author: Caideyipi <[email protected]>
AuthorDate: Mon Nov 2 15:29:15 2026 +0800

    Stabilize blocked priority queue unit tests
---
 .../schedule/queue/L2PriorityQueueTest.java        | 41 +++++++++-------------
 .../queue/MultilevelPriorityQueueTest.java         | 38 +++++++-------------
 2 files changed, 28 insertions(+), 51 deletions(-)

diff --git 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/L2PriorityQueueTest.java
 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/L2PriorityQueueTest.java
index 537358d9a49..7809c75c288 100644
--- 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/L2PriorityQueueTest.java
+++ 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/L2PriorityQueueTest.java
@@ -23,8 +23,7 @@ import 
org.apache.iotdb.calc.execution.schedule.queue.IndexedBlockingQueue;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeUnit;
 
 import static org.awaitility.Awaitility.await;
@@ -32,7 +31,7 @@ import static org.junit.Assert.fail;
 
 public class L2PriorityQueueTest {
   @Test
-  public void testPollBlocked() throws InterruptedException {
+  public void testPollBlocked() throws Exception {
     IndexedBlockingQueue<QueueElement> queue =
         new L2PriorityQueue<>(
             10,
@@ -43,29 +42,21 @@ public class L2PriorityQueueTest {
               return Integer.compare(o1.getValue(), o2.getValue());
             },
             new QueueElement(new QueueElement.QueueElementID(0), 0));
-    List<QueueElement> res = new ArrayList<>();
-    Thread t1 =
-        new Thread(
-            () -> {
-              try {
-                QueueElement e = queue.poll();
-                res.add(e);
-              } catch (InterruptedException e) {
-                e.printStackTrace();
-                fail();
-              }
-            });
+    FutureTask<QueueElement> result = new FutureTask<>(queue::poll);
+    Thread t1 = new Thread(result);
     t1.start();
-    await()
-        .atMost(1, TimeUnit.MINUTES)
-        .untilAsserted(() -> Assert.assertEquals(Thread.State.WAITING, 
t1.getState()));
-    QueueElement e2 = new QueueElement(new QueueElement.QueueElementID(1), 1);
-    queue.push(e2);
-    await()
-        .atMost(1, TimeUnit.MINUTES)
-        .untilAsserted(() -> Assert.assertEquals(Thread.State.TERMINATED, 
t1.getState()));
-    Assert.assertEquals(1, res.size());
-    Assert.assertEquals(e2.getDriverTaskId().toString(), 
res.get(0).getDriverTaskId().toString());
+    try {
+      await()
+          .atMost(10, TimeUnit.SECONDS)
+          .untilAsserted(() -> Assert.assertEquals(Thread.State.WAITING, 
t1.getState()));
+      QueueElement e2 = new QueueElement(new QueueElement.QueueElementID(1), 
1);
+      queue.push(e2);
+      Assert.assertSame(e2, result.get(10, TimeUnit.SECONDS));
+    } finally {
+      t1.interrupt();
+      t1.join(TimeUnit.SECONDS.toMillis(10));
+      Assert.assertFalse(t1.isAlive());
+    }
   }
 
   @Test
diff --git 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/MultilevelPriorityQueueTest.java
 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/MultilevelPriorityQueueTest.java
index 42bb75a2dc5..87f9a8db73e 100644
--- 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/MultilevelPriorityQueueTest.java
+++ 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/schedule/queue/MultilevelPriorityQueueTest.java
@@ -35,44 +35,30 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.OptionalInt;
+import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeUnit;
 
 import static org.awaitility.Awaitility.await;
 
 public class MultilevelPriorityQueueTest {
   @Test
-  public void testPollBlocked() {
+  public void testPollBlocked() throws Exception {
+    IndexedBlockingQueue<DriverTask> queue = new MultilevelPriorityQueue(2, 
1000, new DriverTask());
+    FutureTask<DriverTask> result = new FutureTask<>(queue::poll);
+    Thread t1 = new Thread(result);
+    t1.start();
     try {
-      IndexedBlockingQueue<DriverTask> queue =
-          new MultilevelPriorityQueue(2, 1000, new DriverTask());
-      List<DriverTask> res = new ArrayList<>();
-      Thread t1 =
-          new Thread(
-              () -> {
-                try {
-                  DriverTask e = queue.poll();
-                  res.add(e);
-                } catch (InterruptedException e) {
-                  e.printStackTrace();
-                  Assert.fail();
-                }
-              });
-      t1.start();
       await()
-          .atMost(1, TimeUnit.MINUTES)
+          .atMost(10, TimeUnit.SECONDS)
           .untilAsserted(() -> Assert.assertEquals(Thread.State.WAITING, 
t1.getState()));
       DriverTask e2 = mockDriverTask(mockDriverTaskId(), false);
       queue.push(e2);
-      await()
-          .atMost(1, TimeUnit.MINUTES)
-          .untilAsserted(() -> Assert.assertEquals(Thread.State.TERMINATED, 
t1.getState()));
-      Assert.assertEquals(1, res.size());
-      Assert.assertEquals(e2.getDriverTaskId().toString(), 
res.get(0).getDriverTaskId().toString());
-    } catch (Exception e) {
-      Assert.fail();
+      Assert.assertSame(e2, result.get(10, TimeUnit.SECONDS));
+    } finally {
+      t1.interrupt();
+      t1.join(TimeUnit.SECONDS.toMillis(10));
+      Assert.assertFalse(t1.isAlive());
     }
   }
 

Reply via email to