You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/03/30 17:25:40 UTC
[71/73] [abbrv] lucene-solr:jira/solr-6203: Merge branch 'master'
into jira/solr-6203
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/770265fb/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
index d3daee1,83c81e5..fee7fc4
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
@@@ -155,19 -155,12 +158,19 @@@ public class TopGroupsResultTransforme
return result;
}
- protected ScoreDoc[] transformToNativeShardDoc(List<NamedList<Object>> documents, Sort groupSort, String shard,
+ protected ScoreDoc[] transformToNativeShardDoc(List<NamedList<Object>> documents, SortSpec sortSpec, String shard,
IndexSchema schema) {
ScoreDoc[] scoreDocs = new ScoreDoc[documents.size()];
+
+ final List<SchemaField> schemaFields = sortSpec.getSchemaFields();
+ final SortField[] sortFields = sortSpec.getSort().getSort();
+
+ assert (schemaFields.size() == sortFields.length);
+
+
int j = 0;
for (NamedList<Object> document : documents) {
- Object docId = document.get("id");
+ Object docId = document.get(ID);
if (docId != null) {
docId = docId.toString();
} else {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/770265fb/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
----------------------------------------------------------------------