You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2013/04/22 16:08:11 UTC
svn commit: r1470523 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java
Author: yonik
Date: Mon Apr 22 14:08:10 2013
New Revision: 1470523
URL: http://svn.apache.org/r1470523
Log:
SOLR-4746: fix JSON output for distributed grouping top level
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1470523&r1=1470522&r2=1470523&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Mon Apr 22 14:08:10 2013
@@ -231,6 +231,11 @@ Bug Fixes
* SOLR-4716,SOLR-4584: SolrCloud request proxying does not work on Tomcat and
perhaps other non Jetty containers. (Po Rui, Yago Riveiro via Mark Miller)
+* SOLR-4746: Distributed grouping used a NamedList instead of a SimpleOrderedMap
+ for the top level group commands, causing output formatting differences
+ compared to non-distributed grouping. (yonik)
+
+
Optimizations
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java?rev=1470523&r1=1470522&r2=1470523&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java Mon Apr 22 14:08:10 2013
@@ -50,7 +50,7 @@ public class GroupedEndResultTransformer
*/
@Override
public void transform(Map<String, ?> result, ResponseBuilder rb, SolrDocumentSource solrDocumentSource) {
- NamedList<Object> commands = new NamedList<Object>();
+ NamedList<Object> commands = new SimpleOrderedMap<Object>();
for (Map.Entry<String, ?> entry : result.entrySet()) {
Object value = entry.getValue();
if (TopGroups.class.isInstance(value)) {