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 2017/06/13 02:16:06 UTC
[6/8] lucene-solr:jira/SOLR-10834: more scripted conversions of xpath
(and json 'path') expressions realted to numeric ids -- including converting
any '\d+.0' float ids to just the integer part (as a quoted string)
more scripted conversions of xpath (and json 'path') expressions realted to numeric ids -- including converting any '\d+.0' float ids to just the integer part (as a quoted string)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/134e210b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/134e210b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/134e210b
Branch: refs/heads/jira/SOLR-10834
Commit: 134e210bdf601600a9d90dd0720a35cb122896b0
Parents: ec03260
Author: Chris Hostetter <ho...@apache.org>
Authored: Mon Jun 12 09:25:50 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Mon Jun 12 09:25:50 2017 -0700
----------------------------------------------------------------------
.../PathHierarchyTokenizerFactoryTest.java | 32 +--
.../component/QueryElevationComponentTest.java | 84 +++----
.../handler/component/TestExpandComponent.java | 100 ++++-----
.../transform/TestChildDocTransformer.java | 60 ++---
.../solr/search/TestCollapseQParserPlugin.java | 218 +++++++++----------
.../TestComplexPhraseLeadingWildcard.java | 2 +-
.../search/TestGraphTermsQParserPlugin.java | 34 +--
.../org/apache/solr/search/TestQueryTypes.java | 16 +-
.../solr/search/TestReRankQParserPlugin.java | 206 +++++++++---------
.../function/TestMinMaxOnMultiValuedField.java | 8 +-
.../update/processor/AtomicUpdatesTest.java | 18 +-
11 files changed, 389 insertions(+), 389 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/134e210b/solr/core/src/test/org/apache/solr/analysis/PathHierarchyTokenizerFactoryTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/analysis/PathHierarchyTokenizerFactoryTest.java b/solr/core/src/test/org/apache/solr/analysis/PathHierarchyTokenizerFactoryTest.java
index d079166..ded7f18 100644
--- a/solr/core/src/test/org/apache/solr/analysis/PathHierarchyTokenizerFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/analysis/PathHierarchyTokenizerFactoryTest.java
@@ -54,21 +54,21 @@ public class PathHierarchyTokenizerFactoryTest extends SolrTestCaseJ4 {
assertQ(req("{!field f=cat_path}Books/NonFic")
,"//*[@numFound='4']"
- ,"//int[@name='id' and .='40']"
- ,"//int[@name='id' and .='41']"
- ,"//int[@name='id' and .='42']"
- ,"//int[@name='id' and .='43']"
+ ,"//str[@name='id' and .='40']"
+ ,"//str[@name='id' and .='41']"
+ ,"//str[@name='id' and .='42']"
+ ,"//str[@name='id' and .='43']"
);
assertQ(req("{!field f=cat_path}Books/NonFic/Law")
,"//*[@numFound='2']"
- ,"//int[@name='id' and .='41']"
- ,"//int[@name='id' and .='42']"
+ ,"//str[@name='id' and .='41']"
+ ,"//str[@name='id' and .='42']"
);
assertQ(req("{!field f=cat_path}Books/NonFic/Science")
,"//*[@numFound='2']"
- ,"//int[@name='id' and .='42']"
- ,"//int[@name='id' and .='43']"
+ ,"//str[@name='id' and .='42']"
+ ,"//str[@name='id' and .='43']"
);
}
@@ -76,21 +76,21 @@ public class PathHierarchyTokenizerFactoryTest extends SolrTestCaseJ4 {
assertQ(req("{!field f=cat_ancestor}Books/NonFic/Science")
,"//*[@numFound='2']"
- ,"//int[@name='id' and .='40']"
- ,"//int[@name='id' and .='42']"
+ ,"//str[@name='id' and .='40']"
+ ,"//str[@name='id' and .='42']"
);
assertQ(req("{!field f=cat_ancestor}Books/NonFic/Law")
,"//*[@numFound='3']"
- ,"//int[@name='id' and .='40']"
- ,"//int[@name='id' and .='41']"
- ,"//int[@name='id' and .='42']"
+ ,"//str[@name='id' and .='40']"
+ ,"//str[@name='id' and .='41']"
+ ,"//str[@name='id' and .='42']"
);
assertQ(req("{!field f=cat_ancestor}Books/NonFic/Science/Physics")
,"//*[@numFound='3']"
- ,"//int[@name='id' and .='40']"
- ,"//int[@name='id' and .='42']"
- ,"//int[@name='id' and .='43']"
+ ,"//str[@name='id' and .='40']"
+ ,"//str[@name='id' and .='42']"
+ ,"//str[@name='id' and .='43']"
);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/134e210b/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
index 99238e4..829c585 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
@@ -96,9 +96,9 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
assertQ("", req(CommonParams.Q, "AAAA", CommonParams.QT, "/elevate",
CommonParams.FL, "id, score, [elevated]")
, "//*[@numFound='3']"
- , "//result/doc[1]/str[@name='id'][.='7.0']"
- , "//result/doc[2]/str[@name='id'][.='9.0']"
- , "//result/doc[3]/str[@name='id'][.='8.0']",
+ , "//result/doc[1]/str[@name='id'][.='7']"
+ , "//result/doc[2]/str[@name='id'][.='9']"
+ , "//result/doc[3]/str[@name='id'][.='8']",
"//result/doc[1]/bool[@name='[elevated]'][.='true']",
"//result/doc[2]/bool[@name='[elevated]'][.='false']",
"//result/doc[3]/bool[@name='[elevated]'][.='false']"
@@ -144,19 +144,19 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
, "//*[@name='ngroups'][.='3']"
, "//*[@name='matches'][.='6']"
- , groups +"/lst[1]//doc[1]/str[@name='id'][.='6.0']"
+ , groups +"/lst[1]//doc[1]/str[@name='id'][.='6']"
, groups +"/lst[1]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[1]//doc[2]/str[@name='id'][.='66.0']"
+ , groups +"/lst[1]//doc[2]/str[@name='id'][.='66']"
, groups +"/lst[1]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[1]/str[@name='id'][.='7.0']"
+ , groups +"/lst[2]//doc[1]/str[@name='id'][.='7']"
, groups +"/lst[2]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[2]/str[@name='id'][.='77.0']"
+ , groups +"/lst[2]//doc[2]/str[@name='id'][.='77']"
, groups +"/lst[2]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[1]/str[@name='id'][.='2.0']"
+ , groups +"/lst[3]//doc[1]/str[@name='id'][.='2']"
, groups +"/lst[3]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[2]/str[@name='id'][.='22.0']"
+ , groups +"/lst[3]//doc[2]/str[@name='id'][.='22']"
, groups +"/lst[3]//doc[2]/bool[@name='[elevated]'][.='false']"
);
@@ -171,19 +171,19 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
, "//*[@name='ngroups'][.='3']"
, "//*[@name='matches'][.='6']"
- , groups +"/lst[1]//doc[1]/str[@name='id'][.='7.0']"
+ , groups +"/lst[1]//doc[1]/str[@name='id'][.='7']"
, groups +"/lst[1]//doc[1]/bool[@name='[elevated]'][.='true']"
- , groups +"/lst[1]//doc[2]/str[@name='id'][.='77.0']"
+ , groups +"/lst[1]//doc[2]/str[@name='id'][.='77']"
, groups +"/lst[1]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[1]/str[@name='id'][.='6.0']"
+ , groups +"/lst[2]//doc[1]/str[@name='id'][.='6']"
, groups +"/lst[2]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[2]/str[@name='id'][.='66.0']"
+ , groups +"/lst[2]//doc[2]/str[@name='id'][.='66']"
, groups +"/lst[2]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[1]/str[@name='id'][.='2.0']"
+ , groups +"/lst[3]//doc[1]/str[@name='id'][.='2']"
, groups +"/lst[3]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[2]/str[@name='id'][.='22.0']"
+ , groups +"/lst[3]//doc[2]/str[@name='id'][.='22']"
, groups +"/lst[3]//doc[2]/bool[@name='[elevated]'][.='false']"
);
@@ -199,19 +199,19 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
, "//*[@name='ngroups'][.='3']"
, "//*[@name='matches'][.='6']"
- , groups +"/lst[1]//doc[1]/str[@name='id'][.='2.0']"
+ , groups +"/lst[1]//doc[1]/str[@name='id'][.='2']"
, groups +"/lst[1]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[1]//doc[2]/str[@name='id'][.='22.0']"
+ , groups +"/lst[1]//doc[2]/str[@name='id'][.='22']"
, groups +"/lst[1]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[1]/str[@name='id'][.='6.0']"
+ , groups +"/lst[2]//doc[1]/str[@name='id'][.='6']"
, groups +"/lst[2]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[2]/str[@name='id'][.='66.0']"
+ , groups +"/lst[2]//doc[2]/str[@name='id'][.='66']"
, groups +"/lst[2]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[1]/str[@name='id'][.='7.0']"
+ , groups +"/lst[3]//doc[1]/str[@name='id'][.='7']"
, groups +"/lst[3]//doc[1]/bool[@name='[elevated]'][.='true']"
- , groups +"/lst[3]//doc[2]/str[@name='id'][.='77.0']"
+ , groups +"/lst[3]//doc[2]/str[@name='id'][.='77']"
, groups +"/lst[3]//doc[2]/bool[@name='[elevated]'][.='false']"
);
@@ -228,19 +228,19 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
, "//*[@name='ngroups'][.='3']"
, "//*[@name='matches'][.='6']"
- , groups +"/lst[1]//doc[1]/str[@name='id'][.='7.0']"
+ , groups +"/lst[1]//doc[1]/str[@name='id'][.='7']"
, groups +"/lst[1]//doc[1]/bool[@name='[elevated]'][.='true']"
- , groups +"/lst[1]//doc[2]/str[@name='id'][.='77.0']"
+ , groups +"/lst[1]//doc[2]/str[@name='id'][.='77']"
, groups +"/lst[1]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[1]/str[@name='id'][.='2.0']"
+ , groups +"/lst[2]//doc[1]/str[@name='id'][.='2']"
, groups +"/lst[2]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[2]/str[@name='id'][.='22.0']"
+ , groups +"/lst[2]//doc[2]/str[@name='id'][.='22']"
, groups +"/lst[2]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[1]/str[@name='id'][.='6.0']"
+ , groups +"/lst[3]//doc[1]/str[@name='id'][.='6']"
, groups +"/lst[3]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[2]/str[@name='id'][.='66.0']"
+ , groups +"/lst[3]//doc[2]/str[@name='id'][.='66']"
, groups +"/lst[3]//doc[2]/bool[@name='[elevated]'][.='false']"
);
@@ -258,19 +258,19 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
, "//*[@name='ngroups'][.='3']"
, "//*[@name='matches'][.='6']"
- , groups +"/lst[1]//doc[1]/str[@name='id'][.='22.0']"
+ , groups +"/lst[1]//doc[1]/str[@name='id'][.='22']"
, groups +"/lst[1]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[1]//doc[2]/str[@name='id'][.='2.0']"
+ , groups +"/lst[1]//doc[2]/str[@name='id'][.='2']"
, groups +"/lst[1]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[1]/str[@name='id'][.='66.0']"
+ , groups +"/lst[2]//doc[1]/str[@name='id'][.='66']"
, groups +"/lst[2]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[2]/str[@name='id'][.='6.0']"
+ , groups +"/lst[2]//doc[2]/str[@name='id'][.='6']"
, groups +"/lst[2]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[1]/str[@name='id'][.='77.0']"
+ , groups +"/lst[3]//doc[1]/str[@name='id'][.='77']"
, groups +"/lst[3]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[2]/str[@name='id'][.='7.0']"
+ , groups +"/lst[3]//doc[2]/str[@name='id'][.='7']"
, groups +"/lst[3]//doc[2]/bool[@name='[elevated]'][.='true']"
);
@@ -289,19 +289,19 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
, "//*[@name='ngroups'][.='3']"
, "//*[@name='matches'][.='6']"
- , groups +"/lst[1]//doc[1]/str[@name='id'][.='7.0']"
+ , groups +"/lst[1]//doc[1]/str[@name='id'][.='7']"
, groups +"/lst[1]//doc[1]/bool[@name='[elevated]'][.='true']"
- , groups +"/lst[1]//doc[2]/str[@name='id'][.='77.0']"
+ , groups +"/lst[1]//doc[2]/str[@name='id'][.='77']"
, groups +"/lst[1]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[1]/str[@name='id'][.='22.0']"
+ , groups +"/lst[2]//doc[1]/str[@name='id'][.='22']"
, groups +"/lst[2]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[2]//doc[2]/str[@name='id'][.='2.0']"
+ , groups +"/lst[2]//doc[2]/str[@name='id'][.='2']"
, groups +"/lst[2]//doc[2]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[1]/str[@name='id'][.='66.0']"
+ , groups +"/lst[3]//doc[1]/str[@name='id'][.='66']"
, groups +"/lst[3]//doc[1]/bool[@name='[elevated]'][.='false']"
- , groups +"/lst[3]//doc[2]/str[@name='id'][.='6.0']"
+ , groups +"/lst[3]//doc[2]/str[@name='id'][.='6']"
, groups +"/lst[3]//doc[2]/bool[@name='[elevated]'][.='false']"
);
@@ -750,19 +750,19 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
assertQ("", req(CommonParams.Q, "AAAA", CommonParams.QT, "/elevate",
CommonParams.FL, "id, score, [elevated]")
, "//*[@numFound='1']"
- , "//result/doc[1]/str[@name='id'][.='7.0']"
+ , "//result/doc[1]/str[@name='id'][.='7']"
, "//result/doc[1]/bool[@name='[elevated]'][.='true']"
);
assertQ("", req(CommonParams.Q, "{!q.op=AND}AAAA", CommonParams.QT, "/elevate",
CommonParams.FL, "id, score, [elevated]")
, "//*[@numFound='1']"
- , "//result/doc[1]/str[@name='id'][.='7.0']"
+ , "//result/doc[1]/str[@name='id'][.='7']"
, "//result/doc[1]/bool[@name='[elevated]'][.='true']"
);
assertQ("", req(CommonParams.Q, "{!q.op=AND v='AAAA'}", CommonParams.QT, "/elevate",
CommonParams.FL, "id, score, [elevated]")
, "//*[@numFound='1']"
- , "//result/doc[1]/str[@name='id'][.='7.0']"
+ , "//result/doc[1]/str[@name='id'][.='7']"
, "//result/doc[1]/bool[@name='[elevated]'][.='true']"
);
} finally {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/134e210b/solr/core/src/test/org/apache/solr/handler/component/TestExpandComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestExpandComponent.java b/solr/core/src/test/org/apache/solr/handler/component/TestExpandComponent.java
index f0f0649..9c976d8 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/TestExpandComponent.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/TestExpandComponent.java
@@ -119,12 +119,12 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("expand", "true");
assertQ(req(params), "*[count(/response/result/doc)=2]",
"*[count(/response/lst[@name='expanded']/result)=2]",
- "/response/result/doc[1]/str[@name='id'][.='2.0']",
- "/response/result/doc[2]/str[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='1.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='8.0']"
+ "/response/result/doc[1]/str[@name='id'][.='2']",
+ "/response/result/doc[2]/str[@name='id'][.='6']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='1']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='7']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='5']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='8']"
);
//Basic test case page 2
@@ -139,9 +139,9 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("start", "1");
assertQ(req(params), "*[count(/response/result/doc)=1]",
"*[count(/response/lst[@name='expanded']/result)=1]",
- "/response/result/doc[1]/str[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='8.0']"
+ "/response/result/doc[1]/str[@name='id'][.='6']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='5']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='8']"
);
//Test expand.sort
@@ -154,12 +154,12 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("expand.sort", "test_l desc, sub(1,1) asc");//the "sub()" just testing function queries
assertQ(req(params), "*[count(/response/result/doc)=2]",
"*[count(/response/lst[@name='expanded']/result)=2]",
- "/response/result/doc[1]/str[@name='id'][.='2.0']",
- "/response/result/doc[2]/str[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='1.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='5.0']"
+ "/response/result/doc[1]/str[@name='id'][.='2']",
+ "/response/result/doc[2]/str[@name='id'][.='6']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='1']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='5']"
);
//Test with nullPolicy, ExpandComponent should ignore docs with null values in the collapse fields.
@@ -173,13 +173,13 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("expand.sort", "test_l desc");
assertQ(req(params), "*[count(/response/result/doc)=3]",
"*[count(/response/lst[@name='expanded']/result)=2]",
- "/response/result/doc[1]/str[@name='id'][.='3.0']",
- "/response/result/doc[2]/str[@name='id'][.='2.0']",
- "/response/result/doc[3]/str[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='1.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='5.0']"
+ "/response/result/doc[1]/str[@name='id'][.='3']",
+ "/response/result/doc[2]/str[@name='id'][.='2']",
+ "/response/result/doc[3]/str[@name='id'][.='6']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='1']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='5']"
);
@@ -195,12 +195,12 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("expand.sort", "test_l desc");
assertQ(req(params), "*[count(/response/result/doc)=2]",
"*[count(/response/lst[@name='expanded']/result)=2]",
- "/response/result/doc[1]/str[@name='id'][.='1.0']",
- "/response/result/doc[2]/str[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='2.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='6.0']"
+ "/response/result/doc[1]/str[@name='id'][.='1']",
+ "/response/result/doc[2]/str[@name='id'][.='5']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='2']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='6']"
);
@@ -217,12 +217,12 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("expand.sort", "test_l desc");
assertQ(req(params), "*[count(/response/result/doc)=2]",
"*[count(/response/lst[@name='expanded']/result)=2]",
- "/response/result/doc[1]/str[@name='id'][.='1.0']",
- "/response/result/doc[2]/str[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='2.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='6.0']"
+ "/response/result/doc[1]/str[@name='id'][.='1']",
+ "/response/result/doc[2]/str[@name='id'][.='5']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='2']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='6']"
);
//Test overide expand.fq and expand.q
@@ -239,12 +239,12 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("expand.sort", "test_l desc");
assertQ(req(params), "*[count(/response/result/doc)=2]",
"*[count(/response/lst[@name='expanded']/result)=2]",
- "/response/result/doc[1]/str[@name='id'][.='1.0']",
- "/response/result/doc[2]/str[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='2.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='6.0']"
+ "/response/result/doc[1]/str[@name='id'][.='1']",
+ "/response/result/doc[2]/str[@name='id'][.='5']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='2']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='6']"
);
//Test expand.rows
@@ -261,10 +261,10 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
"*[count(/response/lst[@name='expanded']/result)=2]",
"*[count(/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc)=1]",
"*[count(/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc)=1]",
- "/response/result/doc[1]/str[@name='id'][.='2.0']",
- "/response/result/doc[2]/str[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8.0']"
+ "/response/result/doc[1]/str[@name='id'][.='2']",
+ "/response/result/doc[2]/str[@name='id'][.='6']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='7']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='8']"
);
@@ -307,12 +307,12 @@ public class TestExpandComponent extends SolrTestCaseJ4 {
params.add("fl", "id");
assertQ(req(params), "*[count(/response/result/doc)=2]",
"*[count(/response/lst[@name='expanded']/result)=2]",
- "/response/result/doc[1]/str[@name='id'][.='2.0']",
- "/response/result/doc[2]/str[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='1.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='8.0']"
+ "/response/result/doc[1]/str[@name='id'][.='2']",
+ "/response/result/doc[2]/str[@name='id'][.='6']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/str[@name='id'][.='1']",
+ "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/str[@name='id'][.='7']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/str[@name='id'][.='5']",
+ "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/str[@name='id'][.='8']"
);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/134e210b/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java b/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java
index c10c3e0..2e68d78 100644
--- a/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java
+++ b/solr/core/src/test/org/apache/solr/response/transform/TestChildDocTransformer.java
@@ -145,23 +145,23 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
private void testSubQueryJSON() throws Exception {
String[] test1 = new String[] {
- "/response/docs/[0]/children/docs/[0]/id==2",
- "/response/docs/[0]/children/docs/[1]/id==3",
- "/response/docs/[0]/children/docs/[2]/id==4",
- "/response/docs/[0]/children/docs/[3]/id==5",
- "/response/docs/[0]/children/docs/[4]/id==6",
- "/response/docs/[0]/children/docs/[5]/id==7"
+ "/response/docs/[0]/children/docs/[0]/id=='2'",
+ "/response/docs/[0]/children/docs/[1]/id=='3'",
+ "/response/docs/[0]/children/docs/[2]/id=='4'",
+ "/response/docs/[0]/children/docs/[3]/id=='5'",
+ "/response/docs/[0]/children/docs/[4]/id=='6'",
+ "/response/docs/[0]/children/docs/[5]/id=='7'"
};
String[] test2 = new String[] {
- "/response/docs/[0]/children/docs/[0]/id==2",
- "/response/docs/[0]/children/docs/[1]/id==4",
- "/response/docs/[0]/children/docs/[2]/id==6"
+ "/response/docs/[0]/children/docs/[0]/id=='2'",
+ "/response/docs/[0]/children/docs/[1]/id=='4'",
+ "/response/docs/[0]/children/docs/[2]/id=='6'"
};
String[] test3 = new String[] {
- "/response/docs/[0]/children/docs/[0]/id==3",
- "/response/docs/[0]/children/docs/[1]/id==5"
+ "/response/docs/[0]/children/docs/[0]/id=='3'",
+ "/response/docs/[0]/children/docs/[1]/id=='5'"
};
@@ -186,23 +186,23 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
private void testChildDoctransformerJSON() throws Exception {
String[] test1 = new String[] {
- "/response/docs/[0]/_childDocuments_/[0]/id==2",
- "/response/docs/[0]/_childDocuments_/[1]/id==3",
- "/response/docs/[0]/_childDocuments_/[2]/id==4",
- "/response/docs/[0]/_childDocuments_/[3]/id==5",
- "/response/docs/[0]/_childDocuments_/[4]/id==6",
- "/response/docs/[0]/_childDocuments_/[5]/id==7"
+ "/response/docs/[0]/_childDocuments_/[0]/id=='2'",
+ "/response/docs/[0]/_childDocuments_/[1]/id=='3'",
+ "/response/docs/[0]/_childDocuments_/[2]/id=='4'",
+ "/response/docs/[0]/_childDocuments_/[3]/id=='5'",
+ "/response/docs/[0]/_childDocuments_/[4]/id=='6'",
+ "/response/docs/[0]/_childDocuments_/[5]/id=='7'"
};
String[] test2 = new String[] {
- "/response/docs/[0]/_childDocuments_/[0]/id==2",
- "/response/docs/[0]/_childDocuments_/[1]/id==4",
- "/response/docs/[0]/_childDocuments_/[2]/id==6"
+ "/response/docs/[0]/_childDocuments_/[0]/id=='2'",
+ "/response/docs/[0]/_childDocuments_/[1]/id=='4'",
+ "/response/docs/[0]/_childDocuments_/[2]/id=='6'"
};
String[] test3 = new String[] {
- "/response/docs/[0]/_childDocuments_/[0]/id==3",
- "/response/docs/[0]/_childDocuments_/[1]/id==5"
+ "/response/docs/[0]/_childDocuments_/[0]/id=='3'",
+ "/response/docs/[0]/_childDocuments_/[1]/id=='5'"
};
@@ -285,12 +285,12 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
private void testParentFilterJSON() throws Exception {
String[] tests = new String[] {
- "/response/docs/[0]/id==1",
- "/response/docs/[0]/_childDocuments_/[0]/id==2",
+ "/response/docs/[0]/id=='1'",
+ "/response/docs/[0]/_childDocuments_/[0]/id=='2'",
"/response/docs/[0]/_childDocuments_/[0]/cat/[0]/=='childDocument'",
"/response/docs/[0]/_childDocuments_/[0]/title/[0]/=='" + titleVals[0] + "'",
- "/response/docs/[1]/id==4",
- "/response/docs/[1]/_childDocuments_/[0]/id==5",
+ "/response/docs/[1]/id=='4'",
+ "/response/docs/[1]/_childDocuments_/[0]/id=='5'",
"/response/docs/[1]/_childDocuments_/[0]/cat/[0]/=='childDocument'",
"/response/docs/[1]/_childDocuments_/[0]/title/[0]/=='" + titleVals[1] + "'"
};
@@ -313,12 +313,12 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
private void testSubQueryParentFilterJSON() throws Exception {
String[] tests = new String[] {
- "/response/docs/[0]/id==1",
- "/response/docs/[0]/children/docs/[0]/id==2",
+ "/response/docs/[0]/id=='1'",
+ "/response/docs/[0]/children/docs/[0]/id=='2'",
"/response/docs/[0]/children/docs/[0]/cat/[0]/=='childDocument'",
"/response/docs/[0]/children/docs/[0]/title/[0]/=='" + titleVals[0] + "'",
- "/response/docs/[1]/id==4",
- "/response/docs/[1]/children/docs/[0]/id==5",
+ "/response/docs/[1]/id=='4'",
+ "/response/docs/[1]/children/docs/[0]/id=='5'",
"/response/docs/[1]/children/docs/[0]/cat/[0]/=='childDocument'",
"/response/docs/[1]/children/docs/[0]/title/[0]/=='" + titleVals[1] + "'"
};
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/134e210b/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
index 562c865..9b98dba 100644
--- a/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
@@ -73,8 +73,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "test_i asc, test_l desc, id desc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/str[@name='id'][.='7.0']"
- ,"//result/doc[2]/str[@name='id'][.='3.0']"
+ ,"//result/doc[1]/str[@name='id'][.='7']"
+ ,"//result/doc[2]/str[@name='id'][.='3']"
);
// group heads are selected using a complex sort, simpler sort used for final groups
@@ -84,8 +84,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id asc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/str[@name='id'][.='3.0']"
- ,"//result/doc[2]/str[@name='id'][.='7.0']"
+ ,"//result/doc[1]/str[@name='id'][.='3']"
+ ,"//result/doc[2]/str[@name='id'][.='7']"
);
// diff up the sort directions, only first clause matters with our data
@@ -95,8 +95,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/str[@name='id'][.='8.0']"
- ,"//result/doc[2]/str[@name='id'][.='4.0']"
+ ,"//result/doc[1]/str[@name='id'][.='8']"
+ ,"//result/doc[2]/str[@name='id'][.='4']"
);
// tie broken by index order
@@ -106,8 +106,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/str[@name='id'][.='6.0']"
- ,"//result/doc[2]/str[@name='id'][.='2.0']"
+ ,"//result/doc[1]/str[@name='id'][.='6']"
+ ,"//result/doc[2]/str[@name='id'][.='2']"
);
// score, then tiebreakers; note top level sort by score ASCENDING (just for weirdness)
@@ -117,8 +117,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "score asc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/str[@name='id'][.='2.0']"
- ,"//result/doc[2]/str[@name='id'][.='5.0']"
+ ,"//result/doc[1]/str[@name='id'][.='2']"
+ ,"//result/doc[2]/str[@name='id'][.='5']"
);
// score, then tiebreakers; note no score in top level sort/fl to check needsScores logic
@@ -128,8 +128,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/str[@name='id'][.='5.0']"
- ,"//result/doc[2]/str[@name='id'][.='2.0']"
+ ,"//result/doc[1]/str[@name='id'][.='5']"
+ ,"//result/doc[2]/str[@name='id'][.='2']"
);
// term_s desc -- term_s is missing from many docs, and uses sortMissingLast=true
@@ -139,8 +139,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id asc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/str[@name='id'][.='1.0']"
- ,"//result/doc[2]/str[@name='id'][.='5.0']"
+ ,"//result/doc[1]/str[@name='id'][.='1']"
+ ,"//result/doc[2]/str[@name='id'][.='5']"
);
// term_s asc -- term_s is missing from many docs, and uses sortMissingLast=true
@@ -150,8 +150,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id asc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/str[@name='id'][.='1.0']"
- ,"//result/doc[2]/str[@name='id'][.='7.0']"
+ ,"//result/doc[1]/str[@name='id'][.='1']"
+ ,"//result/doc[2]/str[@name='id'][.='7']"
);
// collapse on int field
@@ -161,8 +161,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id asc");
assertQ(req(params)
, "*[count(//doc)=2]"
- ,"//result/doc[1]/str[@name='id'][.='4.0']"
- ,"//result/doc[2]/str[@name='id'][.='7.0']"
+ ,"//result/doc[1]/str[@name='id'][.='4']"
+ ,"//result/doc[2]/str[@name='id'][.='7']"
);
// collapse on term_s (very sparse) with nullPolicy=collapse
@@ -172,9 +172,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "test_l asc, id asc");
assertQ(req(params)
, "*[count(//doc)=3]"
- ,"//result/doc[1]/str[@name='id'][.='5.0']"
- ,"//result/doc[2]/str[@name='id'][.='2.0']"
- ,"//result/doc[3]/str[@name='id'][.='7.0']"
+ ,"//result/doc[1]/str[@name='id'][.='5']"
+ ,"//result/doc[2]/str[@name='id'][.='2']"
+ ,"//result/doc[3]/str[@name='id'][.='7']"
);
// sort local param + elevation
@@ -187,8 +187,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "4.0");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='4.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']");
+ "//result/doc[1]/str[@name='id'][.='4']",
+ "//result/doc[2]/str[@name='id'][.='5']");
//
params = new ModifiableSolrParams();
params.add("q", "*:*");
@@ -199,8 +199,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "7.0");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='7.0']",
- "//result/doc[2]/str[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='7']",
+ "//result/doc[2]/str[@name='id'][.='1']");
}
@@ -250,13 +250,13 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("q", "*:*");
params.add("fq", "{!collapse field=group_i min=test_f}");
assertQ(req(params), "*[count(//doc)=1]",
- "//result/doc[1]/str[@name='id'][.='6.0']");
+ "//result/doc[1]/str[@name='id'][.='6']");
params = new ModifiableSolrParams();
params.add("q", "*:*");
params.add("fq", "{!collapse field=group_i max=test_f}");
assertQ(req(params), "*[count(//doc)=1]",
- "//result/doc[1]/str[@name='id'][.='2.0']");
+ "//result/doc[1]/str[@name='id'][.='2']");
}
@@ -378,8 +378,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("defType", "edismax");
params.add("bf", "field(test_i)");
assertQ(req(params, "indent", "on"), "*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='2.0']",
- "//result/doc[2]/str[@name='id'][.='6.0']"
+ "//result/doc[1]/str[@name='id'][.='2']",
+ "//result/doc[2]/str[@name='id'][.='6']"
);
@@ -391,10 +391,10 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("bf", "field(test_i)");
params.add("sort","");
assertQ(req(params), "*[count(//doc)=4]",
- "//result/doc[1]/str[@name='id'][.='3.0']",
- "//result/doc[2]/str[@name='id'][.='4.0']",
- "//result/doc[3]/str[@name='id'][.='2.0']",
- "//result/doc[4]/str[@name='id'][.='6.0']"
+ "//result/doc[1]/str[@name='id'][.='3']",
+ "//result/doc[2]/str[@name='id'][.='4']",
+ "//result/doc[3]/str[@name='id'][.='2']",
+ "//result/doc[4]/str[@name='id'][.='6']"
);
// Test value source collapse criteria
@@ -403,9 +403,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" nullPolicy=collapse min=field(test_i)"+hint+"}");
params.add("sort", "test_i desc");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='4.0']",
- "//result/doc[2]/str[@name='id'][.='1.0']",
- "//result/doc[3]/str[@name='id'][.='5.0']"
+ "//result/doc[1]/str[@name='id'][.='4']",
+ "//result/doc[2]/str[@name='id'][.='1']",
+ "//result/doc[3]/str[@name='id'][.='5']"
);
// Test value source collapse criteria with cscore function
@@ -415,9 +415,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("defType", "edismax");
params.add("bf", "field(test_i)");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='4.0']",
- "//result/doc[2]/str[@name='id'][.='1.0']",
- "//result/doc[3]/str[@name='id'][.='5.0']"
+ "//result/doc[1]/str[@name='id'][.='4']",
+ "//result/doc[2]/str[@name='id'][.='1']",
+ "//result/doc[3]/str[@name='id'][.='5']"
);
// Test value source collapse criteria with cscore function but no top level score sort
@@ -429,9 +429,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fl", "id");
params.add("sort", "id desc");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='5.0']",
- "//result/doc[2]/str[@name='id'][.='4.0']",
- "//result/doc[3]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='5']",
+ "//result/doc[2]/str[@name='id'][.='4']",
+ "//result/doc[3]/str[@name='id'][.='1']"
);
// Test value source collapse criteria with compound cscore function
@@ -441,9 +441,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("defType", "edismax");
params.add("bf", "field(test_i)");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='4.0']",
- "//result/doc[2]/str[@name='id'][.='1.0']",
- "//result/doc[3]/str[@name='id'][.='5.0']"
+ "//result/doc[1]/str[@name='id'][.='4']",
+ "//result/doc[2]/str[@name='id'][.='1']",
+ "//result/doc[3]/str[@name='id'][.='5']"
);
//Test collapse by score with elevation
@@ -456,10 +456,10 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qf", "term_s");
params.add("qt", "/elevate");
assertQ(req(params), "*[count(//doc)=4]",
- "//result/doc[1]/str[@name='id'][.='1.0']",
- "//result/doc[2]/str[@name='id'][.='2.0']",
- "//result/doc[3]/str[@name='id'][.='3.0']",
- "//result/doc[4]/str[@name='id'][.='6.0']");
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='2']",
+ "//result/doc[3]/str[@name='id'][.='3']",
+ "//result/doc[4]/str[@name='id'][.='6']");
//Test SOLR-5773 with score collapse criteria
// try both default & sort localparams as alternate ways to ask for max score
@@ -473,9 +473,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qt", "/elevate");
params.add("elevateIds", "1,5");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='1.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']",
- "//result/doc[3]/str[@name='id'][.='3.0']");
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='5']",
+ "//result/doc[3]/str[@name='id'][.='3']");
}
//Test SOLR-5773 with max field collapse criteria
@@ -490,9 +490,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qt", "/elevate");
params.add("elevateIds", "1,5");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='1.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']",
- "//result/doc[3]/str[@name='id'][.='3.0']");
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='5']",
+ "//result/doc[3]/str[@name='id'][.='3']");
}
//Test SOLR-5773 with min field collapse criteria
@@ -507,9 +507,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qt", "/elevate");
params.add("elevateIds", "1,5");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='1.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']",
- "//result/doc[3]/str[@name='id'][.='4.0']");
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='5']",
+ "//result/doc[3]/str[@name='id'][.='4']");
}
//Test SOLR-5773 elevating documents with null group
@@ -522,10 +522,10 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qt", "/elevate");
params.add("elevateIds", "3,4");
assertQ(req(params), "*[count(//doc)=4]",
- "//result/doc[1]/str[@name='id'][.='3.0']",
- "//result/doc[2]/str[@name='id'][.='4.0']",
- "//result/doc[3]/str[@name='id'][.='2.0']",
- "//result/doc[4]/str[@name='id'][.='6.0']");
+ "//result/doc[1]/str[@name='id'][.='3']",
+ "//result/doc[2]/str[@name='id'][.='4']",
+ "//result/doc[3]/str[@name='id'][.='2']",
+ "//result/doc[4]/str[@name='id'][.='6']");
// Non trivial sort local param for picking group head
@@ -535,9 +535,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params),
"*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='5.0']",
- "//result/doc[2]/str[@name='id'][.='4.0']",
- "//result/doc[3]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='5']",
+ "//result/doc[2]/str[@name='id'][.='4']",
+ "//result/doc[3]/str[@name='id'][.='1']"
);
//
params = new ModifiableSolrParams();
@@ -546,9 +546,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params),
"*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='6.0']",
- "//result/doc[2]/str[@name='id'][.='3.0']",
- "//result/doc[3]/str[@name='id'][.='2.0']"
+ "//result/doc[1]/str[@name='id'][.='6']",
+ "//result/doc[2]/str[@name='id'][.='3']",
+ "//result/doc[3]/str[@name='id'][.='2']"
);
@@ -562,8 +562,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id desc");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='5.0']",
- "//result/doc[2]/str[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5']",
+ "//result/doc[2]/str[@name='id'][.='1']");
params = new ModifiableSolrParams();
params.add("q", "*:*");
@@ -571,8 +571,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "id asc");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='1.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']");
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='5']");
params = new ModifiableSolrParams();
params.add("q", "*:*");
@@ -580,8 +580,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "test_l asc,id desc");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='5.0']",
- "//result/doc[2]/str[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5']",
+ "//result/doc[2]/str[@name='id'][.='1']");
params = new ModifiableSolrParams();
params.add("q", "*:*");
@@ -591,8 +591,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("bf", "field(id)");
assertQ(req(params),
"*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='5.0']",
- "//result/doc[2]/str[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5']",
+ "//result/doc[2]/str[@name='id'][.='1']");
}
@@ -602,8 +602,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" max=test_i"+hint+"}");
params.add("sort", "test_i asc");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='6.0']",
- "//result/doc[2]/str[@name='id'][.='2.0']"
+ "//result/doc[1]/str[@name='id'][.='6']",
+ "//result/doc[2]/str[@name='id'][.='2']"
);
try {
@@ -613,8 +613,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" min=test_l"+hint+"}");
params.add("sort", "test_i desc");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='1.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']");
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='5']");
//Test collapse by max long field
@@ -623,8 +623,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" max=test_l"+hint+"}");
params.add("sort", "test_i desc");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='2.0']",
- "//result/doc[2]/str[@name='id'][.='6.0']");
+ "//result/doc[1]/str[@name='id'][.='2']",
+ "//result/doc[2]/str[@name='id'][.='6']");
} catch (Exception e) {
if(!numeric) {
throw e;
@@ -638,8 +638,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" min=test_f"+hint+"}");
params.add("sort", "test_i desc");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='2.0']",
- "//result/doc[2]/str[@name='id'][.='6.0']");
+ "//result/doc[1]/str[@name='id'][.='2']",
+ "//result/doc[2]/str[@name='id'][.='6']");
//Test collapse by min float field
params = new ModifiableSolrParams();
@@ -647,8 +647,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" max=test_f"+hint+"}");
params.add("sort", "test_i asc");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='5.0']",
- "//result/doc[2]/str[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5']",
+ "//result/doc[2]/str[@name='id'][.='1']");
//Test collapse by min float field sort by score
params = new ModifiableSolrParams();
@@ -662,8 +662,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("facet.field", "{!ex=test}term_s");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='5.0']",
- "//result/doc[2]/str[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5']",
+ "//result/doc[2]/str[@name='id'][.='1']");
// Test collapse using selector field in no docs
// tie selector in all of these cases
@@ -718,9 +718,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
assertQ(req(collapse, "q", "*:*", "sort", "test_i desc"),
"*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='4.0']",
- "//result/doc[2]/str[@name='id'][.='1.0']",
- "//result/doc[3]/str[@name='id'][.='5.0']");
+ "//result/doc[1]/str[@name='id'][.='4']",
+ "//result/doc[2]/str[@name='id'][.='1']",
+ "//result/doc[3]/str[@name='id'][.='5']");
}
@@ -730,10 +730,10 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" max=test_f nullPolicy=expand"+hint+"}");
params.add("sort", "id desc");
assertQ(req(params), "*[count(//doc)=4]",
- "//result/doc[1]/str[@name='id'][.='5.0']",
- "//result/doc[2]/str[@name='id'][.='4.0']",
- "//result/doc[3]/str[@name='id'][.='3.0']",
- "//result/doc[4]/str[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5']",
+ "//result/doc[2]/str[@name='id'][.='4']",
+ "//result/doc[3]/str[@name='id'][.='3']",
+ "//result/doc[4]/str[@name='id'][.='1']");
//Test nullPolicy collapse
params = new ModifiableSolrParams();
@@ -741,9 +741,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" max=test_f nullPolicy=collapse"+hint+"}");
params.add("sort", "id desc");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='5.0']",
- "//result/doc[2]/str[@name='id'][.='4.0']",
- "//result/doc[3]/str[@name='id'][.='1.0']");
+ "//result/doc[1]/str[@name='id'][.='5']",
+ "//result/doc[2]/str[@name='id'][.='4']",
+ "//result/doc[3]/str[@name='id'][.='1']");
params = new ModifiableSolrParams();
@@ -778,9 +778,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("qf", "term_s");
params.add("qt", "/elevate");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='3.0']",
- "//result/doc[2]/str[@name='id'][.='6.0']",
- "//result/doc[3]/str[@name='id'][.='7.0']");
+ "//result/doc[1]/str[@name='id'][.='3']",
+ "//result/doc[2]/str[@name='id'][.='6']",
+ "//result/doc[3]/str[@name='id'][.='7']");
}
@@ -861,14 +861,14 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("fq", "{!collapse field="+group+" nullPolicy=expand "+selector+"}");
assertQ(req(params)
, "*[count(//doc)=8]"
- ,"//result/doc[1]/str[@name='id'][.='8.0']"
- ,"//result/doc[2]/str[@name='id'][.='7.0']"
- ,"//result/doc[3]/str[@name='id'][.='6.0']"
- ,"//result/doc[4]/str[@name='id'][.='5.0']"
- ,"//result/doc[5]/str[@name='id'][.='4.0']"
- ,"//result/doc[6]/str[@name='id'][.='3.0']"
- ,"//result/doc[7]/str[@name='id'][.='2.0']"
- ,"//result/doc[8]/str[@name='id'][.='1.0']"
+ ,"//result/doc[1]/str[@name='id'][.='8']"
+ ,"//result/doc[2]/str[@name='id'][.='7']"
+ ,"//result/doc[3]/str[@name='id'][.='6']"
+ ,"//result/doc[4]/str[@name='id'][.='5']"
+ ,"//result/doc[5]/str[@name='id'][.='4']"
+ ,"//result/doc[6]/str[@name='id'][.='3']"
+ ,"//result/doc[7]/str[@name='id'][.='2']"
+ ,"//result/doc[8]/str[@name='id'][.='1']"
);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/134e210b/solr/core/src/test/org/apache/solr/search/TestComplexPhraseLeadingWildcard.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestComplexPhraseLeadingWildcard.java b/solr/core/src/test/org/apache/solr/search/TestComplexPhraseLeadingWildcard.java
index 6c48cc3..ffccaca 100644
--- a/solr/core/src/test/org/apache/solr/search/TestComplexPhraseLeadingWildcard.java
+++ b/solr/core/src/test/org/apache/solr/search/TestComplexPhraseLeadingWildcard.java
@@ -106,7 +106,7 @@ public class TestComplexPhraseLeadingWildcard extends SolrTestCaseJ4 {
xpathes[0]= "//result[@numFound=" +ids.length+ "]";
int i=1;
for(String id : ids) {
- xpathes[i++] = "//doc/int[@name='id' and text()='"+id+"']";
+ xpathes[i++] = "//doc/str[@name='id' and text()='"+id+"']";
}
return xpathes;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/134e210b/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.java
index ee107dd..1cb927d 100644
--- a/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestGraphTermsQParserPlugin.java
@@ -74,11 +74,11 @@ public class TestGraphTermsQParserPlugin extends SolrTestCaseJ4 {
params.add("q", "{!graphTerms f=group_s maxDocFreq=10}1,2");
params.add("sort", "id asc");
assertQ(req(params, "indent", "on"), "*[count(//doc)=5]",
- "//result/doc[1]/str[@name='id'][.='1.0']",
- "//result/doc[2]/str[@name='id'][.='2.0']",
- "//result/doc[3]/str[@name='id'][.='5.0']",
- "//result/doc[4]/str[@name='id'][.='6.0']",
- "//result/doc[5]/str[@name='id'][.='7.0']"
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='2']",
+ "//result/doc[3]/str[@name='id'][.='5']",
+ "//result/doc[4]/str[@name='id'][.='6']",
+ "//result/doc[5]/str[@name='id'][.='7']"
);
//Test without maxDocFreq param. Should default to Integer.MAX_VALUE and match all terms.
@@ -86,11 +86,11 @@ public class TestGraphTermsQParserPlugin extends SolrTestCaseJ4 {
params.add("q", "{!graphTerms f=group_s}1,2");
params.add("sort", "id asc");
assertQ(req(params, "indent", "on"), "*[count(//doc)=5]",
- "//result/doc[1]/str[@name='id'][.='1.0']",
- "//result/doc[2]/str[@name='id'][.='2.0']",
- "//result/doc[3]/str[@name='id'][.='5.0']",
- "//result/doc[4]/str[@name='id'][.='6.0']",
- "//result/doc[5]/str[@name='id'][.='7.0']"
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='2']",
+ "//result/doc[3]/str[@name='id'][.='5']",
+ "//result/doc[4]/str[@name='id'][.='6']",
+ "//result/doc[5]/str[@name='id'][.='7']"
);
params = new ModifiableSolrParams();
@@ -104,11 +104,11 @@ public class TestGraphTermsQParserPlugin extends SolrTestCaseJ4 {
params.add("q", "{!graphTerms f=test_ti maxDocFreq=10}5,10");
params.add("sort", "id asc");
assertQ(req(params, "indent", "on"), "*[count(//doc)=5]",
- "//result/doc[1]/str[@name='id'][.='1.0']",
- "//result/doc[2]/str[@name='id'][.='2.0']",
- "//result/doc[3]/str[@name='id'][.='5.0']",
- "//result/doc[4]/str[@name='id'][.='6.0']",
- "//result/doc[5]/str[@name='id'][.='7.0']"
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='2']",
+ "//result/doc[3]/str[@name='id'][.='5']",
+ "//result/doc[4]/str[@name='id'][.='6']",
+ "//result/doc[5]/str[@name='id'][.='7']"
);
//Test with int field
@@ -116,8 +116,8 @@ public class TestGraphTermsQParserPlugin extends SolrTestCaseJ4 {
params.add("q", "{!graphTerms f=test_ti maxDocFreq=2}5,10");
params.add("sort", "id asc");
assertQ(req(params, "indent", "on"), "*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='6.0']",
- "//result/doc[2]/str[@name='id'][.='7.0']"
+ "//result/doc[1]/str[@name='id'][.='6']",
+ "//result/doc[2]/str[@name='id'][.='7']"
);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/134e210b/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java b/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java
index 3f57ee5..b4ae881 100644
--- a/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java
+++ b/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java
@@ -74,7 +74,7 @@ public class TestQueryTypes extends AbstractSolrTestCase {
// normal lucene fielded query
assertQ(req( "q",f+":\""+v+'"')
,"//result[@numFound='1']"
- ,"//*[@name='id'][.='999.0']"
+ ,"//*[@name='id'][.='999']"
,"//*[@name='" + f + "'][.='" + v + "']"
);
@@ -352,40 +352,40 @@ public class TestQueryTypes extends AbstractSolrTestCase {
req("df", "v_t",
"q", "{!switch case.x=Dude case.z=Yonik} x ")
,"//result[@numFound='1']"
- ,"//*[@name='id'][.='1.0']");
+ ,"//*[@name='id'][.='1']");
assertQ("test empty matching switch query",
req("df", "v_t",
"q", "{!switch case.x=Dude case=Yonik} ")
,"//result[@numFound='1']"
- ,"//*[@name='id'][.='2.0']");
+ ,"//*[@name='id'][.='2']");
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']");
+ ,"//*[@name='id'][.='2']");
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']");
+ ,"//*[@name='id'][.='2']");
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']");
+ ,"//*[@name='id'][.='1']");
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']");
+ ,"//*[@name='id'][.='1']");
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']");
+ ,"//*[@name='id'][.='1']");
try {
ignoreException("No\\ default\\, and no switch case");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/134e210b/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
index f79d498..9b038ca 100644
--- a/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
@@ -93,12 +93,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "6");
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='3.0']",
- "//result/doc[2]/str[@name='id'][.='4.0']",
- "//result/doc[3]/str[@name='id'][.='2.0']",
- "//result/doc[4]/str[@name='id'][.='6.0']",
- "//result/doc[5]/str[@name='id'][.='1.0']",
- "//result/doc[6]/str[@name='id'][.='5.0']"
+ "//result/doc[1]/str[@name='id'][.='3']",
+ "//result/doc[2]/str[@name='id'][.='4']",
+ "//result/doc[3]/str[@name='id'][.='2']",
+ "//result/doc[4]/str[@name='id'][.='6']",
+ "//result/doc[5]/str[@name='id'][.='1']",
+ "//result/doc[6]/str[@name='id'][.='5']"
);
params = new ModifiableSolrParams();
@@ -113,12 +113,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='2.0']",
- "//result/doc[2]/str[@name='id'][.='6.0']",
- "//result/doc[3]/str[@name='id'][.='5.0']",
- "//result/doc[4]/str[@name='id'][.='4.0']",
- "//result/doc[5]/str[@name='id'][.='3.0']",
- "//result/doc[6]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='2']",
+ "//result/doc[2]/str[@name='id'][.='6']",
+ "//result/doc[3]/str[@name='id'][.='5']",
+ "//result/doc[4]/str[@name='id'][.='4']",
+ "//result/doc[5]/str[@name='id'][.='3']",
+ "//result/doc[6]/str[@name='id'][.='1']"
);
//Test with sort by score.
@@ -134,12 +134,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "score desc");
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='2.0']",
- "//result/doc[2]/str[@name='id'][.='6.0']",
- "//result/doc[3]/str[@name='id'][.='5.0']",
- "//result/doc[4]/str[@name='id'][.='4.0']",
- "//result/doc[5]/str[@name='id'][.='3.0']",
- "//result/doc[6]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='2']",
+ "//result/doc[2]/str[@name='id'][.='6']",
+ "//result/doc[3]/str[@name='id'][.='5']",
+ "//result/doc[4]/str[@name='id'][.='4']",
+ "//result/doc[5]/str[@name='id'][.='3']",
+ "//result/doc[6]/str[@name='id'][.='1']"
);
@@ -157,12 +157,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='2.0']",
- "//result/doc[2]/str[@name='id'][.='6.0']",
- "//result/doc[3]/str[@name='id'][.='5.0']",
- "//result/doc[4]/str[@name='id'][.='4.0']",
- "//result/doc[5]/str[@name='id'][.='3.0']",
- "//result/doc[6]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='2']",
+ "//result/doc[2]/str[@name='id'][.='6']",
+ "//result/doc[3]/str[@name='id'][.='5']",
+ "//result/doc[4]/str[@name='id'][.='4']",
+ "//result/doc[5]/str[@name='id'][.='3']",
+ "//result/doc[6]/str[@name='id'][.='1']"
);
@@ -179,12 +179,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("qt", "/elevate");
params.add("elevateIds", "1");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='1.0']",
- "//result/doc[2]/str[@name='id'][.='2.0']",
- "//result/doc[3]/str[@name='id'][.='6.0']",
- "//result/doc[4]/str[@name='id'][.='5.0']",
- "//result/doc[5]/str[@name='id'][.='4.0']",
- "//result/doc[6]/str[@name='id'][.='3.0']"
+ "//result/doc[1]/str[@name='id'][.='1']",
+ "//result/doc[2]/str[@name='id'][.='2']",
+ "//result/doc[3]/str[@name='id'][.='6']",
+ "//result/doc[4]/str[@name='id'][.='5']",
+ "//result/doc[5]/str[@name='id'][.='4']",
+ "//result/doc[6]/str[@name='id'][.='3']"
);
@@ -201,12 +201,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='2.0']",
- "//result/doc[2]/str[@name='id'][.='6.0']",
- "//result/doc[3]/str[@name='id'][.='5.0']",
- "//result/doc[4]/str[@name='id'][.='4.0']",
- "//result/doc[5]/str[@name='id'][.='3.0']",
- "//result/doc[6]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='2']",
+ "//result/doc[2]/str[@name='id'][.='6']",
+ "//result/doc[3]/str[@name='id'][.='5']",
+ "//result/doc[4]/str[@name='id'][.='4']",
+ "//result/doc[5]/str[@name='id'][.='3']",
+ "//result/doc[6]/str[@name='id'][.='1']"
);
@@ -223,12 +223,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "1,4");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='1.0']", //Elevated
- "//result/doc[2]/str[@name='id'][.='4.0']", //Elevated
- "//result/doc[3]/str[@name='id'][.='2.0']", //Boosted during rerank.
- "//result/doc[4]/str[@name='id'][.='6.0']",
- "//result/doc[5]/str[@name='id'][.='5.0']",
- "//result/doc[6]/str[@name='id'][.='3.0']"
+ "//result/doc[1]/str[@name='id'][.='1']", //Elevated
+ "//result/doc[2]/str[@name='id'][.='4']", //Elevated
+ "//result/doc[3]/str[@name='id'][.='2']", //Boosted during rerank.
+ "//result/doc[4]/str[@name='id'][.='6']",
+ "//result/doc[5]/str[@name='id'][.='5']",
+ "//result/doc[6]/str[@name='id'][.='3']"
);
@@ -245,12 +245,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "4,1");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='4.0']", //Elevated
- "//result/doc[2]/str[@name='id'][.='1.0']", //Elevated
- "//result/doc[3]/str[@name='id'][.='2.0']", //Boosted during rerank.
- "//result/doc[4]/str[@name='id'][.='6.0']",
- "//result/doc[5]/str[@name='id'][.='5.0']",
- "//result/doc[6]/str[@name='id'][.='3.0']"
+ "//result/doc[1]/str[@name='id'][.='4']", //Elevated
+ "//result/doc[2]/str[@name='id'][.='1']", //Elevated
+ "//result/doc[3]/str[@name='id'][.='2']", //Boosted during rerank.
+ "//result/doc[4]/str[@name='id'][.='6']",
+ "//result/doc[5]/str[@name='id'][.='5']",
+ "//result/doc[6]/str[@name='id'][.='3']"
);
@@ -268,12 +268,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "4,1");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='4.0']", //Elevated
- "//result/doc[2]/str[@name='id'][.='1.0']", //Elevated
- "//result/doc[3]/str[@name='id'][.='6.0']",
- "//result/doc[4]/str[@name='id'][.='5.0']",
- "//result/doc[5]/str[@name='id'][.='3.0']",
- "//result/doc[6]/str[@name='id'][.='2.0']" //Not in reRankeDocs
+ "//result/doc[1]/str[@name='id'][.='4']", //Elevated
+ "//result/doc[2]/str[@name='id'][.='1']", //Elevated
+ "//result/doc[3]/str[@name='id'][.='6']",
+ "//result/doc[4]/str[@name='id'][.='5']",
+ "//result/doc[5]/str[@name='id'][.='3']",
+ "//result/doc[6]/str[@name='id'][.='2']" //Not in reRankeDocs
);
//Test Elevation with start beyond the rerank docs
@@ -289,8 +289,8 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "4,1");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='3.0']",
- "//result/doc[2]/str[@name='id'][.='2.0']" //Was not in reRankDocs
+ "//result/doc[1]/str[@name='id'][.='3']",
+ "//result/doc[2]/str[@name='id'][.='2']" //Was not in reRankDocs
);
//Test Elevation with zero results
@@ -320,12 +320,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "10");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='6.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']",
- "//result/doc[3]/str[@name='id'][.='4.0']",
- "//result/doc[4]/str[@name='id'][.='3.0']",
- "//result/doc[5]/str[@name='id'][.='2.0']",
- "//result/doc[6]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='6']",
+ "//result/doc[2]/str[@name='id'][.='5']",
+ "//result/doc[3]/str[@name='id'][.='4']",
+ "//result/doc[4]/str[@name='id'][.='3']",
+ "//result/doc[5]/str[@name='id'][.='2']",
+ "//result/doc[6]/str[@name='id'][.='1']"
);
params = new ModifiableSolrParams();
@@ -338,12 +338,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "10");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='6.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']",
- "//result/doc[3]/str[@name='id'][.='4.0']",
- "//result/doc[4]/str[@name='id'][.='3.0']",
- "//result/doc[5]/str[@name='id'][.='2.0']",
- "//result/doc[6]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='6']",
+ "//result/doc[2]/str[@name='id'][.='5']",
+ "//result/doc[3]/str[@name='id'][.='4']",
+ "//result/doc[4]/str[@name='id'][.='3']",
+ "//result/doc[5]/str[@name='id'][.='2']",
+ "//result/doc[6]/str[@name='id'][.='1']"
);
params = new ModifiableSolrParams();
@@ -356,12 +356,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "10");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='5.0']",
- "//result/doc[2]/str[@name='id'][.='6.0']",
- "//result/doc[3]/str[@name='id'][.='4.0']",
- "//result/doc[4]/str[@name='id'][.='3.0']",
- "//result/doc[5]/str[@name='id'][.='2.0']",
- "//result/doc[6]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='5']",
+ "//result/doc[2]/str[@name='id'][.='6']",
+ "//result/doc[3]/str[@name='id'][.='4']",
+ "//result/doc[4]/str[@name='id'][.='3']",
+ "//result/doc[5]/str[@name='id'][.='2']",
+ "//result/doc[6]/str[@name='id'][.='1']"
);
//Test reRankWeight of 0, reranking will have no effect.
@@ -375,11 +375,11 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "5");
assertQ(req(params), "*[count(//doc)=5]",
- "//result/doc[1]/str[@name='id'][.='6.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']",
- "//result/doc[3]/str[@name='id'][.='4.0']",
- "//result/doc[4]/str[@name='id'][.='3.0']",
- "//result/doc[5]/str[@name='id'][.='2.0']"
+ "//result/doc[1]/str[@name='id'][.='6']",
+ "//result/doc[2]/str[@name='id'][.='5']",
+ "//result/doc[3]/str[@name='id'][.='4']",
+ "//result/doc[4]/str[@name='id'][.='3']",
+ "//result/doc[5]/str[@name='id'][.='2']"
);
MetricsMap metrics = (MetricsMap)h.getCore().getCoreMetricManager().getRegistry().getMetrics().get("CACHE.searcher.queryResultCache");
@@ -399,11 +399,11 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "6");
assertQ(req(params), "*[count(//doc)=5]",
- "//result/doc[1]/str[@name='id'][.='6.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']",
- "//result/doc[3]/str[@name='id'][.='4.0']",
- "//result/doc[4]/str[@name='id'][.='2.0']",
- "//result/doc[5]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='6']",
+ "//result/doc[2]/str[@name='id'][.='5']",
+ "//result/doc[3]/str[@name='id'][.='4']",
+ "//result/doc[4]/str[@name='id'][.='2']",
+ "//result/doc[5]/str[@name='id'][.='1']"
);
@@ -424,11 +424,11 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "6");
assertQ(req(params), "*[count(//doc)=5]",
- "//result/doc[1]/str[@name='id'][.='6.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']",
- "//result/doc[3]/str[@name='id'][.='4.0']",
- "//result/doc[4]/str[@name='id'][.='2.0']",
- "//result/doc[5]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='6']",
+ "//result/doc[2]/str[@name='id'][.='5']",
+ "//result/doc[3]/str[@name='id'][.='4']",
+ "//result/doc[4]/str[@name='id'][.='2']",
+ "//result/doc[5]/str[@name='id'][.='1']"
);
stats = metrics.getValue();
@@ -450,12 +450,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "6");
assertQ(req(params), "*[count(//doc)=6]",
- "//result/doc[1]/str[@name='id'][.='6.0']",
- "//result/doc[2]/str[@name='id'][.='5.0']",
- "//result/doc[3]/str[@name='id'][.='4.0']",
- "//result/doc[4]/str[@name='id'][.='2.0']", // reranked out of orig order
- "//result/doc[5]/str[@name='id'][.='3.0']",
- "//result/doc[6]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='6']",
+ "//result/doc[2]/str[@name='id'][.='5']",
+ "//result/doc[3]/str[@name='id'][.='4']",
+ "//result/doc[4]/str[@name='id'][.='2']", // reranked out of orig order
+ "//result/doc[5]/str[@name='id'][.='3']",
+ "//result/doc[6]/str[@name='id'][.='1']"
);
@@ -469,8 +469,8 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "5");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='2.0']",
- "//result/doc[2]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='2']",
+ "//result/doc[2]/str[@name='id'][.='1']"
);
@@ -485,7 +485,7 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("rows", "1");
assertQ(req(params), "*[count(//doc)=1]",
- "//result/doc[1]/str[@name='id'][.='1.0']"
+ "//result/doc[1]/str[@name='id'][.='1']"
);
@@ -556,8 +556,8 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("df", "text");
assertQ(req(params), "*[count(//doc)=2]",
- "//result/doc[1]/str[@name='id'][.='8.0']",
- "//result/doc[2]/str[@name='id'][.='2.0']"
+ "//result/doc[1]/str[@name='id'][.='8']",
+ "//result/doc[2]/str[@name='id'][.='2']"
);
//Test Elevation
@@ -573,9 +573,9 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params.add("elevateIds", "1,4");
assertQ(req(params), "*[count(//doc)=3]",
- "//result/doc[1]/str[@name='id'][.='1.0']", //Elevated
- "//result/doc[2]/str[@name='id'][.='4.0']", //Elevated
- "//result/doc[3]/str[@name='id'][.='8.0']"); //Boosted during rerank.
+ "//result/doc[1]/str[@name='id'][.='1']", //Elevated
+ "//result/doc[2]/str[@name='id'][.='4']", //Elevated
+ "//result/doc[3]/str[@name='id'][.='8']"); //Boosted during rerank.
}
@Test
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/134e210b/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java b/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java
index 4a8f75d..7ec690f 100644
--- a/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java
+++ b/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java
@@ -372,8 +372,8 @@ public class TestMinMaxOnMultiValuedField extends SolrTestCaseJ4 {
"sort", func + " " + dir)
,"//*[@numFound='2']"
// no assumptions about order for now, see bug: SOLR-8005
- ,"//str[@name='id']='1.0'"
- ,"//str[@name='id']='2.0'"
+ ,"//str[@name='id']='1'"
+ ,"//str[@name='id']='2'"
);
}
}
@@ -430,7 +430,7 @@ public class TestMinMaxOnMultiValuedField extends SolrTestCaseJ4 {
assertQ(sort,
req("q","*:*", "rows", ""+numDocs, "sort", sort)
,"//result[@numFound='"+numDocs+"']"
- ,"//result/doc[1]/str[@name='id']='0.0'"
+ ,"//result/doc[1]/str[@name='id']='0'"
);
}
/** helper for testSimpleSort */
@@ -438,7 +438,7 @@ public class TestMinMaxOnMultiValuedField extends SolrTestCaseJ4 {
assertQ(sort,
req("q","*:*", "rows", ""+numDocs, "sort", sort)
,"//result[@numFound='"+numDocs+"']"
- ,"//result/doc["+numDocs+"]/str[@name='id']='0.0'"
+ ,"//result/doc["+numDocs+"]/str[@name='id']='0'"
);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/134e210b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
index 46282fa..19780df 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
@@ -1043,19 +1043,19 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertU(commit());
assertJQ(req("q", "id:2"),
- "/response/docs/[0]/id==2",
+ "/response/docs/[0]/id=='2'",
"/response/docs/[0]/title/[0]=='newtitle2'",
"/response/docs/[0]/single_i_dvo==101");
assertJQ(req("q", "id:3"),
1e-4,
- "/response/docs/[0]/id==3",
+ "/response/docs/[0]/id=='3'",
"/response/docs/[0]/title/[0]=='newtitle3'",
"/response/docs/[0]/single_d_dvo==4.14");
assertJQ(req("q", "id:4"),
1e-4,
- "/response/docs/[0]/id==4",
+ "/response/docs/[0]/id=='4'",
"/response/docs/[0]/single_s_dvo=='abc'",
"/response/docs/[0]/single_i_dvo==2");
@@ -1064,7 +1064,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertU(commit());
assertJQ(req("q", "id:3"),
1e-4,
- "/response/docs/[0]/id==3",
+ "/response/docs/[0]/id=='3'",
"/response/docs/[0]/title/[0]=='newertitle3'",
"/response/docs/[0]/single_d_dvo==4.14");
}
@@ -1079,7 +1079,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
// test that non stored multivalued docvalues was carried forward for a non docvalues update
assertJQ(req("q", "id:1"),
- "/response/docs/[0]/id==1",
+ "/response/docs/[0]/id=='1'",
"/response/docs/[0]/title/[0]=='newtitle1'",
"/response/docs/[0]/multi_ii_dvo/[0]==100",
"/response/docs/[0]/multi_ii_dvo/[1]==" + Integer.MAX_VALUE);
@@ -1103,18 +1103,18 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertU(commit());
assertJQ(req("q", "id:101"),
- "/response/docs/[0]/id==101",
+ "/response/docs/[0]/id=='101'",
"/response/docs/[0]/title/[0]=='newtitle2'",
"/response/docs/[0]/single_i_dvn==102");
assertJQ(req("q", "id:102"),
1e-4,
- "/response/docs/[0]/id==102",
+ "/response/docs/[0]/id=='102'",
"/response/docs/[0]/title/[0]=='newtitle3'",
"/response/docs/[0]/single_d_dvn==5.14");
assertJQ(req("q", "id:103"),
- "/response/docs/[0]/id==103",
+ "/response/docs/[0]/id=='103'",
"/response/docs/[0]/single_s_dvn=='abc'",
"/response/docs/[0]/single_i_dvn==3");
@@ -1123,7 +1123,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
"single_i_dvn", ImmutableMap.of("set", 5))));
assertU(commit());
assertJQ(req("q", "id:103"),
- "/response/docs/[0]/id==103",
+ "/response/docs/[0]/id=='103'",
"/response/docs/[0]/single_s_dvn=='abcupdate'",
"/response/docs/[0]/single_i_dvn==5");
}