You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2012/09/14 01:36:45 UTC
svn commit: r1384599 - in /lucene/dev/branches/branch_4x: ./ dev-tools/
lucene/ lucene/analysis/
lucene/analysis/icu/src/java/org/apache/lucene/collation/ lucene/backwards/
lucene/benchmark/ lucene/codecs/ lucene/core/ lucene/demo/ lucene/facet/
lucene...
Author: hossman
Date: Thu Sep 13 23:36:43 2012
New Revision: 1384599
URL: http://svn.apache.org/viewvc?rev=1384599&view=rev
Log:
SOLR-3569: Fixed debug output on distributed requests when there are no results found (merge r1384597)
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/BUILD.txt (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (props changed)
lucene/dev/branches/branch_4x/lucene/JRE_VERSION_MIGRATION.txt (props changed)
lucene/dev/branches/branch_4x/lucene/LICENSE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/MIGRATE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/README.txt (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java (props changed)
lucene/dev/branches/branch_4x/lucene/backwards/ (props changed)
lucene/dev/branches/branch_4x/lucene/benchmark/ (props changed)
lucene/dev/branches/branch_4x/lucene/build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/codecs/ (props changed)
lucene/dev/branches/branch_4x/lucene/common-build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/demo/ (props changed)
lucene/dev/branches/branch_4x/lucene/facet/ (props changed)
lucene/dev/branches/branch_4x/lucene/grouping/ (props changed)
lucene/dev/branches/branch_4x/lucene/highlighter/ (props changed)
lucene/dev/branches/branch_4x/lucene/ivy-settings.xml (props changed)
lucene/dev/branches/branch_4x/lucene/join/ (props changed)
lucene/dev/branches/branch_4x/lucene/licenses/ (props changed)
lucene/dev/branches/branch_4x/lucene/memory/ (props changed)
lucene/dev/branches/branch_4x/lucene/misc/ (props changed)
lucene/dev/branches/branch_4x/lucene/module-build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/queries/ (props changed)
lucene/dev/branches/branch_4x/lucene/queryparser/ (props changed)
lucene/dev/branches/branch_4x/lucene/sandbox/ (props changed)
lucene/dev/branches/branch_4x/lucene/site/ (props changed)
lucene/dev/branches/branch_4x/lucene/spatial/ (props changed)
lucene/dev/branches/branch_4x/lucene/suggest/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_4x/lucene/tools/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/LICENSE.txt (props changed)
lucene/dev/branches/branch_4x/solr/NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/README.txt (props changed)
lucene/dev/branches/branch_4x/solr/build.xml (props changed)
lucene/dev/branches/branch_4x/solr/cloud-dev/ (props changed)
lucene/dev/branches/branch_4x/solr/common-build.xml (props changed)
lucene/dev/branches/branch_4x/solr/contrib/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
lucene/dev/branches/branch_4x/solr/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/solr/example/ (props changed)
lucene/dev/branches/branch_4x/solr/lib/ (props changed)
lucene/dev/branches/branch_4x/solr/licenses/ (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpclient-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpclient-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpcore-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpcore-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpmime-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpmime-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/scripts/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_4x/solr/testlogging.properties (props changed)
lucene/dev/branches/branch_4x/solr/webapp/ (props changed)
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1384599&r1=1384598&r2=1384599&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Thu Sep 13 23:36:43 2012
@@ -158,6 +158,8 @@ Bug Fixes
not modify the result set or ranking of 'excluded' documents relative to
not using elevation at all. (Alexey Serba via hossman)
+* SOLR-3569: Fixed debug output on distributed requests when there are no
+ results found. (David Bowen via hossman)
Other Changes
----------------------
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java?rev=1384599&r1=1384598&r2=1384599&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java Thu Sep 13 23:36:43 2012
@@ -145,7 +145,13 @@ public class DebugComponent extends Sear
}
if (info == null) {
+ // No responses were received from shards. Show local query info.
info = new SimpleOrderedMap<Object>();
+ SolrPluginUtils.doStandardQueryDebug(
+ rb.req, rb.getQueryString(), rb.getQuery(), rb.isDebugQuery(), info);
+ if (rb.isDebugQuery() && rb.getQparser() != null) {
+ rb.getQparser().addDebugInfo(info);
+ }
}
if (rb.isDebugResults()) {
int idx = info.indexOf("explain",0);
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java?rev=1384599&r1=1384598&r2=1384599&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java Thu Sep 13 23:36:43 2012
@@ -229,57 +229,69 @@ public class SolrPluginUtils {
* @return The debug info
* @throws java.io.IOException if there was an IO error
*/
- public static NamedList doStandardDebug(SolrQueryRequest req,
- String userQuery,
- Query query,
- DocList results, boolean dbgQuery, boolean dbgResults)
- throws IOException {
-
- NamedList dbg = null;
-
- dbg = new SimpleOrderedMap();
-
- SolrIndexSearcher searcher = req.getSearcher();
- IndexSchema schema = req.getSchema();
-
- boolean explainStruct
- = req.getParams().getBool(CommonParams.EXPLAIN_STRUCT, false);
-
+ public static NamedList doStandardDebug(
+ SolrQueryRequest req,
+ String userQuery,
+ Query query,
+ DocList results,
+ boolean dbgQuery,
+ boolean dbgResults)
+ throws IOException
+ {
+ NamedList dbg = new SimpleOrderedMap();
+ doStandardQueryDebug(req, userQuery, query, dbgQuery, dbg);
+ doStandardResultsDebug(req, query, results, dbgResults, dbg);
+ return dbg;
+ }
+
+ public static void doStandardQueryDebug(
+ SolrQueryRequest req,
+ String userQuery,
+ Query query,
+ boolean dbgQuery,
+ NamedList dbg)
+ {
if (dbgQuery) {
/* userQuery may have been pre-processed .. expose that */
dbg.add("rawquerystring", req.getParams().get(CommonParams.Q));
dbg.add("querystring", userQuery);
- /* QueryParsing.toString isn't perfect, use it to see converted
+ /* QueryParsing.toString isn't perfect, use it to see converted
* values, use regular toString to see any attributes of the
* underlying Query it may have missed.
*/
- dbg.add("parsedquery", QueryParsing.toString(query, schema));
+ dbg.add("parsedquery", QueryParsing.toString(query, req.getSchema()));
dbg.add("parsedquery_toString", query.toString());
}
-
+ }
+
+ public static void doStandardResultsDebug(
+ SolrQueryRequest req,
+ Query query,
+ DocList results,
+ boolean dbgResults,
+ NamedList dbg) throws IOException
+ {
if (dbgResults) {
- NamedList<Explanation> explain
- = getExplanations(query, results, searcher, schema);
- dbg.add("explain", explainStruct ?
- explanationsToNamedLists(explain) :
- explanationsToStrings(explain));
+ SolrIndexSearcher searcher = req.getSearcher();
+ IndexSchema schema = req.getSchema();
+ boolean explainStruct = req.getParams().getBool(CommonParams.EXPLAIN_STRUCT, false);
+
+ NamedList<Explanation> explain = getExplanations(query, results, searcher, schema);
+ dbg.add("explain", explainStruct
+ ? explanationsToNamedLists(explain)
+ : explanationsToStrings(explain));
String otherQueryS = req.getParams().get(CommonParams.EXPLAIN_OTHER);
if (otherQueryS != null && otherQueryS.length() > 0) {
- DocList otherResults = doSimpleQuery
- (otherQueryS, req, 0, 10);
+ DocList otherResults = doSimpleQuery(otherQueryS, req, 0, 10);
dbg.add("otherQuery", otherQueryS);
- NamedList<Explanation> explainO
- = getExplanations(query, otherResults, searcher, schema);
- dbg.add("explainOther", explainStruct ?
- explanationsToNamedLists(explainO) :
- explanationsToStrings(explainO));
+ NamedList<Explanation> explainO = getExplanations(query, otherResults, searcher, schema);
+ dbg.add("explainOther", explainStruct
+ ? explanationsToNamedLists(explainO)
+ : explanationsToStrings(explainO));
}
}
-
-
- return dbg;
}
public static NamedList<Object> explanationToNamedList(Explanation e) {