Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename fields in OrderedMergeIterator (#3149) 

* code readable

* fix the pre middle manager peon no stop

* Revert "fix the pre middle manager peon no stop"

This reverts commit 6cef4980bf.
This commit is contained in:
jianran 2016-08-12 00:42:12 +08:00 committed by Fangjin Yang
parent 2f46effc8e
commit 18af480017
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
common/src/main/java/io/druid/collections/OrderedMergeIterator.java
View File

@ -45,7 +45,7 @@ import java.util.PriorityQueue;
*/
public class OrderedMergeIterator<T> implements Iterator<T>
{
private final PriorityQueue<PeekingIterator<T>> pQueue;
private final PriorityQueue<PeekingIterator<T>> firstElementComparedPQueue;
private PeekingIterator<PeekingIterator<T>> iterOfIterators;
private final Comparator<T> comparator;
@ -56,7 +56,7 @@ public class OrderedMergeIterator<T> implements Iterator<T>
)
{
this.comparator = comparator;
pQueue = new PriorityQueue<PeekingIterator<T>>(
firstElementComparedPQueue = new PriorityQueue<PeekingIterator<T>>(
16,
new Comparator<PeekingIterator<T>>()
{
@ -96,7 +96,7 @@ public class OrderedMergeIterator<T> implements Iterator<T>
@Override
public boolean hasNext()
{
return !pQueue.isEmpty() || iterOfIterators.hasNext();
return !firstElementComparedPQueue.isEmpty() || iterOfIterators.hasNext();
}
@Override
@ -106,26 +106,26 @@ public class OrderedMergeIterator<T> implements Iterator<T>
throw new NoSuchElementException();
}
final PeekingIterator<T> it;
final PeekingIterator<T> littleIt;
if (!iterOfIterators.hasNext()) {
it = pQueue.remove();
} else if (pQueue.isEmpty()) {
it = iterOfIterators.next();
littleIt = firstElementComparedPQueue.remove();
} else if (firstElementComparedPQueue.isEmpty()) {
littleIt = iterOfIterators.next();
} else {
T pQueueValue = pQueue.peek().peek();
T pQueueValue = firstElementComparedPQueue.peek().peek();
T iterItersValue = iterOfIterators.peek().peek();
if (comparator.compare(pQueueValue, iterItersValue) <= 0) {
it = pQueue.remove();
littleIt = firstElementComparedPQueue.remove();
} else {
it = iterOfIterators.next();
littleIt = iterOfIterators.next();
}
}
T retVal = it.next();
T retVal = littleIt.next();
if (it.hasNext()) {
pQueue.add(it);
if (littleIt.hasNext()) {
firstElementComparedPQueue.add(littleIt);
}
return retVal;