You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jb...@apache.org on 2013/12/21 06:24:50 UTC

svn commit: r1552875 - in /lucene/dev/branches/lucene_solr_4_6: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java

Author: jbernste
Date: Sat Dec 21 05:24:49 2013
New Revision: 1552875

URL: http://svn.apache.org/r1552875
Log:
SOLR-5408: CollapsingQParserPlugin scores incorrectly when multiple sort criteria are used

Modified:
    lucene/dev/branches/lucene_solr_4_6/   (props changed)
    lucene/dev/branches/lucene_solr_4_6/solr/   (props changed)
    lucene/dev/branches/lucene_solr_4_6/solr/core/   (props changed)
    lucene/dev/branches/lucene_solr_4_6/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java

Modified: lucene/dev/branches/lucene_solr_4_6/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_6/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java?rev=1552875&r1=1552874&r2=1552875&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_6/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java (original)
+++ lucene/dev/branches/lucene_solr_4_6/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java Sat Dec 21 05:24:49 2013
@@ -317,6 +317,7 @@ public class CollapsingQParserPlugin ext
   private class DummyScorer extends Scorer {
 
     public float score;
+    public int docId;
 
     public DummyScorer() {
       super(null);
@@ -339,7 +340,7 @@ public class CollapsingQParserPlugin ext
     }
 
     public int docID() {
-      return 0;
+      return docId;
     }
 
     public long cost() {
@@ -474,6 +475,7 @@ public class CollapsingQParserPlugin ext
         }
 
         int contextDoc = docId-currentDocBase;
+        dummy.docId = contextDoc;
         delegate.collect(contextDoc);
       }
 
@@ -587,6 +589,7 @@ public class CollapsingQParserPlugin ext
         }
 
         int contextDoc = docId-currentDocBase;
+        dummy.docId = contextDoc;
         delegate.collect(contextDoc);
       }