You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2014/03/17 04:35:22 UTC
svn commit: r1578218 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/search/
solr/core/src/test-files/solr/collection1/conf/
solr/core/src/test/org/apache/solr/search/
Author: erick
Date: Mon Mar 17 03:35:21 2014
New Revision: 1578218
URL: http://svn.apache.org/r1578218
Log:
SOLR-1604: Wildcards, ORs etc inside Phrase Queries or 'ComplexPhraseQueryParser support in Solr'
Added:
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java
- copied unchanged from r1578200, lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java
lucene/dev/branches/branch_4x/solr/core/src/test-files/solr/collection1/conf/schema-complex-phrase.xml
- copied unchanged from r1578200, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-complex-phrase.xml
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestComplexPhraseQParserPlugin.java
- copied unchanged from r1578200, lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestComplexPhraseQParserPlugin.java
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/QParserPlugin.java
lucene/dev/branches/branch_4x/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1578218&r1=1578217&r2=1578218&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Mon Mar 17 03:35:21 2014
@@ -73,6 +73,8 @@ New Features
* SOLR-3177: Enable tagging and excluding filters in StatsComponent via the
localParams syntax. (Mathias H., Nikolai Luthman, Vitaliy Zhovtyuk, shalin)
+
+* SOLR-1604: Wildcards, ORs etc inside Phrase Queries. (Ahmet Arslan via Erick Erickson)
Bug Fixes
----------------------
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/QParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/QParserPlugin.java?rev=1578218&r1=1578217&r2=1578218&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/QParserPlugin.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/QParserPlugin.java Mon Mar 17 03:35:21 2014
@@ -59,7 +59,8 @@ public abstract class QParserPlugin impl
BlockJoinParentQParserPlugin.NAME, BlockJoinParentQParserPlugin.class,
BlockJoinChildQParserPlugin.NAME, BlockJoinChildQParserPlugin.class,
CollapsingQParserPlugin.NAME, CollapsingQParserPlugin.class,
- SimpleQParserPlugin.NAME, SimpleQParserPlugin.class
+ SimpleQParserPlugin.NAME, SimpleQParserPlugin.class,
+ ComplexPhraseQParserPlugin.NAME, ComplexPhraseQParserPlugin.class
};
/** return a {@link QParser} */
Modified: lucene/dev/branches/branch_4x/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml?rev=1578218&r1=1578217&r2=1578218&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test-files/solr/collection1/conf/solrconfig-query-parser-init.xml Mon Mar 17 03:35:21 2014
@@ -28,4 +28,9 @@
<!-- query parser without final NAME field lead to NPE during query parser initialization-->
<queryParser name="fail" class="solr.search.LuceneQParserPlugin"/>
+ <!-- Un-ordered complex phrase query parser Same behaviour as Lucene's Sloppy PhraseQuery where slop is greater than 0 -->
+ <queryParser name="unorderedcomplexphrase" class="solr.search.ComplexPhraseQParserPlugin">
+ <bool name="inOrder">false</bool>
+ </queryParser>
+
</config>
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java?rev=1578218&r1=1578217&r2=1578218&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java Mon Mar 17 03:35:21 2014
@@ -344,6 +344,13 @@ public class QueryEqualityTest extends S
"and(apache,solr)", "apache AND solr");
}
+ public void testQueryComplexPhrase() throws Exception {
+ assertQueryEquals("complexphrase", "{!complexphrase df=text}\"jo* smith\"",
+ "text:\"jo* smith\"");
+ assertQueryEquals("complexphrase", "{!complexphrase df=title}\"jo* smith\"",
+ "title:\"jo* smith\"");
+ }
+
public void testFuncTestfunc() throws Exception {
assertFuncEquals("testfunc(foo_i)","testfunc(field(foo_i))");
assertFuncEquals("testfunc(23)");