You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by eh...@apache.org on 2013/05/21 19:33:35 UTC
svn commit: r1484884 - in /lucene/dev/trunk: ./ dev-tools/ lucene/
lucene/analysis/ lucene/analysis/common/ lucene/backwards/
lucene/benchmark/ lucene/classification/ lucene/codecs/ lucene/core/
lucene/demo/ lucene/facet/ lucene/grouping/ lucene/highli...
Author: ehatcher
Date: Tue May 21 17:33:34 2013
New Revision: 1484884
URL: http://svn.apache.org/r1484884
Log:
SOLR-4842: merge from branch_4x
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/dev-tools/ (props changed)
lucene/dev/trunk/lucene/ (props changed)
lucene/dev/trunk/lucene/BUILD.txt (props changed)
lucene/dev/trunk/lucene/CHANGES.txt (props changed)
lucene/dev/trunk/lucene/LICENSE.txt (props changed)
lucene/dev/trunk/lucene/MIGRATE.txt (props changed)
lucene/dev/trunk/lucene/NOTICE.txt (props changed)
lucene/dev/trunk/lucene/analysis/ (props changed)
lucene/dev/trunk/lucene/analysis/common/ (props changed)
lucene/dev/trunk/lucene/backwards/ (props changed)
lucene/dev/trunk/lucene/benchmark/ (props changed)
lucene/dev/trunk/lucene/build.xml (props changed)
lucene/dev/trunk/lucene/classification/ (props changed)
lucene/dev/trunk/lucene/codecs/ (props changed)
lucene/dev/trunk/lucene/common-build.xml (props changed)
lucene/dev/trunk/lucene/core/ (props changed)
lucene/dev/trunk/lucene/demo/ (props changed)
lucene/dev/trunk/lucene/facet/ (props changed)
lucene/dev/trunk/lucene/grouping/ (props changed)
lucene/dev/trunk/lucene/highlighter/ (props changed)
lucene/dev/trunk/lucene/ivy-settings.xml (props changed)
lucene/dev/trunk/lucene/join/ (props changed)
lucene/dev/trunk/lucene/licenses/ (props changed)
lucene/dev/trunk/lucene/memory/ (props changed)
lucene/dev/trunk/lucene/misc/ (props changed)
lucene/dev/trunk/lucene/module-build.xml (props changed)
lucene/dev/trunk/lucene/queries/ (props changed)
lucene/dev/trunk/lucene/queryparser/ (props changed)
lucene/dev/trunk/lucene/sandbox/ (props changed)
lucene/dev/trunk/lucene/site/ (props changed)
lucene/dev/trunk/lucene/spatial/ (props changed)
lucene/dev/trunk/lucene/suggest/ (props changed)
lucene/dev/trunk/lucene/test-framework/ (props changed)
lucene/dev/trunk/lucene/tools/ (props changed)
lucene/dev/trunk/solr/ (props changed)
lucene/dev/trunk/solr/CHANGES.txt (contents, props changed)
lucene/dev/trunk/solr/NOTICE.txt (props changed)
lucene/dev/trunk/solr/build.xml (props changed)
lucene/dev/trunk/solr/cloud-dev/ (props changed)
lucene/dev/trunk/solr/common-build.xml (props changed)
lucene/dev/trunk/solr/contrib/ (props changed)
lucene/dev/trunk/solr/contrib/velocity/src/test-files/velocity/solr/collection1/conf/velocity/numFound.vm (props changed)
lucene/dev/trunk/solr/core/ (props changed)
lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestFaceting.java
lucene/dev/trunk/solr/example/ (props changed)
lucene/dev/trunk/solr/licenses/ (props changed)
lucene/dev/trunk/solr/site/ (props changed)
lucene/dev/trunk/solr/solrj/ (props changed)
lucene/dev/trunk/solr/test-framework/ (props changed)
lucene/dev/trunk/solr/webapp/ (props changed)
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1484884&r1=1484883&r2=1484884&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue May 21 17:33:34 2013
@@ -102,6 +102,9 @@ Bug Fixes
* SOLR-4790: Throw an error if a core has the same name as another core, both old and
new style solr.xml
+* SOLR-4842: Fix facet.field local params from affecting other facet.field's.
+ (ehatcher, hossman)
+
Other Changes
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SimpleFacets.java?rev=1484884&r1=1484883&r2=1484884&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SimpleFacets.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/request/SimpleFacets.java Tue May 21 17:33:34 2013
@@ -149,6 +149,8 @@ public class SimpleFacets {
threads = -1;
if (localParams == null) {
+ params = orig;
+ required = new RequiredSolrParams(params);
return;
}
params = SolrParams.wrapDefaults(localParams, orig);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestFaceting.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestFaceting.java?rev=1484884&r1=1484883&r2=1484884&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestFaceting.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/request/TestFaceting.java Tue May 21 17:33:34 2013
@@ -494,6 +494,104 @@ public class TestFaceting extends SolrTe
,"//lst[@name='bar']/int[@name='Chauvinist'][.='1']"
,"//lst[@name='bar']/int[@name='Obnoxious'][.='1']"
);
+
+ assertQ("localparams in one facet variant should not affect defaults in another: facet.sort vs facet.missing",
+ req("q", "id:[42 TO 47]"
+ ,"rows","0"
+ ,"facet", "true"
+ ,"fq", "id:[42 TO 45]"
+ ,"facet.field", "{!key=foo " +
+ "facet.sort=index" +
+ "}"+fname
+ ,"facet.field", "{!key=bar " +
+ "facet.missing=true" +
+ "}"+fname
+ )
+ // foo is in index order w/o missing
+ ,"*[count(//lst[@name='foo']/int)=4]"
+ ,"//lst[@name='foo']/int[1][@name='Chauvinist'][.='1']"
+ ,"//lst[@name='foo']/int[2][@name='Obnoxious'][.='1']"
+ ,"//lst[@name='foo']/int[3][@name='Pig'][.='0']"
+ ,"//lst[@name='foo']/int[4][@name='Tool'][.='2']"
+ // bar is in count order by default and includes missing
+ ,"*[count(//lst[@name='bar']/int)=5]"
+ ,"//lst[@name='bar']/int[1][@name='Tool'][.='2']"
+ // don't assume tie breaker for slots 3 & 4, behavior undefined?
+ ,"//lst[@name='bar']/int[4][@name='Pig'][.='0']"
+ ,"//lst[@name='bar']/int[5][not(@name)][.='1']"
+ );
+
+ assertQ("localparams in one facet variant should not affect defaults in another: facet.mincount",
+ req("q", "id:[42 TO 47]"
+ ,"rows","0"
+ ,"facet", "true"
+ ,"fq", "id:[42 TO 45]"
+ ,"facet.field", "{!key=foo " +
+ "facet.mincount=2" +
+ "}"+fname
+ ,"facet.field", "{!key=bar}"+fname
+ )
+ // only Tool for foo
+ ,"*[count(//lst[@name='foo']/int)=1]"
+ ,"//lst[@name='foo']/int[1][@name='Tool'][.='2']"
+ // all for bar
+ ,"*[count(//lst[@name='bar']/int)=4]"
+ ,"//lst[@name='bar']/int[1][@name='Tool'][.='2']"
+ // don't assume tie breaker for slots 3 & 4, behavior undefined?
+ ,"//lst[@name='bar']/int[4][@name='Pig'][.='0']"
+ );
+
+ assertQ("localparams in one facet variant should not affect defaults in another: facet.missing",
+ req("q", "id:[42 TO 47]"
+ ,"rows","0"
+ ,"facet", "true"
+ ,"fq", "id:[42 TO 45]"
+ ,"facet.field", "{!key=foo " +
+ "facet.missing=true" +
+ "}"+fname
+ ,"facet.field", "{!key=bar}"+fname
+ )
+ // foo includes missing
+ ,"*[count(//lst[@name='foo']/int)=5]"
+ ,"//lst[@name='foo']/int[1][@name='Tool'][.='2']"
+ // don't assume tie breaker for slots 3 & 4, behavior undefined?
+ ,"//lst[@name='foo']/int[4][@name='Pig'][.='0']"
+ ,"//lst[@name='foo']/int[5][not(@name)][.='1']"
+ // bar does not
+ ,"*[count(//lst[@name='bar']/int)=4]"
+ ,"//lst[@name='bar']/int[1][@name='Tool'][.='2']"
+ // don't assume tie breaker for slots 3 & 4, behavior undefined?
+ ,"//lst[@name='bar']/int[4][@name='Pig'][.='0']"
+ );
+
+ assertQ("checking facets when local facet.prefix param used after regular/raw field faceting",
+ req("q", "*:*"
+ ,"facet", "true"
+ ,"facet.field", fname
+ ,"facet.field", "{!key=foo " +
+ "facet.prefix=T "+
+ "}"+fname
+ )
+ ,"*[count(//doc)=6]"
+ ,"*[count(//lst[@name='" + fname + "']/int)=4]"
+ ,"*[count(//lst[@name='foo']/int)=1]"
+ ,"//lst[@name='foo']/int[@name='Tool'][.='2']"
+ );
+
+ assertQ("checking facets when local facet.prefix param used before regular/raw field faceting",
+ req("q", "*:*"
+ ,"facet", "true"
+ ,"facet.field", "{!key=foo " +
+ "facet.prefix=T "+
+ "}"+fname
+ ,"facet.field", fname
+ )
+ ,"*[count(//doc)=6]"
+ ,"*[count(//lst[@name='" + fname + "']/int)=4]"
+ ,"*[count(//lst[@name='foo']/int)=1]"
+ ,"//lst[@name='foo']/int[@name='Tool'][.='2']"
+ );
+
clearIndex();
assertU(commit());
}