You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by cp...@apache.org on 2021/07/05 13:12:52 UTC
[solr] branch main updated: SOLR-15517: Remove unnecessary no-op
implementation of SolrCoreAware in ExpandComponent and TermVectorComponent.
(#201)
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new b10b275 SOLR-15517: Remove unnecessary no-op implementation of SolrCoreAware in ExpandComponent and TermVectorComponent. (#201)
b10b275 is described below
commit b10b2755f53432d647c0919e007549e00d937185
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Mon Jul 5 14:12:47 2021 +0100
SOLR-15517: Remove unnecessary no-op implementation of SolrCoreAware in ExpandComponent and TermVectorComponent. (#201)
---
solr/CHANGES.txt | 2 ++
.../java/org/apache/solr/handler/component/ExpandComponent.java | 9 +--------
.../org/apache/solr/handler/component/TermVectorComponent.java | 9 +--------
3 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0f707b0..1cc25bb 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -344,6 +344,8 @@ Other Changes
* SOLR-15461: SOLR-15461: Upgrade Apache Calcite to 1.27.0. (Mark Miller, Timothy Potter)
+* SOLR-15517: Remove unnecessary no-op implementation of SolrCoreAware in ExpandComponent and TermVectorComponent. (Christine Poerschke)
+
Bug Fixes
---------------------
* SOLR-14546: Fix for a relatively hard to hit issue in OverseerTaskProcessor that could lead to out of order execution
diff --git a/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java b/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
index 75faad0..c47b03c 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
@@ -71,7 +71,6 @@ import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.PluginInfo;
-import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.FieldType;
import org.apache.solr.schema.SchemaField;
@@ -87,7 +86,6 @@ import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.search.SortSpecParsing;
import org.apache.solr.search.SyntaxError;
import org.apache.solr.util.plugin.PluginInfoInitialized;
-import org.apache.solr.util.plugin.SolrCoreAware;
/**
* The ExpandComponent is designed to work with the CollapsingPostFilter.
@@ -106,7 +104,7 @@ import org.apache.solr.util.plugin.SolrCoreAware;
* expand.fq=type:child (optional, overrides the main filter queries)<br>
* expand.field=field (mandatory, if the not used with the CollapsingQParserPlugin. This is given higher priority when both are present)<br>
*/
-public class ExpandComponent extends SearchComponent implements PluginInfoInitialized, SolrCoreAware {
+public class ExpandComponent extends SearchComponent implements PluginInfoInitialized {
public static final String COMPONENT_NAME = "expand";
private static final int finishingStage = ResponseBuilder.STAGE_GET_FIELDS;
private PluginInfo info = PluginInfo.EMPTY_INFO;
@@ -127,11 +125,6 @@ public class ExpandComponent extends SearchComponent implements PluginInfoInitia
}
@Override
- public void inform(SolrCore core) {
-
- }
-
- @Override
public void process(ResponseBuilder rb) throws IOException {
if (!rb.doExpand) {
diff --git a/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java b/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java
index 977b5c6..bd1a4e6 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java
@@ -41,7 +41,6 @@ import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.params.TermVectorParams;
import org.apache.solr.common.util.Base64;
import org.apache.solr.common.util.NamedList;
-import org.apache.solr.core.SolrCore;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.DocList;
@@ -51,7 +50,6 @@ import org.apache.solr.search.SolrDocumentFetcher;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.search.SolrReturnFields;
import org.apache.solr.util.SolrPluginUtils;
-import org.apache.solr.util.plugin.SolrCoreAware;
/**
* Return term vectors for the documents in a query result set.
@@ -75,7 +73,7 @@ import org.apache.solr.util.plugin.SolrCoreAware;
*
*
*/
-public class TermVectorComponent extends SearchComponent implements SolrCoreAware {
+public class TermVectorComponent extends SearchComponent {
public static final String COMPONENT_NAME = "tv";
@@ -459,11 +457,6 @@ public class TermVectorComponent extends SearchComponent implements SolrCoreAwar
}
@Override
- public void inform(SolrCore core) {
-
- }
-
- @Override
public String getDescription() {
return "A Component for working with Term Vectors";
}