Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-6064: Return DebugComponent track output as JSON object 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1603608 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alan Woodward 2014-06-18 19:55:28 +00:00
parent ac9f70adc8
commit 23a3287f00
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -153,6 +153,9 @@ New Features
* SOLR-6125: Allow SolrIndexWriter to close without waiting for merges * SOLR-6125: Allow SolrIndexWriter to close without waiting for merges
(Christine Poerschke via Alan Woodward) (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 Bug Fixes
---------------------- ----------------------

26
solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java
View File

@ -17,7 +17,16 @@
package org.apache.solr.handler.component; 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.io.IOException;
import java.net.URL; import java.net.URL;
@ -32,16 +41,7 @@ import java.util.Set;
import java.util.TreeMap; import java.util.TreeMap;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
import org.apache.lucene.search.Query; import static org.apache.solr.common.params.CommonParams.FQ;
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;
/** /**
* Adds debugging information to a request. * Adds debugging information to a request.
@ -183,7 +183,7 @@ public class DebugComponent extends SearchComponent
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
NamedList<Object> stageList = (NamedList<Object>) ((NamedList<Object>)rb.getDebugInfo().get("track")).get(stages.get(rb.stage)); NamedList<Object> stageList = (NamedList<Object>) ((NamedList<Object>)rb.getDebugInfo().get("track")).get(stages.get(rb.stage));
if(stageList == null) { if(stageList == null) {
stageList = new NamedList<>(); stageList = new SimpleOrderedMap<>();
rb.addDebug(stageList, "track", stages.get(rb.stage)); rb.addDebug(stageList, "track", stages.get(rb.stage));
} }
for(ShardResponse response: sreq.responses) { for(ShardResponse response: sreq.responses) {
@ -261,7 +261,7 @@ public class DebugComponent extends SearchComponent
private NamedList<String> getTrackResponse(ShardResponse shardResponse) { private NamedList<String> getTrackResponse(ShardResponse shardResponse) {
NamedList<String> namedList = new NamedList<>(); NamedList<String> namedList = new SimpleOrderedMap<>();
if (shardResponse.getException() != null) { if (shardResponse.getException() != null) {
namedList.add("Exception", shardResponse.getException().getMessage()); namedList.add("Exception", shardResponse.getException().getMessage());
return namedList; return namedList;