-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Specialize DisiPriorityQueue for the 2-clauses case. #14070
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
19f1b88
Specialize DisiPriorityQueue for the 2-clauses case.
jpountz 40def5a
Fail when trying to add more than 2 entries.
jpountz d63f3bb
tidy
jpountz 53e0861
Merge branch 'main' into specialize_disi_pq_2_clauses
jpountz f9101cd
review feedback
jpountz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
110 changes: 110 additions & 0 deletions
110
lucene/core/src/java/org/apache/lucene/search/DisiPriorityQueue2.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,110 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.apache.lucene.search; | ||
|
||
import java.util.Arrays; | ||
import java.util.Collections; | ||
import java.util.Iterator; | ||
|
||
/** {@link DisiPriorityQueue} of two entries or less. */ | ||
final class DisiPriorityQueue2 extends DisiPriorityQueue { | ||
|
||
private DisiWrapper top, top2; | ||
|
||
@Override | ||
public Iterator<DisiWrapper> iterator() { | ||
if (top2 != null) { | ||
return Arrays.asList(top, top2).iterator(); | ||
} else if (top != null) { | ||
return Collections.singleton(top).iterator(); | ||
} else { | ||
return Collections.emptyIterator(); | ||
} | ||
} | ||
|
||
@Override | ||
public int size() { | ||
return top2 == null ? (top == null ? 0 : 1) : 2; | ||
} | ||
|
||
@Override | ||
public DisiWrapper top() { | ||
return top; | ||
} | ||
|
||
@Override | ||
public DisiWrapper top2() { | ||
return top2; | ||
} | ||
|
||
@Override | ||
public DisiWrapper topList() { | ||
DisiWrapper topList = null; | ||
if (top != null) { | ||
top.next = null; | ||
topList = top; | ||
if (top2 != null && top.doc == top2.doc) { | ||
top2.next = topList; | ||
topList = top2; | ||
} | ||
} | ||
return topList; | ||
} | ||
|
||
@Override | ||
public DisiWrapper add(DisiWrapper entry) { | ||
if (top == null) { | ||
return top = entry; | ||
} else if (top2 == null) { | ||
top2 = entry; | ||
return updateTop(); | ||
} else { | ||
throw new IllegalStateException( | ||
"Trying to add a 3rd element to a DisiPriorityQueue configured with a max size of 2"); | ||
} | ||
} | ||
|
||
@Override | ||
public DisiWrapper pop() { | ||
DisiWrapper ret = top; | ||
top = top2; | ||
top2 = null; | ||
return ret; | ||
} | ||
|
||
@Override | ||
public DisiWrapper updateTop() { | ||
if (top2 != null && top2.doc < top.doc) { | ||
DisiWrapper tmp = top; | ||
top = top2; | ||
top2 = tmp; | ||
} | ||
return top; | ||
} | ||
|
||
@Override | ||
DisiWrapper updateTop(DisiWrapper topReplacement) { | ||
top = topReplacement; | ||
return updateTop(); | ||
} | ||
|
||
@Override | ||
public void clear() { | ||
top = null; | ||
top2 = null; | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.