You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by tf...@apache.org on 2020/12/30 07:52:19 UTC
[lucene-solr] branch branch_8x updated: SOLR-14723: Remove the
class attribute for the caches in the _default/example configsets
This is an automated email from the ASF dual-hosted git repository.
tflobbe pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new 196632d SOLR-14723: Remove the class attribute for the caches in the _default/example configsets
196632d is described below
commit 196632d538a26b0c92a67941ad7c47e2f9cd2e1d
Author: Tomas Fernandez Lobbe <tf...@apache.org>
AuthorDate: Tue Dec 29 23:34:32 2020 -0800
SOLR-14723: Remove the class attribute for the caches in the _default/example configsets
This is an 8.x change only. Closes #2169
Squashed commit of the following:
commit c638cbcfdb58b57cde8c4be641a7847b8a37422a
Merge: b13011e97ae a22abe8ae0d
Author: Tomas Fernandez Lobbe <tf...@apache.org>
Date: Tue Dec 29 23:33:38 2020 -0800
Merge branch 'jira/SOLR-14723' of https://github.com/trdillon/lucene-solr into trdillon-jira/SOLR-14723
commit a22abe8ae0ddd5934dd8f74f4a48599e188ffc73
Author: Tim Dillon <ti...@itsdits.com>
Date: Wed Dec 30 15:34:34 2020 +0900
Add SOLR-14723 to CHANGES.txt
commit 655bba5db63118c3055c30d331d1d082e0dd6050
Author: Tim Dillon <ti...@itsdits.com>
Date: Wed Dec 30 15:02:16 2020 +0900
Fix TestSolr4Spatial2 test
commit 2d8544fc455de8b596c6fbf3ecd2feb2ca6a84fc
Author: Tim Dillon <ti...@itsdits.com>
Date: Tue Dec 29 20:40:03 2020 +0900
Update doc to state default cache class
commit 3c5ee62d8fe87da080595822b46a3390510dea41
Author: Tim Dillon <ti...@itsdits.com>
Date: Tue Dec 29 19:51:57 2020 +0900
Replaced the class attribute in solrconfig-caching
commit 2341eef4a63696068b010d8da51f2fa818790fc0
Author: Tim Dillon <ti...@itsdits.com>
Date: Sun Dec 27 15:52:07 2020 +0900
Remove REQUIRE_CLASS from SolrCache plugin
commit 627995aba1a29dc4deaf726c0a49599224ea2de5
Author: Tim Dillon <ti...@itsdits.com>
Date: Sat Dec 26 11:14:03 2020 +0900
Remove cast to FastLRUCache in TestJsonRequest
commit 11319c119570c861d62f09fc6b482a6993dd38ff
Author: Tim Dillon <ti...@itsdits.com>
Date: Sat Dec 19 16:53:07 2020 +0900
Removed class attribute from caches
---
solr/CHANGES.txt | 2 ++
.../solr/collection1/conf/dataimport-solrconfig.xml | 5 -----
.../solr/collection1/conf/contentstream-solrconfig.xml | 5 -----
.../conf/dataimport-nodatasource-solrconfig.xml | 5 -----
.../dih/solr/collection1/conf/dataimport-solrconfig.xml | 5 -----
.../extraction/solr/collection1/conf/solrconfig.xml | 4 ----
.../test-files/solr/collection1/conf/solrconfig-ltr.xml | 4 ++--
.../solr/collection1/conf/solrconfig-ltr_Th10_10.xml | 4 ++--
.../solr/collection1/conf/solrconfig-multiseg.xml | 4 ++--
.../src/test-files/solr/collection1/conf/solrconfig.xml | 10 +++-------
solr/core/src/java/org/apache/solr/core/SolrConfig.java | 2 +-
.../solr/collection1/conf/solrconfig-analytics-query.xml | 6 ------
.../collection1/conf/solrconfig-cache-enable-disable.xml | 6 ------
.../solr/collection1/conf/solrconfig-collapseqparser.xml | 6 ------
.../solr/collection1/conf/solrconfig-deeppaging.xml | 5 ++---
.../solr/collection1/conf/solrconfig-elevate.xml | 3 ---
.../solr/collection1/conf/solrconfig-managed-schema.xml | 3 ---
.../solr/collection1/conf/solrconfig-minhash.xml | 6 ------
.../solr/collection1/conf/solrconfig-noopregen.xml | 3 +--
.../solr/collection1/conf/solrconfig-plugcollector.xml | 6 ------
.../solr/collection1/conf/solrconfig-sortingresponse.xml | 3 +--
.../solr/collection1/conf/solrconfig-spatial.xml | 4 +---
.../test-files/solr/collection1/conf/solrconfig-tlog.xml | 10 +++-------
.../src/test-files/solr/collection1/conf/solrconfig.xml | 6 ------
.../test-files/solr/collection1/conf/solrconfig_perf.xml | 3 ---
.../test-files/solr/configsets/ccjoin/conf/solrconfig.xml | 10 +++-------
.../configsets/exitable-directory/conf/solrconfig.xml | 12 ++++--------
.../test/org/apache/solr/search/TestSolr4Spatial2.java | 3 +++
.../test/org/apache/solr/search/json/TestJsonRequest.java | 4 ++--
solr/example/example-DIH/solr/db/conf/solrconfig.xml | 14 ++++----------
solr/example/example-DIH/solr/mail/conf/solrconfig.xml | 14 ++++----------
solr/example/example-DIH/solr/solr/conf/solrconfig.xml | 14 ++++----------
solr/example/files/conf/solrconfig.xml | 13 ++++---------
solr/server/solr/configsets/_default/conf/solrconfig.xml | 15 +++++----------
.../sample_techproducts_configs/conf/solrconfig.xml | 15 ++++-----------
35 files changed, 57 insertions(+), 177 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 96df9c8..374f7f1 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -102,6 +102,8 @@ Other Changes
* SOLR-14951: Upgrade Angular JS 1.7.9 to 1.8.0 (Kevin Risden)
+* SOLR-14723: Remove the class attribute for the caches in the _default/example configsets (Tim Dillon)
+
================== 8.7.0 ==================
Consult the lucene/CHANGES.txt file for additional, low level, changes in this release.
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 f74c48b..9d4cb34 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
@@ -69,7 +69,6 @@
and old cache.
-->
<filterCache
- class="solr.LRUCache"
size="512"
initialSize="512"
autowarmCount="256"/>
@@ -78,7 +77,6 @@
document ids (DocList) based on a query, a sort, and the range
of documents requested. -->
<queryResultCache
- class="solr.LRUCache"
size="512"
initialSize="512"
autowarmCount="256"/>
@@ -86,7 +84,6 @@
<!-- documentCache caches Lucene Document objects (the stored fields for each document).
Since Lucene internal document ids are transient, this cache will not be autowarmed. -->
<documentCache
- class="solr.LRUCache"
size="512"
initialSize="512"
autowarmCount="0"/>
@@ -106,7 +103,6 @@
of solr.search.CacheRegenerator if autowarming is desired. -->
<!--
<cache name="myUserCache"
- class="solr.LRUCache"
size="4096"
initialSize="1024"
autowarmCount="1024"
@@ -274,4 +270,3 @@
</admin>
</config>
-
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 dfe50f1..9980c2a 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
@@ -69,7 +69,6 @@
and old cache.
-->
<filterCache
- class="solr.LRUCache"
size="512"
initialSize="512"
autowarmCount="256"/>
@@ -78,7 +77,6 @@
document ids (DocList) based on a query, a sort, and the range
of documents requested. -->
<queryResultCache
- class="solr.LRUCache"
size="512"
initialSize="512"
autowarmCount="256"/>
@@ -86,7 +84,6 @@
<!-- documentCache caches Lucene Document objects (the stored fields for each document).
Since Lucene internal document ids are transient, this cache will not be autowarmed. -->
<documentCache
- class="solr.LRUCache"
size="512"
initialSize="512"
autowarmCount="0"/>
@@ -106,7 +103,6 @@
of solr.search.CacheRegenerator if autowarming is desired. -->
<!--
<cache name="myUserCache"
- class="solr.LRUCache"
size="4096"
initialSize="1024"
autowarmCount="1024"
@@ -284,4 +280,3 @@
</updateRequestProcessorChain>
</config>
-
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 0e84b89..6b59d70 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
@@ -71,7 +71,6 @@
and old cache.
-->
<filterCache
- class="solr.LRUCache"
size="512"
initialSize="512"
autowarmCount="256"/>
@@ -80,7 +79,6 @@
document ids (DocList) based on a query, a sort, and the range
of documents requested. -->
<queryResultCache
- class="solr.LRUCache"
size="512"
initialSize="512"
autowarmCount="256"/>
@@ -88,7 +86,6 @@
<!-- documentCache caches Lucene Document objects (the stored fields for each document).
Since Lucene internal document ids are transient, this cache will not be autowarmed. -->
<documentCache
- class="solr.LRUCache"
size="512"
initialSize="512"
autowarmCount="0"/>
@@ -108,7 +105,6 @@
of solr.search.CacheRegenerator if autowarming is desired. -->
<!--
<cache name="myUserCache"
- class="solr.LRUCache"
size="4096"
initialSize="1024"
autowarmCount="1024"
@@ -276,4 +272,3 @@
</admin>
</config>
-
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 73e16f6..dcdd0d2 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
@@ -69,7 +69,6 @@
and old cache.
-->
<filterCache
- class="solr.LRUCache"
size="512"
initialSize="512"
autowarmCount="256"/>
@@ -78,7 +77,6 @@
document ids (DocList) based on a query, a sort, and the range
of documents requested. -->
<queryResultCache
- class="solr.LRUCache"
size="512"
initialSize="512"
autowarmCount="256"/>
@@ -86,7 +84,6 @@
<!-- documentCache caches Lucene Document objects (the stored fields for each document).
Since Lucene internal document ids are transient, this cache will not be autowarmed. -->
<documentCache
- class="solr.LRUCache"
size="512"
initialSize="512"
autowarmCount="0"/>
@@ -106,7 +103,6 @@
of solr.search.CacheRegenerator if autowarming is desired. -->
<!--
<cache name="myUserCache"
- class="solr.LRUCache"
size="4096"
initialSize="1024"
autowarmCount="1024"
@@ -284,4 +280,3 @@
</updateRequestProcessorChain>
</config>
-
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 175b6fb..d24bc78 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
@@ -74,19 +74,16 @@
that match a particular query.
-->
<filterCache
- class="solr.search.LRUCache"
size="512"
initialSize="512"
autowarmCount="256"/>
<queryResultCache
- class="solr.search.LRUCache"
size="512"
initialSize="512"
autowarmCount="1024"/>
<documentCache
- class="solr.search.LRUCache"
size="512"
initialSize="512"
autowarmCount="0"/>
@@ -98,7 +95,6 @@
<!--
<cache name="myUserCache"
- class="solr.search.LRUCache"
size="4096"
initialSize="1024"
autowarmCount="1024"
diff --git a/solr/contrib/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr.xml b/solr/contrib/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr.xml
index 51e81c4..fa32f45 100644
--- a/solr/contrib/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr.xml
+++ b/solr/contrib/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr.xml
@@ -30,9 +30,9 @@
class="org.apache.solr.ltr.search.LTRQParserPlugin" />
<query>
- <filterCache class="solr.FastLRUCache" size="4096"
+ <filterCache size="4096"
initialSize="2048" autowarmCount="0" />
- <cache name="QUERY_DOC_FV" class="solr.search.LRUCache" size="4096"
+ <cache name="QUERY_DOC_FV" size="4096"
initialSize="2048" autowarmCount="4096" regenerator="solr.search.NoOpRegenerator" />
</query>
diff --git a/solr/contrib/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr_Th10_10.xml b/solr/contrib/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr_Th10_10.xml
index e375793..cc15dbd 100644
--- a/solr/contrib/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr_Th10_10.xml
+++ b/solr/contrib/ltr/src/test-files/solr/collection1/conf/solrconfig-ltr_Th10_10.xml
@@ -31,9 +31,9 @@
<query>
- <filterCache class="solr.FastLRUCache" size="4096"
+ <filterCache size="4096"
initialSize="2048" autowarmCount="0" />
- <cache name="QUERY_DOC_FV" class="solr.search.LRUCache" size="4096"
+ <cache name="QUERY_DOC_FV" size="4096"
initialSize="2048" autowarmCount="4096" regenerator="solr.search.NoOpRegenerator" />
</query>
diff --git a/solr/contrib/ltr/src/test-files/solr/collection1/conf/solrconfig-multiseg.xml b/solr/contrib/ltr/src/test-files/solr/collection1/conf/solrconfig-multiseg.xml
index a251407d..8cda5bc 100644
--- a/solr/contrib/ltr/src/test-files/solr/collection1/conf/solrconfig-multiseg.xml
+++ b/solr/contrib/ltr/src/test-files/solr/collection1/conf/solrconfig-multiseg.xml
@@ -26,9 +26,9 @@
<queryParser name="ltr" class="org.apache.solr.ltr.search.LTRQParserPlugin" />
<query>
- <filterCache class="solr.FastLRUCache" size="4096"
+ <filterCache size="4096"
initialSize="2048" autowarmCount="0" />
- <cache name="QUERY_DOC_FV" class="solr.search.LRUCache" size="4096"
+ <cache name="QUERY_DOC_FV" size="4096"
initialSize="2048" autowarmCount="4096" regenerator="solr.search.NoOpRegenerator" />
</query>
diff --git a/solr/contrib/prometheus-exporter/src/test-files/solr/collection1/conf/solrconfig.xml b/solr/contrib/prometheus-exporter/src/test-files/solr/collection1/conf/solrconfig.xml
index 72c5430..c97c527 100644
--- a/solr/contrib/prometheus-exporter/src/test-files/solr/collection1/conf/solrconfig.xml
+++ b/solr/contrib/prometheus-exporter/src/test-files/solr/collection1/conf/solrconfig.xml
@@ -55,23 +55,19 @@
<maxBooleanClauses>1024</maxBooleanClauses>
- <filterCache class="solr.FastLRUCache"
- size="512"
+ <filterCache size="512"
initialSize="512"
autowarmCount="0"/>
- <queryResultCache class="solr.LRUCache"
- size="512"
+ <queryResultCache size="512"
initialSize="512"
autowarmCount="0"/>
- <documentCache class="solr.LRUCache"
- size="512"
+ <documentCache size="512"
initialSize="512"
autowarmCount="0"/>
<cache name="perSegFilter"
- class="solr.search.LRUCache"
size="10"
initialSize="0"
autowarmCount="10"
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 6258931..cc0bdef 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
@@ -335,7 +335,7 @@ public class SolrConfig extends XmlConfigFile implements MapSerializable {
.add(new SolrPluginInfo(TransformerFactory.class, "transformer", REQUIRE_NAME, REQUIRE_CLASS, MULTI_OK))
.add(new SolrPluginInfo(SearchComponent.class, "searchComponent", REQUIRE_NAME, REQUIRE_CLASS, MULTI_OK))
.add(new SolrPluginInfo(UpdateRequestProcessorFactory.class, "updateProcessor", REQUIRE_NAME, REQUIRE_CLASS, MULTI_OK))
- .add(new SolrPluginInfo(SolrCache.class, "cache", REQUIRE_NAME, REQUIRE_CLASS, MULTI_OK))
+ .add(new SolrPluginInfo(SolrCache.class, "cache", REQUIRE_NAME, MULTI_OK))
// TODO: WTF is up with queryConverter???
// it apparently *only* works as a singleton? - SOLR-4304
// and even then -- only if there is a single SpellCheckComponent
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 1896feb..9b2b8aa 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
@@ -83,25 +83,21 @@
that match a particular query.
-->
<filterCache
- class="solr.search.FastLRUCache"
size="512"
initialSize="512"
autowarmCount="2"/>
<queryResultCache
- class="solr.search.LRUCache"
size="512"
initialSize="512"
autowarmCount="2"/>
<documentCache
- class="solr.search.LRUCache"
size="512"
initialSize="512"
autowarmCount="0"/>
<cache name="perSegFilter"
- class="solr.search.LRUCache"
size="10"
initialSize="0"
autowarmCount="10" />
@@ -113,7 +109,6 @@
<!--
<cache name="myUserCache"
- class="solr.search.LRUCache"
size="4096"
initialSize="1024"
autowarmCount="1024"
@@ -313,4 +308,3 @@ based HashBitset. -->
</updateRequestProcessorChain>
</config>
-
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 d85e627..a83ccb0 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
@@ -37,21 +37,18 @@
-->
<filterCache
enabled="${filterCache.enabled}"
- class="solr.search.FastLRUCache"
size="512"
initialSize="512"
autowarmCount="2"/>
<queryResultCache
enabled="${queryResultCache.enabled}"
- class="solr.search.LRUCache"
size="512"
initialSize="512"
autowarmCount="2"/>
<documentCache
enabled="${documentCache.enabled}"
- class="solr.search.LRUCache"
size="512"
initialSize="512"
autowarmCount="0"/>
@@ -88,6 +85,3 @@
</initParams>
</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 8302204..7180f18 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
@@ -83,25 +83,21 @@
that match a particular query.
-->
<filterCache
- class="solr.search.FastLRUCache"
size="512"
initialSize="512"
autowarmCount="2"/>
<queryResultCache
- class="solr.search.LRUCache"
size="512"
initialSize="512"
autowarmCount="2"/>
<documentCache
- class="solr.search.LRUCache"
size="512"
initialSize="512"
autowarmCount="0"/>
<cache name="perSegFilter"
- class="solr.search.LRUCache"
size="10"
initialSize="0"
autowarmCount="10" />
@@ -113,7 +109,6 @@
<!--
<cache name="myUserCache"
- class="solr.search.LRUCache"
size="4096"
initialSize="1024"
autowarmCount="1024"
@@ -320,4 +315,3 @@ based HashBitset. -->
</lst>
</initParams>
</config>
-
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml
index 004a4e7..56c5fb8 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml
@@ -48,8 +48,8 @@
<!-- deep paging better play nice with caching -->
<query>
<!-- no wautowarming, it screws up our ability to sanity check cache stats in tests -->
- <filterCache class="solr.FastLRUCache" size="50" initialSize="50" autowarmCount="0"/>
- <queryResultCache class="solr.LRUCache" size="50" initialSize="50" autowarmCount="0"/>
+ <filterCache size="50" initialSize="50" autowarmCount="0"/>
+ <queryResultCache size="50" initialSize="50" autowarmCount="0"/>
<queryResultWindowSize>50</queryResultWindowSize>
<queryResultMaxDocsCached>500</queryResultMaxDocsCached>
<!-- randomized so we excersize cursors using various paths in SolrIndexSearcher -->
@@ -58,4 +58,3 @@
<requestHandler name="/select" class="solr.SearchHandler" default="true" />
</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 fa0a0e9..75d36c9 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
@@ -56,19 +56,16 @@
that match a particular query.
-->
<filterCache
- class="solr.search.FastLRUCache"
size="512"
initialSize="512"
autowarmCount="256"/>
<queryResultCache
- class="solr.search.LRUCache"
size="512"
initialSize="512"
autowarmCount="1024"/>
<documentCache
- class="solr.search.LRUCache"
size="512"
initialSize="512"
autowarmCount="0"/>
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 84307ff..46158cd 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
@@ -37,21 +37,18 @@
<query>
<filterCache
enabled="${filterCache.enabled:false}"
- class="solr.search.FastLRUCache"
size="512"
initialSize="512"
autowarmCount="2"/>
<queryResultCache
enabled="${queryResultCache.enabled:false}"
- class="solr.search.LRUCache"
size="512"
initialSize="512"
autowarmCount="2"/>
<documentCache
enabled="${documentCache.enabled:false}"
- class="solr.search.LRUCache"
size="512"
initialSize="512"
autowarmCount="0"/>
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 dd96184..c482089 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
@@ -95,25 +95,21 @@
that match a particular query.
-->
<filterCache
- class="solr.search.FastLRUCache"
size="512"
initialSize="512"
autowarmCount="2"/>
<queryResultCache
- class="solr.search.LRUCache"
size="512"
initialSize="512"
autowarmCount="2"/>
<documentCache
- class="solr.search.LRUCache"
size="512"
initialSize="512"
autowarmCount="0"/>
<cache name="perSegFilter"
- class="solr.search.LRUCache"
size="10"
initialSize="0"
autowarmCount="10" />
@@ -125,7 +121,6 @@
<!--
<cache name="myUserCache"
- class="solr.search.LRUCache"
size="4096"
initialSize="1024"
autowarmCount="1024"
@@ -561,4 +556,3 @@
<queryParser name="minhash" class="org.apache.solr.search.MinHashQParserPlugin" />
</config>
-
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 a3cd7b6..4412fd8 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
@@ -26,8 +26,7 @@
<schemaFactory class="ClassicIndexSchemaFactory"/>
<requestHandler name="/select" class="solr.SearchHandler" />
<query>
- <cache name="myPerSegmentCache"
- class="solr.LRUCache"
+ <cache name="myPerSegmentCache"
size="3"
initialSize="0"
autowarmCount="100%"
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 b20f501..e19aaed 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
@@ -82,25 +82,21 @@
that match a particular query.
-->
<filterCache
- class="solr.search.FastLRUCache"
size="512"
initialSize="512"
autowarmCount="2"/>
<queryResultCache
- class="solr.search.LRUCache"
size="512"
initialSize="512"
autowarmCount="2"/>
<documentCache
- class="solr.search.LRUCache"
size="512"
initialSize="512"
autowarmCount="0"/>
<cache name="perSegFilter"
- class="solr.search.LRUCache"
size="10"
initialSize="0"
autowarmCount="10" />
@@ -112,7 +108,6 @@
<!--
<cache name="myUserCache"
- class="solr.search.LRUCache"
size="4096"
initialSize="1024"
autowarmCount="1024"
@@ -537,4 +532,3 @@ based HashBitset. -->
</initParams>
</config>
-
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 efb9eea..1bb3c97 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
@@ -35,8 +35,7 @@
<queryResultMaxDocsCached>200</queryResultMaxDocsCached>
- <documentCache class="solr.LRUCache"
- size="512"
+ <documentCache size="512"
initialSize="512"
autowarmCount="0"/>
</query>
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 968575a..68583a2 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
@@ -27,16 +27,14 @@
<requestHandler name="/select" class="solr.SearchHandler" />
<query>
<cache name="perSegSpatialFieldCache_srptgeom"
- class="solr.LRUCache"
size="3"
initialSize="0"
autowarmCount="100%"
regenerator="solr.NoOpRegenerator"/>
<cache name="perSegSpatialFieldCache_srptgeom_geo3d"
- class="solr.LRUCache"
size="3"
initialSize="0"
autowarmCount="100%"
regenerator="solr.NoOpRegenerator"/>
</query>
-</config>
\ No newline at end of file
+</config>
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 b5e542d..f7cfdb9 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
@@ -136,23 +136,19 @@
<query>
- <filterCache class="solr.FastLRUCache"
- size="512"
+ <filterCache size="512"
initialSize="512"
autowarmCount="0" />
- <queryResultCache class="solr.LRUCache"
- size="512"
+ <queryResultCache size="512"
initialSize="512"
autowarmCount="0" />
- <documentCache class="solr.LRUCache"
- size="512"
+ <documentCache size="512"
initialSize="512"
autowarmCount="0" />
<cache name="perSegFilter"
- class="solr.search.LRUCache"
size="10"
initialSize="0"
autowarmCount="10"
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 2bfd0b5..d143329 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
@@ -95,25 +95,21 @@
that match a particular query.
-->
<filterCache
- class="solr.search.FastLRUCache"
size="512"
initialSize="512"
autowarmCount="2"/>
<queryResultCache
- class="solr.search.LRUCache"
size="512"
initialSize="512"
autowarmCount="2"/>
<documentCache
- class="solr.search.LRUCache"
size="512"
initialSize="512"
autowarmCount="0"/>
<cache name="perSegFilter"
- class="solr.search.LRUCache"
size="10"
initialSize="0"
autowarmCount="10" />
@@ -125,7 +121,6 @@
<!--
<cache name="myUserCache"
- class="solr.search.LRUCache"
size="4096"
initialSize="1024"
autowarmCount="1024"
@@ -567,4 +562,3 @@
</transformer>
</config>
-
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 6f35efa..29fbd3d 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
@@ -36,19 +36,16 @@
<query>
<filterCache
- class="solr.FastLRUCache"
size="512"
initialSize="512"
autowarmCount="0"/>
<queryResultCache
- class="solr.LRUCache"
size="512"
initialSize="512"
autowarmCount="0"/>
<documentCache
- class="solr.LRUCache"
size="512"
initialSize="512"
autowarmCount="0"/>
diff --git a/solr/core/src/test-files/solr/configsets/ccjoin/conf/solrconfig.xml b/solr/core/src/test-files/solr/configsets/ccjoin/conf/solrconfig.xml
index 8e3a8ef..3a69325 100644
--- a/solr/core/src/test-files/solr/configsets/ccjoin/conf/solrconfig.xml
+++ b/solr/core/src/test-files/solr/configsets/ccjoin/conf/solrconfig.xml
@@ -26,24 +26,20 @@
<requestHandler name="/select" class="solr.SearchHandler" />
<query>
- <filterCache class="solr.CaffeineCache"
- size="512"
+ <filterCache size="512"
initialSize="512"
autowarmCount="0" />
- <queryResultCache class="solr.CaffeineCache"
- size="512"
+ <queryResultCache size="512"
initialSize="512"
autowarmCount="0" />
- <documentCache class="solr.CaffeineCache"
- size="512"
+ <documentCache size="512"
initialSize="512"
autowarmCount="0" />
</query>
<cache name="hash_product_id_s"
- class="solr.CaffeineCache"
size="128"
initialSize="0"
regenerator="solr.NoOpRegenerator"/>
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 5d466e8..3957073 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
@@ -56,20 +56,16 @@
</updateHandler>
<query>
- <filterCache class="solr.FastLRUCache"
- size="0"
+ <filterCache size="0"
initialSize="0"
autowarmCount="0"/>
- <queryResultCache class="solr.LRUCache"
- size="0"
+ <queryResultCache size="0"
initialSize="0"
autowarmCount="0"/>
- <documentCache class="solr.LRUCache"
- size="0"
+ <documentCache size="0"
initialSize="0"
autowarmCount="0"/>
- <fieldValueCache class="solr.FastLRUCache"
- size="0"
+ <fieldValueCache size="0"
autowarmCount="0"
showItems="0" />
</query>
diff --git a/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.java b/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.java
index 022237e..e68f536 100644
--- a/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.java
@@ -315,8 +315,11 @@ public class TestSolr4Spatial2 extends SolrTestCaseJ4 {
assertJQ(sameReq, "/response/numFound==1", "/response/docs/[0]/id=='1'");
// When there are new segments, we accumulate another hit. This tests the cache was not blown away on commit.
+ // (i.e. the cache instance is new but it should've been regenerated from the old one).
// Checking equality for the first reader's cache key indicates whether the cache should still be valid.
Object leafKey2 = getFirstLeafReaderKey();
+ // get the current instance of metrics - the old one may not represent the current cache instance
+ cacheMetrics = (MetricsMap) ((SolrMetricManager.GaugeWrapper)h.getCore().getCoreMetricManager().getRegistry().getMetrics().get("CACHE.searcher.perSegSpatialFieldCache_" + fieldName)).getGauge();
assertEquals(leafKey1.equals(leafKey2) ? "2" : "1", cacheMetrics.getValue().get("cumulative_hits").toString());
}
diff --git a/solr/core/src/test/org/apache/solr/search/json/TestJsonRequest.java b/solr/core/src/test/org/apache/solr/search/json/TestJsonRequest.java
index bf5a2b7..a6b5f53 100644
--- a/solr/core/src/test/org/apache/solr/search/json/TestJsonRequest.java
+++ b/solr/core/src/test/org/apache/solr/search/json/TestJsonRequest.java
@@ -26,8 +26,8 @@ import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.search.CaffeineCache;
import org.apache.solr.search.DocSet;
-import org.apache.solr.search.FastLRUCache;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -448,7 +448,7 @@ public class TestJsonRequest extends SolrTestCaseHS {
if(client.getClientProvider()==null) {
final SolrQueryRequest request = req();
try {
- final FastLRUCache<Query,DocSet> filterCache = (FastLRUCache<Query,DocSet>) request.getSearcher().getFilterCache();
+ final CaffeineCache<Query,DocSet> filterCache = (CaffeineCache<Query,DocSet>) request.getSearcher().getFilterCache();
filterCache.clear();
final TermQuery catA = new TermQuery(new Term("cat_s", "A"));
assertNull("cache is empty",filterCache.get(catA));
diff --git a/solr/example/example-DIH/solr/db/conf/solrconfig.xml b/solr/example/example-DIH/solr/db/conf/solrconfig.xml
index 97a34d7..2310bc9 100644
--- a/solr/example/example-DIH/solr/db/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/db/conf/solrconfig.xml
@@ -406,8 +406,7 @@
autowarmCount - the number of entries to prepopulate from
and old cache.
-->
- <filterCache class="solr.FastLRUCache"
- size="512"
+ <filterCache size="512"
initialSize="512"
autowarmCount="0"/>
@@ -416,8 +415,7 @@
Caches results of searches - ordered lists of document ids
(DocList) based on a query, a sort, and the range of documents requested.
-->
- <queryResultCache class="solr.LRUCache"
- size="512"
+ <queryResultCache size="512"
initialSize="512"
autowarmCount="0"/>
@@ -427,14 +425,12 @@
document). Since Lucene internal document ids are transient,
this cache will not be autowarmed.
-->
- <documentCache class="solr.LRUCache"
- size="512"
+ <documentCache size="512"
initialSize="512"
autowarmCount="0"/>
<!-- custom cache currently used by block join -->
<cache name="perSegFilter"
- class="solr.search.LRUCache"
size="10"
initialSize="0"
autowarmCount="10"
@@ -447,8 +443,7 @@
even if not configured here.
-->
<!--
- <fieldValueCache class="solr.FastLRUCache"
- size="512"
+ <fieldValueCache size="512"
autowarmCount="128"
showItems="32" />
-->
@@ -464,7 +459,6 @@
-->
<!--
<cache name="myUserCache"
- class="solr.LRUCache"
size="4096"
initialSize="1024"
autowarmCount="1024"
diff --git a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml b/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
index 8ff016c..9b42a0f 100644
--- a/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
@@ -409,8 +409,7 @@
autowarmCount - the number of entries to prepopulate from
and old cache.
-->
- <filterCache class="solr.FastLRUCache"
- size="512"
+ <filterCache size="512"
initialSize="512"
autowarmCount="0"/>
@@ -419,8 +418,7 @@
Caches results of searches - ordered lists of document ids
(DocList) based on a query, a sort, and the range of documents requested.
-->
- <queryResultCache class="solr.LRUCache"
- size="512"
+ <queryResultCache size="512"
initialSize="512"
autowarmCount="0"/>
@@ -430,14 +428,12 @@
document). Since Lucene internal document ids are transient,
this cache will not be autowarmed.
-->
- <documentCache class="solr.LRUCache"
- size="512"
+ <documentCache size="512"
initialSize="512"
autowarmCount="0"/>
<!-- custom cache currently used by block join -->
<cache name="perSegFilter"
- class="solr.search.LRUCache"
size="10"
initialSize="0"
autowarmCount="10"
@@ -450,8 +446,7 @@
even if not configured here.
-->
<!--
- <fieldValueCache class="solr.FastLRUCache"
- size="512"
+ <fieldValueCache size="512"
autowarmCount="128"
showItems="32" />
-->
@@ -467,7 +462,6 @@
-->
<!--
<cache name="myUserCache"
- class="solr.LRUCache"
size="4096"
initialSize="1024"
autowarmCount="1024"
diff --git a/solr/example/example-DIH/solr/solr/conf/solrconfig.xml b/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
index 3c8eab9..9687bbd 100644
--- a/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
+++ b/solr/example/example-DIH/solr/solr/conf/solrconfig.xml
@@ -406,8 +406,7 @@
autowarmCount - the number of entries to prepopulate from
and old cache.
-->
- <filterCache class="solr.FastLRUCache"
- size="512"
+ <filterCache size="512"
initialSize="512"
autowarmCount="0"/>
@@ -416,8 +415,7 @@
Caches results of searches - ordered lists of document ids
(DocList) based on a query, a sort, and the range of documents requested.
-->
- <queryResultCache class="solr.LRUCache"
- size="512"
+ <queryResultCache size="512"
initialSize="512"
autowarmCount="0"/>
@@ -427,14 +425,12 @@
document). Since Lucene internal document ids are transient,
this cache will not be autowarmed.
-->
- <documentCache class="solr.LRUCache"
- size="512"
+ <documentCache size="512"
initialSize="512"
autowarmCount="0"/>
<!-- custom cache currently used by block join -->
<cache name="perSegFilter"
- class="solr.search.LRUCache"
size="10"
initialSize="0"
autowarmCount="10"
@@ -447,8 +443,7 @@
even if not configured here.
-->
<!--
- <fieldValueCache class="solr.FastLRUCache"
- size="512"
+ <fieldValueCache size="512"
autowarmCount="128"
showItems="32" />
-->
@@ -464,7 +459,6 @@
-->
<!--
<cache name="myUserCache"
- class="solr.LRUCache"
size="4096"
initialSize="1024"
autowarmCount="1024"
diff --git a/solr/example/files/conf/solrconfig.xml b/solr/example/files/conf/solrconfig.xml
index 7b5b055..f7ec379 100644
--- a/solr/example/files/conf/solrconfig.xml
+++ b/solr/example/files/conf/solrconfig.xml
@@ -404,8 +404,7 @@
autowarmCount - the number of entries to prepopulate from
and old cache.
-->
- <filterCache class="solr.FastLRUCache"
- size="512"
+ <filterCache size="512"
initialSize="512"
autowarmCount="0"/>
@@ -417,8 +416,7 @@
maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed
to occupy
-->
- <queryResultCache class="solr.LRUCache"
- size="512"
+ <queryResultCache size="512"
initialSize="512"
autowarmCount="0"/>
@@ -428,8 +426,7 @@
document). Since Lucene internal document ids are transient,
this cache will not be autowarmed.
-->
- <documentCache class="solr.LRUCache"
- size="512"
+ <documentCache size="512"
initialSize="512"
autowarmCount="0"/>
@@ -440,8 +437,7 @@
even if not configured here.
-->
<!--
- <fieldValueCache class="solr.FastLRUCache"
- size="512"
+ <fieldValueCache size="512"
autowarmCount="128"
showItems="32" />
-->
@@ -457,7 +453,6 @@
-->
<!--
<cache name="myUserCache"
- class="solr.LRUCache"
size="4096"
initialSize="1024"
autowarmCount="1024"
diff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml b/solr/server/solr/configsets/_default/conf/solrconfig.xml
index 7421a12..b418820 100644
--- a/solr/server/solr/configsets/_default/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/_default/conf/solrconfig.xml
@@ -392,6 +392,7 @@
threaded operation and thus is generally faster than LRUCache
when the hit ratio of the cache is high (> 75%), and may be
faster under other scenarios on multi-cpu systems.
+ Starting with Solr 9.0 the default cache implementation used is CaffeineCache.
-->
<!-- Filter Cache
@@ -416,8 +417,7 @@
to occupy. Note that when this option is specified, the size
and initialSize parameters are ignored.
-->
- <filterCache class="solr.FastLRUCache"
- size="512"
+ <filterCache size="512"
initialSize="512"
autowarmCount="0"/>
@@ -429,8 +429,7 @@
maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed
to occupy
-->
- <queryResultCache class="solr.LRUCache"
- size="512"
+ <queryResultCache size="512"
initialSize="512"
autowarmCount="0"/>
@@ -440,14 +439,12 @@
document). Since Lucene internal document ids are transient,
this cache will not be autowarmed.
-->
- <documentCache class="solr.LRUCache"
- size="512"
+ <documentCache size="512"
initialSize="512"
autowarmCount="0"/>
<!-- custom cache currently used by block join -->
<cache name="perSegFilter"
- class="solr.search.LRUCache"
size="10"
initialSize="0"
autowarmCount="10"
@@ -460,8 +457,7 @@
even if not configured here.
-->
<!--
- <fieldValueCache class="solr.FastLRUCache"
- size="512"
+ <fieldValueCache size="512"
autowarmCount="128"
showItems="32" />
-->
@@ -477,7 +473,6 @@
-->
<!--
<cache name="myUserCache"
- class="solr.LRUCache"
size="4096"
initialSize="1024"
autowarmCount="1024"
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
index 43ab2fd..08a1a80 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
@@ -439,8 +439,7 @@
to occupy. Note that when this option is specified, the size
and initialSize parameters are ignored.
-->
- <filterCache class="solr.FastLRUCache"
- size="512"
+ <filterCache size="512"
initialSize="512"
autowarmCount="0"/>
@@ -452,8 +451,7 @@
maxRamMB - the maximum amount of RAM (in MB) that this cache is allowed
to occupy
-->
- <queryResultCache class="solr.LRUCache"
- size="512"
+ <queryResultCache size="512"
initialSize="512"
autowarmCount="0"/>
@@ -463,14 +461,12 @@
document). Since Lucene internal document ids are transient,
this cache will not be autowarmed.
-->
- <documentCache class="solr.LRUCache"
- size="512"
+ <documentCache size="512"
initialSize="512"
autowarmCount="0"/>
<!-- custom cache currently used by block join -->
<cache name="perSegFilter"
- class="solr.search.LRUCache"
size="10"
initialSize="0"
autowarmCount="10"
@@ -483,8 +479,7 @@
even if not configured here.
-->
<!--
- <fieldValueCache class="solr.FastLRUCache"
- size="512"
+ <fieldValueCache size="512"
autowarmCount="128"
showItems="32" />
-->
@@ -500,7 +495,6 @@
https://lucene.apache.org/solr/guide/learning-to-rank.html
-->
<cache enable="${solr.ltr.enabled:false}" name="QUERY_DOC_FV"
- class="solr.search.LRUCache"
size="4096"
initialSize="2048"
autowarmCount="4096"
@@ -517,7 +511,6 @@
-->
<!--
<cache name="myUserCache"
- class="solr.LRUCache"
size="4096"
initialSize="1024"
autowarmCount="1024"