You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2010/08/18 19:41:40 UTC
svn commit: r986815 - in /lucene/dev/trunk/solr: CHANGES.txt
example/solr/conf/solrconfig.xml
src/java/org/apache/solr/handler/component/SearchHandler.java
Author: yonik
Date: Wed Aug 18 17:41:40 2010
New Revision: 986815
URL: http://svn.apache.org/viewvc?rev=986815&view=rev
Log:
SOLR-1881: add url-scheme for SearchHandler config
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/example/solr/conf/solrconfig.xml
lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/SearchHandler.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=986815&r1=986814&r2=986815&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Aug 18 17:41:40 2010
@@ -228,6 +228,9 @@ New Features
* SOLR-2049: Add hl.multiValuedSeparatorChar for FastVectorHighlighter, per LUCENE-2603. (koji)
+* SOLR-1881: add a url-scheme config string to SearchHandler to specify alternate
+ URL prefixes for distributed search shard requests. (Sami Siren via yonik)
+
Optimizations
----------------------
Modified: lucene/dev/trunk/solr/example/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/solr/conf/solrconfig.xml?rev=986815&r1=986814&r2=986815&view=diff
==============================================================================
--- lucene/dev/trunk/solr/example/solr/conf/solrconfig.xml (original)
+++ lucene/dev/trunk/solr/example/solr/conf/solrconfig.xml Wed Aug 18 17:41:40 2010
@@ -543,6 +543,9 @@
<arr name="last-components">
<str>spellcheck</str>
</arr>
+ <!--
+ <str name="url-scheme">httpx</str>
+ -->
</requestHandler>
Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/SearchHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/SearchHandler.java?rev=986815&r1=986814&r2=986815&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/SearchHandler.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/component/SearchHandler.java Wed Aug 18 17:41:40 2010
@@ -64,9 +64,14 @@ public class SearchHandler extends Reque
// cannot be established within x ms. with a
// java.net.SocketTimeoutException: Connection timed out
static final String INIT_CONNECTION_TIMEOUT = "shard-connection-timeout";
+
+ // URL scheme to be used in distributed search.
+ static final String INIT_URL_SCHEME = "url-scheme";
+
static int soTimeout = 0; //current default values
static int connectionTimeout = 0; //current default values
-
+ public static String scheme = "http://"; //current default values
+
protected static Logger log = LoggerFactory.getLogger(SearchHandler.class);
protected List<SearchComponent> components = null;
@@ -148,6 +153,12 @@ public class SearchHandler extends Reque
soTimeout = (Integer) so;
log.info("Setting shard-socket-timeout to: " + soTimeout);
}
+
+ Object urlScheme = initArgs.get(INIT_URL_SCHEME);
+ if (urlScheme != null) {
+ SearchHandler.scheme = (String) urlScheme + "://";
+ log.info("Setting url-scheme to: " + urlScheme);
+ }
}
public List<SearchComponent> getComponents() {
@@ -403,7 +414,7 @@ class HttpCommComponent {
try {
// String url = "http://" + shard + "/select";
- String url = "http://" + shard;
+ String url = SearchHandler.scheme + shard;
params.remove(CommonParams.WT); // use default (currently javabin)
params.remove(CommonParams.VERSION);