Apache Solr open-source search software
SOLR-15886: remove showItems (#490)
Andy Lester6bd17aeebac7
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex ed4f87e445e..46cd130aed1 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -57,6 +57,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.javaindex 1cd05df5e81..817aa5d55e5 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.javaindex 67e375b8769..c8ccc7bd76f 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.xmlindex 3521efd12a9..515ad64d7f5 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.xmlindex 30d8b3ad36c..b6ec37eed7d 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 Cachediff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml b/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xmlindex df34a2e4094..6f56dce9ce1 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