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 2013/02/25 20:32:48 UTC
svn commit: r1449823 - in /lucene/dev/branches/branch_4x: ./ dev-tools/
lucene/ lucene/analysis/
lucene/analysis/icu/src/java/org/apache/lucene/collation/ lucene/backwards/
lucene/benchmark/ lucene/classification/ lucene/codecs/ lucene/core/
lucene/cor...
Author: hossman
Date: Mon Feb 25 19:32:46 2013
New Revision: 1449823
URL: http://svn.apache.org/r1449823
Log:
SOLR-4481: SwitchQParserPlugin registered by default as 'switch' (merge r1449809)
Added:
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/search/SwitchQParserPlugin.java
- copied unchanged from r1449809, lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SwitchQParserPlugin.java
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/BUILD.txt (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (props changed)
lucene/dev/branches/branch_4x/lucene/JRE_VERSION_MIGRATION.txt (props changed)
lucene/dev/branches/branch_4x/lucene/LICENSE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/MIGRATE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/lucene/README.txt (props changed)
lucene/dev/branches/branch_4x/lucene/SYSTEM_REQUIREMENTS.txt (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java (props changed)
lucene/dev/branches/branch_4x/lucene/backwards/ (props changed)
lucene/dev/branches/branch_4x/lucene/benchmark/ (props changed)
lucene/dev/branches/branch_4x/lucene/build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/classification/ (props changed)
lucene/dev/branches/branch_4x/lucene/codecs/ (props changed)
lucene/dev/branches/branch_4x/lucene/common-build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.cfs.zip (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.nocfs.zip (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.cfs.zip (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.nocfs.zip (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSort.java (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSortDocValues.java (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java (props changed)
lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java (props changed)
lucene/dev/branches/branch_4x/lucene/demo/ (props changed)
lucene/dev/branches/branch_4x/lucene/facet/ (props changed)
lucene/dev/branches/branch_4x/lucene/grouping/ (props changed)
lucene/dev/branches/branch_4x/lucene/highlighter/ (props changed)
lucene/dev/branches/branch_4x/lucene/ivy-settings.xml (props changed)
lucene/dev/branches/branch_4x/lucene/join/ (props changed)
lucene/dev/branches/branch_4x/lucene/licenses/ (props changed)
lucene/dev/branches/branch_4x/lucene/memory/ (props changed)
lucene/dev/branches/branch_4x/lucene/misc/ (props changed)
lucene/dev/branches/branch_4x/lucene/module-build.xml (props changed)
lucene/dev/branches/branch_4x/lucene/queries/ (props changed)
lucene/dev/branches/branch_4x/lucene/queryparser/ (props changed)
lucene/dev/branches/branch_4x/lucene/sandbox/ (props changed)
lucene/dev/branches/branch_4x/lucene/site/ (props changed)
lucene/dev/branches/branch_4x/lucene/spatial/ (props changed)
lucene/dev/branches/branch_4x/lucene/suggest/ (props changed)
lucene/dev/branches/branch_4x/lucene/test-framework/ (props changed)
lucene/dev/branches/branch_4x/lucene/tools/ (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/LICENSE.txt (props changed)
lucene/dev/branches/branch_4x/solr/NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/README.txt (props changed)
lucene/dev/branches/branch_4x/solr/SYSTEM_REQUIREMENTS.txt (props changed)
lucene/dev/branches/branch_4x/solr/build.xml (props changed)
lucene/dev/branches/branch_4x/solr/cloud-dev/ (props changed)
lucene/dev/branches/branch_4x/solr/common-build.xml (props changed)
lucene/dev/branches/branch_4x/solr/contrib/ (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/org/apache/solr/core/TestConfig.java (props changed)
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java
lucene/dev/branches/branch_4x/solr/example/ (props changed)
lucene/dev/branches/branch_4x/solr/licenses/ (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpclient-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpclient-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpcore-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpcore-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpmime-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpmime-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/scripts/ (props changed)
lucene/dev/branches/branch_4x/solr/site/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_4x/solr/testlogging.properties (props changed)
lucene/dev/branches/branch_4x/solr/webapp/ (props changed)
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1449823&r1=1449822&r2=1449823&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Mon Feb 25 19:32:46 2013
@@ -66,6 +66,10 @@ New Features
* SOLR-4498: Add list command to ZkCLI that prints out the contents of
ZooKeeper. (Roman Shaposhnik via Mark Miller)
+* SOLR-4481: SwitchQParserPlugin registered by default as 'switch' using
+ syntax: {!switch case=XXX case.foo=YYY case.bar=ZZZ default=QQQ}foo
+ (hossman)
+
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=1449823&r1=1449822&r2=1449823&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 Feb 25 19:32:46 2013
@@ -42,6 +42,7 @@ public abstract class QParserPlugin impl
SpatialBoxQParserPlugin.NAME, SpatialBoxQParserPlugin.class,
JoinQParserPlugin.NAME, JoinQParserPlugin.class,
SurroundQParserPlugin.NAME, SurroundQParserPlugin.class,
+ SwitchQParserPlugin.NAME, SwitchQParserPlugin.class,
};
/** return a {@link QParser} */
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=1449823&r1=1449822&r2=1449823&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 Feb 25 19:32:46 2013
@@ -113,6 +113,31 @@ public class QueryEqualityTest extends S
}
}
+ public void testQuerySwitch() throws Exception {
+ SolrQueryRequest req = req("myXXX", "XXX",
+ "myField", "foo_s",
+ "myQ", "{!prefix f=$myField}asdf");
+ try {
+ assertQueryEquals("switch", req,
+ "{!switch case.foo=XXX case.bar=zzz case.yak=qqq}foo",
+ "{!switch case.foo=qqq case.bar=XXX case.yak=zzz} bar ",
+ "{!switch case.foo=qqq case.bar=XXX case.yak=zzz v=' bar '}",
+ "{!switch default=XXX case.foo=qqq case.bar=zzz}asdf",
+ "{!switch default=$myXXX case.foo=qqq case.bar=zzz}asdf",
+ "{!switch case=XXX case.bar=zzz case.yak=qqq v=''}",
+ "{!switch case.bar=zzz case=XXX case.yak=qqq v=''}",
+ "{!switch case=XXX case.bar=zzz case.yak=qqq}",
+ "{!switch case=XXX case.bar=zzz case.yak=qqq} ",
+ "{!switch case=$myXXX case.bar=zzz case.yak=qqq} ");
+
+ assertQueryEquals("switch", req,
+ "{!switch case.foo=$myQ case.bar=zzz case.yak=qqq}foo",
+ "{!query v=$myQ}");
+ } finally {
+ req.close();
+ }
+ }
+
public void testQueryDismax() throws Exception {
for (final String type : new String[]{"dismax","edismax"}) {
assertQueryEquals(type, "{!"+type+"}apache solr",
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java?rev=1449823&r1=1449822&r2=1449823&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java Mon Feb 25 19:32:46 2013
@@ -16,6 +16,7 @@
*/
package org.apache.solr.search;
+import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.util.AbstractSolrTestCase;
import org.junit.BeforeClass;
@@ -336,6 +337,63 @@ public class TestQueryTypes extends Abst
,"//doc[./float[@name='v_f']='1.5' and ./float[@name='score']='2.25']"
);
+ // switch queries
+ assertQ("test matching switch query",
+ req("df", "v_t",
+ "q", "{!switch case.x=Dude case.z=Yonik} x ")
+ ,"//result[@numFound='1']"
+ ,"//*[@name='id'][.='1.0']");
+ assertQ("test empty matching switch query",
+ req("df", "v_t",
+ "q", "{!switch case.x=Dude case=Yonik} ")
+ ,"//result[@numFound='1']"
+ ,"//*[@name='id'][.='2.0']");
+ assertQ("test empty matching switch query",
+ req("df", "v_t",
+ "q", "{!switch case.x=Dude case=Yonik v=''}")
+ ,"//result[@numFound='1']"
+ ,"//*[@name='id'][.='2.0']");
+ assertQ("test empty matching switch query",
+ req("df", "v_t",
+ "q", "{!switch case.x=Dude case=Yonik v=$qq}")
+ ,"//result[@numFound='1']"
+ ,"//*[@name='id'][.='2.0']");
+ assertQ("test matching switch query w/deref",
+ req("q", "{!switch case.x=$d case.z=Yonik} x ",
+ "df", "v_t",
+ "d", "Dude")
+ ,"//result[@numFound='1']"
+ ,"//*[@name='id'][.='1.0']");
+ assertQ("test default switch query",
+ req("q", "{!switch default=$d case.x=$d case.z=Yonik}asdf",
+ "df", "v_t",
+ "d", "Dude")
+ ,"//result[@numFound='1']"
+ ,"//*[@name='id'][.='1.0']");
+ assertQ("test empty default switch query",
+ req("q", "{!switch default=$d case.x=$d case.z=Yonik v=$qq}",
+ "df", "v_t",
+ "d", "Dude")
+ ,"//result[@numFound='1']"
+ ,"//*[@name='id'][.='1.0']");
+
+ try {
+ ignoreException("No\\ default\\, and no switch case");
+ assertQ("no match and no default",
+ req("q", "{!switch case.x=Dude case.z=Yonik}asdf")
+ ,"//result[@numFound='BOGUS']");
+ fail("Should have gotten an error w/o default");
+ } catch (RuntimeException exp) {
+ assertTrue("exp cause is wrong",
+ exp.getCause() instanceof SolrException);
+ SolrException e = (SolrException) exp.getCause();
+ assertEquals("error isn't user error", 400, e.code());
+ assertTrue("Error doesn't include bad switch case: " + e.getMessage(),
+ e.getMessage().contains("asdf"));
+ } finally {
+ resetExceptionIgnores();
+ }
+
// dismax query from std request handler
assertQ("test dismax query",