From 3841854c97dc47f12f72a9e861f626579d94598f Mon Sep 17 00:00:00 2001 From: Michael Peter Christen Date: Sat, 4 May 2013 00:14:22 +0200 Subject: [PATCH] abstraction of catchall term --- htroot/HostBrowser.java | 2 +- .../federate/solr/connector/AbstractSolrConnector.java | 7 ++++--- .../cora/federate/solr/connector/SolrServerConnector.java | 2 +- source/net/yacy/search/index/Segment.java | 2 +- source/net/yacy/search/query/QueryGoal.java | 3 ++- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/htroot/HostBrowser.java b/htroot/HostBrowser.java index be3bf13d0..7c30edae4 100644 --- a/htroot/HostBrowser.java +++ b/htroot/HostBrowser.java @@ -166,7 +166,7 @@ public class HostBrowser { int maxcount = admin ? 2 * 3 * 2 * 5 * 7 * 2 * 3 : 360; // which makes nice matrixes for 2, 3, 4, 5, 6, 7, 8, 9 rows/colums // collect hosts from index - ReversibleScoreMap hostscore = fulltext.getDefaultConnector().getFacets("*:*", maxcount, CollectionSchema.host_s.getSolrFieldName()).get(CollectionSchema.host_s.getSolrFieldName()); + ReversibleScoreMap hostscore = fulltext.getDefaultConnector().getFacets(AbstractSolrConnector.CATCHALL_TERM, maxcount, CollectionSchema.host_s.getSolrFieldName()).get(CollectionSchema.host_s.getSolrFieldName()); if (hostscore == null) hostscore = new ClusteredScoreMap(); // collect hosts from crawler diff --git a/source/net/yacy/cora/federate/solr/connector/AbstractSolrConnector.java b/source/net/yacy/cora/federate/solr/connector/AbstractSolrConnector.java index 5f0f94e5a..807aad050 100644 --- a/source/net/yacy/cora/federate/solr/connector/AbstractSolrConnector.java +++ b/source/net/yacy/cora/federate/solr/connector/AbstractSolrConnector.java @@ -49,9 +49,10 @@ public abstract class AbstractSolrConnector implements SolrConnector { public final static SolrDocument POISON_DOCUMENT = new SolrDocument(); public final static String POISON_ID = "POISON_ID"; + public final static String CATCHALL_TERM = "*:*"; public final static SolrQuery catchallQuery = new SolrQuery(); static { - catchallQuery.setQuery("*:*"); + catchallQuery.setQuery(CATCHALL_TERM); catchallQuery.setFields(CollectionSchema.id.getSolrFieldName()); catchallQuery.setRows(0); catchallQuery.setStart(0); @@ -59,7 +60,7 @@ public abstract class AbstractSolrConnector implements SolrConnector { public final static SolrQuery catchSuccessQuery = new SolrQuery(); static { //catchSuccessQuery.setQuery("-" + CollectionSchema.failreason_t.getSolrFieldName() + ":[* TO *]"); - catchSuccessQuery.setQuery("*:*"); // failreason_t is only available for core collection1 + catchSuccessQuery.setQuery(CATCHALL_TERM); // failreason_t is only available for core collection1 catchSuccessQuery.setFields(CollectionSchema.id.getSolrFieldName()); catchSuccessQuery.clearSorts(); catchSuccessQuery.setIncludeScore(false); @@ -158,7 +159,7 @@ public abstract class AbstractSolrConnector implements SolrConnector { @Override public Iterator iterator() { - final BlockingQueue queue = concurrentIDsByQuery("*:*", 0, Integer.MAX_VALUE, 60000); + final BlockingQueue queue = concurrentIDsByQuery(CATCHALL_TERM, 0, Integer.MAX_VALUE, 60000); return new LookAheadIterator() { @Override protected String next0() { diff --git a/source/net/yacy/cora/federate/solr/connector/SolrServerConnector.java b/source/net/yacy/cora/federate/solr/connector/SolrServerConnector.java index 99327a146..ce7d97680 100644 --- a/source/net/yacy/cora/federate/solr/connector/SolrServerConnector.java +++ b/source/net/yacy/cora/federate/solr/connector/SolrServerConnector.java @@ -111,7 +111,7 @@ public abstract class SolrServerConnector extends AbstractSolrConnector implemen @Override public synchronized void clear() throws IOException { try { - this.server.deleteByQuery("*:*"); + this.server.deleteByQuery(AbstractSolrConnector.CATCHALL_TERM); this.server.commit(true, true, false); } catch (final Throwable e) { throw new IOException(e); diff --git a/source/net/yacy/search/index/Segment.java b/source/net/yacy/search/index/Segment.java index 3e54d0323..2b75218c0 100644 --- a/source/net/yacy/search/index/Segment.java +++ b/source/net/yacy/search/index/Segment.java @@ -308,7 +308,7 @@ public class Segment { final BlockingQueue docQueue; final String urlstub; if (stub == null) { - docQueue = this.fulltext.getDefaultConnector().concurrentDocumentsByQuery("*:*", 0, Integer.MAX_VALUE, maxtime, maxcount, CollectionSchema.id.getSolrFieldName(), CollectionSchema.sku.getSolrFieldName()); + docQueue = this.fulltext.getDefaultConnector().concurrentDocumentsByQuery(AbstractSolrConnector.CATCHALL_TERM, 0, Integer.MAX_VALUE, maxtime, maxcount, CollectionSchema.id.getSolrFieldName(), CollectionSchema.sku.getSolrFieldName()); urlstub = null; } else { final String host = stub.getHost(); diff --git a/source/net/yacy/search/query/QueryGoal.java b/source/net/yacy/search/query/QueryGoal.java index f12e247f6..3c8e5dcbc 100644 --- a/source/net/yacy/search/query/QueryGoal.java +++ b/source/net/yacy/search/query/QueryGoal.java @@ -31,6 +31,7 @@ import net.yacy.cora.document.WordCache; import net.yacy.cora.federate.solr.Ranking; import net.yacy.cora.federate.solr.SchemaDeclaration; import net.yacy.cora.federate.solr.SolrType; +import net.yacy.cora.federate.solr.connector.AbstractSolrConnector; import net.yacy.cora.storage.HandleSet; import net.yacy.document.parser.html.AbstractScraper; import net.yacy.document.parser.html.CharacterCoding; @@ -201,7 +202,7 @@ public class QueryGoal { // parse special requests if (include_strings.size() == 1 && exclude_strings.size() == 0) { String w = include_strings.get(0); - if (Segment.catchallString.equals(w)) return new StringBuilder("*:*"); + if (Segment.catchallString.equals(w)) return new StringBuilder(AbstractSolrConnector.CATCHALL_TERM); } // add text query