From 525575bd97cbaf0eec778eb5de9fdb7a8b8d86a1 Mon Sep 17 00:00:00 2001 From: Michael Peter Christen Date: Fri, 11 Jul 2014 17:34:41 +0200 Subject: [PATCH] added debugging of filter queries in thread dump thread names --- .../cora/federate/solr/connector/AbstractSolrConnector.java | 1 + .../cora/federate/solr/connector/EmbeddedSolrConnector.java | 6 ++++-- .../cora/federate/solr/connector/RemoteSolrConnector.java | 3 ++- .../cora/federate/solr/connector/SolrServerConnector.java | 3 ++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/source/net/yacy/cora/federate/solr/connector/AbstractSolrConnector.java b/source/net/yacy/cora/federate/solr/connector/AbstractSolrConnector.java index a5c54c49a..68b2912c7 100644 --- a/source/net/yacy/cora/federate/solr/connector/AbstractSolrConnector.java +++ b/source/net/yacy/cora/federate/solr/connector/AbstractSolrConnector.java @@ -391,6 +391,7 @@ public abstract class AbstractSolrConnector implements SolrConnector { // construct query StringBuilder sb = new StringBuilder(23); sb.append("{!raw f=").append(CollectionSchema.id.getSolrFieldName()).append('}').append(id); + //query.setQuery(sb.toString()); query.setQuery("*:*"); query.addFilterQuery(sb.toString()); query.clearSorts(); diff --git a/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java b/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java index 8fda40feb..9d36801d4 100644 --- a/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java +++ b/source/net/yacy/cora/federate/solr/connector/EmbeddedSolrConnector.java @@ -199,8 +199,9 @@ public class EmbeddedSolrConnector extends SolrServerConnector implements SolrCo // during the solr query we set the thread name to the query string to get more debugging info in thread dumps String q = req.getParams().get("q"); + String fq = req.getParams().get("fq"); String threadname = Thread.currentThread().getName(); - if (q != null) Thread.currentThread().setName("solr query: q = " + q); + if (q != null) Thread.currentThread().setName("solr query: q = " + q + (fq == null ? "" : ", fq = " + fq)); SolrQueryResponse rsp = new SolrQueryResponse(); NamedList responseHeader = new SimpleOrderedMap(); @@ -302,8 +303,9 @@ public class EmbeddedSolrConnector extends SolrServerConnector implements SolrCo if (this.server == null) throw new IOException("server disconnected"); // during the solr query we set the thread name to the query string to get more debugging info in thread dumps String q = params.get("q"); + String fq = params.get("fq"); String threadname = Thread.currentThread().getName(); - if (q != null) Thread.currentThread().setName("solr query: q = " + q); + if (q != null) Thread.currentThread().setName("solr query: q = " + q + (fq == null ? "" : ", fq = " + fq)); QueryResponse rsp; try { rsp = this.server.query(params); diff --git a/source/net/yacy/cora/federate/solr/connector/RemoteSolrConnector.java b/source/net/yacy/cora/federate/solr/connector/RemoteSolrConnector.java index dcf8bc0e3..00e7ded71 100644 --- a/source/net/yacy/cora/federate/solr/connector/RemoteSolrConnector.java +++ b/source/net/yacy/cora/federate/solr/connector/RemoteSolrConnector.java @@ -99,8 +99,9 @@ public class RemoteSolrConnector extends SolrServerConnector implements SolrConn public QueryResponse getResponseByParams(ModifiableSolrParams params) throws IOException { // during the solr query we set the thread name to the query string to get more debugging info in thread dumps String q = params.get("q"); + String fq = params.get("fq"); String threadname = Thread.currentThread().getName(); - if (q != null) Thread.currentThread().setName("solr query: q = " + q); + if (q != null) Thread.currentThread().setName("solr query: q = " + q + (fq == null ? "" : ", fq = " + fq)); QueryRequest request = new QueryRequest(params); ResponseParser responseParser = useBinaryResponseWriter ? new BinaryResponseParser() : new XMLResponseParser(); diff --git a/source/net/yacy/cora/federate/solr/connector/SolrServerConnector.java b/source/net/yacy/cora/federate/solr/connector/SolrServerConnector.java index e37c1d1c7..736cf942e 100644 --- a/source/net/yacy/cora/federate/solr/connector/SolrServerConnector.java +++ b/source/net/yacy/cora/federate/solr/connector/SolrServerConnector.java @@ -293,8 +293,9 @@ public abstract class SolrServerConnector extends AbstractSolrConnector implemen if (this.server == null) throw new IOException("server disconnected"); // during the solr query we set the thread name to the query string to get more debugging info in thread dumps String q = params.get("q"); + String fq = params.get("fq"); String threadname = Thread.currentThread().getName(); - if (q != null) Thread.currentThread().setName("solr query: q = " + q); + if (q != null) Thread.currentThread().setName("solr query: q = " + q + (fq == null ? "" : ", fq = " + fq)); QueryResponse rsp; try { rsp = this.server.query(params);