You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2017/06/02 17:51:44 UTC
lucene-solr:master: SOLR-10801: Remove several deprecated methods
that were exposed to plugin writers
Repository: lucene-solr
Updated Branches:
refs/heads/master 3b45d8284 -> 038baaed9
SOLR-10801: Remove several deprecated methods that were exposed to plugin writers
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/038baaed
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/038baaed
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/038baaed
Branch: refs/heads/master
Commit: 038baaed92a0894faa4204089373fd1deb295097
Parents: 3b45d82
Author: Chris Hostetter <ho...@apache.org>
Authored: Fri Jun 2 10:49:26 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Fri Jun 2 10:51:23 2017 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 2 +
.../apache/solr/search/LuceneQParserPlugin.java | 6 --
.../java/org/apache/solr/search/QParser.java | 10 ----
.../org/apache/solr/search/QueryParsing.java | 26 --------
.../org/apache/solr/util/SolrPluginUtils.java | 63 --------------------
5 files changed, 2 insertions(+), 105 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/038baaed/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 6b664e4..b7e0b61 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -228,6 +228,8 @@ Other Changes
* SOLR-10799: Extracted functionality to collect eligible replicas from HttpShardHandler.prepDistributed()
to a new method (Domenico Fabio Marino via Tomás Fernández Löbbe)
+* SOLR-10801: Remove several deprecated methods that were exposed to plugin writers (hossman)
+
================== 6.7.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/038baaed/solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java
index 8668330..912b57f 100644
--- a/solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java
@@ -79,12 +79,6 @@ class OldLuceneQParser extends LuceneQParser {
}
@Override
- @Deprecated
- public SortSpec getSort(boolean useGlobal) throws SyntaxError {
- return getSortSpec(useGlobal);
- }
-
- @Override
public SortSpec getSortSpec(boolean useGlobal) throws SyntaxError {
SortSpec sort = super.getSortSpec(useGlobal);
if (sortStr != null && sortStr.length()>0 && sort.getSort()==null) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/038baaed/solr/core/src/java/org/apache/solr/search/QParser.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/QParser.java b/solr/core/src/java/org/apache/solr/search/QParser.java
index 58c0265..7392cbc 100644
--- a/solr/core/src/java/org/apache/solr/search/QParser.java
+++ b/solr/core/src/java/org/apache/solr/search/QParser.java
@@ -238,16 +238,6 @@ public abstract class QParser {
/**
* @param useGlobalParams look up sort, start, rows in global params if not in local params
* @return the sort specification
- * @deprecated Use the not misleadingly named getSortSpec() function instead.
- */
- @Deprecated
- public SortSpec getSort(boolean useGlobalParams) throws SyntaxError {
- return getSortSpec(useGlobalParams);
- }
-
- /**
- * @param useGlobalParams look up sort, start, rows in global params if not in local params
- * @return the sort specification
*/
public SortSpec getSortSpec(boolean useGlobalParams) throws SyntaxError {
getQuery(); // ensure query is parsed first
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/038baaed/solr/core/src/java/org/apache/solr/search/QueryParsing.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/QueryParsing.java b/solr/core/src/java/org/apache/solr/search/QueryParsing.java
index bbce610..f636aca 100644
--- a/solr/core/src/java/org/apache/solr/search/QueryParsing.java
+++ b/solr/core/src/java/org/apache/solr/search/QueryParsing.java
@@ -57,32 +57,6 @@ public class QueryParsing {
// true if the value was specified by the "v" param (i.e. v=myval, or v=$param)
public static final String VAL_EXPLICIT = "__VAL_EXPLICIT__";
-
- /**
- * Returns the default operator for use by Query Parsers, parsed from the df string
- * @param notUsed is not used, but is there for back compat with 3rd party QParsers
- * @param df the df string from request
- * @deprecated this method is here purely not to break code back compat in 7.x
- */
- @Deprecated
- public static QueryParser.Operator getQueryParserDefaultOperator(final IndexSchema notUsed,
- final String df) {
- return parseOP(df);
- }
-
- /**
- * Returns the effective default field based on the 'df' param.
- * TODO: This is kept for 3rd party QParser compat in 7.x. Remove this method in Solr 8.0
- * @param ignored Not in use
- * @param df the default field, which will be returned as-is
- * @see org.apache.solr.common.params.CommonParams#DF
- * @deprecated IndexScema does not contain defaultField anymore, you must rely on df alone
- */
- @Deprecated
- public static String getDefaultField(final IndexSchema ignored, final String df) {
- return df;
- }
-
/**
* @param txt Text to parse
* @param start Index into text for start of parsing
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/038baaed/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
----------------------------------------------------------------------
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 658b035..1d265c7 100644
--- a/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
@@ -35,7 +35,6 @@ import java.util.TreeMap;
import java.util.regex.Pattern;
import org.apache.lucene.document.Document;
-import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.BooleanQuery;
@@ -44,8 +43,6 @@ import org.apache.lucene.search.DisjunctionMaxQuery;
import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Sort;
-import org.apache.solr.common.SolrDocument;
-import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.MapSolrParams;
@@ -1009,66 +1006,6 @@ public class SolrPluginUtils {
}
}
- /**
- * Convert a DocList to a SolrDocumentList
- *
- * The optional param "ids" is populated with the lucene document id
- * for each SolrDocument.
- *
- * @param docs The {@link org.apache.solr.search.DocList} to convert
- * @param searcher The {@link org.apache.solr.search.SolrIndexSearcher} to use to load the docs from the Lucene index
- * @param fields The names of the Fields to load
- * @param ids A map to store the ids of the docs
- * @return The new {@link org.apache.solr.common.SolrDocumentList} containing all the loaded docs
- * @throws java.io.IOException if there was a problem loading the docs
- * @since solr 1.4
- * @deprecated TODO in 7.0 remove this. It was inlined into ClusteringComponent. DWS: 'ids' is ugly.
- */
- public static SolrDocumentList docListToSolrDocumentList(
- DocList docs,
- SolrIndexSearcher searcher,
- Set<String> fields,
- Map<SolrDocument, Integer> ids ) throws IOException
- {
- /* DWS deprecation note:
- It's only called by ClusteringComponent, and I think the "ids" param aspect is a bit messy and not worth supporting.
- If someone wants a similar method they can speak up and we can add a method to SolrDocumentFetcher.
- */
- IndexSchema schema = searcher.getSchema();
-
- SolrDocumentList list = new SolrDocumentList();
- list.setNumFound(docs.matches());
- list.setMaxScore(docs.maxScore());
- list.setStart(docs.offset());
-
- DocIterator dit = docs.iterator();
-
- while (dit.hasNext()) {
- int docid = dit.nextDoc();
-
- Document luceneDoc = searcher.doc(docid, fields);
- SolrDocument doc = new SolrDocument();
-
- for( IndexableField field : luceneDoc) {
- if (null == fields || fields.contains(field.name())) {
- SchemaField sf = schema.getField( field.name() );
- doc.addField( field.name(), sf.getType().toObject( field ) );
- }
- }
- if (docs.hasScores() && (null == fields || fields.contains("score"))) {
- doc.addField("score", dit.score());
- }
-
- list.add( doc );
-
- if( ids != null ) {
- ids.put( doc, new Integer(docid) );
- }
- }
- return list;
- }
-
-
public static void invokeSetters(Object bean, Iterable<Map.Entry<String,Object>> initArgs) {
invokeSetters(bean, initArgs, false);
}