You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ep...@apache.org on 2021/11/13 14:44:34 UTC
[solr] branch main updated: SOLR-15791: Remove remaining clauses from solrconfigs (#411)
This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 9ee30f1 SOLR-15791: Remove remaining <admin> clauses from solrconfigs (#411)
9ee30f1 is described below
commit 9ee30f1c1e0a0594c72b867103888c96bbd7857f
Author: Eric Pugh <ep...@opensourceconnections.com>
AuthorDate: Sat Nov 13 09:44:25 2021 -0500
SOLR-15791: Remove remaining <admin> clauses from solrconfigs (#411)
Test files had lots of unused <admin/> stanzas in solrconfigs that hadn't been removed when this was deprecated in SOLR-8766.
---
solr/CHANGES.txt | 2 ++
.../solr/collection1/conf/solrconfig.xml | 11 ++-----
.../conf/solrconfig-analytics-query.xml | 6 ----
.../conf/solrconfig-collapseqparser.xml | 6 ----
.../conf/solrconfig-components-name.xml | 7 +----
.../conf/solrconfig-doctransformers.xml | 6 ----
.../solr/collection1/conf/solrconfig-elevate.xml | 11 ++-----
.../solr/collection1/conf/solrconfig-hash.xml | 6 ----
.../solr/collection1/conf/solrconfig-minhash.xml | 30 ++++++++-----------
.../collection1/conf/solrconfig-plugcollector.xml | 5 ----
.../solr/collection1/conf/solrconfig-sql.xml | 6 ----
.../solr/collection1/conf/solrconfig-test-misc.xml | 8 +----
.../solr/collection1/conf/solrconfig.xml | 34 +++++++++-------------
.../src/test-files/solr/crazy-path-to-config.xml | 5 ----
.../src/test/org/apache/solr/core/TestConfig.java | 30 +++++++------------
.../solrj/solr/collection1/conf/solrconfig-sql.xml | 6 ----
.../solrj/solr/collection1/conf/solrconfig.xml | 10 ++-----
.../solrj/solr/configsets/ml/conf/solrconfig.xml | 6 ----
.../solr/configsets/shared/conf/solrconfig.xml | 10 ++-----
.../solr/configsets/streaming/conf/solrconfig.xml | 6 ----
.../solrj/solr/multicore/core0/conf/solrconfig.xml | 20 +++++--------
.../solrj/solr/multicore/core1/conf/solrconfig.xml | 20 +++++--------
22 files changed, 64 insertions(+), 187 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index f3a7fc3..f64fba3 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -394,6 +394,8 @@ Other Changes
* SOLR-15728: Remove dead, unused log rotation code from SolrCLI (janhoy)
+* SOLR-15791: Remove remaining unused <admin/> clauses from solrconfigs. (Eric Pugh)
+
Bug Fixes
---------------------
* SOLR-14546: Fix for a relatively hard to hit issue in OverseerTaskProcessor that could lead to out of order execution
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 ba9ea59..2dab548 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
@@ -33,10 +33,10 @@
<updateHandler class="solr.DirectUpdateHandler2">
- <!-- autocommit pending docs if certain criteria are met
- <autoCommit>
+ <!-- autocommit pending docs if certain criteria are met
+ <autoCommit>
<maxDocs>10000</maxDocs>
- <maxTime>3600000</maxTime>
+ <maxTime>3600000</maxTime>
</autoCommit>
-->
@@ -199,11 +199,6 @@
</httpCaching>
</requestDispatcher>
- <admin>
- <defaultQuery>solr</defaultQuery>
- <gettableFiles>solrconfig.xml schema.xml</gettableFiles>
- </admin>
-
<!-- test getting system property -->
<propTest attr1="${solr.test.sys.prop1}-$${literal}"
attr2="${non.existent.sys.prop:default-from-config}">prefix-${solr.test.sys.prop2}-suffix</propTest>
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 c0c964f..6406171 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
@@ -219,11 +219,6 @@
</httpCaching>
</requestDispatcher>
- <admin>
- <defaultQuery>solr</defaultQuery>
- <gettableFiles>solrconfig.xml schema.xml</gettableFiles>
- </admin>
-
<!-- test getting system property -->
<propTest attr1="${solr.test.sys.prop1}-$${literal}"
attr2="${non.existent.sys.prop:default-from-config}">prefix-${solr.test.sys.prop2}-suffix</propTest>
@@ -273,4 +268,3 @@
</updateRequestProcessorChain>
</config>
-
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
index 9f2bf3d..20df49e 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
@@ -222,11 +222,6 @@
</httpCaching>
</requestDispatcher>
- <admin>
- <defaultQuery>solr</defaultQuery>
- <gettableFiles>solrconfig.xml schema.xml</gettableFiles>
- </admin>
-
<!-- test getting system property -->
<propTest attr1="${solr.test.sys.prop1}-$${literal}"
attr2="${non.existent.sys.prop:default-from-config}">prefix-${solr.test.sys.prop2}-suffix</propTest>
@@ -281,4 +276,3 @@
</lst>
</initParams>
</config>
-
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 4c54a6e..e862fee 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
@@ -38,7 +38,7 @@
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
<updateHandler class="solr.DirectUpdateHandler2"></updateHandler>
-
+
<queryResponseWriter name="xml" default="true"
class="solr.XMLResponseWriter" />
@@ -59,11 +59,6 @@
</httpCaching>
</requestDispatcher>
- <admin>
- <defaultQuery>solr</defaultQuery>
- <gettableFiles>solrconfig.xml schema.xml</gettableFiles>
- </admin>
-
<searchComponent name="component1" class="org.apache.solr.search.MockSearchComponent">
<str name="testParam">foo</str>
</searchComponent>
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml
index f3a0bd5..8511e89 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-doctransformers.xml
@@ -43,10 +43,4 @@
<requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="-1" />
</requestDispatcher>
- <!-- config for the admin interface -->
- <admin>
- <defaultQuery>solr</defaultQuery>
- </admin>
-
</config>
-
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
index 4157dc5..39bcd82 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
@@ -36,10 +36,10 @@
<updateHandler class="solr.DirectUpdateHandler2">
- <!-- autocommit pending docs if certain criteria are met
- <autoCommit>
+ <!-- autocommit pending docs if certain criteria are met
+ <autoCommit>
<maxDocs>10000</maxDocs>
- <maxTime>3600000</maxTime>
+ <maxTime>3600000</maxTime>
</autoCommit>
-->
@@ -121,11 +121,6 @@
</httpCaching>
</requestDispatcher>
- <admin>
- <defaultQuery>solr</defaultQuery>
- <gettableFiles>solrconfig.xml schema.xml</gettableFiles>
- </admin>
-
<!-- test getting system property -->
<propTest attr1="${solr.test.sys.prop1}-$${literal}"
attr2="${non.existent.sys.prop:default-from-config}">prefix-${solr.test.sys.prop2}-suffix</propTest>
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 6600f7c..9c2e9f3 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
@@ -52,10 +52,4 @@
<requestHandler name="/select" class="solr.SearchHandler" />
- <!-- config for the admin interface -->
- <admin>
- <defaultQuery>solr</defaultQuery>
- </admin>
-
</config>
-
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml
index d8e40da..e17f655 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml
@@ -46,7 +46,7 @@
<double name="maxWriteMBPerSecMerge">3000000</double>
<double name="maxWriteMBPerSecRead">4000000</double>
<str name="solr.hdfs.home">${solr.hdfs.home:}</str>
- <bool name="solr.hdfs.blockcache.enabled">${solr.hdfs.blockcache.enabled:true}</bool>
+ <bool name="solr.hdfs.blockcache.enabled">${solr.hdfs.blockcache.enabled:true}</bool>
<bool name="solr.hdfs.blockcache.global">${solr.hdfs.blockcache.global:true}</bool>
<bool name="solr.hdfs.blockcache.write.enabled">${solr.hdfs.blockcache.write.enabled:false}</bool>
<int name="solr.hdfs.blockcache.blocksperbank">${solr.hdfs.blockcache.blocksperbank:10}</int>
@@ -73,11 +73,11 @@
<maxTime>3600000</maxTime>
</autoCommit>
-->
-
+
<updateLog enable="${enable.update.log:true}">
<str name="dir">${solr.ulog.dir:}</str>
- </updateLog>
-
+ </updateLog>
+
<commitWithin>
<softCommit>${solr.commitwithin.softcommit:true}</softCommit>
</commitWithin>
@@ -169,7 +169,7 @@
<slowQueryThresholdMillis>2000</slowQueryThresholdMillis>
</query>
-
+
<queryResponseWriter name="xml" default="true"
class="solr.XMLResponseWriter" />
@@ -240,7 +240,7 @@
</lst>
<lst name="spellchecker">
<str name="name">wordbreak</str>
- <str name="classname">solr.WordBreakSolrSpellChecker</str>
+ <str name="classname">solr.WordBreakSolrSpellChecker</str>
<str name="field">lowerfilt</str>
<str name="combineWords">true</str>
<str name="breakWords">true</str>
@@ -354,7 +354,7 @@
<str>spellcheck</str>
</arr>
</requestHandler>
-
+
<requestHandler name="/mltrh" class="org.apache.solr.handler.component.SearchHandler">
</requestHandler>
@@ -441,11 +441,6 @@
<str name="facet.query">foo_s:bar</str>
</lst>
</requestHandler>
-
- <admin>
- <defaultQuery>solr</defaultQuery>
- <gettableFiles>solrconfig.xml schema.xml</gettableFiles>
- </admin>
<!-- test getting system property -->
<propTest attr1="${solr.test.sys.prop1}-$${literal}"
@@ -459,10 +454,10 @@
<str>uniq</str>
<str>uniq2</str>
<str>uniq3</str>
- </arr>
+ </arr>
</processor>
<processor class="solr.RunUpdateProcessorFactory" />
- </updateRequestProcessorChain>
+ </updateRequestProcessorChain>
<updateRequestProcessorChain name="distrib-dup-test-chain-explicit">
<!-- explicit test using processors before and after distrib -->
@@ -478,7 +473,7 @@
<str name="replacement">x_x</str>
</processor>
<processor class="solr.RunUpdateProcessorFactory" />
- </updateRequestProcessorChain>
+ </updateRequestProcessorChain>
<updateRequestProcessorChain name="distrib-dup-test-chain-implicit">
<!-- implicit test w/o distrib declared-->
@@ -493,10 +488,10 @@
<str name="replacement">x_x</str>
</processor>
<processor class="solr.RunUpdateProcessorFactory" />
- </updateRequestProcessorChain>
+ </updateRequestProcessorChain>
<restManager>
- <!--
+ <!--
IMPORTANT: Due to the Lucene SecurityManager, tests can only write to their runtime directory or below.
But it's easier to just keep everything in memory for testing so no remnants are left behind.
-->
@@ -513,4 +508,3 @@
<queryParser name="minhash" class="org.apache.solr.search.MinHashQParserPlugin" />
</config>
-
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 54da41e..1d515f6 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
@@ -431,10 +431,6 @@
<cacheControl>max-age=30, public</cacheControl>
</httpCaching>
</requestDispatcher>
- <admin>
- <defaultQuery>solr</defaultQuery>
- <gettableFiles>solrconfig.xml schema.xml</gettableFiles>
- </admin>
<!-- test getting system property -->
<propTest attr1="${solr.test.sys.prop1}-$${literal}"
@@ -491,4 +487,3 @@
</initParams>
</config>
-
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 ac8ea62..35e56aa 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
@@ -63,10 +63,4 @@
<str name="healthcheckFile">server-enabled.txt</str>
</requestHandler>
- <!-- config for the admin interface -->
- <admin>
- <defaultQuery>solr</defaultQuery>
- </admin>
-
</config>
-
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 afd5954..00d49db 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
@@ -28,18 +28,12 @@
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<schemaFactory class="ClassicIndexSchemaFactory"/>
- <!-- see TestConfig.testAutomaticDeprecationSupport -->
- <admin>
- <defaultQuery>solr</defaultQuery>
- <gettableFiles>solrconfig.xml schema.xml</gettableFiles>
- </admin>
-
<!-- see TestConfig.testLib() -->
<lib dir="../../lib-dirs/a" />
<lib dir="../../lib-dirs/b" regex="b." />
<lib dir="../../lib-dirs/c" regex="c1" />
<lib path="../../lib-dirs/d/d1/" />
-
+
<!-- see TestConfig.testJavaProperty -->
<propTest attr1="${solr.test.sys.prop1}-$${literal}"
attr2="${non.existent.sys.prop:default-from-config}">prefix-${solr.test.sys.prop2}-suffix</propTest>
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
index d46a8b7..9890103 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
@@ -46,7 +46,7 @@
<double name="maxWriteMBPerSecMerge">3000000</double>
<double name="maxWriteMBPerSecRead">4000000</double>
<str name="solr.hdfs.home">${solr.hdfs.home:}</str>
- <bool name="solr.hdfs.blockcache.enabled">${solr.hdfs.blockcache.enabled:true}</bool>
+ <bool name="solr.hdfs.blockcache.enabled">${solr.hdfs.blockcache.enabled:true}</bool>
<bool name="solr.hdfs.blockcache.global">${solr.hdfs.blockcache.global:true}</bool>
<bool name="solr.hdfs.blockcache.write.enabled">${solr.hdfs.blockcache.write.enabled:false}</bool>
<int name="solr.hdfs.blockcache.blocksperbank">${solr.hdfs.blockcache.blocksperbank:10}</int>
@@ -73,11 +73,11 @@
<maxTime>3600000</maxTime>
</autoCommit>
-->
-
+
<updateLog enable="${enable.update.log:true}">
<str name="dir">${solr.ulog.dir:}</str>
- </updateLog>
-
+ </updateLog>
+
<commitWithin>
<softCommit>${solr.commitwithin.softcommit:true}</softCommit>
</commitWithin>
@@ -169,7 +169,7 @@
<slowQueryThresholdMillis>2000</slowQueryThresholdMillis>
</query>
-
+
<queryResponseWriter name="xml" default="true"
class="solr.XMLResponseWriter" />
@@ -240,7 +240,7 @@
</lst>
<lst name="spellchecker">
<str name="name">wordbreak</str>
- <str name="classname">solr.WordBreakSolrSpellChecker</str>
+ <str name="classname">solr.WordBreakSolrSpellChecker</str>
<str name="field">lowerfilt</str>
<str name="combineWords">true</str>
<str name="breakWords">true</str>
@@ -304,8 +304,8 @@
</arr>
</requestHandler>
-->
-
-
+
+
<!--
The SpellingQueryConverter to convert raw (CommonParams.Q) queries into tokens. Uses a simple regular expression
to strip off field markup, boosts, ranges, etc. but it is not guaranteed to match an exact parse from the query parser.
@@ -365,7 +365,7 @@
<str>spellcheck</str>
</arr>
</requestHandler>
-
+
<requestHandler name="/mltrh" class="org.apache.solr.handler.component.SearchHandler">
</requestHandler>
@@ -452,11 +452,6 @@
<str name="facet.query">foo_s:bar</str>
</lst>
</requestHandler>
-
- <admin>
- <defaultQuery>solr</defaultQuery>
- <gettableFiles>solrconfig.xml schema.xml</gettableFiles>
- </admin>
<!-- test getting system property -->
<propTest attr1="${solr.test.sys.prop1}-$${literal}"
@@ -470,10 +465,10 @@
<str>uniq</str>
<str>uniq2</str>
<str>uniq3</str>
- </arr>
+ </arr>
</processor>
<processor class="solr.RunUpdateProcessorFactory" />
- </updateRequestProcessorChain>
+ </updateRequestProcessorChain>
<updateRequestProcessorChain name="distrib-dup-test-chain-explicit">
<!-- explicit test using processors before and after distrib -->
@@ -489,7 +484,7 @@
<str name="replacement">x_x</str>
</processor>
<processor class="solr.RunUpdateProcessorFactory" />
- </updateRequestProcessorChain>
+ </updateRequestProcessorChain>
<updateRequestProcessorChain name="distrib-dup-test-chain-implicit">
<!-- implicit test w/o distrib declared-->
@@ -504,10 +499,10 @@
<str name="replacement">x_x</str>
</processor>
<processor class="solr.RunUpdateProcessorFactory" />
- </updateRequestProcessorChain>
+ </updateRequestProcessorChain>
<restManager>
- <!--
+ <!--
IMPORTANT: Due to the Lucene SecurityManager, tests can only write to their runtime directory or below.
But it's easier to just keep everything in memory for testing so no remnants are left behind.
-->
@@ -530,4 +525,3 @@
</transformer>
</config>
-
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 0c95657..ccc0e87 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
@@ -52,11 +52,6 @@
<queryResponseWriter name="standard" class="solr.XMLResponseWriter"/>
<queryResponseWriter name="useless" class="org.apache.solr.OutputWriterTest$UselessOutputWriter" startup="lazy"/>
- <admin>
- <defaultQuery>solr</defaultQuery>
- <gettableFiles>solrconfig.xml schema.xml</gettableFiles>
- </admin>
-
<initParams path="/select,/crazy_custom_qt">
<lst name="defaults">
<str name="df">subject</str>
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 567262a..71b163b 100644
--- a/solr/core/src/test/org/apache/solr/core/TestConfig.java
+++ b/solr/core/src/test/org/apache/solr/core/TestConfig.java
@@ -28,7 +28,6 @@ import org.apache.lucene.index.TieredMergePolicy;
import org.apache.lucene.util.InfoStream;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.ConfigNode;
-import org.apache.solr.handler.admin.ShowFileRequestHandler;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.IndexSchemaFactory;
import org.apache.solr.search.CacheConfig;
@@ -99,18 +98,9 @@ public class TestConfig extends SolrTestCaseJ4 {
assertEquals("prefix-proptwo-suffix", solrConfig.get("propTest").txt());
}
- // sometime if the config referes to old things, it must be replaced with new stuff
- @Test
- public void testAutomaticDeprecationSupport() {
- // make sure the "admin/file" handler is registered
- ShowFileRequestHandler handler = (ShowFileRequestHandler) h.getCore().getRequestHandler("/admin/file");
- assertTrue("file handler should have been automatically registered", handler != null);
-
- }
-
@Test
public void testCacheEnablingDisabling() throws Exception {
- // ensure if cache is not defined in the config then cache is disabled
+ // ensure if cache is not defined in the config then cache is disabled
SolrConfig sc = new SolrConfig(TEST_PATH().resolve("collection1"), "solrconfig-defaults.xml");
assertNull(sc.filterCacheConfig);
assertNull(sc.queryResultCacheConfig);
@@ -118,14 +108,14 @@ public class TestConfig extends SolrTestCaseJ4 {
//
assertNotNull(sc.userCacheConfigs);
assertEquals(Collections.<String, CacheConfig>emptyMap(), sc.userCacheConfigs);
-
- // enable all the core caches (and one user cache) via system properties and verify
+
+ // enable all the core caches (and one user cache) via system properties and verify
System.setProperty("filterCache.enabled", "true");
System.setProperty("queryResultCache.enabled", "true");
System.setProperty("documentCache.enabled", "true");
System.setProperty("user_defined_cache_XXX.enabled","true");
// user_defined_cache_ZZZ.enabled defaults to false in config
-
+
sc = new SolrConfig(TEST_PATH().resolve("collection1"), "solrconfig-cache-enable-disable.xml");
assertNotNull(sc.filterCacheConfig);
assertNotNull(sc.queryResultCacheConfig);
@@ -134,7 +124,7 @@ public class TestConfig extends SolrTestCaseJ4 {
assertNotNull(sc.userCacheConfigs);
assertEquals(1, sc.userCacheConfigs.size());
assertNotNull(sc.userCacheConfigs.get("user_defined_cache_XXX"));
-
+
// disable all the core caches (and enable both user caches) via system properties and verify
System.setProperty("filterCache.enabled", "false");
System.setProperty("queryResultCache.enabled", "false");
@@ -151,14 +141,14 @@ public class TestConfig extends SolrTestCaseJ4 {
assertEquals(2, sc.userCacheConfigs.size());
assertNotNull(sc.userCacheConfigs.get("user_defined_cache_XXX"));
assertNotNull(sc.userCacheConfigs.get("user_defined_cache_ZZZ"));
-
+
System.clearProperty("user_defined_cache_XXX.enabled");
System.clearProperty("user_defined_cache_ZZZ.enabled");
System.clearProperty("filterCache.enabled");
System.clearProperty("queryResultCache.enabled");
System.clearProperty("documentCache.enabled");
}
-
+
// If defaults change, add test methods to cover each version
@Test
@@ -245,12 +235,12 @@ public class TestConfig extends SolrTestCaseJ4 {
SolrConfig sc = new SolrConfig(TEST_PATH().resolve("collection1"), "solrconfig-basic.xml");
SolrIndexConfig sic = sc.indexConfig;
- assertEquals("ramBufferSizeMB sysprop",
- Double.parseDouble(System.getProperty("solr.tests.ramBufferSizeMB")),
+ assertEquals("ramBufferSizeMB sysprop",
+ Double.parseDouble(System.getProperty("solr.tests.ramBufferSizeMB")),
sic.ramBufferSizeMB, 0.0D);
assertEquals("ramPerThreadHardLimitMB sysprop",
Integer.parseInt(System.getProperty("solr.tests.ramPerThreadHardLimitMB")), sic.ramPerThreadHardLimitMB);
- assertEquals("useCompoundFile sysprop",
+ assertEquals("useCompoundFile sysprop",
Boolean.parseBoolean(System.getProperty("useCompoundFile")), sic.useCompoundFile);
}
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 129cc48..f455443 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
@@ -63,10 +63,4 @@
<str name="healthcheckFile">server-enabled.txt</str>
</requestHandler>
- <!-- config for the admin interface -->
- <admin>
- <defaultQuery>solr</defaultQuery>
- </admin>
-
</config>
-
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 78bba01..3d3643d 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
@@ -17,8 +17,8 @@
-->
<!--
- This is a stripped down config file used for a simple example...
- It is *not* a good example to work from.
+ This is a stripped down config file used for a simple example...
+ It is *not* a good example to work from.
-->
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
@@ -51,10 +51,4 @@
<str name="healthcheckFile">server-enabled.txt</str>
</requestHandler>
- <!-- config for the admin interface -->
- <admin>
- <defaultQuery>solr</defaultQuery>
- </admin>
-
</config>
-
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 0120f35..dab985b 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
@@ -42,10 +42,4 @@
<requestHandler name="/select" class="solr.SearchHandler"/>
- <!-- config for the admin interface -->
- <admin>
- <defaultQuery>solr</defaultQuery>
- </admin>
-
</config>
-
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 fbfa82b..7dffd91 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
@@ -17,8 +17,8 @@
-->
<!--
- This is a stripped down config file used for a simple example...
- It is *not* a good example to work from.
+ This is a stripped down config file used for a simple example...
+ It is *not* a good example to work from.
-->
<config>
<luceneMatchVersion>${tests.luceneMatchVersion:LATEST}</luceneMatchVersion>
@@ -41,11 +41,6 @@
<requestHandler name="/select" class="solr.SearchHandler"/>
- <!-- config for the admin interface -->
- <admin>
- <defaultQuery>solr</defaultQuery>
- </admin>
-
<initParams path="/select">
<lst name="defaults">
<str name="df">name</str>
@@ -53,4 +48,3 @@
</initParams>
</config>
-
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 e7e5c1e..69eb458 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
@@ -47,11 +47,6 @@
<requestHandler name="/select" class="solr.SearchHandler"/>
- <!-- config for the admin interface -->
- <admin>
- <defaultQuery>solr</defaultQuery>
- </admin>
-
<initParams path="/select">
<lst name="defaults">
<str name="df">text</str>
@@ -59,4 +54,3 @@
</initParams>
</config>
-
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 633f9d6..c674520 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
@@ -17,8 +17,8 @@
-->
<!--
- This is a stripped down config file used for a simple example...
- It is *not* a good example to work from.
+ This is a stripped down config file used for a simple example...
+ It is *not* a good example to work from.
-->
<config>
<luceneMatchVersion>6.0.0</luceneMatchVersion>
@@ -30,24 +30,24 @@
<dataDir>${solr.core0.data.dir:}</dataDir>
<!-- To enable dynamic schema REST APIs, use the following for <schemaFactory>:
-
+
<schemaFactory class="ManagedIndexSchemaFactory">
<bool name="mutable">true</bool>
<str name="managedSchemaResourceName">managed-schema</str>
</schemaFactory>
-
+
When ManagedIndexSchemaFactory is specified, Solr will load the schema from
the resource named in 'managedSchemaResourceName', rather than from schema.xml.
Note that the managed schema resource CANNOT be named schema.xml. If the managed
schema does not exist, Solr will create it after reading schema.xml, then rename
- 'schema.xml' to 'schema.xml.bak'.
-
+ 'schema.xml' to 'schema.xml.bak'.
+
Do NOT hand edit the managed schema - external modifications will be ignored and
overwritten as a result of schema modification REST API calls.
When ManagedIndexSchemaFactory is specified with mutable = true, schema
modification REST API calls will be allowed; otherwise, error responses will be
- sent back for these requests.
+ sent back for these requests.
-->
<schemaFactory class="ClassicIndexSchemaFactory"/>
@@ -63,11 +63,6 @@
<requestHandler name="/select" class="solr.SearchHandler"/>
- <!-- config for the admin interface -->
- <admin>
- <defaultQuery>solr</defaultQuery>
- </admin>
-
<initParams path="/select">
<lst name="defaults">
<str name="df">name</str>
@@ -75,4 +70,3 @@
</initParams>
</config>
-
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 097b705..012e88a 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
@@ -17,8 +17,8 @@
-->
<!--
- This is a stripped down config file used for a simple example...
- It is *not* a good example to work from.
+ This is a stripped down config file used for a simple example...
+ It is *not* a good example to work from.
-->
<config>
<luceneMatchVersion>6.0.0</luceneMatchVersion>
@@ -30,24 +30,24 @@
<dataDir>${solr.core1.data.dir:}</dataDir>
<!-- To enable dynamic schema REST APIs, use the following for <schemaFactory>:
-
+
<schemaFactory class="ManagedIndexSchemaFactory">
<bool name="mutable">true</bool>
<str name="managedSchemaResourceName">managed-schema</str>
</schemaFactory>
-
+
When ManagedIndexSchemaFactory is specified, Solr will load the schema from
the resource named in 'managedSchemaResourceName', rather than from schema.xml.
Note that the managed schema resource CANNOT be named schema.xml. If the managed
schema does not exist, Solr will create it after reading schema.xml, then rename
- 'schema.xml' to 'schema.xml.bak'.
-
+ 'schema.xml' to 'schema.xml.bak'.
+
Do NOT hand edit the managed schema - external modifications will be ignored and
overwritten as a result of schema modification REST API calls.
When ManagedIndexSchemaFactory is specified with mutable = true, schema
modification REST API calls will be allowed; otherwise, error responses will be
- sent back for these requests.
+ sent back for these requests.
-->
<schemaFactory class="ClassicIndexSchemaFactory"/>
@@ -63,11 +63,6 @@
<requestHandler name="/select" class="solr.SearchHandler"/>
- <!-- config for the admin interface -->
- <admin>
- <defaultQuery>solr</defaultQuery>
- </admin>
-
<initParams path="/select">
<lst name="defaults">
<str name="df">name</str>
@@ -75,4 +70,3 @@
</initParams>
</config>
-