lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yo...@apache.org
Subject svn commit: r1470534 - in /lucene/dev/branches/lucene_solr_4_3: ./ dev-tools/ lucene/ lucene/analysis/ lucene/analysis/icu/src/java/org/apache/lucene/collation/ lucene/backwards/ lucene/benchmark/ lucene/classification/ lucene/classification/src/ lucen...
Date Mon, 22 Apr 2013 14:18:38 GMT
Author: yonik
Date: Mon Apr 22 14:18:36 2013
New Revision: 1470534

URL: http://svn.apache.org/r1470534
Log:
SOLR-4746: fix JSON output for distributed grouping top level

Modified:
    lucene/dev/branches/lucene_solr_4_3/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/dev-tools/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/BUILD.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/CHANGES.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/JRE_VERSION_MIGRATION.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/LICENSE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/MIGRATE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/NOTICE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/README.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/SYSTEM_REQUIREMENTS.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/analysis/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java
  (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/backwards/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/benchmark/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/build.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/classification/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/classification/build.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/classification/ivy.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/classification/src/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/codecs/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/common-build.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/core/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
  (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/core/src/test/org/apache/lucene/index/index.40.cfs.zip
  (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/core/src/test/org/apache/lucene/index/index.40.nocfs.zip
  (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.cfs.zip
  (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.nocfs.zip
  (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/core/src/test/org/apache/lucene/search/TestSort.java
  (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/core/src/test/org/apache/lucene/search/TestSortDocValues.java
  (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java
  (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java
  (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java
  (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/demo/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/facet/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/grouping/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/highlighter/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/ivy-settings.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/join/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/licenses/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/memory/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/misc/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/module-build.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/queries/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java
  (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/queryparser/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/sandbox/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/site/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/spatial/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/suggest/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/test-framework/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/lucene/tools/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/LICENSE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/NOTICE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/README.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/SYSTEM_REQUIREMENTS.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/build.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/cloud-dev/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/common-build.xml   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/contrib/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/core/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java
    lucene/dev/branches/lucene_solr_4_3/solr/core/src/test/org/apache/solr/core/TestConfig.java
  (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/example/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/licenses/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/licenses/httpclient-LICENSE-ASL.txt   (props
changed)
    lucene/dev/branches/lucene_solr_4_3/solr/licenses/httpclient-NOTICE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/licenses/httpcore-LICENSE-ASL.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/licenses/httpcore-NOTICE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/licenses/httpmime-LICENSE-ASL.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/licenses/httpmime-NOTICE.txt   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/scripts/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/site/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/solrj/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/test-framework/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/webapp/   (props changed)

Modified: lucene/dev/branches/lucene_solr_4_3/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_3/solr/CHANGES.txt?rev=1470534&r1=1470533&r2=1470534&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_3/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_3/solr/CHANGES.txt Mon Apr 22 14:18:36 2013
@@ -186,6 +186,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/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java?rev=1470534&r1=1470533&r2=1470534&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java
(original)
+++ lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java
Mon Apr 22 14:18:36 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)) {



Mime
View raw message