You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2023/04/27 14:13:00 UTC
[iotdb] branch removeBugMaster created (now b6c1068ee6)
This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a change to branch removeBugMaster
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at b6c1068ee6 fix bug
This branch includes the following new commits:
new b6c1068ee6 fix bug
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: fix bug
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a commit to branch removeBugMaster
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit b6c1068ee6318128e2f21d87a5c0188afda6ecf9
Author: Alima777 <wx...@gmail.com>
AuthorDate: Thu Apr 27 22:08:51 2023 +0800
fix bug
---
.../iotdb/db/mpp/execution/schedule/queue/IndexedBlockingQueue.java | 1 +
.../schedule/queue/multilevelqueue/MultilevelPriorityQueue.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/queue/IndexedBlockingQueue.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/queue/IndexedBlockingQueue.java
index 6fdcbb0392..d219571b44 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/queue/IndexedBlockingQueue.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/queue/IndexedBlockingQueue.java
@@ -104,6 +104,7 @@ public abstract class IndexedBlockingQueue<E extends IDIndexedAccessible> {
return null;
}
size--;
+ Preconditions.checkState(size >= 0, "The size of readyQueue cannot be negative.");
return output;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/queue/multilevelqueue/MultilevelPriorityQueue.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/queue/multilevelqueue/MultilevelPriorityQueue.java
index 2c5bc41fa1..529dd95cfb 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/queue/multilevelqueue/MultilevelPriorityQueue.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/queue/multilevelqueue/MultilevelPriorityQueue.java
@@ -157,10 +157,10 @@ public class MultilevelPriorityQueue extends IndexedBlockingReserveQueue<DriverT
checkArgument(driverTask != null, "driverTask is null");
for (PriorityQueue<DriverTask> level : levelWaitingSplits) {
if (level.remove(driverTask)) {
- break;
+ return driverTask;
}
}
- return driverTask;
+ return null;
}
@Override