svn commit: r1603611 - in /lucene/dev/branches/lucene_solr_4_9: ./ solr/ solr/CHANGES.txt solr/core/ solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java

[ro...@apache.org]

Author: romseygeek
Date: Wed Jun 18 19:56:59 2014
New Revision: 1603611

URL: http://svn.apache.org/r1603611
Log:
SOLR-6064: Return DebugComponent track output as JSON object

Modified:
    lucene/dev/branches/lucene_solr_4_9/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/core/   (props changed)
    lucene/dev/branches/lucene_solr_4_9/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java

Modified: lucene/dev/branches/lucene_solr_4_9/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_9/solr/CHANGES.txt?rev=1603611&r1=1603610&r2=1603611&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_9/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_9/solr/CHANGES.txt Wed Jun 18 19:56:59 2014
@@ -78,6 +78,9 @@ New Features
 * SOLR-6125: Allow SolrIndexWriter to close without waiting for merges
   (Christine Poerschke via Alan Woodward)
 
+* SOLR-6064: DebugComponent track output should be returned as a JSON
+  object rather than a list (Christine Poerschke, Alan Woodward)
+
 
 Bug Fixes
 ----------------------

Modified: lucene/dev/branches/lucene_solr_4_9/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_9/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java?rev=1603611&r1=1603610&r2=1603611&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_9/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java (original)
+++ lucene/dev/branches/lucene_solr_4_9/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java Wed Jun 18 19:56:59 2014
@@ -17,7 +17,16 @@
 
 package org.apache.solr.handler.component;
 
-import static org.apache.solr.common.params.CommonParams.FQ;
+import org.apache.lucene.search.Query;
+import org.apache.solr.common.SolrDocumentList;
+import org.apache.solr.common.params.CommonParams;
+import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.common.util.NamedList;
+import org.apache.solr.common.util.SimpleOrderedMap;
+import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.search.DocList;
+import org.apache.solr.search.QueryParsing;
+import org.apache.solr.util.SolrPluginUtils;
 
 import java.io.IOException;
 import java.net.URL;
@@ -32,16 +41,7 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.lucene.search.Query;
-import org.apache.solr.common.SolrDocumentList;
-import org.apache.solr.common.params.CommonParams;
-import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.common.util.NamedList;
-import org.apache.solr.common.util.SimpleOrderedMap;
-import org.apache.solr.request.SolrQueryRequest;
-import org.apache.solr.search.DocList;
-import org.apache.solr.search.QueryParsing;
-import org.apache.solr.util.SolrPluginUtils;
+import static org.apache.solr.common.params.CommonParams.FQ;
 
 /**
  * Adds debugging information to a request.
@@ -183,7 +183,7 @@ public class DebugComponent extends Sear
       @SuppressWarnings("unchecked")
       NamedList<Object> stageList = (NamedList<Object>) ((NamedList<Object>)rb.getDebugInfo().get("track")).get(stages.get(rb.stage));
       if(stageList == null) {
-        stageList = new NamedList<>();
+        stageList = new SimpleOrderedMap<>();
         rb.addDebug(stageList, "track", stages.get(rb.stage));
       }
       for(ShardResponse response: sreq.responses) {
@@ -261,7 +261,7 @@ public class DebugComponent extends Sear
 
 
   private NamedList<String> getTrackResponse(ShardResponse shardResponse) {
-    NamedList<String> namedList = new NamedList<>();
+    NamedList<String> namedList = new SimpleOrderedMap<>();
     if (shardResponse.getException() != null) {
       namedList.add("Exception", shardResponse.getException().getMessage());
       return namedList;