diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 9578698247f..be23b3af990 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -120,6 +120,13 @@ Upgrading from Solr 6.x fields, a new JSON request language, and more. DocValues are now required for any field used in the analytics expression whereas previously docValues was not required. Please see SOLR-10123 for details. +* solrconfig.xml: now defaults to false when luceneMatchVersion >= 7.0, + thus ignoring "qt". Regardless, "qt" is still used as a SolrJ special parameter that specifies the request handler + (tail URL path) to use. If you have request handlers without a leading '/', you can set handleSelect="true" + or better yet consider migrating. + +* StandardRequestHandler is deprecated. Simply use SearchHandler instead. + New Features ---------------------- * SOLR-9857, SOLR-9858: Collect aggregated metrics from nodes and shard leaders in overseer. (ab) @@ -351,6 +358,11 @@ Other Changes - SOLR-10946: Randomize the usage of Points based numerics in solrj test schemas (hossman) - SOLR-10947: Randomize the usage of Points based numerics in contrib test schemas (hossman) +* SOLR-6807: Changed requestDispatcher's handleSelect to default to false, thus ignoring "qt". + Simplified configs to not refer to handleSelect or "qt". Switch all tests that assumed true to assume false + (added leading '/' in request handlers). Switch all tests referring to "standard" request handler to + instead refer to "/select" with SearchHandler. Deprecated the old StandardRequestHandler. (David Smiley) + ================== 6.7.0 ================== Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release. diff --git a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml index 8266aae17d3..90c52d71cbe 100644 --- a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml +++ b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/solrconfig-icucollate.xml @@ -22,6 +22,6 @@ ${useCompoundFile:false} - + diff --git a/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-analytics.xml b/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-analytics.xml index 31d64371cef..4c359a67c6a 100644 --- a/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-analytics.xml +++ b/solr/contrib/analytics/src/test-files/solr/collection1/conf/solrconfig-analytics.xml @@ -24,7 +24,7 @@ - + query facet diff --git a/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml b/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml index 74d903efee1..8d0f82e5bed 100644 --- a/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml +++ b/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/solrconfig.xml @@ -214,12 +214,7 @@ - - + @@ -260,17 +255,8 @@ - - - - + + explicit diff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java index bff9f378930..8ccc8edfa96 100644 --- a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java +++ b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java @@ -66,7 +66,7 @@ public class ClusteringComponentTest extends AbstractClusteringTestCase { params.add(ClusteringParams.USE_SEARCH_RESULTS, "true"); - SolrRequestHandler handler = core.getRequestHandler("standard"); + SolrRequestHandler handler = core.getRequestHandler("/select"); SolrQueryResponse rsp; rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap<>()); diff --git a/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml b/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml index 7672cabda18..d426320f514 100644 --- a/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml +++ b/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-solrconfig.xml @@ -144,21 +144,21 @@ and there is a current searcher handling requests (aka registered). --> - - - solr 0 10 - rocks 0 10 - static newSearcher warming query from solrconfig.xml - - + + + + + + + - - - - + + + + - + @@ -220,16 +215,7 @@ - - - + explicit diff --git a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml index 235b15c2fca..a07ab78190f 100644 --- a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml +++ b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/contentstream-solrconfig.xml @@ -144,21 +144,21 @@ and there is a current searcher handling requests (aka registered). --> - - - solr 0 10 - rocks 0 10 - static newSearcher warming query from solrconfig.xml - - + + + + + + + - - - - + + + + - + @@ -219,17 +214,8 @@ - - - - + + explicit diff --git a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml index 7f206771cb8..6754f9e08a7 100644 --- a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml +++ b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-nodatasource-solrconfig.xml @@ -146,21 +146,21 @@ and there is a current searcher handling requests (aka registered). --> - - - solr 0 10 - rocks 0 10 - static newSearcher warming query from solrconfig.xml - - + + + + + + + - - - - + + + + - + @@ -221,17 +216,8 @@ - - - - + + explicit diff --git a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml index 2eacf8aec99..a662fd98cab 100644 --- a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml +++ b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig.xml @@ -144,21 +144,21 @@ and there is a current searcher handling requests (aka registered). --> - - - solr 0 10 - rocks 0 10 - static newSearcher warming query from solrconfig.xml - - + + + + + + + - - - - + + + + - + @@ -219,17 +214,8 @@ - - - - + + explicit diff --git a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml b/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml index 261263ecd4e..4dbf0828a6a 100644 --- a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml +++ b/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml @@ -149,42 +149,9 @@ - - - - + true - - - dismax - - - - - - - 4 - true - text,name,subject,title,whitetok - - - - - - - 4 - true - text,name,subject,title,whitetok - - parseContext.xml @@ -227,7 +194,7 @@ - + max-age=30, public diff --git a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java index 5c79f0d76a9..7d378445700 100644 --- a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java +++ b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/TestXLSXResponseWriter.java @@ -228,7 +228,7 @@ public class TestXLSXResponseWriter extends SolrTestCaseJ4 { // returns first worksheet as XLSXResponseWriter only returns one sheet private XSSFSheet getWSResultForQuery(SolrQueryRequest req) throws IOException, Exception { - SolrQueryResponse rsp = h.queryAndResponse("standard", req); + SolrQueryResponse rsp = h.queryAndResponse("", req); return getWSResultForQuery(req, rsp); } diff --git a/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml b/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml index 04b75f20191..9ae54adc148 100644 --- a/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml +++ b/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/solrconfig-languageidentifier.xml @@ -44,11 +44,11 @@ - + true - + max-age=30, public diff --git a/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml b/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml index a79db3f10dc..96392d3f9e0 100644 --- a/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml +++ b/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/solrconfig.xml @@ -315,12 +315,7 @@ - - + - + explicit @@ -387,7 +372,7 @@ standard SearchHandler with a default query parser of "dismax". see http://wiki.apache.org/solr/DisMaxRequestHandler --> - + dismax explicit @@ -427,7 +412,7 @@ Note how you can register the same handler multiple times with different names (and different init parameters) --> - + dismax explicit @@ -568,7 +553,7 @@ example. You will likely want to add the component to your already specified request handlers. --> - true diff --git a/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml b/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml index 1a0f58b8a63..df7dc1eed4d 100644 --- a/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml +++ b/solr/contrib/uima/src/test-files/uima/uima-tokenizers-solrconfig.xml @@ -314,12 +314,7 @@ - - + - @@ -386,7 +381,7 @@ standard SearchHandler with a default query parser of "dismax". see http://wiki.apache.org/solr/DisMaxRequestHandler --> - + dismax explicit @@ -426,7 +421,7 @@ Note how you can register the same handler multiple times with different names (and different init parameters) --> - + dismax explicit @@ -567,7 +562,7 @@ example. You will likely want to add the component to your already specified request handlers. --> - true diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.java index dc7fe283743..99423239fa7 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java +++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java @@ -308,9 +308,8 @@ public class SolrConfig extends Config implements MapSerializable { enableRemoteStreams = getBool( "requestDispatcher/requestParsers/@enableRemoteStreaming", false); - // Let this filter take care of /select?xxx format handleSelect = getBool( - "requestDispatcher/@handleSelect", true); + "requestDispatcher/@handleSelect", !luceneMatchVersion.onOrAfter(Version.LUCENE_7_0_0)); addHttpRequestToContext = getBool( "requestDispatcher/requestParsers/@addHttpRequestToContext", false); diff --git a/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java b/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java index 0d1213695b1..62f1016bbaf 100644 --- a/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java @@ -249,7 +249,7 @@ public class MoreLikeThisHandler extends RequestHandlerBase dbgQuery = true; dbgResults = true; } - // Copied from StandardRequestHandler... perhaps it should be added to doStandardDebug? + // TODO resolve duplicated code with DebugComponent. Perhaps it should be added to doStandardDebug? if (dbg == true) { try { NamedList dbgInfo = SolrPluginUtils.doStandardDebug(req, q, mlt.getRawMLTQuery(), mltDocs.docList, dbgQuery, dbgResults); diff --git a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java index 421976801b2..990d475adc3 100644 --- a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java +++ b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java @@ -125,7 +125,6 @@ public abstract class RequestHandlerBase implements SolrRequestHandler, SolrInfo public void init(NamedList args) { initArgs = args; - // Copied from StandardRequestHandler if( args != null ) { defaults = getSolrParamsFromNamedList(args, "defaults"); appends = getSolrParamsFromNamedList(args, "appends"); diff --git a/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java index f167b1d5dc3..e87aa68831c 100644 --- a/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java @@ -18,24 +18,7 @@ package org.apache.solr.handler; import org.apache.solr.handler.component.*; -/** - * - * - * All of the following options may be configured for this handler - * in the solrconfig as defaults, and may be overridden as request parameters. - * (TODO: complete documentation of request parameters here, rather than only - * on the wiki). - * - *
    - *
  • highlight - Set to any value not .equal() to "false" to enable highlight - * generation
    • - *
  • highlightFields - Set to a comma- or space-delimited list of fields to - * highlight. If unspecified, uses the default query field
    • - *
  • maxSnippets - maximum number of snippets to generate per field-highlight. - *
    • - *
- * - */ +@Deprecated public class StandardRequestHandler extends SearchHandler { //////////////////////// SolrInfoMBeans methods ////////////////////// diff --git a/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java b/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java index 1d265c7826e..01c7c338afa 100644 --- a/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java +++ b/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java @@ -88,17 +88,7 @@ import static org.apache.solr.core.PluginInfo.INVARIANTS; import static org.apache.solr.core.RequestParams.USEPARAM; /** - *

Utilities that may be of use to RequestHandlers.

- * - *

- * Many of these functions have code that was stolen/mutated from - * StandardRequestHandler. - *

- * - *

:TODO: refactor StandardRequestHandler to use these utilities

- * - *

:TODO: Many "standard" functionality methods are not cognisant of - * default parameter settings. + * Utilities that may be of use to RequestHandlers. */ public class SolrPluginUtils { diff --git a/solr/core/src/resources/SystemCollectionSolrConfig.xml b/solr/core/src/resources/SystemCollectionSolrConfig.xml index 7b1da63fca8..f857561d6e4 100644 --- a/solr/core/src/resources/SystemCollectionSolrConfig.xml +++ b/solr/core/src/resources/SystemCollectionSolrConfig.xml @@ -10,7 +10,7 @@ 1 true - + ${blob.max.size.mb:5} diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml b/solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml index 75014acc4eb..c8bb8cf66e3 100644 --- a/solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml +++ b/solr/core/src/test-files/solr/collection1/conf/bad-error-solrconfig.xml @@ -23,7 +23,7 @@ ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-mpf-solrconfig.xml b/solr/core/src/test-files/solr/collection1/conf/bad-mpf-solrconfig.xml index 0adf3215180..189d4490fd3 100644 --- a/solr/core/src/test-files/solr/collection1/conf/bad-mpf-solrconfig.xml +++ b/solr/core/src/test-files/solr/collection1/conf/bad-mpf-solrconfig.xml @@ -30,7 +30,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml index 4541fbc521c..f2e0f3ed14b 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml @@ -23,7 +23,7 @@ --> ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-altdirectory.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-altdirectory.xml index cb4cd7cec82..0c62584957c 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-altdirectory.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-altdirectory.xml @@ -20,7 +20,7 @@ ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml index f729afab6a7..fc33e46a38d 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml @@ -187,233 +187,12 @@ If the set cardinality <= maxSize elements, then HashDocSet will be used instead of the bitset based HashBitset. --> - - + true - - - - dismax - *:* - 0.01 - - text^0.5 features_t^1.0 subject^1.4 title_stemmed^2.0 - - - text^0.2 features_t^1.1 subject^1.4 title_stemmed^2.0 title^1.5 - - - ord(weight)^0.5 recip(rord(iind),1,1000,1000)^0.3 - - - 3<-1 5<-2 6<90% - - 100 - - - - - - - - - 4 - true - text,name,subject,title,whitetok - - - - - - - 4 - true - text,name,subject,title,whitetok - - - - - - lowerpunctfilt - - - default - lowerfilt - spellchecker1 - false - - - direct - DirectSolrSpellChecker - lowerfilt - 3 - - - wordbreak - solr.WordBreakSolrSpellChecker - lowerfilt - true - true - 10 - - - multipleFields - lowerfilt1and2 - spellcheckerMultipleFields - false - - - - jarowinkler - lowerfilt - - org.apache.lucene.search.spell.JaroWinklerDistance - spellchecker2 - - - - solr.FileBasedSpellChecker - external - spellings.txt - UTF-8 - spellchecker3 - - - - freq - lowerfilt - spellcheckerFreq - - freq - false - - - fqcn - lowerfilt - spellcheckerFQCN - org.apache.solr.spelling.SampleComparator - false - - - perDict - org.apache.solr.handler.component.DummyCustomParamSpellChecker - lowerfilt - - - - - - - - termsComp - - - - - - - - - false - - false - - 1 - - - spellcheck - - - - - direct - false - false - 1 - - - spellcheck - - - - - default - wordbreak - 20 - - - spellcheck - - - - - direct - wordbreak - 20 - - - spellcheck - - - - - dismax - lowerfilt1^1 - - - spellcheck - - - - - - - - - - - - - - - tvComponent - - - - - - string - elevate.xml - - - - - - explicit - - - elevate - - - - - - - @@ -461,7 +240,7 @@ based HashBitset. --> - + max-age=30, public diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml index ff9fab2fd3c..d98ecacf454 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-basic.xml @@ -25,5 +25,5 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-blockjoinfacetcomponent.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-blockjoinfacetcomponent.xml index b22269397ad..b1145358d22 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-blockjoinfacetcomponent.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-blockjoinfacetcomponent.xml @@ -24,8 +24,7 @@ ${solr.data.dir:} - - + @@ -38,18 +37,18 @@ - + - blockJoinFacetRH + /blockJoinFacetRH blockJoinFacet - + - blockJoinDocSetFacetRH + /blockJoinDocSetFacetRH blockJoinDocSetFacet diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml index 5990a81935b..b8e3dd7e880 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml @@ -23,7 +23,7 @@ - + The "standard" request handler is the default and will be used if qt is not specified in the request. --> - + true - - - dismax - *:* - 0.01 - - text^0.5 features_t^1.0 subject^1.4 title_stemmed^2.0 - - - text^0.2 features_t^1.1 subject^1.4 title_stemmed^2.0 title^1.5 - - - ord(weight)^0.5 recip(rord(iind),1,1000,1000)^0.3 - - - 3<-1 5<-2 6<90% - - 100 - - - - - - - - - 4 - true - text,name,subject,title,whitetok - - - - - - - 4 - true - text,name,subject,title,whitetok - - - a_s - + direct DirectSolrSpellChecker a_s 3 - + - - - - - termsComp - - - + direct false @@ -274,21 +226,6 @@ based HashBitset. --> - - - - - - - - - - - - tvComponent - - - string @@ -305,57 +242,7 @@ based HashBitset. --> - - - - - - - - - 100 - - - - - - 70 - - - - - - - ]]> - ]]> - - - - - - - - - - - - - 10 - .,!? - - - - - - WORD - en - US - - - - - - + max-age=30, public @@ -447,7 +334,7 @@ based HashBitset. --> - + text diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml index fe0e55cd13d..8d311ddeb7e 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml @@ -42,7 +42,7 @@ - + true component1 @@ -52,7 +52,7 @@ - + max-age=30, public diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-configurerecoverystrategy.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-configurerecoverystrategy.xml index 62e671d5671..d86a6de1012 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-configurerecoverystrategy.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-configurerecoverystrategy.xml @@ -20,7 +20,7 @@ ${tests.luceneMatchVersion:LATEST} - + 250 diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-customrecoverystrategy.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-customrecoverystrategy.xml index d43ed29a95b..4e8effab96d 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-customrecoverystrategy.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-customrecoverystrategy.xml @@ -20,7 +20,7 @@ ${tests.luceneMatchVersion:LATEST} - + - + max-age=30, public diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml index eef941e4051..3a0adbe08ac 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml @@ -109,7 +109,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml index 10f5e85eff1..ef0c39ae8e4 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-functionquery.xml @@ -28,7 +28,7 @@ - + @@ -39,7 +39,7 @@ 0.0 - + text diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml index 94cceb613b6..cad70d83c90 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-hash.xml @@ -46,11 +46,11 @@ - + - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml index f7b494064b0..328fc9bd56a 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-headers.xml @@ -24,7 +24,7 @@ - + componentThatAddsHeader diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml index 577f18260ef..c714a4148d7 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-highlight.xml @@ -31,7 +31,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml index d87d364386f..5ef9d723369 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml @@ -49,7 +49,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-infixsuggesters.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-infixsuggesters.xml index 8fc42ffd93d..a30186d9eed 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-infixsuggesters.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-infixsuggesters.xml @@ -25,7 +25,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicyfactory.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicyfactory.xml index 27a18673236..539fd5c4d5c 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicyfactory.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-logmergepolicyfactory.xml @@ -32,6 +32,6 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema-test.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema-test.xml index 22aeeda7fd0..666132f8e74 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema-test.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema-test.xml @@ -23,5 +23,5 @@ ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml index 146b1544a07..739ad2215ab 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml @@ -60,7 +60,7 @@ - + true @@ -72,7 +72,7 @@ - + text diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml index 516d504b109..4a53776a4bb 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml @@ -28,7 +28,7 @@ - + true @@ -39,7 +39,7 @@ - + 4 true @@ -48,7 +48,7 @@ - + 4 true @@ -56,7 +56,7 @@ - + max-age=30, public diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml index b1345acb0eb..e501af2bee4 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml @@ -28,7 +28,7 @@ - + true @@ -43,7 +43,7 @@ - + 4 true @@ -52,7 +52,7 @@ - + 4 true @@ -60,7 +60,7 @@ - + max-age=30, public diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml index 69f765943e7..bcd7874d9c0 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml @@ -27,7 +27,7 @@ - + @@ -39,7 +39,7 @@ - + max-age=30, public diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml index db39b1f5b02..9271686dd04 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml @@ -28,7 +28,7 @@ - + true @@ -41,7 +41,7 @@ - + 4 true @@ -50,7 +50,7 @@ - + 4 true @@ -58,7 +58,7 @@ - + max-age=30, public diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml index 91923c9f7b3..55301c21c79 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml @@ -27,7 +27,7 @@ - + true @@ -39,7 +39,7 @@ - + 4 true @@ -48,7 +48,7 @@ - + 4 true @@ -56,7 +56,7 @@ - + max-age=30, public diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml index b03aef4da65..1c1dd40f9c8 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml @@ -27,7 +27,7 @@ - + true @@ -40,7 +40,7 @@ - + 4 true @@ -49,7 +49,7 @@ - + 4 true @@ -57,7 +57,7 @@ - + max-age=30, public diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml index aaf8593ecae..3e0cf1927b6 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-defaults.xml @@ -28,6 +28,6 @@ --> - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml index a7361cc4fe9..b67d6645f31 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy-legacy.xml @@ -26,6 +26,6 @@ ${useCompoundFile:false} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicyfactory-nocfs.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicyfactory-nocfs.xml index 4dd82d7a6a0..b93fabd7c3a 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicyfactory-nocfs.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicyfactory-nocfs.xml @@ -29,6 +29,6 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml index 15e58af6393..137c519bdc4 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml @@ -31,15 +31,15 @@ - - - + + + - + text diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-nomergepolicyfactory.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-nomergepolicyfactory.xml index a9e38016d20..62fb05b03c4 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-nomergepolicyfactory.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-nomergepolicyfactory.xml @@ -27,6 +27,6 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml index 1f54630c63e..a3cd7b64735 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-noopregen.xml @@ -24,7 +24,7 @@ - + - + A diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml index f83df6ce18d..5930d37d775 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-parsing-update-processor-chains.xml @@ -23,7 +23,7 @@ --> ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml index 450766628a2..0f79d7c4572 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-phrasesuggest.xml @@ -24,7 +24,7 @@ ${solr.data.dir:} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml index 09f0974931c..431447ceb65 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml @@ -190,12 +190,12 @@ based HashBitset. --> The "standard" request handler is the default and will be used if qt is not specified in the request. --> - + true - + dismax *:* @@ -216,10 +216,10 @@ based HashBitset. --> - + - + 4 true @@ -228,7 +228,7 @@ based HashBitset. --> - + 4 true @@ -322,7 +322,7 @@ based HashBitset. --> --> - + false @@ -335,7 +335,7 @@ based HashBitset. --> spellcheck - + direct false @@ -346,7 +346,7 @@ based HashBitset. --> spellcheck - + default wordbreak @@ -356,7 +356,7 @@ based HashBitset. --> spellcheck - + direct wordbreak @@ -366,7 +366,7 @@ based HashBitset. --> spellcheck - + dismax lowerfilt1^1 @@ -376,13 +376,13 @@ based HashBitset. --> - + - + @@ -458,7 +458,7 @@ based HashBitset. --> - + max-age=30, public @@ -549,7 +549,7 @@ based HashBitset. --> - + text diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml index 9db620570e5..a5785634156 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-postingshighlight.xml @@ -24,7 +24,7 @@ - + false text diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml index 24c2ea8c5f0..eb538fa620b 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml @@ -23,7 +23,7 @@ ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml index 0945be254c1..9d4f83d68c3 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender-noquery.xml @@ -68,7 +68,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml index 7f7bf1886e7..1404f8abb4f 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-querysender.xml @@ -42,8 +42,8 @@ local query request for each NamedList in sequence. --> - solr 0 10 mock - rocks 0 10 mock + solr 0 10 /mock + rocks 0 10 /mock fast_warm 0 10 - mock + /mock @@ -64,7 +64,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml index 76c379cab21..761d45dc032 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml @@ -28,17 +28,17 @@ - + true - + - + @@ -51,7 +51,7 @@ - + max-age=30, public diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-reqHandler.incl b/solr/core/src/test-files/solr/collection1/conf/solrconfig-reqHandler.incl index 03f236fccf7..cc975040e14 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-reqHandler.incl +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-reqHandler.incl @@ -1,5 +1,5 @@ - diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml index f89b187f0e4..643d9a62fc7 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml @@ -20,8 +20,8 @@ ${tests.luceneMatchVersion:LATEST} - + - - - dismax - + + + dismax + responselog - + dismax - + text diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml index ac8321b726c..04ba1f22080 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml @@ -35,7 +35,7 @@ - + true diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml index 8fa8dcfc351..f87385ee336 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-script-updateprocessor.xml @@ -24,7 +24,7 @@ ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml index 73fb42adfde..c71f8baf9d4 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-searcher-listeners1.xml @@ -41,7 +41,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml index 5ca7184188b..39a7870b156 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml @@ -28,17 +28,17 @@ - + true - + - + @@ -49,7 +49,7 @@ - + max-age=30, public diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml index aa2f8a46ec4..26821b4e578 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml @@ -28,21 +28,21 @@ - + true - + - + - + max-age=30, public diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml index 4278d675090..fc707d461fd 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml @@ -26,7 +26,7 @@ - + ${foo.foo1} ${foo.foo2} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingmergepolicyfactory.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingmergepolicyfactory.xml index a7a83586c76..17e6f4c7a56 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingmergepolicyfactory.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingmergepolicyfactory.xml @@ -31,7 +31,7 @@ ${solr.tests.lockType:single} - + @@ -47,7 +47,7 @@ ${solr.autoSoftCommit.maxTime:-1} - + text diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml index 35ad58b3750..efb9eead864 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml @@ -25,7 +25,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml index 243eb5ed5cc..646a9eb822f 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spatial.xml @@ -24,7 +24,7 @@ - + 1 - + - + false @@ -169,7 +169,7 @@ spellcheck - + dismax lowerfilt1^1 @@ -178,7 +178,7 @@ spellcheck - + default wordbreak @@ -188,7 +188,7 @@ spellcheck - + text diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml index 3b0aff681a8..a876fb6f27c 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellchecker.xml @@ -29,7 +29,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml index 6a0c5b59e22..8ec6489d0c5 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-sql.xml @@ -44,13 +44,13 @@ - + - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent-context-filter-query.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent-context-filter-query.xml index 394b25e2ca8..36b6755bd23 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent-context-filter-query.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent-context-filter-query.xml @@ -27,7 +27,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml index 661913c6828..857fb113687 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-suggestercomponent.xml @@ -28,7 +28,7 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml index 3dba2720e81..dc7bb66ceab 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-test-misc.xml @@ -45,8 +45,8 @@ attr2="${non.existent.sys.prop:default-from-config}">prefix-${solr.test.sys.prop2}-suffix - - + + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-testxmlparser.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-testxmlparser.xml index 40c39a18984..401710e8d32 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-testxmlparser.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-testxmlparser.xml @@ -24,7 +24,7 @@ - + org.apache.solr.search.HandyQueryBuilder org.apache.solr.search.HelloQueryBuilder diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml index af5d208923c..4a5810040f8 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tieredmergepolicyfactory.xml @@ -36,6 +36,6 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml index cf12c4a19d8..12e5089363c 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml @@ -44,8 +44,7 @@ - - + ${solr.peerSync.useRangeVersions:true} @@ -158,7 +157,7 @@ - + text diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-uninvertdocvaluesmergepolicyfactory.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-uninvertdocvaluesmergepolicyfactory.xml index 613357bf91b..5f15430bad8 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-uninvertdocvaluesmergepolicyfactory.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-uninvertdocvaluesmergepolicyfactory.xml @@ -33,6 +33,6 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml index 426f3c09352..4113bd133eb 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-update-processor-chains.xml @@ -25,7 +25,7 @@ ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer-randommergepolicyfactory.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer-randommergepolicyfactory.xml index 1e1936b2096..21101b1d9e6 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer-randommergepolicyfactory.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-warmer-randommergepolicyfactory.xml @@ -24,7 +24,7 @@ ${solr.data.dir:} - + - - + true - + dismax *:* @@ -231,10 +227,10 @@ - + - + 4 true @@ -243,7 +239,7 @@ - + 4 true @@ -341,7 +337,7 @@ --> - + false @@ -354,7 +350,7 @@ spellcheck - + direct false @@ -365,7 +361,7 @@ spellcheck - + default wordbreak @@ -375,7 +371,7 @@ spellcheck - + direct wordbreak @@ -385,7 +381,7 @@ spellcheck - + dismax lowerfilt1^1 @@ -395,13 +391,13 @@ - + - + @@ -460,7 +456,7 @@ - + max-age=30, public @@ -578,7 +574,8 @@ org.apache.solr.rest.ManagedResourceStorage$InMemoryStorageIO - + + text diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig_SimpleTextCodec.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig_SimpleTextCodec.xml index f3abf9bc1d3..7b0c3e368ba 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig_SimpleTextCodec.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig_SimpleTextCodec.xml @@ -21,6 +21,6 @@ - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml index 0c3e81e3416..ad080961d9f 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec.xml @@ -21,7 +21,7 @@ - + ${tests.COMPRESSION_MODE:BEST_COMPRESSION} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec2.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec2.xml index d3790a4c2b0..c4a8ae73dfe 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec2.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig_codec2.xml @@ -20,7 +20,7 @@ ${tests.luceneMatchVersion:LATEST} - + diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml index cc6f97b372b..6f35efa4e34 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml @@ -60,7 +60,7 @@ - + - - + diff --git a/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml index 49bbf582682..3ef080dcca3 100644 --- a/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/bad-mergepolicy/conf/solrconfig.xml @@ -31,6 +31,6 @@ - + diff --git a/solr/core/src/test-files/solr/configsets/cdcr-source/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cdcr-source/conf/solrconfig.xml index f2528c3ad10..64690386bd4 100644 --- a/solr/core/src/test-files/solr/configsets/cdcr-source/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/cdcr-source/conf/solrconfig.xml @@ -64,8 +64,7 @@ - - + diff --git a/solr/core/src/test-files/solr/configsets/cdcr-target/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/cdcr-target/conf/solrconfig.xml index ef24fa49a46..bb4a7749f7c 100644 --- a/solr/core/src/test-files/solr/configsets/cdcr-target/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/cdcr-target/conf/solrconfig.xml @@ -51,8 +51,7 @@ - - + diff --git a/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml index 31c374cb628..af1036f999f 100644 --- a/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml +++ b/solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml @@ -42,7 +42,7 @@ - + diff --git a/solr/core/src/test-files/solr/crazy-path-to-config.xml b/solr/core/src/test-files/solr/crazy-path-to-config.xml index c6dc859f7be..00781a98f2a 100644 --- a/solr/core/src/test-files/solr/crazy-path-to-config.xml +++ b/solr/core/src/test-files/solr/crazy-path-to-config.xml @@ -37,9 +37,11 @@ - - - + + + + + implicit subject @@ -55,7 +57,7 @@ solrconfig.xml schema.xml - + subject diff --git a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java index 2122c90fe57..52e2e781819 100644 --- a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java +++ b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java @@ -122,7 +122,7 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 { SolrCore core = h.getCore(); // test that we got the expected config, not just hardcoded defaults - assertNotNull(core.getRequestHandler("mock")); + assertNotNull(core.getRequestHandler("/mock")); // test stats call SolrMetricManager manager = core.getCoreContainer().getMetricManager(); @@ -756,12 +756,12 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 { ); assertQ("defaults handler returns fewer matches", - req("q", "id:[42 TO 47]", "qt","defaults"), + req("q", "id:[42 TO 47]", "qt","/defaults"), "*[count(//doc)=4]" ); assertQ("defaults handler includes highlighting", - req("q", "name:Zapp OR title:General", "qt","defaults"), + req("q", "name:Zapp OR title:General", "qt","/defaults"), "//lst[@name='highlighting']" ); diff --git a/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java b/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java index bf7925a318d..35bd1073fd0 100644 --- a/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java +++ b/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java @@ -134,7 +134,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 { ); args = new HashMap<>(); req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", - "standard", 2, 5 , args); + "/select", 2, 5 , args); assertQ(req ,"//*[@numFound='3'] " ,"*[count(//doc)=1] " @@ -143,28 +143,28 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 { ); args = new HashMap<>(); req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", - "standard", 3, 5 , args); + "/select", 3, 5 , args); assertQ(req ,"//*[@numFound='3'] " ,"*[count(//doc)=0]" ); args = new HashMap<>(); req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", - "standard", 4, 5 , args); + "/select", 4, 5 , args); assertQ(req ,"//*[@numFound='3'] " ,"*[count(//doc)=0]" ); args = new HashMap<>(); req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", - "standard", 25, 5 , args); + "/select", 25, 5 , args); assertQ(req ,"//*[@numFound='3'] " ,"*[count(//doc)=0]" ); args = new HashMap<>(); req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", - "standard", 0, 1 , args); + "/select", 0, 1 , args); assertQ(req ,"//*[@numFound='3'] " ,"*[count(//doc)=1] " @@ -172,7 +172,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 { ); args = new HashMap<>(); req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", - "standard", 0, 2 , args); + "/select", 0, 2 , args); assertQ(req ,"//*[@numFound='3'] " ,"*[count(//doc)=2] " @@ -180,7 +180,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 { ); args = new HashMap<>(); req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", - "standard", 1, 1 , args); + "/select", 1, 1 , args); assertQ(req ,"//*[@numFound='3'] " ,"*[count(//doc)=1] " @@ -188,28 +188,28 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 { ); args = new HashMap<>(); req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", - "standard", 3, 1 , args); + "/select", 3, 1 , args); assertQ(req ,"//*[@numFound='3'] " ,"*[count(//doc)=0]" ); args = new HashMap<>(); req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", - "standard", 4, 1 , args); + "/select", 4, 1 , args); assertQ(req ,"//*[@numFound='3'] " ,"*[count(//doc)=0]" ); args = new HashMap<>(); req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", - "standard", 1, 0 , args); + "/select", 1, 0 , args); assertQ(req ,"//*[@numFound='3'] " ,"*[count(//doc)=0]" ); args = new HashMap<>(); req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z]", - "standard", 0, 0 , args); + "/select", 0, 0 , args); assertQ(req ,"//*[@numFound='3'] " ,"*[count(//doc)=0]" @@ -217,7 +217,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 { args = new HashMap<>(); args.put("defType","lucenePlusSort"); req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z];val_s1 asc", - "standard", 0, 0 , args); + "/select", 0, 0 , args); assertQ(req ,"//*[@numFound='3'] " ,"*[count(//doc)=0]" @@ -225,7 +225,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 { args = new HashMap<>(); args.put("defType","lucenePlusSort"); req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z];val_s1 desc", - "standard", 0, 0 , args); + "/select", 0, 0 , args); assertQ(req ,"//*[@numFound='3'] " ,"*[count(//doc)=0]" @@ -1109,7 +1109,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 { args = new HashMap<>(); args.put("fl","fname_s,arr_f "); req = new LocalSolrQueryRequest(h.getCore(), "id:44", - "standard", 0, 10, args); + "/select", 0, 10, args); assertQ(req ,"//str[.='Yonik'] " ,"//float[.='1.4142135']" @@ -1117,7 +1117,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 { args = new HashMap<>(); args.put("fl","fname_s,score"); req = new LocalSolrQueryRequest(h.getCore(), "id:44", - "standard", 0, 10, args); + "/select", 0, 10, args); assertQ(req ,"//str[.='Yonik']" ,"//float[@name='score' and . > 0]" @@ -1128,7 +1128,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 { args = new HashMap<>(); args.put("fl","score,* "); req = new LocalSolrQueryRequest(h.getCore(), "id:44", - "standard", 0, 10, args); + "/select", 0, 10, args); assertQ(req ,"//str[.='Yonik'] " ,"//float[.='1.4142135'] " @@ -1138,7 +1138,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 { args = new HashMap<>(); args.put("fl","*,score "); req = new LocalSolrQueryRequest(h.getCore(), "id:44", - "standard", 0, 10, args); + "/select", 0, 10, args); assertQ(req ,"//str[.='Yonik'] " ,"//float[.='1.4142135'] " @@ -1148,7 +1148,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 { args = new HashMap<>(); args.put("fl","* "); req = new LocalSolrQueryRequest(h.getCore(), "id:44", - "standard", 0, 10, args); + "/select", 0, 10, args); assertQ(req ,"//str[.='Yonik'] " ,"//float[.='1.4142135'] " @@ -1160,7 +1160,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 { args = new HashMap<>(); args.put("fl","score "); req = new LocalSolrQueryRequest(h.getCore(), "id:44", - "standard", 0, 10, args); + "/select", 0, 10, args); assertQ(req ,"//result[@maxScore>0]" ); @@ -1168,7 +1168,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 { args.put("fl","score "); args.put("defType","lucenePlusSort"); req = new LocalSolrQueryRequest(h.getCore(), "id:44;id desc;", - "standard", 0, 10, args); + "/select", 0, 10, args); assertQ(req ,"//result[@maxScore>0]" ); @@ -1176,7 +1176,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 { args.put("fl","score "); args.put("defType","lucenePlusSort"); req = new LocalSolrQueryRequest(h.getCore(), "id:44;", - "standard", 0, 10, args); + "/select", 0, 10, args); assertQ(req ,"//@maxScore = //doc/float[@name='score']" ); @@ -1184,7 +1184,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 { args.put("fl","score "); args.put("defType","lucenePlusSort"); req = new LocalSolrQueryRequest(h.getCore(), "id:44;id desc;", - "standard", 0, 10, args); + "/select", 0, 10, args); assertQ(req ,"//@maxScore = //doc/float[@name='score']" ); @@ -1192,7 +1192,7 @@ public class ConvertedLegacyTest extends SolrTestCaseJ4 { args.put("fl","*,score"); args.put("defType","lucenePlusSort"); req = new LocalSolrQueryRequest(h.getCore(), "id:44;id desc;", - "standard", 0, 0 , args); + "/select", 0, 0 , args); assertQ(req ,"//result[@maxScore>0]" ); diff --git a/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java index bdeeb40ea17..386f6900e71 100644 --- a/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java @@ -30,7 +30,7 @@ public class DisMaxRequestHandlerTest extends SolrTestCaseJ4 { public static void beforeClass() throws Exception { initCore("solrconfig.xml","schema.xml"); lrf = h.getRequestFactory - ("dismax", 0, 20, + ("/dismax", 0, 20, CommonParams.VERSION,"2.2", "facet", "true", "facet.field","t_s" @@ -69,7 +69,7 @@ public class DisMaxRequestHandlerTest extends SolrTestCaseJ4 { @Test public void testSomeStuff() throws Exception { - doTestSomeStuff("dismax"); + doTestSomeStuff("/dismax"); } public void doTestSomeStuff(final String qt) throws Exception { @@ -179,7 +179,7 @@ public class DisMaxRequestHandlerTest extends SolrTestCaseJ4 { Pattern p = Pattern.compile("subject:hell\\s*subject:cool"); Pattern p_bool = Pattern.compile("\\(subject:hell\\s*subject:cool\\)"); String resp = h.query(req("q", "cool stuff" - ,"qt", "dismax" + ,"qt", "/dismax" ,CommonParams.VERSION, "2.2" ,"bq", "subject:hell OR subject:cool" ,CommonParams.DEBUG_QUERY, "true" @@ -188,7 +188,7 @@ public class DisMaxRequestHandlerTest extends SolrTestCaseJ4 { assertFalse(p_bool.matcher(resp).find()); resp = h.query(req("q", "cool stuff" - ,"qt", "dismax" + ,"qt", "/dismax" ,CommonParams.VERSION, "2.2" ,"bq", "subject:hell OR subject:cool" ,"bq","" diff --git a/solr/core/src/test/org/apache/solr/EchoParamsTest.java b/solr/core/src/test/org/apache/solr/EchoParamsTest.java index a89a5125aa4..44699e8948c 100644 --- a/solr/core/src/test/org/apache/solr/EchoParamsTest.java +++ b/solr/core/src/test/org/apache/solr/EchoParamsTest.java @@ -66,7 +66,7 @@ public class EchoParamsTest extends SolrTestCaseJ4 { private void allEchoParams() { lrf = h.getRequestFactory - ("crazy_custom_qt", 0, 20, + ("/crazy_custom_qt", 0, 20, CommonParams.VERSION,"2.2", "wt","xml", "echoParams", "all", @@ -74,7 +74,7 @@ public class EchoParamsTest extends SolrTestCaseJ4 { ); assertQ(req("foo"),HEADER_XPATH + "/lst[@name='params']/str[@name='fl'][.='implicit']"); - assertQ(req("foo"),HEADER_XPATH + "/str[@name='handler'][.='org.apache.solr.handler.StandardRequestHandler']"); + assertQ(req("foo"),HEADER_XPATH + "/str[@name='handler'][.='org.apache.solr.handler.component.SearchHandler']"); } } diff --git a/solr/core/src/test/org/apache/solr/SampleTest.java b/solr/core/src/test/org/apache/solr/SampleTest.java index 244272f7a6e..407a4832ff4 100644 --- a/solr/core/src/test/org/apache/solr/SampleTest.java +++ b/solr/core/src/test/org/apache/solr/SampleTest.java @@ -102,7 +102,7 @@ public class SampleTest extends SolrTestCaseJ4 { * Note: the qt proves we are using our custom config... */ TestHarness.LocalRequestFactory l = h.getRequestFactory - ("crazy_custom_qt",100,200,CommonParams.VERSION,"2.2"); + ("/crazy_custom_qt",100,200,CommonParams.VERSION,"2.2"); assertQ("how did i find Mack Daddy? ", l.makeRequest( "Mack Daddy" ) ,"//result[@numFound=0]" diff --git a/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java b/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java index d39c87fad0b..72fdf25d9d3 100644 --- a/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java +++ b/solr/core/src/test/org/apache/solr/SolrInfoBeanTest.java @@ -18,9 +18,9 @@ package org.apache.solr; import org.apache.lucene.util.TestUtil; import org.apache.solr.core.SolrInfoBean; -import org.apache.solr.handler.StandardRequestHandler; import org.apache.solr.handler.admin.LukeRequestHandler; import org.apache.solr.handler.component.SearchComponent; +import org.apache.solr.handler.component.SearchHandler; import org.apache.solr.highlight.DefaultSolrHighlighter; import org.apache.solr.metrics.SolrMetricManager; import org.apache.solr.metrics.SolrMetricProducer; @@ -49,7 +49,7 @@ public class SolrInfoBeanTest extends SolrTestCaseJ4 */ public void testCallMBeanInfo() throws Exception { List classes = new ArrayList<>(); - classes.addAll(getClassesForPackage(StandardRequestHandler.class.getPackage().getName())); + classes.addAll(getClassesForPackage(SearchHandler.class.getPackage().getName())); classes.addAll(getClassesForPackage(SearchComponent.class.getPackage().getName())); classes.addAll(getClassesForPackage(LukeRequestHandler.class.getPackage().getName())); classes.addAll(getClassesForPackage(DefaultSolrHighlighter.class.getPackage().getName())); diff --git a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java index 9a821aaeefb..02754f0b578 100644 --- a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java +++ b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java @@ -386,7 +386,7 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase { query("q","*:*", "fl","n_*","sort",i1 + " desc"); // basic spellcheck testing - query("q", "toyata", "fl", "id,lowerfilt", "spellcheck", true, "spellcheck.q", "toyata", "qt", "spellCheckCompRH_Direct", "shards.qt", "spellCheckCompRH_Direct"); + query("q", "toyata", "fl", "id,lowerfilt", "spellcheck", true, "spellcheck.q", "toyata", "qt", "/spellCheckCompRH_Direct", "shards.qt", "/spellCheckCompRH_Direct"); stress=0; // turn off stress... we want to tex max combos in min time for (int i=0; i<25*RANDOM_MULTIPLIER; i++) { @@ -1012,8 +1012,8 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase { "q", "toyata", "spellcheck", "true", "spellcheck.q", "toyata", - "qt", "spellCheckCompRH_Direct", - "shards.qt", "spellCheckCompRH_Direct", + "qt", "/spellCheckCompRH_Direct", + "shards.qt", "/spellCheckCompRH_Direct", ShardParams.SHARDS_INFO, "true", ShardParams.SHARDS_TOLERANT, "true"); diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java index 7a9dbdb4cac..79b49dc2152 100644 --- a/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java @@ -58,7 +58,7 @@ public class BasicZkTest extends AbstractZkTestCase { SolrCore core = h.getCore(); // test that we got the expected config, not just hardcoded defaults - assertNotNull(core.getRequestHandler("mock")); + assertNotNull(core.getRequestHandler("/mock")); lrf.args.put(CommonParams.VERSION, "2.2"); assertQ("test query on empty index", request("qlkciyopsbgzyvkylsjhchghjrdf"), diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java b/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java index 30898b9996e..55cdee84043 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java @@ -108,7 +108,7 @@ public class TestRandomRequestDistribution extends AbstractFullDistribZkTestBase SolrMetricManager metricManager = container.getMetricManager(); for (SolrCore core : container.getCores()) { String registry = core.getCoreMetricManager().getRegistryName(); - Counter cnt = metricManager.counter(null, registry, "requests", "QUERY.standard"); + Counter cnt = metricManager.counter(null, registry, "requests", "QUERY./select"); SolrRequestHandler select = core.getRequestHandler(""); // long c = (long) select.getStatistics().get("requests"); shardVsCount.put(core.getName(), (int) cnt.getCount()); @@ -188,7 +188,7 @@ public class TestRandomRequestDistribution extends AbstractFullDistribZkTestBase SolrMetricManager leaderMetricManager = leaderCore.getCoreContainer().getMetricManager(); String leaderRegistry = leaderCore.getCoreMetricManager().getRegistryName(); - Counter cnt = leaderMetricManager.counter(null, leaderRegistry, "requests", "QUERY.standard"); + Counter cnt = leaderMetricManager.counter(null, leaderRegistry, "requests", "QUERY./select"); // All queries should be served by the active replica // To make sure that's true we keep querying the down replica diff --git a/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java b/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java index cf8d7c65f06..9bf08a53523 100644 --- a/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java +++ b/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java @@ -37,7 +37,7 @@ public class AlternateDirectoryTest extends SolrTestCaseJ4 { } public void testAltDirectoryUsed() throws Exception { - assertQ(req("q","*:*","qt","standard")); + assertQ(req("q","*:*","qt","/select")); assertTrue(TestFSDirectoryFactory.openCalled); assertTrue(TestIndexReaderFactory.newReaderCalled); } diff --git a/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java b/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java index 3c13645702c..637aa24aa8e 100644 --- a/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java +++ b/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java @@ -36,7 +36,7 @@ public class RequestHandlersTest extends SolrTestCaseJ4 { public void testInitCount() { String registry = h.getCore().getCoreMetricManager().getRegistryName(); SolrMetricManager manager = h.getCoreContainer().getMetricManager(); - Gauge g = (Gauge)manager.registry(registry).getMetrics().get("QUERY.mock.initCount"); + Gauge g = (Gauge)manager.registry(registry).getMetrics().get("QUERY./mock.initCount"); assertEquals("Incorrect init count", 1, g.getValue().intValue()); } @@ -52,7 +52,7 @@ public class RequestHandlersTest extends SolrTestCaseJ4 { @Test public void testLazyLoading() { SolrCore core = h.getCore(); - PluginBag.PluginHolder handler = core.getRequestHandlers().getRegistry().get("lazy"); + PluginBag.PluginHolder handler = core.getRequestHandlers().getRegistry().get("/lazy"); assertFalse(handler.isLoaded()); assertU(adoc("id", "42", @@ -75,12 +75,12 @@ public class RequestHandlersTest extends SolrTestCaseJ4 { // But it should behave just like the 'defaults' request handler above assertQ("lazy handler returns fewer matches", - req("q", "id:[42 TO 47]", "qt","lazy"), + req("q", "id:[42 TO 47]", "qt","/lazy"), "*[count(//doc)=4]" ); assertQ("lazy handler includes highlighting", - req("q", "name:Zapp OR title:General", "qt","lazy"), + req("q", "name:Zapp OR title:General", "qt","/lazy"), "//lst[@name='highlighting']" ); } diff --git a/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java b/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java index c042bd66c4e..62f4d2e7744 100644 --- a/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java +++ b/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java @@ -254,7 +254,7 @@ public class SolrCoreTest extends SolrTestCaseJ4 { bean = infoRegistry.get(QueryComponent.COMPONENT_NAME); assertNotNull("bean not registered", bean); //try a Req Handler, which are stored by name, not clas - bean = infoRegistry.get("standard"); + bean = infoRegistry.get("/select"); assertNotNull("bean not registered", bean); } diff --git a/solr/core/src/test/org/apache/solr/core/TestConfig.java b/solr/core/src/test/org/apache/solr/core/TestConfig.java index 87a453faf92..5a7b706d3f9 100644 --- a/solr/core/src/test/org/apache/solr/core/TestConfig.java +++ b/solr/core/src/test/org/apache/solr/core/TestConfig.java @@ -69,8 +69,8 @@ public class TestConfig extends SolrTestCaseJ4 { } @Test public void testDisableRequetsHandler() throws Exception { - assertNull(h.getCore().getRequestHandler("disabled")); - assertNotNull(h.getCore().getRequestHandler("enabled")); + assertNull(h.getCore().getRequestHandler("/disabled")); + assertNotNull(h.getCore().getRequestHandler("/enabled")); } @Test diff --git a/solr/core/src/test/org/apache/solr/core/TestQuerySenderListener.java b/solr/core/src/test/org/apache/solr/core/TestQuerySenderListener.java index c1eb873bbec..900f02494e7 100644 --- a/solr/core/src/test/org/apache/solr/core/TestQuerySenderListener.java +++ b/solr/core/src/test/org/apache/solr/core/TestQuerySenderListener.java @@ -75,7 +75,7 @@ public class TestQuerySenderListener extends SolrTestCaseJ4 { RefCounted currentSearcherRef = core.getSearcher(); SolrIndexSearcher currentSearcher = currentSearcherRef.get(); qsl.newSearcher(currentSearcher, null);//test new Searcher - MockQuerySenderListenerReqHandler mock = (MockQuerySenderListenerReqHandler) core.getRequestHandler("mock"); + MockQuerySenderListenerReqHandler mock = (MockQuerySenderListenerReqHandler) core.getRequestHandler("/mock"); assertNotNull("Mock is null", mock); String evt = mock.req.getParams().get(EventParams.EVENT); assertNotNull("Event is null", evt); diff --git a/solr/core/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java b/solr/core/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java index 425f04a1402..76ac7c32745 100644 --- a/solr/core/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java +++ b/solr/core/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java @@ -70,7 +70,7 @@ public class TestQuerySenderNoQuery extends SolrTestCaseJ4 { SolrIndexSearcher currentSearcher = currentSearcherRef.get(); SolrIndexSearcher dummy = null; qsl.newSearcher(currentSearcher, dummy);//test first Searcher (since param is null) - MockQuerySenderListenerReqHandler mock = (MockQuerySenderListenerReqHandler) core.getRequestHandler("mock"); + MockQuerySenderListenerReqHandler mock = (MockQuerySenderListenerReqHandler) core.getRequestHandler("/mock"); assertNotNull("Mock is null", mock); assertNull("Req (firstsearcher) is not null", mock.req); diff --git a/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java b/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java index 529fa06aac5..32be46e12a8 100644 --- a/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java +++ b/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java @@ -52,7 +52,7 @@ public class TestXIncludeConfig extends AbstractSolrTestCase { SolrCore core = h.getCore(); assertNotNull("includedHandler is null", - core.getRequestHandler("includedHandler")); + core.getRequestHandler("/includedHandler")); UpdateRequestProcessorChain chain = core.getUpdateProcessingChain("special-include"); diff --git a/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java index 6da06b1d384..aa63ce32576 100644 --- a/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java @@ -38,7 +38,6 @@ public class MoreLikeThisHandlerTest extends SolrTestCaseJ4 { @BeforeClass public static void moreLikeThisBeforeClass() throws Exception { initCore("solrconfig.xml", "schema.xml"); - lrf = h.getRequestFactory("standard", 0, 20 ); } @Test diff --git a/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/SearchHandlerTest.java similarity index 88% rename from solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java rename to solr/core/src/test/org/apache/solr/handler/SearchHandlerTest.java index 668fefd4203..b35103ba7ce 100644 --- a/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/SearchHandlerTest.java @@ -16,28 +16,20 @@ */ package org.apache.solr.handler; -import org.apache.solr.core.SolrCore; import org.apache.solr.util.AbstractSolrTestCase; import org.junit.BeforeClass; /** - * Most of the tests for StandardRequestHandler are in ConvertedLegacyTest - * + * Most of the tests for {@link org.apache.solr.handler.component.SearchHandler} are in {@link org.apache.solr.ConvertedLegacyTest}. */ -public class StandardRequestHandlerTest extends AbstractSolrTestCase { +public class SearchHandlerTest extends AbstractSolrTestCase { @BeforeClass public static void beforeClass() throws Exception { initCore("solrconfig.xml", "schema.xml"); } - @Override public void setUp() throws Exception { - super.setUp(); - lrf = h.getRequestFactory("standard", 0, 20 ); - } - public void testSorting() throws Exception { - SolrCore core = h.getCore(); assertU(adoc("id", "10", "title", "test", "val_s1", "aaa")); assertU(adoc("id", "11", "title", "test", "val_s1", "bbb")); assertU(adoc("id", "12", "title", "test", "val_s1", "ccc")); diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java index 40e952abb67..9e84fd2adfe 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java @@ -124,11 +124,11 @@ public class DistributedSpellCheckComponentTest extends BaseDistributedSearchTes handle.put("grouped", SKIP); //Randomly select either IndexBasedSpellChecker or DirectSolrSpellChecker - String requestHandlerName = "spellCheckCompRH_Direct"; - String reqHandlerWithWordbreak = "spellCheckWithWordbreak_Direct"; + String requestHandlerName = "/spellCheckCompRH_Direct"; + String reqHandlerWithWordbreak = "/spellCheckWithWordbreak_Direct"; if(random().nextBoolean()) { - requestHandlerName = "spellCheckCompRH"; - reqHandlerWithWordbreak = "spellCheckWithWordbreak"; + requestHandlerName = "/spellCheckCompRH"; + reqHandlerWithWordbreak = "/spellCheckWithWordbreak"; } //Shortcut names @@ -143,7 +143,7 @@ public class DistributedSpellCheckComponentTest extends BaseDistributedSearchTes String maxResults = SpellingParams.SPELLCHECK_MAX_RESULTS_FOR_SUGGEST; //Build the dictionary for IndexBasedSpellChecker - q(buildRequest("*:*", false, "spellCheckCompRH", false, build, "true")); + q(buildRequest("*:*", false, "/spellCheckCompRH", false, build, "true")); //Test Basic Functionality query(buildRequest("toyata", true, requestHandlerName, random().nextBoolean(), (String[]) null)); diff --git a/solr/core/src/test/org/apache/solr/handler/component/FacetPivotSmallTest.java b/solr/core/src/test/org/apache/solr/handler/component/FacetPivotSmallTest.java index 4b5e8a75fb8..0f4ec0630be 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/FacetPivotSmallTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/FacetPivotSmallTest.java @@ -40,7 +40,6 @@ public class FacetPivotSmallTest extends SolrTestCaseJ4 { super.setUp(); clearIndex(); assertU(commit()); - lrf = h.getRequestFactory("standard", 0, 20); } /** diff --git a/solr/core/src/test/org/apache/solr/handler/component/ResponseLogComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/ResponseLogComponentTest.java index 7e309fc894b..cf657dae273 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/ResponseLogComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/ResponseLogComponentTest.java @@ -38,8 +38,8 @@ public class ResponseLogComponentTest extends SolrTestCaseJ4 { public void testToLogIds() throws Exception { SolrQueryRequest req = null; try { - String handler="withlog"; - req = req("indent","true", "qt","withlog", "q","aa", "rows","2", + String handler="/withlog"; + req = req("indent","true", "qt","/withlog", "q","aa", "rows","2", "fl","id,subject", "responseLog","true"); SolrQueryResponse qr = h.queryAndResponse(handler, req); NamedList entries = qr.getToLog(); @@ -55,8 +55,8 @@ public class ResponseLogComponentTest extends SolrTestCaseJ4 { public void testToLogScores() throws Exception { SolrQueryRequest req = null; try { - String handler="withlog"; - req = req("indent","true", "qt","withlog", "q","aa", "rows","2", + String handler="/withlog"; + req = req("indent","true", "qt","/withlog", "q","aa", "rows","2", "fl","id,subject,score", "responseLog","true"); SolrQueryResponse qr = h.queryAndResponse(handler, req); NamedList entries = qr.getToLog(); @@ -72,8 +72,8 @@ public class ResponseLogComponentTest extends SolrTestCaseJ4 { public void testDisabling() throws Exception { SolrQueryRequest req = null; try { - String handler="withlog"; - req = req("indent","true", "qt","withlog", "q","aa", "rows","2", + String handler="/withlog"; + req = req("indent","true", "qt","/withlog", "q","aa", "rows","2", "fl","id,subject", "responseLog","false"); SolrQueryResponse qr = h.queryAndResponse(handler, req); NamedList entries = qr.getToLog(); diff --git a/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java index 37d02d9be87..d3b0828d71c 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java @@ -43,7 +43,7 @@ import org.junit.Test; @Slow @SuppressTempFileChecks(bugUrl = "https://issues.apache.org/jira/browse/SOLR-1877 Spellcheck IndexReader leak bug?") public class SpellCheckComponentTest extends SolrTestCaseJ4 { - static String rh = "spellCheckCompRH"; + static String rh = "/spellCheckCompRH"; @BeforeClass @@ -254,7 +254,7 @@ public class SpellCheckComponentTest extends SolrTestCaseJ4 { public void testReloadOnStart() throws Exception { assertU(adoc("id", "0", "lowerfilt", "This is a title")); assertU(commit()); - SolrQueryRequest request = req("qt", "spellCheckCompRH", "q", "*:*", + SolrQueryRequest request = req("qt", "/spellCheckCompRH", "q", "*:*", "spellcheck.q", "ttle", "spellcheck", "true", "spellcheck.dictionary", "default", "spellcheck.build", "true"); assertQ(request, "//arr[@name='suggestion'][.='title']"); @@ -271,7 +271,7 @@ public class SpellCheckComponentTest extends SolrTestCaseJ4 { checker.init(args); checker.inform(h.getCore()); - request = req("qt", "spellCheckCompRH", "q", "*:*", "spellcheck.q", "ttle", + request = req("qt", "/spellCheckCompRH", "q", "*:*", "spellcheck.q", "ttle", "spellcheck", "true", "spellcheck.dictionary", "default", "spellcheck.reload", "true"); List components = new ArrayList<>(); @@ -293,7 +293,7 @@ public class SpellCheckComponentTest extends SolrTestCaseJ4 { @SuppressWarnings("unchecked") @Test public void testRebuildOnCommit() throws Exception { - SolrQueryRequest req = req("q", "lowerfilt:lucenejavt", "qt", "spellCheckCompRH", "spellcheck", "true"); + SolrQueryRequest req = req("q", "lowerfilt:lucenejavt", "qt", "/spellCheckCompRH", "spellcheck", "true"); String response = h.query(req); assertFalse("No suggestions should be returned", response.contains("lucenejava")); @@ -330,7 +330,7 @@ public class SpellCheckComponentTest extends SolrTestCaseJ4 { params.add(SpellingParams.SPELLCHECK_EXTENDED_RESULTS,"true"); params.add(CommonParams.Q, "anotheq"); - SolrRequestHandler handler = core.getRequestHandler("spellCheckCompRH"); + SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH"); SolrQueryResponse rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); SolrQueryRequest req = new LocalSolrQueryRequest(core, params); diff --git a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java index 3bb497479ac..cee1ab5e3d3 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java @@ -78,7 +78,6 @@ public class StatsComponentTest extends AbstractSolrTestCase { super.setUp(); clearIndex(); assertU(commit()); - lrf = h.getRequestFactory("standard", 0, 20); } public void testStats() throws Exception { diff --git a/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentTest.java index ed7a9e77af8..b15e167aa05 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentTest.java @@ -516,7 +516,7 @@ public class SuggestComponentTest extends SolrTestCaseJ4 { waitForWarming(); } - assertQ(req("qt", "standard", + assertQ(req("qt", "/select", "q", "*:*"), "//*[@numFound='11']" ); diff --git a/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java index abee4bd3439..91a586993f9 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java @@ -118,7 +118,7 @@ public class TermVectorComponentTest extends SolrTestCaseJ4 { assertNull(h.validateUpdate(commit())); } - static String tv = "tvrh"; + static String tv = "/tvrh"; @Test public void testBasics() throws Exception { diff --git a/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java b/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java index aafe3f5bf29..99868a7b6f6 100644 --- a/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java +++ b/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java @@ -77,7 +77,7 @@ public class FastVectorHighlighterTest extends SolrTestCaseJ4 { args.put("hl.method", "fastVector"); // the new way } TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard",0,200,args); + "",0,200,args); assertU(adoc("tv_text", "basic fast vector highlighter test", "id", "1")); diff --git a/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java b/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java index f022e96ecb2..58321328336 100644 --- a/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java +++ b/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java @@ -62,7 +62,7 @@ public class HighlighterConfigTest extends AbstractSolrTestCase { args.put("df", "t_text"); args.put("hl.fl", ""); TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); assertU(adoc("t_text", "a long day's night", "id", "1")); assertU(commit()); diff --git a/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java b/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java index f0b58cd53f3..759de00cc2e 100644 --- a/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java +++ b/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java @@ -119,7 +119,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put(HighlightParams.MERGE_CONTIGUOUS_FRAGMENTS, "true"); args.put(HighlightParams.METHOD, "original"); // test works; no complaints TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); String input = "this is some long text. It has the word long in many places. In fact, it has long on some different fragments. " + "Let us see what happens to long in this case."; String gold = "this is some long text. It has the word long in many places. In fact, it has long on some different fragments. " + @@ -145,7 +145,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put(HighlightParams.MERGE_CONTIGUOUS_FRAGMENTS, "false"); args.put("f.t_text." + HighlightParams.MERGE_CONTIGUOUS_FRAGMENTS, "false"); sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); assertQ("Merge Contiguous", sumLRF.makeRequest("t_text:long"), "//lst[@name='highlighting']/lst[@name='1']", @@ -165,7 +165,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put("hl.fl", "tv_text"); args.put("hl.snippets", "2"); TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard",0,200,args); + "",0,200,args); assertU(adoc("tv_text", LONG_TEXT, "id", "1")); @@ -186,7 +186,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put("hl", "true"); args.put("hl.fl", "tv_no_off_text"); - TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory("standard", 0, 200, args); + TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory("", 0, 200, args); assertU(adoc("tv_no_off_text", "Crackerjack Cameron", "id", "1")); assertU(commit()); @@ -229,7 +229,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put("hl.fl", "tv_mv_text"); args.put("hl.snippets", "2"); TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard",0,200,args); + "",0,200,args); assertU(adoc("tv_mv_text", LONG_TEXT, "tv_mv_text", LONG_TEXT, @@ -256,7 +256,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put("hl.fl", "tv_mv_text"); args.put("hl.snippets", "2"); TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard",0,200,args); + "",0,200,args); String shortText = "short"; assertU(adoc("tv_mv_text", shortText, @@ -282,7 +282,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put("qf", "tv_text"); args.put("q.alt", "*:*"); TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "dismax",0,200,args); + "/dismax",0,200,args); assertU(adoc("tv_text", "a long day's night", "id", "1")); assertU(commit()); @@ -309,7 +309,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put("hl.fl", "textgap"); args.put("df", "textgap"); TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); assertU(adoc("textgap", "first entry hasnt queryword", "textgap", "second entry has queryword long", @@ -331,7 +331,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put("hl.fl", "textgap"); args.put("df", "textgap"); TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); assertU(adoc("textgap", "first entry has one word foo", "textgap", "second entry has both words foo bar", @@ -370,7 +370,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put("df", "t_text"); args.put("hl.fl", ""); TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); assertU(adoc("t_text", "a long day's night", "id", "1")); assertU(commit()); @@ -392,7 +392,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put("hl", "false"); args.put("hl.fl", "t_text"); TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); assertU(adoc("t_text", "a long day's night", "id", "1")); assertU(commit()); @@ -410,7 +410,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put("hl", "true"); args.put("hl.fl", "t_text tv_text"); TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); assertU(adoc("t_text", "a long day's night", "id", "1", "tv_text", "a long night's day")); @@ -437,7 +437,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put("hl.fl", "t_text1 t_text2"); TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); // default should highlight both random and words in both fields assertQ("Test Default", sumLRF.makeRequest("t_text1:random OR t_text2:words"), @@ -449,7 +449,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { // requireFieldMatch=true - highlighting should only occur if term matched in that field args.put("hl.requireFieldMatch", "true"); sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); assertQ("Test RequireFieldMatch", sumLRF.makeRequest("t_text1:random OR t_text2:words"), "//lst[@name='highlighting']/lst[@name='1']", @@ -463,7 +463,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { assertU(delI("1")); assertU(commit()); sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); assertQ("Test RequireFieldMatch on un-optimized index", sumLRF.makeRequest("t_text1:random OR t_text2:words"), "//lst[@name='highlighting']/lst[@name='2']", @@ -482,7 +482,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put("hl.simple.pre",""); args.put("hl.simple.post", ""); TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); assertU(adoc("t_text", "a long days night", "id", "1")); assertU(commit()); @@ -497,7 +497,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put("f.t_text.hl.simple.pre", ""); args.put("f.t_text.hl.simple.post", ""); sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); assertQ("Basic summarization", sumLRF.makeRequest("t_text:long"), "//lst[@name='highlighting']/lst[@name='1']", @@ -513,7 +513,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put("hl", "true"); args.put("hl.fl", "tv_text"); TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); String text = @@ -537,7 +537,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { final String field = random().nextBoolean() ? "t_text" : "tv_text"; args.put("hl.fl", field); TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); assertU(adoc(field, LONG_TEXT, "id", "1")); @@ -549,14 +549,14 @@ public class HighlighterTest extends SolrTestCaseJ4 { "//lst[@name='1']/arr[count(str)=1]" ); args.put("hl.maxAnalyzedChars", "20"); - sumLRF = h.getRequestFactory("standard", 0, 200, args); + sumLRF = h.getRequestFactory("", 0, 200, args); assertQ("token at end of text", sumLRF.makeRequest(field + ":disjoint"), "//lst[@name='highlighting']/lst[@name='1']", "//lst[@name='1'][not(*)]" ); args.put("hl.maxAnalyzedChars", "-1"); - sumLRF = h.getRequestFactory("standard", 0, 200, args); + sumLRF = h.getRequestFactory("", 0, 200, args); assertQ("token at start of text", sumLRF.makeRequest(field + ":disjoint"), "//lst[@name='highlighting']/lst[@name='1']", @@ -598,7 +598,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put("hl.regex.pattern", "[-\\w ,\"']{20,200}"); args.put("hl.regex.slop", ".9"); TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); String t = "This is an example of a sentence. Another example \"sentence\" with " + "special characters\nand a line-break! Miscellaneous character like ^ are " + @@ -617,7 +617,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { ); // try with some punctuation included args.put("hl.regex.pattern", "[-\\w ,^/\\n\"']{20,200}"); - sumLRF = h.getRequestFactory("standard", 0, 200, args); + sumLRF = h.getRequestFactory("", 0, 200, args); assertQ("regex fragmenter 2", sumLRF.makeRequest("t_text:example"), "//lst[@name='highlighting']/lst[@name='1']", @@ -640,7 +640,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put("hl", "true"); args.put("hl.fl", "tv_text"); TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); assertQ("Basic summarization", sumLRF.makeRequest("tv_text:long"), "//lst[@name='highlighting']/lst[@name='1']", @@ -650,7 +650,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { // 25 args.put("hl.fragsize","25"); sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); assertQ("Basic summarization", sumLRF.makeRequest("tv_text:long"), "//lst[@name='highlighting']/lst[@name='1']", @@ -660,7 +660,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { // 0 - NullFragmenter args.put("hl.fragsize","0"); sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); assertQ("Basic summarization", sumLRF.makeRequest("tv_text:long"), "//lst[@name='highlighting']/lst[@name='1']", @@ -684,7 +684,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put("hl.fragsize","0"); args.put("hl.fl", "t_text"); TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); // no alternate assertQ("Alternate summarization", @@ -695,7 +695,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { // with an alternate args.put("hl.alternateField", "foo_t"); - sumLRF = h.getRequestFactory("standard", 0, 200, args); + sumLRF = h.getRequestFactory("", 0, 200, args); assertQ("Alternate summarization", sumLRF.makeRequest("tv_text:keyword"), "//lst[@name='highlighting']/lst[@name='1' and count(*)=1]", @@ -705,7 +705,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { // with an alternate + max length args.put("hl.alternateField", "t_text"); args.put("hl.maxAlternateFieldLength", "15"); - sumLRF = h.getRequestFactory("standard", 0, 200, args); + sumLRF = h.getRequestFactory("", 0, 200, args); assertQ("Alternate summarization", sumLRF.makeRequest("tv_text:keyword"), "//lst[@name='highlighting']/lst[@name='1' and count(*)=1]", @@ -715,7 +715,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { // with a non-existing alternate field + max length args.put("hl.alternateField", "NonExistingField"); args.put("hl.maxAlternateFieldLength", "15"); - sumLRF = h.getRequestFactory("standard", 0, 200, args); + sumLRF = h.getRequestFactory("", 0, 200, args); assertQ("Alternate summarization", sumLRF.makeRequest("tv_text:keyword"), "//lst[@name='highlighting']/lst[@name='1' and count(*)=1]", @@ -744,7 +744,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put("hl.alternateField", "tv_text"); args.put("hl.maxAlternateFieldLength", "39"); TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); assertQ("Alternate summarization with highlighting", sumLRF.makeRequest("tv_text:keyword"), "//lst[@name='highlighting']/lst[@name='1' and count(*)=1]", @@ -761,7 +761,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { // With hl.requireFieldMatch, will not highlight but fall back to plain-text alternate args.put("hl.requireFieldMatch", "true"); sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); assertQ("Alternate summarization with highlighting, requireFieldMatch", sumLRF.makeRequest("other_t:keyword"), "//lst[@name='highlighting']/lst[@name='1' and count(*)=1]", @@ -774,7 +774,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.remove("hl.alternateField"); args.put("f.t_text.hl.alternateField", "tv_text"); args.put("f.t_text.hl.maxAlternateFieldLength", "0"); - sumLRF = h.getRequestFactory("standard", 0, 200, args); + sumLRF = h.getRequestFactory("", 0, 200, args); assertQ("Alternate summarization with highlighting", sumLRF.makeRequest("tv_text:keyword"), "//lst[@name='highlighting']/lst[@name='1' and count(*)=1]", @@ -786,7 +786,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put("hl.tag.pre", ""); args.put("hl.tag.post", ""); args.put("f.t_text.hl.maxAlternateFieldLength", "18"); - sumLRF = h.getRequestFactory("standard", 0, 200, args); + sumLRF = h.getRequestFactory("", 0, 200, args); assertQ("Alternate summarization with highlighting using FVH", sumLRF.makeRequest("tv_text:keyword"), "//lst[@name='highlighting']/lst[@name='1' and count(*)=1]", @@ -795,7 +795,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { // Prove it is possible to turn off highlighting of alternate field args.put("hl.highlightAlternate", "false"); - sumLRF = h.getRequestFactory("standard", 0, 200, args); + sumLRF = h.getRequestFactory("", 0, 200, args); assertQ("Alternate summarization without highlighting", sumLRF.makeRequest("tv_text:keyword"), "//lst[@name='highlighting']/lst[@name='1' and count(*)=1]", @@ -813,7 +813,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put("hl.usePhraseHighlighter", "false"); TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); // String borrowed from Lucene's HighlighterTest String t = "This piece of text refers to Kennedy at the beginning then has a longer piece of text that is very long in the middle and finally ends with another reference to Kennedy"; @@ -843,7 +843,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { // now check if Lucene-794 highlighting works as expected args.put("hl.usePhraseHighlighter", "true"); - sumLRF = h.getRequestFactory("standard", 0, 200, args); + sumLRF = h.getRequestFactory("", 0, 200, args); // check phrase highlighting assertQ("Phrase highlighting - Lucene-794", @@ -877,7 +877,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { assertU(commit()); assertU(optimize()); - TestHarness.LocalRequestFactory lrf = h.getRequestFactory("standard", 0, + TestHarness.LocalRequestFactory lrf = h.getRequestFactory("", 0, 10, args); SolrQueryRequest request = lrf.makeRequest("test"); @@ -893,7 +893,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { request.close(); args.put("hl.fl", "foo_*"); - lrf = h.getRequestFactory("standard", 0, 10, args); + lrf = h.getRequestFactory("", 0, 10, args); request = lrf.makeRequest("test"); highlighter = HighlightComponent.getHighlighter(h.getCore()); highlightFieldNames = Arrays.asList(highlighter.getHighlightFields(null, @@ -906,7 +906,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { // SOLR-5127 args.put("hl.fl", (random().nextBoolean() ? "foo_*,bar_*" : "bar_*,foo_*")); - lrf = h.getRequestFactory("standard", 0, 10, args); + lrf = h.getRequestFactory("", 0, 10, args); // hl.fl ordering need not be preserved in output final Set highlightedSetExpected = new HashSet(); highlightedSetExpected.add("foo_s"); @@ -931,7 +931,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put("hl.usePhraseHighlighter", "true"); args.put("hl.highlightMultiTerm", "true"); TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); assertU(adoc("t_text", "a long day's night", "id", "1")); assertU(commit()); @@ -955,7 +955,7 @@ public class HighlighterTest extends SolrTestCaseJ4 { args.put("hl.usePhraseHighlighter", "true"); args.put("hl.highlightMultiTerm", "true"); TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); assertU(adoc("t_text", "a long day's night", "id", "1")); assertU(commit()); diff --git a/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java b/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java index a8e7ecdda8b..b2cb5f38b72 100644 --- a/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java +++ b/solr/core/src/test/org/apache/solr/metrics/SolrMetricsIntegrationTest.java @@ -43,7 +43,7 @@ public class SolrMetricsIntegrationTest extends SolrTestCaseJ4 { private static final int MAX_ITERATIONS = 20; private static final String CORE_NAME = "metrics_integration"; private static final String METRIC_NAME = "requestTimes"; - private static final String HANDLER_NAME = "standard"; + private static final String HANDLER_NAME = "/select"; private static final String[] REPORTER_NAMES = {"reporter1", "reporter2"}; private static final String UNIVERSAL = "universal"; private static final String SPECIFIC = "specific"; diff --git a/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java b/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java index 0ee345ee1ed..35a66c3e17b 100644 --- a/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java +++ b/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java @@ -3312,7 +3312,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 { SolrQueryRequest req = req(params); log.info("Using Params: " + params); try { - SolrQueryResponse rsp = h.queryAndResponse("standard", req); + SolrQueryResponse rsp = h.queryAndResponse("", req); rangeFacetsFilter = (NamedList) ((NamedList) rsp.getValues().get("facet_counts")).get("facet_ranges"); } finally { req.close(); @@ -3320,7 +3320,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 { params.add("facet.range.method", FacetRangeMethod.DV.toString()); req = req(params); try { - SolrQueryResponse rsp = h.queryAndResponse("standard", req); + SolrQueryResponse rsp = h.queryAndResponse("", req); rangeFacetsDv = (NamedList) ((NamedList) rsp.getValues().get("facet_counts")).get("facet_ranges"); } finally { req.close(); diff --git a/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java b/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java index fc8ddff37bb..df0031f1c09 100644 --- a/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java +++ b/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java @@ -326,7 +326,7 @@ public class TestIntervalFaceting extends SolrTestCaseJ4 { } SolrQueryRequest req = req(params); try { - SolrQueryResponse rsp = h.queryAndResponse("standard", req); + SolrQueryResponse rsp = h.queryAndResponse("", req); NamedList facetQueries = (NamedList) ((NamedList) rsp.getValues().get("facet_counts")).get("facet_queries"); NamedList facetIntervals = (NamedList) ((NamedList) (NamedList) ((NamedList) rsp.getValues().get("facet_counts")) .get("facet_intervals")).get(field); diff --git a/solr/core/src/test/org/apache/solr/search/TestComplexPhraseQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestComplexPhraseQParserPlugin.java index 8c592813baf..02060a98acb 100644 --- a/solr/core/src/test/org/apache/solr/search/TestComplexPhraseQParserPlugin.java +++ b/solr/core/src/test/org/apache/solr/search/TestComplexPhraseQParserPlugin.java @@ -102,7 +102,7 @@ public class TestComplexPhraseQParserPlugin extends AbstractSolrTestCase { args.put(CommonParams.FL, "id"); TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); assertU(adoc("name", "john smith", "id", "1")); assertU(adoc("name", "johathon smith", "id", "2")); @@ -181,7 +181,7 @@ public class TestComplexPhraseQParserPlugin extends AbstractSolrTestCase { TestHarness.LocalRequestFactory sumLRF = h.getRequestFactory( - "standard", 0, 200, args); + "", 0, 200, args); assertU(adoc("name", "john smith smith john", "id", "1")); assertU(adoc("name", "johathon smith smith johathon", "id", "2")); @@ -198,7 +198,7 @@ public class TestComplexPhraseQParserPlugin extends AbstractSolrTestCase { ); - sumLRF = h.getRequestFactory("standard", 0, 200, args); + sumLRF = h.getRequestFactory("", 0, 200, args); assertQ("PhraseHighlighter=true Test", sumLRF.makeRequest("name:\"(john johathon) smith\""), "//lst[@name='highlighting']/lst[@name='1']", @@ -209,7 +209,7 @@ public class TestComplexPhraseQParserPlugin extends AbstractSolrTestCase { args.put(HighlightParams.USE_PHRASE_HIGHLIGHTER, Boolean.FALSE.toString()); - sumLRF = h.getRequestFactory("standard", 0, 200, args); + sumLRF = h.getRequestFactory("", 0, 200, args); assertQ("PhraseHighlighter=false Test", sumLRF.makeRequest("name:\"(john johathon) smith\""), "//lst[@name='highlighting']/lst[@name='1']", diff --git a/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetDistribTest.java b/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetDistribTest.java index 1b126575c0f..123ce97adf4 100644 --- a/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetDistribTest.java +++ b/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetDistribTest.java @@ -137,7 +137,7 @@ public class BlockJoinFacetDistribTest extends SolrCloudTestCase{ oldFacetsEnabled&&usually() ? "facet.limit" : "ignore" , "1", oldFacetsEnabled&&usually() ? "facet.mincount" : "ignore" , "2", oldFacetsEnabled&&usually() ? "facet.overrequest.count" : "ignore" , "0", - "qt", random().nextBoolean() ? "blockJoinDocSetFacetRH" : "blockJoinFacetRH", + "qt", random().nextBoolean() ? "/blockJoinDocSetFacetRH" : "/blockJoinFacetRH", "child.facet.field", "COLOR_s", "child.facet.field", "SIZE_s", "distrib.singlePass", random().nextBoolean() ? "true":"false", diff --git a/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetRandomTest.java b/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetRandomTest.java index 1b04d79ca09..21ec78004d9 100644 --- a/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetRandomTest.java +++ b/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetRandomTest.java @@ -46,7 +46,7 @@ public class BlockJoinFacetRandomTest extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() throws Exception { initCore("solrconfig-blockjoinfacetcomponent.xml", "schema-blockjoinfacetcomponent.xml"); - handler = random().nextBoolean() ? "blockJoinDocSetFacetRH":"blockJoinFacetRH"; + handler = random().nextBoolean() ? "/blockJoinDocSetFacetRH":"/blockJoinFacetRH"; facets = createFacets(); createIndex(); } diff --git a/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetSimpleTest.java b/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetSimpleTest.java index 5e610cfe22e..c4d3a64253e 100644 --- a/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetSimpleTest.java +++ b/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetSimpleTest.java @@ -32,7 +32,7 @@ public class BlockJoinFacetSimpleTest extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() throws Exception { initCore("solrconfig-blockjoinfacetcomponent.xml", "schema-blockjoinfacetcomponent.xml"); - handler = random().nextBoolean() ? "blockJoinDocSetFacetRH":"blockJoinFacetRH"; + handler = random().nextBoolean() ? "/blockJoinDocSetFacetRH":"/blockJoinFacetRH"; createIndex(); } diff --git a/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java index cb5bba7d214..29551ded7ac 100644 --- a/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java +++ b/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java @@ -83,7 +83,7 @@ public class DirectSolrSpellCheckerTest extends SolrTestCaseJ4 { @Test public void testOnlyMorePopularWithExtendedResults() throws Exception { - assertQ(req("q", "teststop:fox", "qt", "spellCheckCompRH", SpellCheckComponent.COMPONENT_NAME, "true", SpellingParams.SPELLCHECK_DICT, "direct", SpellingParams.SPELLCHECK_EXTENDED_RESULTS, "true", SpellingParams.SPELLCHECK_ONLY_MORE_POPULAR, "true"), + assertQ(req("q", "teststop:fox", "qt", "/spellCheckCompRH", SpellCheckComponent.COMPONENT_NAME, "true", SpellingParams.SPELLCHECK_DICT, "direct", SpellingParams.SPELLCHECK_EXTENDED_RESULTS, "true", SpellingParams.SPELLCHECK_ONLY_MORE_POPULAR, "true"), "//lst[@name='spellcheck']/lst[@name='suggestions']/lst[@name='fox']/int[@name='origFreq']=1", "//lst[@name='spellcheck']/lst[@name='suggestions']/lst[@name='fox']/arr[@name='suggestion']/lst/str[@name='word']='foo'", "//lst[@name='spellcheck']/lst[@name='suggestions']/lst[@name='fox']/arr[@name='suggestion']/lst/int[@name='freq']=2", diff --git a/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java b/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java index 54280448a1b..06f18fc8bdb 100644 --- a/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java +++ b/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java @@ -115,7 +115,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 { params.add(SpellingParams.SPELLCHECK_ALTERNATIVE_TERM_COUNT, "10"); params.add(CommonParams.Q, "id:[1 TO 10] AND lowerfilt:lovw"); { - SolrRequestHandler handler = core.getRequestHandler("spellCheckCompRH"); + SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH"); SolrQueryResponse rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); SolrQueryRequest req = new LocalSolrQueryRequest(core, params); @@ -147,7 +147,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 { params.add(CommonParams.Q, "lowerfilt:(hypenated-wotd)"); { - SolrRequestHandler handler = core.getRequestHandler("spellCheckCompRH"); + SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH"); SolrQueryResponse rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); SolrQueryRequest req = new LocalSolrQueryRequest(core, params); @@ -164,10 +164,10 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 { params.remove(CommonParams.Q); params.add("defType", "dismax"); - params.add("qf", "lowerfilt"); + params.add("qf", "/lowerfilt"); params.add(CommonParams.Q, "hypenated-wotd"); { - SolrRequestHandler handler = core.getRequestHandler("spellCheckCompRH"); + SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH"); SolrQueryResponse rsp = new SolrQueryResponse(); rsp.add("responseHeader", new SimpleOrderedMap()); SolrQueryRequest req = new LocalSolrQueryRequest(core, params); @@ -194,7 +194,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 { SpellingParams.SPELLCHECK_COLLATE, "true", SpellingParams.SPELLCHECK_MAX_COLLATION_TRIES, "10", SpellingParams.SPELLCHECK_MAX_COLLATIONS, "10", - "qt", "spellCheckCompRH", + "qt", "/spellCheckCompRH", "defType", "edismax", "qf", "teststop", "mm", "1", @@ -210,7 +210,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 { SpellingParams.SPELLCHECK_COLLATE, "true", SpellingParams.SPELLCHECK_MAX_COLLATION_TRIES, "10", SpellingParams.SPELLCHECK_MAX_COLLATIONS, "10", - "qt", "spellCheckCompRH", + "qt", "/spellCheckCompRH", "defType", "edismax", "qf", "teststop", "mm", "1", @@ -241,7 +241,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 { //Because a FilterQuery is applied which removes doc id#1 from possible hits, we would //not want the collations to return us "lowerfilt:(+faith +hope +loaves)" as this only matches doc id#1. - SolrRequestHandler handler = core.getRequestHandler("spellCheckCompRH"); + SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH"); SolrQueryResponse rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); SolrQueryRequest req = new LocalSolrQueryRequest(core, params); @@ -276,7 +276,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 { //SpellCheckCompRH has no "qf" defined. It will not find "peace" from "peac" despite it being in the dictionary //because requrying against this Request Handler results in 0 hits. - SolrRequestHandler handler = core.getRequestHandler("spellCheckCompRH"); + SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH"); SolrQueryResponse rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); SolrQueryRequest req = new LocalSolrQueryRequest(core, params); @@ -291,7 +291,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 { //SpellCheckCompRH1 has "lowerfilt1" defined in the "qf" param. It will find "peace" from "peac" because //requrying field "lowerfilt1" returns the hit. params.remove(SpellingParams.SPELLCHECK_BUILD); - handler = core.getRequestHandler("spellCheckCompRH1"); + handler = core.getRequestHandler("/spellCheckCompRH1"); rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); req = new LocalSolrQueryRequest(core, params); @@ -323,7 +323,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 { // Returns 1 collation as a single string. // All words are "correct" per the dictionary, but this collation would // return no results if tried. - SolrRequestHandler handler = core.getRequestHandler("spellCheckCompRH"); + SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH"); SolrQueryResponse rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); SolrQueryRequest req = new LocalSolrQueryRequest(core, params); @@ -340,7 +340,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 { params.remove(SpellingParams.SPELLCHECK_BUILD); params.add(SpellingParams.SPELLCHECK_MAX_COLLATION_TRIES, "5"); params.add(SpellingParams.SPELLCHECK_MAX_COLLATIONS, "1"); - handler = core.getRequestHandler("spellCheckCompRH"); + handler = core.getRequestHandler("/spellCheckCompRH"); rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); req = new LocalSolrQueryRequest(core, params); @@ -358,7 +358,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 { params.remove(SpellingParams.SPELLCHECK_MAX_COLLATIONS); params.add(SpellingParams.SPELLCHECK_MAX_COLLATION_TRIES, "10"); params.add(SpellingParams.SPELLCHECK_MAX_COLLATIONS, "2"); - handler = core.getRequestHandler("spellCheckCompRH"); + handler = core.getRequestHandler("/spellCheckCompRH"); rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); req = new LocalSolrQueryRequest(core, params); @@ -377,7 +377,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 { // Testing return multiple collations with expanded collation response // format. params.add(SpellingParams.SPELLCHECK_COLLATE_EXTENDED_RESULTS, "true"); - handler = core.getRequestHandler("spellCheckCompRH"); + handler = core.getRequestHandler("/spellCheckCompRH"); rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); req = new LocalSolrQueryRequest(core, params); @@ -430,7 +430,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 { //Because a FilterQuery is applied which removes doc id#1 from possible hits, we would //not want the collations to return us "lowerfilt:(+faith +hope +loaves)" as this only matches doc id#1. - SolrRequestHandler handler = core.getRequestHandler("spellCheckCompRH"); + SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH"); SolrQueryResponse rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); SolrQueryRequest req = new LocalSolrQueryRequest(core, params); @@ -451,7 +451,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 { assertQ( req( "q", "teststop:(flew AND form AND heathrow)", - "qt", "spellCheckCompRH", + "qt", "/spellCheckCompRH", "indent", "true", SpellCheckComponent.COMPONENT_NAME, "true", SpellCheckComponent.SPELLCHECK_BUILD, "true", @@ -479,7 +479,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 { assertQ( req( "q", "teststop:(june AND customs)", - "qt", "spellCheckCompRH", + "qt", "/spellCheckCompRH", "indent", "true", SpellCheckComponent.COMPONENT_NAME, "true", SpellCheckComponent.SPELLCHECK_DICT, dictionary[i], @@ -500,8 +500,9 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 { "//lst[@name='spellcheck']/lst[@name='collations']/lst[@name='collation']/lst[@name='misspellingsAndCorrections']/str[@name='june']='jane'" ); //SOLR-5090, alternativeTermCount==0 was being evaluated, sometimes would throw NPE - assertQ(req("q", "teststop:(june customs)", "mm", "2", "qt", - "spellCheckCompRH", "indent", "true", + assertQ(req("q", "teststop:(june customs)", "mm", "2", + "qt", "/spellCheckCompRH", + "indent", "true", SpellCheckComponent.COMPONENT_NAME, "true", SpellCheckComponent.SPELLCHECK_DICT, dictionary[i], SpellCheckComponent.SPELLCHECK_COUNT, "10", @@ -522,7 +523,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 { SpellingParams.SPELLCHECK_MAX_COLLATION_TRIES, "1", SpellingParams.SPELLCHECK_MAX_COLLATIONS, "1", SpellingParams.SPELLCHECK_COLLATE_EXTENDED_RESULTS, "true", - "qt", "spellCheckCompRH"); + "qt", "/spellCheckCompRH"); // default case, no SPELLCHECK_COLLATE_MAX_COLLECT_DOCS should be exact num hits assertQ(req(reusedParams, @@ -589,7 +590,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 { params.add(SpellCheckComponent.SPELLCHECK_MAX_COLLATION_TRIES, "0"); params.add(SpellCheckComponent.SPELLCHECK_MAX_COLLATIONS, "2"); params.add(CommonParams.Q, "lowerfilt:(+fauth)"); - SolrRequestHandler handler = core.getRequestHandler("spellCheckCompRH"); + SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH"); SolrQueryResponse rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); SolrQueryRequest req = new LocalSolrQueryRequest(core, params); @@ -618,7 +619,7 @@ public class SpellCheckCollatorTest extends SolrTestCaseJ4 { params.add(CommonParams.Q, "lowerfilt:(+fauth)"); params.add(CommonParams.SORT, "id asc"); params.add(CursorMarkParams.CURSOR_MARK_PARAM, CursorMarkParams.CURSOR_MARK_START); - SolrRequestHandler handler = core.getRequestHandler("spellCheckCompRH"); + SolrRequestHandler handler = core.getRequestHandler("/spellCheckCompRH"); SolrQueryResponse rsp = new SolrQueryResponse(); rsp.addResponseHeader(new SimpleOrderedMap()); SolrQueryRequest req = new LocalSolrQueryRequest(core, params); diff --git a/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorWithCollapseTest.java b/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorWithCollapseTest.java index f985b418c5b..fe8e787ffd3 100644 --- a/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorWithCollapseTest.java +++ b/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorWithCollapseTest.java @@ -57,7 +57,7 @@ public class SpellCheckCollatorWithCollapseTest extends SolrTestCaseJ4 { SpellingParams.SPELLCHECK_MAX_COLLATION_TRIES, "5", SpellingParams.SPELLCHECK_MAX_COLLATIONS, "1", CommonParams.Q, "a_s:lpve", - CommonParams.QT, "spellCheckCompRH_Direct", + CommonParams.QT, "/spellCheckCompRH_Direct", SpellingParams.SPELLCHECK_COLLATE_MAX_COLLECT_DOCS, "5", CommonParams.FQ, "{!collapse field=group_i}", "expand", "true"), diff --git a/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java index f24bcbaa7bc..258594aa4c8 100644 --- a/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java +++ b/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java @@ -158,7 +158,7 @@ public class WordBreakSolrSpellCheckerTest extends SolrTestCaseJ4 { public void testInConjunction() throws Exception { assertQ(req( "q", "lowerfilt:(paintable pine apple good ness)", - "qt", "spellCheckWithWordbreak", + "qt", "/spellCheckWithWordbreak", "indent", "true", SpellCheckComponent.SPELLCHECK_BUILD, "true", SpellCheckComponent.COMPONENT_NAME, "true", @@ -222,7 +222,7 @@ public class WordBreakSolrSpellCheckerTest extends SolrTestCaseJ4 { public void testCollate() throws Exception { assertQ(req( "q", "lowerfilt:(paintable pine apple godness)", - "qt", "spellCheckWithWordbreak", + "qt", "/spellCheckWithWordbreak", "indent", "true", SpellCheckComponent.SPELLCHECK_BUILD, "true", SpellCheckComponent.COMPONENT_NAME, "true", @@ -248,7 +248,7 @@ public class WordBreakSolrSpellCheckerTest extends SolrTestCaseJ4 { ); assertQ(req( "q", "lowerfilt:(pine AND apple)", - "qt", "spellCheckWithWordbreak", + "qt", "/spellCheckWithWordbreak", "indent", "true", SpellCheckComponent.COMPONENT_NAME, "true", SpellCheckComponent.SPELLCHECK_ACCURACY, ".75", @@ -262,7 +262,7 @@ public class WordBreakSolrSpellCheckerTest extends SolrTestCaseJ4 { ); assertQ(req( "q", "lowerfilt:pine AND NOT lowerfilt:apple", - "qt", "spellCheckWithWordbreak", + "qt", "/spellCheckWithWordbreak", "indent", "true", SpellCheckComponent.COMPONENT_NAME, "true", SpellCheckComponent.SPELLCHECK_ACCURACY, ".75", @@ -275,7 +275,7 @@ public class WordBreakSolrSpellCheckerTest extends SolrTestCaseJ4 { ); assertQ(req( "q", "lowerfilt:pine NOT lowerfilt:apple", - "qt", "spellCheckWithWordbreak", + "qt", "/spellCheckWithWordbreak", "indent", "true", SpellCheckComponent.COMPONENT_NAME, "true", SpellCheckComponent.SPELLCHECK_ACCURACY, ".75", @@ -288,7 +288,7 @@ public class WordBreakSolrSpellCheckerTest extends SolrTestCaseJ4 { ); assertQ(req( "q", "lowerfilt:(+pine -apple)", - "qt", "spellCheckWithWordbreak", + "qt", "/spellCheckWithWordbreak", "indent", "true", SpellCheckComponent.COMPONENT_NAME, "true", SpellCheckComponent.SPELLCHECK_ACCURACY, ".75", @@ -301,7 +301,7 @@ public class WordBreakSolrSpellCheckerTest extends SolrTestCaseJ4 { ); assertQ(req( "q", "lowerfilt:(+printableinpuntableplantable)", - "qt", "spellCheckWithWordbreak", + "qt", "/spellCheckWithWordbreak", "indent", "true", SpellCheckComponent.COMPONENT_NAME, "true", SpellCheckComponent.SPELLCHECK_ACCURACY, "1", @@ -313,7 +313,7 @@ public class WordBreakSolrSpellCheckerTest extends SolrTestCaseJ4 { ); assertQ(req( "q", "zxcv AND qwtp AND fghj", - "qt", "spellCheckWithWordbreak", + "qt", "/spellCheckWithWordbreak", "defType", "edismax", "qf", "lowerfilt", "indent", "true", diff --git a/solr/example/example-DIH/solr/db/conf/solrconfig.xml b/solr/example/example-DIH/solr/db/conf/solrconfig.xml index 46e7b87dba2..c03529e81e9 100644 --- a/solr/example/example-DIH/solr/db/conf/solrconfig.xml +++ b/solr/example/example-DIH/solr/db/conf/solrconfig.xml @@ -587,22 +587,8 @@ This section contains instructions for how the SolrDispatchFilter should behave when processing requests for this SolrCore. - - handleSelect is a legacy option that affects the behavior of requests - such as /select?qt=XXX - - handleSelect="true" will cause the SolrDispatchFilter to process - the request and dispatch the query to a handler specified by the - "qt" param, assuming "/select" isn't already registered. - - handleSelect="false" will cause the SolrDispatchFilter to - ignore "/select" requests, resulting in a 404 unless a handler - is explicitly registered with the name "/select" - - handleSelect="true" is not recommended for new users, but is the default - for backwards compatibility --> - + - + - + - + - + - + 1000 diff --git a/solr/solr-ref-guide/src/the-dismax-query-parser.adoc b/solr/solr-ref-guide/src/the-dismax-query-parser.adoc index d624d7c7450..378fd93f1c4 100644 --- a/solr/solr-ref-guide/src/the-dismax-query-parser.adoc +++ b/solr/solr-ref-guide/src/the-dismax-query-parser.adoc @@ -20,9 +20,9 @@ The DisMax query parser is designed to process simple phrases (without complex syntax) entered by users and to search for individual terms across several fields using different weighting (boosts) based on the significance of each field. Additional options enable users to influence the score based on rules specific to each use case (independent of user input). -In general, the DisMax query parser's interface is more like that of Google than the interface of the 'standard' Solr request handler. This similarity makes DisMax the appropriate query parser for many consumer applications. It accepts a simple syntax, and it rarely produces error messages. +In general, the DisMax query parser's interface is more like that of Google than the interface of the 'lucene' Solr query parser. This similarity makes DisMax the appropriate query parser for many consumer applications. It accepts a simple syntax, and it rarely produces error messages. -The DisMax query parser supports an extremely simplified subset of the Lucene QueryParser syntax. As in Lucene, quotes can be used to group phrases, and +/- can be used to denote mandatory and optional clauses. All other Lucene query parser special characters (except AND and OR) are escaped to simplify the user experience. The DisMax query parser takes responsibility for building a good query from the user's input using Boolean clauses containing DisMax queries across fields and boosts specified by the user. It also lets the Solr administrator provide additional boosting queries, boosting functions, and filtering queries to artificially affect the outcome of all searches. These options can all be specified as default parameters for the handler in the `solrconfig.xml` file or overridden in the Solr query URL. +The DisMax query parser supports an extremely simplified subset of the Lucene QueryParser syntax. As in Lucene, quotes can be used to group phrases, and +/- can be used to denote mandatory and optional clauses. All other Lucene query parser special characters (except AND and OR) are escaped to simplify the user experience. The DisMax query parser takes responsibility for building a good query from the user's input using Boolean clauses containing DisMax queries across fields and boosts specified by the user. It also lets the Solr administrator provide additional boosting queries, boosting functions, and filtering queries to artificially affect the outcome of all searches. These options can all be specified as default parameters for the request handler in the `solrconfig.xml` file or overridden in the Solr query URL. Interested in the technical concept behind the DisMax name? DisMax stands for Maximum Disjunction. Here's a definition of a Maximum Disjunction or "DisMax" query: @@ -190,11 +190,11 @@ All of the sample URLs in this section assume you are running Solr's "techproduc bin/solr -e techproducts ---- -Normal results for the word "video" using the StandardRequestHandler with the default search field: +Results for the word "video" using the standard query parser, and we assume "df" is pointing to a field to search: `\http://localhost:8983/solr/techproducts/select?q=video&fl=name+score` -The "dismax" handler is configured to search across the text, features, name, sku, id, manu, and cat fields all with varying boosts designed to ensure that "better" matches appear first, specifically: documents which match on the name and cat fields get higher scores. +The "dismax" parser is configured to search across the text, features, name, sku, id, manu, and cat fields all with varying boosts designed to ensure that "better" matches appear first, specifically: documents which match on the name and cat fields get higher scores. `\http://localhost:8983/solr/techproducts/select?defType=dismax&q=video` @@ -210,13 +210,13 @@ You can boost results that have a field that matches a specific value. `\http://localhost:8983/solr/techproducts/select?defType=dismax&q=video&bq=cat:electronics^5.0` -Another instance of the handler is registered using the `qt` "instock" and has slightly different configuration options, notably: a filter for (you guessed it) `inStock:true)`. +Another request handler is registered at "/instock" and has slightly different configuration options, notably: a filter for (you guessed it) `inStock:true)`. `\http://localhost:8983/solr/techproducts/select?defType=dismax&q=video&fl=name,score,inStock` -`\http://localhost:8983/solr/techproducts/select?defType=dismax&q=video&qt=instock&fl=name,score,inStock` +`\http://localhost:8983/solr/techproducts/instock?defType=dismax&q=video&fl=name,score,inStock` -One of the other really cool features in this handler is robust support for specifying the "BooleanQuery.minimumNumberShouldMatch" you want to be used based on how many terms are in your user's query. These allows flexibility for typos and partial matches. For the dismax handler, one and two word queries require that all of the optional clauses match, but for three to five word queries one missing word is allowed. +One of the other really cool features in this parser is robust support for specifying the "BooleanQuery.minimumNumberShouldMatch" you want to be used based on how many terms are in your user's query. These allows flexibility for typos and partial matches. For the dismax parser, one and two word queries require that all of the optional clauses match, but for three to five word queries one missing word is allowed. `\http://localhost:8983/solr/techproducts/select?defType=dismax&q=belkin+ipod` @@ -224,7 +224,7 @@ One of the other really cool features in this handler is robust support for spec `\http://localhost:8983/solr/techproducts/select?defType=dismax&q=belkin+ipod+apple` -Just like the StandardRequestHandler, it supports the debugQuery option to viewing the parsed query, and the score explanations for each document. +Use the debugQuery option to see the parsed query, and the score explanations for each document. `\http://localhost:8983/solr/techproducts/select?defType=dismax&q=belkin+ipod+gibberish&debugQuery=true` diff --git a/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java b/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java index 919f786ee06..882a32e50be 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java @@ -19,11 +19,10 @@ package org.apache.solr.common.params; import java.util.Locale; /** - * @since solr 1.3 + * Params for {@code MoreLikeThisHandler}. */ public interface MoreLikeThisParams { - // enable more like this -- this only applies to 'StandardRequestHandler' maybe DismaxRequestHandler public final static String MLT = "mlt"; public final static String PREFIX = "mlt."; diff --git a/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml b/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml index 9114cfd4b86..a68ac11ae08 100644 --- a/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml +++ b/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml @@ -29,17 +29,17 @@ - + true - + - + @@ -47,7 +47,7 @@ - + max-age=30, public diff --git a/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-sql.xml b/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-sql.xml index 6a0c5b59e22..af659ad1c34 100644 --- a/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-sql.xml +++ b/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-sql.xml @@ -44,13 +44,13 @@ - + - + diff --git a/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig.xml index a2db090b3e8..78bba011c69 100644 --- a/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig.xml +++ b/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig.xml @@ -35,11 +35,11 @@ - + - + diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml index b404e875ade..b002a309ea6 100644 --- a/solr/solrj/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml +++ b/solr/solrj/src/test-files/solrj/solr/configsets/ml/conf/solrconfig.xml @@ -36,11 +36,11 @@ - + - + diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml index 6beb0b71294..fbfa82b8ade 100644 --- a/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml +++ b/solr/solrj/src/test-files/solrj/solr/configsets/shared/conf/solrconfig.xml @@ -35,18 +35,18 @@ - + - - + + solr - + name diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/streaming/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/configsets/streaming/conf/solrconfig.xml index c7985d2a33f..70e9403ed96 100644 --- a/solr/solrj/src/test-files/solrj/solr/configsets/streaming/conf/solrconfig.xml +++ b/solr/solrj/src/test-files/solrj/solr/configsets/streaming/conf/solrconfig.xml @@ -36,18 +36,18 @@ - + - + solr - + text diff --git a/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml index 58a78923396..633f9d604fb 100644 --- a/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml +++ b/solr/solrj/src/test-files/solrj/solr/multicore/core0/conf/solrconfig.xml @@ -57,18 +57,18 @@ - + - - + + solr - + name diff --git a/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml index 81ee32a7f54..097b705e06b 100644 --- a/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml +++ b/solr/solrj/src/test-files/solrj/solr/multicore/core1/conf/solrconfig.xml @@ -57,18 +57,18 @@ - + - - + + solr - + name diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java index c91cb67a2fa..49cec5d4d4f 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java @@ -456,7 +456,7 @@ public class CloudSolrClientTest extends SolrCloudTestCase { private Long getNumRequests(String baseUrl, String collectionName) throws SolrServerException, IOException { - return getNumRequests(baseUrl, collectionName, "QUERY", "standard", null, false); + return getNumRequests(baseUrl, collectionName, "QUERY", "/select", null, false); } private Long getNumRequests(String baseUrl, String collectionName, String category, String key, String scope, boolean returnNumErrors) throws diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java index c8ec6c019ca..f9a93f7e258 100644 --- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java +++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java @@ -489,7 +489,7 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase { xmlStr = ""; Files.write(solrHome.resolve(SolrXmlConfig.SOLR_XML_FILE), xmlStr.getBytes(StandardCharsets.UTF_8)); h = new TestHarness(SolrXmlConfig.fromSolrHome(solrHome)); - lrf = h.getRequestFactory("standard", 0, 20, CommonParams.VERSION, "2.2"); + lrf = h.getRequestFactory("/select", 0, 20, CommonParams.VERSION, "2.2"); } /** @@ -687,20 +687,20 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase { solrConfig, getSchemaFile()); lrf = h.getRequestFactory - ("standard",0,20,CommonParams.VERSION,"2.2"); + ("",0,20,CommonParams.VERSION,"2.2"); } public static CoreContainer createCoreContainer(Path solrHome, String solrXML) { testSolrHome = requireNonNull(solrHome); h = new TestHarness(solrHome, solrXML); - lrf = h.getRequestFactory("standard", 0, 20, CommonParams.VERSION, "2.2"); + lrf = h.getRequestFactory("", 0, 20, CommonParams.VERSION, "2.2"); return h.getCoreContainer(); } public static CoreContainer createCoreContainer(NodeConfig config, CoresLocator locator) { testSolrHome = config.getSolrResourceLoader().getInstancePath(); h = new TestHarness(config, locator); - lrf = h.getRequestFactory("standard", 0, 20, CommonParams.VERSION, "2.2"); + lrf = h.getRequestFactory("", 0, 20, CommonParams.VERSION, "2.2"); return h.getCoreContainer(); } @@ -715,7 +715,7 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase { public static CoreContainer createDefaultCoreContainer(Path solrHome) { testSolrHome = requireNonNull(solrHome); h = new TestHarness("collection1", initCoreDataDir.getAbsolutePath(), "solrconfig.xml", "schema.xml"); - lrf = h.getRequestFactory("standard", 0, 20, CommonParams.VERSION, "2.2"); + lrf = h.getRequestFactory("", 0, 20, CommonParams.VERSION, "2.2"); return h.getCoreContainer(); }