You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ho...@apache.org on 2009/02/28 01:36:31 UTC
svn commit: r748763 - in /lucene/solr/trunk: ./
src/java/org/apache/solr/handler/component/
src/java/org/apache/solr/search/ src/test/org/apache/solr/
src/test/org/apache/solr/handler/
Author: hossman
Date: Sat Feb 28 00:36:30 2009
New Revision: 748763
URL: http://svn.apache.org/viewvc?rev=748763&view=rev
Log:
SOLR-1036: Change default QParser from "lucenePlusSort" to "lucene"
Modified:
lucene/solr/trunk/CHANGES.txt
lucene/solr/trunk/src/java/org/apache/solr/handler/component/QueryComponent.java
lucene/solr/trunk/src/java/org/apache/solr/search/QParserPlugin.java
lucene/solr/trunk/src/test/org/apache/solr/ConvertedLegacyTest.java
lucene/solr/trunk/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java
Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=748763&r1=748762&r2=748763&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Sat Feb 28 00:36:30 2009
@@ -32,6 +32,14 @@
release and want to enable omitTf by default, change the schema version from
1.1 to 1.2 in schema.xml. Remove any existing index and restart Solr to ensure that omitTf completely takes affect.
+The default QParserPlugin used by the QueryComponent for parsing the "q" param
+has been changed, to remove support for the deprecated use of ";" as a separator
+between the query string and the sort options when no "sort" param was used.
+Users who wish to continue using the semi-colon based method of specifying the
+sort options should explicitly set the defType param to "lucenePlusSort" on all
+requests. (The simplest way to do this is by specifying it as a default param
+for your request handlers in solrconfig.xml, see the example solrconfig.xml for
+sample syntax.)
Detailed Change List
----------------------
@@ -330,6 +338,9 @@
19. SOLR-967: New type-safe constructor for NamedList (Kay Kay via hossman)
+20. SOLR-1036: Change default QParser from "lucenePlusSort" to "lucene" to
+ reduce confusion of semicolon splitting behavior when no sort param is
+ specified (hossman)
Build
----------------------
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/component/QueryComponent.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/component/QueryComponent.java?rev=748763&r1=748762&r2=748763&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/component/QueryComponent.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/component/QueryComponent.java Sat Feb 28 00:36:30 2009
@@ -75,7 +75,7 @@
rb.setFieldFlags( fieldFlags );
String defType = params.get(QueryParsing.DEFTYPE);
- defType = defType==null ? OldLuceneQParserPlugin.NAME : defType;
+ defType = defType==null ? QParserPlugin.DEFAULT_QTYPE : defType;
if (rb.getQueryString() == null) {
rb.setQueryString( params.get( CommonParams.Q ) );
Modified: lucene/solr/trunk/src/java/org/apache/solr/search/QParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/search/QParserPlugin.java?rev=748763&r1=748762&r2=748763&view=diff
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/search/QParserPlugin.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/search/QParserPlugin.java Sat Feb 28 00:36:30 2009
@@ -22,11 +22,11 @@
public abstract class QParserPlugin implements NamedListInitializedPlugin {
/** internal use - name of the default parser */
- public static String DEFAULT_QTYPE="lucene";
+ public static String DEFAULT_QTYPE = LuceneQParserPlugin.NAME;
/** internal use - name to class mappings of builtin parsers */
public static final Object[] standardPlugins = {
- DEFAULT_QTYPE, LuceneQParserPlugin.class,
+ LuceneQParserPlugin.NAME, LuceneQParserPlugin.class,
OldLuceneQParserPlugin.NAME, OldLuceneQParserPlugin.class,
FunctionQParserPlugin.NAME, FunctionQParserPlugin.class,
PrefixQParserPlugin.NAME, PrefixQParserPlugin.class,
Modified: lucene/solr/trunk/src/test/org/apache/solr/ConvertedLegacyTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/ConvertedLegacyTest.java?rev=748763&r1=748762&r2=748763&view=diff
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/ConvertedLegacyTest.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/ConvertedLegacyTest.java Sat Feb 28 00:36:30 2009
@@ -39,6 +39,7 @@
SolrQueryRequest req = null;
Map<String,String> args = new HashMap<String,String>();
lrf.args.put("version","2.0");
+ lrf.args.put("defType","lucenePlusSort");
// compact the index, keep things from getting out of hand
@@ -222,6 +223,7 @@
);
args = new HashMap<String,String>();
args.put("version","2.0");
+ args.put("defType","lucenePlusSort");
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z];val_s asc",
"standard", 0, 0 , args);
assertQ(req
@@ -230,6 +232,7 @@
);
args = new HashMap<String,String>();
args.put("version","2.0");
+ args.put("defType","lucenePlusSort");
req = new LocalSolrQueryRequest(h.getCore(), "val_s:[a TO z];val_s desc",
"standard", 0, 0 , args);
assertQ(req
@@ -1171,6 +1174,7 @@
args = new HashMap<String,String>();
args.put("version","2.0");
args.put("fl","score ");
+ args.put("defType","lucenePlusSort");
req = new LocalSolrQueryRequest(h.getCore(), "id:44;id desc;",
"standard", 0, 10, args);
assertQ(req
@@ -1179,6 +1183,7 @@
args = new HashMap<String,String>();
args.put("version","2.0");
args.put("fl","score ");
+ args.put("defType","lucenePlusSort");
req = new LocalSolrQueryRequest(h.getCore(), "id:44;",
"standard", 0, 10, args);
assertQ(req
@@ -1187,6 +1192,7 @@
args = new HashMap<String,String>();
args.put("version","2.0");
args.put("fl","score ");
+ args.put("defType","lucenePlusSort");
req = new LocalSolrQueryRequest(h.getCore(), "id:44;id desc;",
"standard", 0, 10, args);
assertQ(req
@@ -1195,6 +1201,7 @@
args = new HashMap<String,String>();
args.put("version","2.0");
args.put("fl","score");
+ args.put("defType","lucenePlusSort");
req = new LocalSolrQueryRequest(h.getCore(), "id:44;id desc;",
"standard", 0, 0 , args);
assertQ(req
Modified: lucene/solr/trunk/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java?rev=748763&r1=748762&r2=748763&view=diff
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java Sat Feb 28 00:36:30 2009
@@ -25,6 +25,7 @@
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.search.QueryParsing;
import org.apache.solr.util.AbstractSolrTestCase;
/**
@@ -82,6 +83,7 @@
// Using legacy ';' param
args.remove( CommonParams.SORT );
+ args.put( QueryParsing.DEFTYPE, "lucenePlusSort" );
args.put( CommonParams.Q, "title:test; val_s desc" );
assertQ("with sort param [desc]", req
,"//*[@numFound='3']"