Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-10792: Deprecate and remove implicit registration of lucenePlusSort aka OldLuceneQParser

This commit is contained in:
Chris Hostetter 2017-06-01 10:01:17 -07:00
parent 57fe80d8a0
commit c88c524bbf
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
solr/CHANGES.txt
View File

@ -82,6 +82,10 @@ Upgrading from Solr 6.x
* Deprecated LatLonType, GeoHashField, SpatialPointVectorFieldType, and SpatialTermQueryPrefixTreeFieldType. * Deprecated LatLonType, GeoHashField, SpatialPointVectorFieldType, and SpatialTermQueryPrefixTreeFieldType.
Instead, switch to LatLonPointSpatialField or SpatialRecursivePrefixTreeFieldType or RptWithGeometrySpatialField. Instead, switch to LatLonPointSpatialField or SpatialRecursivePrefixTreeFieldType or RptWithGeometrySpatialField.
* The 'lucenePlusSort' QParser has been deprecated, and is no longer implicitly defined. If you wish to continue using
this QParser untill Solr 8, you must explicitly register it in your solrconfig.xml:
'<queryParser name="lucenePlusSort" class="solr.OldLuceneQParserPlugin"/>'
New Features New Features
---------------------- ----------------------
* SOLR-9857, SOLR-9858: Collect aggregated metrics from nodes and shard leaders in overseer. (ab) * SOLR-9857, SOLR-9858: Collect aggregated metrics from nodes and shard leaders in overseer. (ab)
@ -207,6 +211,7 @@ Other Changes
* SOLR-10744: Update noggit to newer version (0.8) (noble) * SOLR-10744: Update noggit to newer version (0.8) (noble)
* SOLR-10792: Deprecate and remove implicit registration of "lucenePlusSort" aka OldLuceneQParser (hossman)
================== 6.7.0 ================== ================== 6.7.0 ==================

2
solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java
View File

@ -42,7 +42,7 @@ public class LuceneQParserPlugin extends QParserPlugin {
} }
} }
@Deprecated
class OldLuceneQParser extends LuceneQParser { class OldLuceneQParser extends LuceneQParser {
String sortStr; String sortStr;

3
solr/core/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java
View File

@ -23,7 +23,10 @@ import org.apache.solr.request.SolrQueryRequest;
* Parse Solr's variant of Lucene QueryParser syntax, including the * Parse Solr's variant of Lucene QueryParser syntax, including the
* deprecated sort specification after the query. * deprecated sort specification after the query.
* <br>Example: <code>{!lucenePlusSort}myfield:foo +bar -baz;price asc</code> * <br>Example: <code>{!lucenePlusSort}myfield:foo +bar -baz;price asc</code>
*
* @deprecated This class should have been removed a long time ago, it will be removed in Solr 8.0
*/ */
@Deprecated
public class OldLuceneQParserPlugin extends QParserPlugin { public class OldLuceneQParserPlugin extends QParserPlugin {
public static final String NAME = "lucenePlusSort"; public static final String NAME = "lucenePlusSort";

1
solr/core/src/java/org/apache/solr/search/QParserPlugin.java
View File

@ -47,7 +47,6 @@ public abstract class QParserPlugin implements NamedListInitializedPlugin, SolrI
static { static {
HashMap<String, Class<? extends QParserPlugin>> map = new HashMap<>(30, 1); HashMap<String, Class<? extends QParserPlugin>> map = new HashMap<>(30, 1);
map.put(LuceneQParserPlugin.NAME, LuceneQParserPlugin.class); map.put(LuceneQParserPlugin.NAME, LuceneQParserPlugin.class);
map.put(OldLuceneQParserPlugin.NAME, OldLuceneQParserPlugin.class);
map.put(FunctionQParserPlugin.NAME, FunctionQParserPlugin.class); map.put(FunctionQParserPlugin.NAME, FunctionQParserPlugin.class);
map.put(PrefixQParserPlugin.NAME, PrefixQParserPlugin.class); map.put(PrefixQParserPlugin.NAME, PrefixQParserPlugin.class);
map.put(BoostQParserPlugin.NAME, BoostQParserPlugin.class); map.put(BoostQParserPlugin.NAME, BoostQParserPlugin.class);

3
solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
View File

@ -494,6 +494,9 @@
<queryParser name="foo" class="FooQParserPlugin"/> <queryParser name="foo" class="FooQParserPlugin"/>
<!-- deprecated parser, delete once class is deleted in Solr 8.0 -->
<queryParser name="lucenePlusSort" class="solr.OldLuceneQParserPlugin"/>
<updateRequestProcessorChain name="dedupe"> <updateRequestProcessorChain name="dedupe">
<processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory"> <processor class="org.apache.solr.update.processor.SignatureUpdateProcessorFactory">
<bool name="enabled">false</bool> <bool name="enabled">false</bool>

1
solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
View File

@ -94,6 +94,7 @@ public class QueryEqualityTest extends SolrTestCaseJ4 {
" +apache +solr"); " +apache +solr");
} }
@Deprecated
public void testQueryLucenePlusSort() throws Exception { public void testQueryLucenePlusSort() throws Exception {
assertQueryEquals("lucenePlusSort", assertQueryEquals("lucenePlusSort",
"apache solr", "apache solr", "apache solr ; score desc"); "apache solr", "apache solr", "apache solr ; score desc");

11
solr/solr-ref-guide/src/other-parsers.adoc
View File

@ -645,17 +645,6 @@ If the `q1` parameter is price, then the query would be a function query on the
For more information about the possibilities of nested queries, see Yonik Seeley's blog post https://lucidworks.com/2009/03/31/nested-queries-in-solr/[Nested Queries in Solr]. For more information about the possibilities of nested queries, see Yonik Seeley's blog post https://lucidworks.com/2009/03/31/nested-queries-in-solr/[Nested Queries in Solr].
[[OtherParsers-OldLuceneQueryParser]]
== Old Lucene Query Parser
`OldLuceneQParser` extends the `QParserPlugin` by parsing Solr's variant of Lucene's QueryParser syntax, including the deprecated sort specification after the query.
Example:
[source,text]
----
{!lucenePlusSort} myfield:foo +bar -baz;price asc
----
[[OtherParsers-PayloadQueryParsers]] [[OtherParsers-PayloadQueryParsers]]
== Payload Query Parsers == Payload Query Parsers