You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2019/06/14 12:11:47 UTC
[lucene-solr] 02/02: SOLR-13515: remove
SolrPluginUtils.IdentityRegenerator in favour of NoOpRegenerator
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 335aaf801edda188af1a9fa01a268878882ffe22
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Fri Jun 14 12:39:29 2019 +0100
SOLR-13515: remove SolrPluginUtils.IdentityRegenerator in favour of NoOpRegenerator
---
solr/CHANGES.txt | 3 +++
.../java/org/apache/solr/util/SolrPluginUtils.java | 24 ----------------------
2 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 41b29f9..370482d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -73,6 +73,9 @@ Upgrade Notes
4lw.commands.whitelist=* to enable all ZooKeeper "4 letter commands".
(Erick Erickson)
+* SOLR-13515: org.apache.solr.util.SolrPluginUtils.IdentityRegenerator has been removed, please use
+ the identical org.apache.solr.search.NoOpRegenerator instead. (David Smiley, Christine Poerschke)
+
New Features
----------------------
diff --git a/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java b/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
index 02b253e..2807ad6 100644
--- a/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
@@ -63,7 +63,6 @@ import org.apache.solr.request.json.RequestUtil;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
-import org.apache.solr.search.CacheRegenerator;
import org.apache.solr.search.DocIterator;
import org.apache.solr.search.DocList;
import org.apache.solr.search.DocSet;
@@ -71,7 +70,6 @@ import org.apache.solr.search.FieldParams;
import org.apache.solr.search.QParser;
import org.apache.solr.search.QueryParsing;
import org.apache.solr.search.ReturnFields;
-import org.apache.solr.search.SolrCache;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.search.SolrQueryParser;
import org.apache.solr.search.SortSpecParsing;
@@ -974,28 +972,6 @@ public class SolrPluginUtils {
return out;
}
- /**
- * A CacheRegenerator that can be used whenever the items in the cache
- * are not dependant on the current searcher.
- *
- * <p>
- * Flat out copies the oldKey=>oldVal pair into the newCache
- * </p>
- */
- public static class IdentityRegenerator implements CacheRegenerator {
- @Override
- public boolean regenerateItem(SolrIndexSearcher newSearcher,
- SolrCache newCache,
- SolrCache oldCache,
- Object oldKey,
- Object oldVal)
- throws IOException {
-
- newCache.put(oldKey,oldVal);
- return true;
- }
- }
-
public static void invokeSetters(Object bean, Iterable<Map.Entry<String,Object>> initArgs) {
invokeSetters(bean, initArgs, false);
}