Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-13817: Clean up config files to remove the default 'class=' attribute in 

standard caches.
This commit is contained in:
Andrzej Bialecki 2020-01-02 20:58:47 +01:00
parent 15d5e6662c
commit 7d0cf0df32
20 changed files with 39 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
View File

@ -83,25 +83,22 @@
that match a particular query. that match a particular query.
--> -->
<filterCache <filterCache
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="2"/> autowarmCount="2"/>
<queryResultCache <queryResultCache
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="2"/> autowarmCount="2"/>
<documentCache <documentCache
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>
<cache name="perSegFilter" <cache name="perSegFilter"
class="solr.search.CaffeineCache" class="solr.CaffeineCache"
size="10" size="10"
initialSize="0" initialSize="0"
autowarmCount="10" /> autowarmCount="10" />

3
solr/core/src/test-files/solr/collection1/conf/solrconfig-cache-enable-disable.xml
View File

@ -37,21 +37,18 @@
--> -->
<filterCache <filterCache
enabled="${filterCache.enabled}" enabled="${filterCache.enabled}"
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="2"/> autowarmCount="2"/>
<queryResultCache <queryResultCache
enabled="${queryResultCache.enabled}" enabled="${queryResultCache.enabled}"
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="2"/> autowarmCount="2"/>
<documentCache <documentCache
enabled="${documentCache.enabled}" enabled="${documentCache.enabled}"
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>

6
solr/core/src/test-files/solr/collection1/conf/solrconfig-caching.xml
View File

@ -21,19 +21,19 @@
<schemaFactory class="ClassicIndexSchemaFactory"/> <schemaFactory class="ClassicIndexSchemaFactory"/>
<query> <query>
<cache name="lfuCacheDecayFalse" <cache name="lfuCacheDecayFalse"
class="solr.search.CaffeineCache" class="solr.CaffeineCache"
size="10" size="10"
initialSize="9" initialSize="9"
timeDecay="false" /> timeDecay="false" />
<cache name="lfuCacheDecayTrue" <cache name="lfuCacheDecayTrue"
class="solr.search.CaffeineCache" class="solr.CaffeineCache"
size="10" size="10"
initialSize="9" initialSize="9"
timeDecay="true" /> timeDecay="true" />
<cache name="lfuCacheDecayDefault" <cache name="lfuCacheDecayDefault"
class="solr.search.CaffeineCache" class="solr.CaffeineCache"
size="10" size="10"
initialSize="9" /> initialSize="9" />
</query> </query>

5
solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
View File

@ -83,25 +83,22 @@
that match a particular query. that match a particular query.
--> -->
<filterCache <filterCache
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="2"/> autowarmCount="2"/>
<queryResultCache <queryResultCache
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="2"/> autowarmCount="2"/>
<documentCache <documentCache
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>
<cache name="perSegFilter" <cache name="perSegFilter"
class="solr.search.CaffeineCache" class="solr.CaffeineCache"
size="10" size="10"
initialSize="0" initialSize="0"
autowarmCount="10" /> autowarmCount="10" />

4
solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml
View File

@ -39,8 +39,8 @@
<!-- deep paging better play nice with caching --> <!-- deep paging better play nice with caching -->
<query> <query>
<!-- no wautowarming, it screws up our ability to sanity check cache stats in tests --> <!-- no wautowarming, it screws up our ability to sanity check cache stats in tests -->
<filterCache class="solr.CaffeineCache" size="50" initialSize="50" autowarmCount="0"/> <filterCache size="50" initialSize="50" autowarmCount="0"/>
<queryResultCache class="solr.CaffeineCache" size="50" initialSize="50" autowarmCount="0"/> <queryResultCache size="50" initialSize="50" autowarmCount="0"/>
<queryResultWindowSize>50</queryResultWindowSize> <queryResultWindowSize>50</queryResultWindowSize>
<queryResultMaxDocsCached>500</queryResultMaxDocsCached> <queryResultMaxDocsCached>500</queryResultMaxDocsCached>
<!-- randomized so we excersize cursors using various paths in SolrIndexSearcher --> <!-- randomized so we excersize cursors using various paths in SolrIndexSearcher -->

3
solr/core/src/test-files/solr/collection1/conf/solrconfig-delaying-component.xml
View File

@ -41,19 +41,16 @@
<query> <query>
<filterCache <filterCache
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>
<queryResultCache <queryResultCache
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>
<documentCache <documentCache
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>

3
solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml
View File

@ -56,19 +56,16 @@
that match a particular query. that match a particular query.
--> -->
<filterCache <filterCache
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="256"/> autowarmCount="256"/>
<queryResultCache <queryResultCache
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="1024"/> autowarmCount="1024"/>
<documentCache <documentCache
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>

3
solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml
View File

@ -37,21 +37,18 @@
<query> <query>
<filterCache <filterCache
enabled="${filterCache.enabled:false}" enabled="${filterCache.enabled:false}"
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="2"/> autowarmCount="2"/>
<queryResultCache <queryResultCache
enabled="${queryResultCache.enabled:false}" enabled="${queryResultCache.enabled:false}"
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="2"/> autowarmCount="2"/>
<documentCache <documentCache
enabled="${documentCache.enabled:false}" enabled="${documentCache.enabled:false}"
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>

5
solr/core/src/test-files/solr/collection1/conf/solrconfig-minhash.xml
View File

@ -95,25 +95,22 @@
that match a particular query. that match a particular query.
--> -->
<filterCache <filterCache
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="2"/> autowarmCount="2"/>
<queryResultCache <queryResultCache
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="2"/> autowarmCount="2"/>
<documentCache <documentCache
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>
<cache name="perSegFilter" <cache name="perSegFilter"
class="solr.search.CaffeineCache" class="solr.CaffeineCache"
size="10" size="10"
initialSize="0" initialSize="0"
autowarmCount="10" /> autowarmCount="10" />

5
solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
View File

@ -82,25 +82,22 @@
that match a particular query. that match a particular query.
--> -->
<filterCache <filterCache
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="2"/> autowarmCount="2"/>
<queryResultCache <queryResultCache
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="2"/> autowarmCount="2"/>
<documentCache <documentCache
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>
<cache name="perSegFilter" <cache name="perSegFilter"
class="solr.search.CaffeineCache" class="solr.CaffeineCache"
size="10" size="10"
initialSize="0" initialSize="0"
autowarmCount="10" /> autowarmCount="10" />

3
solr/core/src/test-files/solr/collection1/conf/solrconfig-sortingresponse.xml
View File

@ -35,8 +35,7 @@
<queryResultMaxDocsCached>200</queryResultMaxDocsCached> <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
<documentCache class="solr.CaffeineCache" <documentCache size="512"
size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>
</query> </query>

8
solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
View File

@ -140,23 +140,23 @@
<query> <query>
<filterCache class="solr.CaffeineCache" <filterCache
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="0" /> autowarmCount="0" />
<queryResultCache class="solr.CaffeineCache" <queryResultCache
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="0" /> autowarmCount="0" />
<documentCache class="solr.CaffeineCache" <documentCache
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="0" /> autowarmCount="0" />
<cache name="perSegFilter" <cache name="perSegFilter"
class="solr.search.CaffeineCache" class="solr.CaffeineCache"
size="10" size="10"
initialSize="0" initialSize="0"
autowarmCount="10" autowarmCount="10"

6
solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
View File

@ -95,25 +95,22 @@
that match a particular query. that match a particular query.
--> -->
<filterCache <filterCache
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="2"/> autowarmCount="2"/>
<queryResultCache <queryResultCache
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="2"/> autowarmCount="2"/>
<documentCache <documentCache
class="solr.search.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>
<cache name="perSegFilter" <cache name="perSegFilter"
class="solr.search.CaffeineCache" class="solr.CaffeineCache"
size="10" size="10"
initialSize="0" initialSize="0"
autowarmCount="10" /> autowarmCount="10" />
@ -125,7 +122,6 @@
<!-- <!--
<cache name="myUserCache" <cache name="myUserCache"
class="solr.search.CaffeineCache"
size="4096" size="4096"
initialSize="1024" initialSize="1024"
autowarmCount="1024" autowarmCount="1024"

3
solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
View File

@ -36,19 +36,16 @@
<query> <query>
<filterCache <filterCache
class="solr.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>
<queryResultCache <queryResultCache
class="solr.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>
<documentCache <documentCache
class="solr.CaffeineCache"
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>

14
solr/core/src/test-files/solr/configsets/_default/conf/solrconfig.xml
View File

@ -404,8 +404,7 @@
to occupy. Note that when this option is specified, the size to occupy. Note that when this option is specified, the size
and initialSize parameters are ignored. and initialSize parameters are ignored.
--> -->
<filterCache class="solr.CaffeineCache" <filterCache size="512"
size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>
@ -417,8 +416,7 @@
maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed
to occupy to occupy
--> -->
<queryResultCache class="solr.CaffeineCache" <queryResultCache size="512"
size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>
@ -428,14 +426,13 @@
document). Since Lucene internal document ids are transient, document). Since Lucene internal document ids are transient,
this cache will not be autowarmed. this cache will not be autowarmed.
--> -->
<documentCache class="solr.CaffeineCache" <documentCache size="512"
size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>
<!-- custom cache currently used by block join --> <!-- custom cache currently used by block join -->
<cache name="perSegFilter" <cache name="perSegFilter"
class="solr.search.CaffeineCache" class="solr.CaffeineCache"
size="10" size="10"
initialSize="0" initialSize="0"
autowarmCount="10" autowarmCount="10"
@ -448,8 +445,7 @@
even if not configured here. even if not configured here.
--> -->
<!-- <!--
<fieldValueCache class="solr.CaffeineCache" <fieldValueCache size="512"
size="512"
autowarmCount="128" autowarmCount="128"
showItems="32" /> showItems="32" />
--> -->

8
solr/core/src/test-files/solr/configsets/exitable-directory/conf/solrconfig.xml
View File

@ -56,19 +56,19 @@
</updateHandler> </updateHandler>
<query> <query>
<filterCache class="solr.CaffeineCache" <filterCache
size="0" size="0"
initialSize="0" initialSize="0"
autowarmCount="0"/> autowarmCount="0"/>
<queryResultCache class="solr.CaffeineCache" <queryResultCache
size="0" size="0"
initialSize="0" initialSize="0"
autowarmCount="0"/> autowarmCount="0"/>
<documentCache class="solr.CaffeineCache" <documentCache
size="0" size="0"
initialSize="0" initialSize="0"
autowarmCount="0"/> autowarmCount="0"/>
<fieldValueCache class="solr.CaffeineCache" <fieldValueCache
size="0" size="0"
autowarmCount="0" autowarmCount="0"
showItems="0" /> showItems="0" />

6
solr/core/src/test-files/solr/configsets/xcjf/conf/solrconfig.xml
View File

@ -26,17 +26,17 @@
<requestHandler name="/select" class="solr.SearchHandler" /> <requestHandler name="/select" class="solr.SearchHandler" />
<query> <query>
<filterCache class="solr.CaffeineCache" <filterCache
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="0" /> autowarmCount="0" />
<queryResultCache class="solr.CaffeineCache" <queryResultCache
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="0" /> autowarmCount="0" />
<documentCache class="solr.CaffeineCache" <documentCache
size="512" size="512"
initialSize="512" initialSize="512"
autowarmCount="0" /> autowarmCount="0" />

14
solr/server/solr/configsets/_default/conf/solrconfig.xml
View File

@ -404,8 +404,7 @@
to occupy. Note that when this option is specified, the size to occupy. Note that when this option is specified, the size
and initialSize parameters are ignored. and initialSize parameters are ignored.
--> -->
<filterCache class="solr.CaffeineCache" <filterCache size="512"
size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>
@ -417,8 +416,7 @@
maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed
to occupy to occupy
--> -->
<queryResultCache class="solr.CaffeineCache" <queryResultCache size="512"
size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>
@ -428,14 +426,13 @@
document). Since Lucene internal document ids are transient, document). Since Lucene internal document ids are transient,
this cache will not be autowarmed. this cache will not be autowarmed.
--> -->
<documentCache class="solr.CaffeineCache" <documentCache size="512"
size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>
<!-- custom cache currently used by block join --> <!-- custom cache currently used by block join -->
<cache name="perSegFilter" <cache name="perSegFilter"
class="solr.search.CaffeineCache" class="solr.CaffeineCache"
size="10" size="10"
initialSize="0" initialSize="0"
autowarmCount="10" autowarmCount="10"
@ -448,8 +445,7 @@
even if not configured here. even if not configured here.
--> -->
<!-- <!--
<fieldValueCache class="solr.CaffeineCache" <fieldValueCache size="512"
size="512"
autowarmCount="128" autowarmCount="128"
showItems="32" /> showItems="32" />
--> -->

16
solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
View File

@ -428,8 +428,7 @@
to occupy. Note that when this option is specified, the size to occupy. Note that when this option is specified, the size
and initialSize parameters are ignored. and initialSize parameters are ignored.
--> -->
<filterCache class="solr.CaffeineCache" <filterCache size="512"
size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>
@ -441,8 +440,7 @@
maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed
to occupy to occupy
--> -->
<queryResultCache class="solr.CaffeineCache" <queryResultCache size="512"
size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>
@ -452,14 +450,13 @@
document). Since Lucene internal document ids are transient, document). Since Lucene internal document ids are transient,
this cache will not be autowarmed. this cache will not be autowarmed.
--> -->
<documentCache class="solr.CaffeineCache" <documentCache size="512"
size="512"
initialSize="512" initialSize="512"
autowarmCount="0"/> autowarmCount="0"/>
<!-- custom cache currently used by block join --> <!-- custom cache currently used by block join -->
<cache name="perSegFilter" <cache name="perSegFilter"
class="solr.search.CaffeineCache" class="solr.CaffeineCache"
size="10" size="10"
initialSize="0" initialSize="0"
autowarmCount="10" autowarmCount="10"
@ -472,8 +469,7 @@
even if not configured here. even if not configured here.
--> -->
<!-- <!--
<fieldValueCache class="solr.CaffeineCache" <fieldValueCache size="512"
size="512"
autowarmCount="128" autowarmCount="128"
showItems="32" /> showItems="32" />
--> -->
@ -489,7 +485,7 @@
https://lucene.apache.org/solr/guide/learning-to-rank.html https://lucene.apache.org/solr/guide/learning-to-rank.html
--> -->
<cache enable="${solr.ltr.enabled:false}" name="QUERY_DOC_FV" <cache enable="${solr.ltr.enabled:false}" name="QUERY_DOC_FV"
class="solr.search.CaffeineCache" class="solr.CaffeineCache"
size="4096" size="4096"
initialSize="2048" initialSize="2048"
autowarmCount="4096" autowarmCount="4096"