You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by to...@apache.org on 2012/12/13 10:24:30 UTC
svn commit: r1421164 -
/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
Author: tommaso
Date: Thu Dec 13 09:24:29 2012
New Revision: 1421164
URL: http://svn.apache.org/viewvc?rev=1421164&view=rev
Log:
[SOLR-4150] - added null checks (with log warnings in case of null) to TopGroupsResultTransformer#transformToNative
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java?rev=1421164&r1=1421163&r2=1421164&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java Thu Dec 13 09:24:29 2012
@@ -17,7 +17,6 @@ package org.apache.solr.search.grouping.
* limitations under the License.
*/
-import org.apache.lucene.document.Document;
import org.apache.lucene.document.DocumentStoredFieldVisitor;
import org.apache.lucene.index.StoredDocument;
import org.apache.lucene.search.FieldDoc;
@@ -38,6 +37,8 @@ import org.apache.solr.search.grouping.C
import org.apache.solr.search.grouping.distributed.command.QueryCommand;
import org.apache.solr.search.grouping.distributed.command.QueryCommandResult;
import org.apache.solr.search.grouping.distributed.command.TopGroupsFieldCommand;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.ArrayList;
@@ -53,6 +54,8 @@ public class TopGroupsResultTransformer
private final ResponseBuilder rb;
+ private static final Logger log = LoggerFactory.getLogger(TopGroupsResultTransformer.class);
+
public TopGroupsResultTransformer(ResponseBuilder rb) {
this.rb = rb;
}
@@ -105,12 +108,24 @@ public class TopGroupsResultTransformer
ScoreDoc[] scoreDocs = new ScoreDoc[documents.size()];
int j = 0;
for (NamedList<Object> document : documents) {
- Object uniqueId = document.get("id").toString();
+ Object docId = document.get("id");
+ Object uniqueId = null;
+ if (docId != null)
+ uniqueId = docId.toString();
+ else
+ log.warn("doc {} has null 'id'", document);
Float score = (Float) document.get("score");
if (score == null) {
score = Float.NaN;
}
- Object[] sortValues = ((List) document.get("sortValues")).toArray();
+ Object[] sortValues = null;
+ Object sortValuesVal = document.get("sortValues");
+ if (sortValuesVal != null) {
+ sortValues = ((List) sortValuesVal).toArray();
+ }
+ else {
+ log.warn("doc {} has null 'sortValues'", document);
+ }
scoreDocs[j++] = new ShardDoc(score, sortValues, uniqueId, shard);
}
result.put(key, new QueryCommandResult(new TopDocs(totalHits, scoreDocs, maxScore), matches));