svn commit: r1588580 - in /lucene/dev/trunk/solr: CHANGES.txt core/src/java/org/apache/solr/handler/component/QueryComponent.java core/src/java/org/apache/solr/handler/component/ShardDoc.java

[rj...@apache.org]

Author: rjernst
Date: Fri Apr 18 22:10:26 2014
New Revision: 1588580

URL: http://svn.apache.org/r1588580
Log:
SOLR-5974: Remove ShardDoc.score and use parent's ScoreDoc.score

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/ShardDoc.java

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1588580&r1=1588579&r2=1588580&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Apr 18 22:10:26 2014
@@ -122,6 +122,9 @@ Other Changes
 * SOLR-3862: Add remove" as update option for atomically removing a value 
   from a multivalued field (Jim Musli, Steven Bower, Alaknantha via Erick Erickson) 
 
+* SOLR-5974: Remove ShardDoc.score and use parent's ScoreDoc.score.
+  (Tomás Fernández Löbbe via Ryan Ernst)
+
 ==================  4.8.0 ==================
 
 Versions of Major Components

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java?rev=1588580&r1=1588579&r2=1588580&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java Fri Apr 18 22:10:26 2014
@@ -1025,7 +1025,6 @@ public class QueryComponent extends Sear
     List<Object> nextCursorMarkValues = new ArrayList<>(sortFields.length);
     for (SortField sf : sortFields) {
       if (sf.getType().equals(SortField.Type.SCORE)) {
-        assert null != lastDoc.score : "lastDoc has null score";
         nextCursorMarkValues.add(lastDoc.score);
       } else {
         assert null != sf.getField() : "SortField has null field";
@@ -1152,7 +1151,7 @@ public class QueryComponent extends Sear
           Object id = doc.getFieldValue(keyFieldName);
           ShardDoc sdoc = rb.resultIds.get(id.toString());
           if (sdoc != null) {
-            if (returnScores && sdoc.score != null) {
+            if (returnScores) {
               doc.setField("score", sdoc.score);
             }
             if (removeKeyField) {

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/ShardDoc.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/ShardDoc.java?rev=1588580&r1=1588579&r2=1588580&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/ShardDoc.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/ShardDoc.java Fri Apr 18 22:10:26 2014
@@ -23,7 +23,6 @@ import org.apache.lucene.search.SortFiel
 import org.apache.lucene.util.PriorityQueue;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.util.NamedList;
-import org.apache.solr.search.SolrIndexSearcher;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -45,8 +44,6 @@ public class ShardDoc extends FieldDoc {
     // this is currently the uniqueKeyField but
     // may be replaced with internal docid in a future release.
 
-  Float score;
-
   NamedList sortFieldValues;
   // sort field values for *all* docs in a particular shard.
   // this doc's values are in position orderInShard