You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2015/11/03 15:30:14 UTC
svn commit: r1712299 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/CHANGES.txt lucene/core/
lucene/core/src/java/org/apache/lucene/search/TopDocs.java
Author: jpountz
Date: Tue Nov 3 14:30:14 2015
New Revision: 1712299
URL: http://svn.apache.org/viewvc?rev=1712299&view=rev
Log:
LUCENE-6878: Speed up TopDocs.merge.
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/lucene/core/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/TopDocs.java
Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1712299&r1=1712298&r2=1712299&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Tue Nov 3 14:30:14 2015
@@ -100,6 +100,8 @@ Optimizations
addresses for BINARY fields are now stored on disk instead of in memory.
(Adrien Grand)
+* LUCENE-6878: Speed up TopDocs.merge. (Daniel Jelinski via Adrien Grand)
+
Bug Fixes
* LUCENE-6817: ComplexPhraseQueryParser.ComplexPhraseQuery does not display
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/TopDocs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/TopDocs.java?rev=1712299&r1=1712298&r2=1712299&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/TopDocs.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/TopDocs.java Tue Nov 3 14:30:14 2015
@@ -272,7 +272,7 @@ public class TopDocs {
int hitUpto = 0;
while (hitUpto < numIterOnHits) {
assert queue.size() > 0;
- ShardRef ref = queue.pop();
+ ShardRef ref = queue.top();
final ScoreDoc hit = shardHits[ref.shardIndex].scoreDocs[ref.hitIndex++];
hit.shardIndex = ref.shardIndex;
if (hitUpto >= start) {
@@ -286,7 +286,9 @@ public class TopDocs {
if (ref.hitIndex < shardHits[ref.shardIndex].scoreDocs.length) {
// Not done with this these TopDocs yet:
- queue.add(ref);
+ queue.updateTop();
+ } else {
+ queue.pop();
}
}
}