This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 391f450 SOLR-15886: remove showItems (#490)
391f450 is described below
commit 391f45001cfed326cd4a4578fb74bbb086464b2b
Author: Andy Lester <[email protected]>
AuthorDate: Wed Feb 2 14:20:00 2022 -0600
SOLR-15886: remove showItems (#490)
* Remove obsolete showItems from fieldValueCache
Co-authored-by: Eric Pugh <[email protected]>
---
solr/CHANGES.txt | 2 ++
solr/core/src/java/org/apache/solr/core/SolrConfig.java | 1 -
solr/core/src/java/org/apache/solr/search/SolrCache.java | 1 -
.../solr/configsets/exitable-directory/conf/solrconfig.xml | 5 ++---
solr/server/solr/configsets/_default/conf/solrconfig.xml | 2 +-
.../solr/configsets/sample_techproducts_configs/conf/solrconfig.xml | 2 +-
6 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index be34fff..534f151 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -34,6 +34,8 @@ Other Changes
* SOLR-9529: Consistency in how dynamic fields are defined in sample
schema.xml files (Eric Pugh, Trey Grainger)
+* SOLR-15886: Remove deprecated showItems configuration value from
solrconfig.xml files (Andy Lester via Eric Pugh)
+
================== 9.0.0 ==================
Docker and modules have separate CHANGES.md files.
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 1cd05df..817aa5d 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java
@@ -301,7 +301,6 @@ public class SolrConfig implements MapSerializable {
args.put(NAME, "fieldValueCache");
args.put("size", "10000");
args.put("initialSize", "10");
- args.put("showItems", "-1");
conf = new CacheConfig(CaffeineCache.class, args, null);
}
fieldValueCacheConfig = conf;
diff --git a/solr/core/src/java/org/apache/solr/search/SolrCache.java
b/solr/core/src/java/org/apache/solr/search/SolrCache.java
index 67e375b..c8ccc7b 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrCache.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrCache.java
@@ -41,7 +41,6 @@ public interface SolrCache<K,V> extends SolrInfoBean {
String MAX_IDLE_TIME_PARAM = "maxIdleTime";
String INITIAL_SIZE_PARAM = "initialSize";
String CLEANUP_THREAD_PARAM = "cleanupThread";
- String SHOW_ITEMS_PARAM = "showItems";
String ASYNC_PARAM = "async";
/**
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 3521efd..515ad64 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
@@ -68,9 +68,8 @@
initialSize="0"
autowarmCount="0"/>
<fieldValueCache
- size="0"
- autowarmCount="0"
- showItems="0" />
+ size="0"
+ autowarmCount="0"/>
</query>
<searchComponent name="delayingSearchComponent"
diff --git a/solr/server/solr/configsets/_default/conf/solrconfig.xml
b/solr/server/solr/configsets/_default/conf/solrconfig.xml
index 30d8b3a..b6ec37e 100644
--- a/solr/server/solr/configsets/_default/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/_default/conf/solrconfig.xml
@@ -428,7 +428,7 @@
<!--
<fieldValueCache size="512"
autowarmCount="128"
- showItems="32" />
+ />
-->
<!-- Custom Cache
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 df34a2e..6f56dce 100644
---
a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
+++
b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
@@ -448,7 +448,7 @@
<!--
<fieldValueCache size="512"
autowarmCount="128"
- showItems="32" />
+ />
-->
<!-- Feature Values Cache
