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/15 16:16:12 UTC
[5/7] lucene-solr:master: SOLR-10834: Fixed tests and test configs to
stop using numeric uniqueKey fields
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f1e2be64/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java
index 4b3e92a..7efde0c 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java
@@ -64,44 +64,44 @@ public class DistributedQueryComponentCustomSortTest extends BaseDistributedSear
QueryResponse rsp;
rsp = query("q", "*:*", "fl", "id", "sort", "payload asc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 7, 1, 6, 4, 2, 10, 12, 3, 5, 9, 8, 13, 11);
+ assertFieldValues(rsp.getResults(), id, "7", "1", "6", "4", "2", "10", "12", "3", "5", "9", "8", "13", "11");
rsp = query("q", "*:*", "fl", "id", "sort", "payload desc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 11, 13, 8, 9, 5, 3, 12, 10, 2, 4, 6, 1, 7);
+ assertFieldValues(rsp.getResults(), id, "11", "13", "8", "9", "5", "3", "12", "10", "2", "4", "6", "1", "7");
// SOLR-6744
rsp = query("q", "*:*", "fl", "key:id", "sort", "payload asc", "rows", "20");
- assertFieldValues(rsp.getResults(), "key", 7, 1, 6, 4, 2, 10, 12, 3, 5, 9, 8, 13, 11);
+ assertFieldValues(rsp.getResults(), "key", "7", "1", "6", "4", "2", "10", "12", "3", "5", "9", "8", "13", "11");
rsp = query("q", "*:*", "fl", "key:id,id:text", "sort", "payload asc", "rows", "20");
- assertFieldValues(rsp.getResults(), "key", 7, 1, 6, 4, 2, 10, 12, 3, 5, 9, 8, 13, 11);
+ assertFieldValues(rsp.getResults(), "key", "7", "1", "6", "4", "2", "10", "12", "3", "5", "9", "8", "13", "11");
rsp = query("q", "text:a", "fl", "id", "sort", "payload asc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 1, 3, 5, 9);
+ assertFieldValues(rsp.getResults(), id, "1", "3", "5", "9");
rsp = query("q", "text:a", "fl", "id", "sort", "payload desc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 9, 5, 3, 1);
+ assertFieldValues(rsp.getResults(), id, "9", "5", "3", "1");
rsp = query("q", "text:b", "fl", "id", "sort", "payload asc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 4, 2, 10);
+ assertFieldValues(rsp.getResults(), id, "4", "2", "10");
rsp = query("q", "text:b", "fl", "id", "sort", "payload desc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 10, 2, 4);
+ assertFieldValues(rsp.getResults(), id, "10", "2", "4");
// SOLR-6744
rsp = query("q", "text:b", "fl", "key:id", "sort", "payload asc", "rows", "20");
assertFieldValues(rsp.getResults(), id, null, null, null);
rsp = query("q", "text:c", "fl", "id", "sort", "payload asc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 7, 6, 8);
+ assertFieldValues(rsp.getResults(), id, "7", "6", "8");
rsp = query("q", "text:c", "fl", "id", "sort", "payload desc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 8, 6, 7);
+ assertFieldValues(rsp.getResults(), id, "8", "6", "7");
rsp = query("q", "text:d", "fl", "id", "sort", "payload asc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 12, 13, 11);
+ assertFieldValues(rsp.getResults(), id, "12", "13", "11");
rsp = query("q", "text:d", "fl", "id", "sort", "payload desc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 11, 13, 12);
+ assertFieldValues(rsp.getResults(), id, "11", "13", "12");
// sanity check function sorting
- rsp = query("q", "id:[1 TO 10]", "fl", "id", "rows", "20",
- "sort", "abs(sub(5,id)) asc, id desc");
- assertFieldValues(rsp.getResults(), id, 5 , 6,4 , 7,3 , 8,2 , 9,1 , 10 );
+ rsp = query("q", "id_i:[1 TO 10]", "fl", "id", "rows", "20",
+ "sort", "abs(sub(5,id_i)) asc, id desc");
+ assertFieldValues(rsp.getResults(), id, "5", "6","4", "7","3" , "8","2" , "9","1" , "10" );
// Add two more docs with same payload as in doc #4
index(id, "14", "text", "b", "payload", ByteBuffer.wrap(new byte[] { 0x25, 0x21, 0x15 }));
@@ -114,9 +114,9 @@ public class DistributedQueryComponentCustomSortTest extends BaseDistributedSear
commit();
- rsp = query("q", "*:*", "fl", "id", "sort", "payload asc, id desc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 7, 1, 6, 15,14,4, 2, 18,17,16,10, 12, 3, 5, 9, 8, 13, 11);
- rsp = query("q", "*:*", "fl", "id", "sort", "payload desc, id asc", "rows", "20");
- assertFieldValues(rsp.getResults(), id, 11, 13, 8, 9, 5, 3, 12, 10,16,17,18, 2, 4,14,15, 6, 1, 7);
+ rsp = query("q", "*:*", "fl", "id", "sort", "payload asc, id_i desc", "rows", "20");
+ assertFieldValues(rsp.getResults(), id, "7", "1", "6", "15","14","4", "2", "18","17","16","10", "12", "3", "5", "9", "8", "13", "11");
+ rsp = query("q", "*:*", "fl", "id", "sort", "payload desc, id_i asc", "rows", "20");
+ assertFieldValues(rsp.getResults(), id, "11", "13", "8", "9", "5", "3", "12", "10","16","17","18", "2", "4","14","15", "6", "1", "7");
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f1e2be64/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java
index fb90e83..c211548 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java
@@ -105,7 +105,7 @@ public class DistributedQueryElevationComponentTest extends BaseDistributedSearc
assertTrue(response.getResults().getNumFound() > 0);
SolrDocument document = response.getResults().get(0);
- assertEquals(6.0f, document.getFieldValue("id"));
+ assertEquals("6", document.getFieldValue("id"));
assertEquals(true, document.getFieldValue("[elevated]"));
// Force javabin format
@@ -121,7 +121,7 @@ public class DistributedQueryElevationComponentTest extends BaseDistributedSearc
assertTrue(response.getResults().getNumFound() > 0);
document = response.getResults().get(0);
- assertEquals(6.0f, document.getFieldValue("id"));
+ assertEquals("6", document.getFieldValue("id"));
assertEquals(true, document.getFieldValue("[elevated]"));
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f1e2be64/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 f439e87..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]/float[@name='id'][.='7.0']"
- , "//result/doc[2]/float[@name='id'][.='9.0']"
- , "//result/doc[3]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@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]/float[@name='id'][.='6.0']"
+ , groups +"/lst[3]//doc[2]/str[@name='id'][.='6']"
, groups +"/lst[3]//doc[2]/bool[@name='[elevated]'][.='false']"
);
@@ -331,9 +331,9 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
assertQ("", req(CommonParams.Q, "AAAA", CommonParams.QT, "/elevate",
CommonParams.FL, "id, score, [elevated]")
,"//*[@numFound='3']"
- ,"//result/doc[1]/int[@name='id'][.='7']"
- ,"//result/doc[2]/int[@name='id'][.='8']"
- ,"//result/doc[3]/int[@name='id'][.='9']",
+ ,"//result/doc[1]/str[@name='id'][.='7']"
+ ,"//result/doc[2]/str[@name='id'][.='8']"
+ ,"//result/doc[3]/str[@name='id'][.='9']",
"//result/doc[1]/bool[@name='[elevated]'][.='true']",
"//result/doc[2]/bool[@name='[elevated]'][.='false']",
"//result/doc[3]/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]/float[@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]/float[@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]/float[@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/f1e2be64/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
index 1798ae5..568676c 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
@@ -94,8 +94,8 @@ public class StatsComponentTest extends AbstractSolrTestCase {
// NOTE: doTestFieldStatisticsResult needs the full list of possible tags to exclude
params("stats.field", f, "stats", "true"),
params("stats.field", "{!ex=fq1,fq2}"+f, "stats", "true",
- "fq", "{!tag=fq1}-id:[0 TO 2]",
- "fq", "{!tag=fq2}-id:[2 TO 1000]"),
+ "fq", "{!tag=fq1}-id_i:[0 TO 2]",
+ "fq", "{!tag=fq2}-id_i:[2 TO 1000]"),
params("stats.field", "{!ex=fq1}"+f, "stats", "true",
"fq", "{!tag=fq1}id:1")
};
@@ -299,8 +299,8 @@ public class StatsComponentTest extends AbstractSolrTestCase {
params("stats.field", "{!ex=fq1}"+f, "stats", "true",
"fq", "{!tag=fq1}id:1"),
params("stats.field", "{!ex=fq1,fq2}"+f, "stats", "true",
- "fq", "{!tag=fq1}-id:[0 TO 2]",
- "fq", "{!tag=fq2}-id:[2 TO 1000]") }) {
+ "fq", "{!tag=fq1}-id_i:[0 TO 2]",
+ "fq", "{!tag=fq2}-id_i:[2 TO 1000]") }) {
assertQ("test statistics values",
@@ -878,19 +878,19 @@ public class StatsComponentTest extends AbstractSolrTestCase {
Map<String, String> args = new HashMap<String, String>();
args.put(CommonParams.Q, "*:*");
args.put(StatsParams.STATS, "true");
- args.put(StatsParams.STATS_FIELD, "{!ex=id}id");
- args.put("fq", "{!tag=id}id:[2 TO 3]");
+ args.put(StatsParams.STATS_FIELD, "{!ex=id}id_i");
+ args.put("fq", "{!tag=id}id_i:[2 TO 3]");
SolrQueryRequest req = new LocalSolrQueryRequest(core, new MapSolrParams(args));
assertQ("test exluding filter query", req
- , "//lst[@name='id']/double[@name='min'][.='1.0']"
- , "//lst[@name='id']/double[@name='max'][.='4.0']");
+ , "//lst[@name='id_i']/double[@name='min'][.='1.0']"
+ , "//lst[@name='id_i']/double[@name='max'][.='4.0']");
args = new HashMap<String, String>();
args.put(CommonParams.Q, "*:*");
args.put(StatsParams.STATS, "true");
- args.put(StatsParams.STATS_FIELD, "{!key=id2}id");
- args.put("fq", "{!tag=id}id:[2 TO 3]");
+ args.put(StatsParams.STATS_FIELD, "{!key=id2}id_i");
+ args.put("fq", "{!tag=id}id_i:[2 TO 3]");
req = new LocalSolrQueryRequest(core, new MapSolrParams(args));
assertQ("test rename field", req
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f1e2be64/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java b/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java
index c703683..dca45dc 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java
@@ -244,7 +244,7 @@ public class TestDistributedStatsComponentCardinality extends BaseDistributedSea
final int highId,
final int log2m,
final int regwidth) {
- ModifiableSolrParams p = params("q", "id:["+lowId+" TO "+highId+"]",
+ ModifiableSolrParams p = params("q", "id_i1:["+lowId+" TO "+highId+"]",
"rows", "0", "stats", "true");
final String prefix = "{!cardinality=true hllLog2m="+log2m+" hllRegwidth="+regwidth;
for (String f : STAT_FIELDS) {
@@ -267,7 +267,7 @@ public class TestDistributedStatsComponentCardinality extends BaseDistributedSea
final int highId,
final double lowAccuracy,
final double highAccuracy) {
- ModifiableSolrParams p = params("q", "id:["+lowId+" TO "+highId+"]",
+ ModifiableSolrParams p = params("q", "id_i1:["+lowId+" TO "+highId+"]",
"rows", "0", "stats", "true");
final String[] prefixes = new String[] {
"{!cardinality=" + lowAccuracy + " key=low_",
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f1e2be64/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 332e346..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]/float[@name='id'][.='2.0']",
- "/response/result/doc[2]/float[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/float[@name='id'][.='1.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/float[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/float[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/float[@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]/float[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/float[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/float[@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]/float[@name='id'][.='2.0']",
- "/response/result/doc[2]/float[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/float[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/float[@name='id'][.='1.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/float[@name='id'][.='8.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/float[@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]/float[@name='id'][.='3.0']",
- "/response/result/doc[2]/float[@name='id'][.='2.0']",
- "/response/result/doc[3]/float[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/float[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/float[@name='id'][.='1.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/float[@name='id'][.='8.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/float[@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]/float[@name='id'][.='1.0']",
- "/response/result/doc[2]/float[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/float[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/float[@name='id'][.='2.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/float[@name='id'][.='8.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/float[@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]/float[@name='id'][.='1.0']",
- "/response/result/doc[2]/float[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/float[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/float[@name='id'][.='2.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/float[@name='id'][.='8.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/float[@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]/float[@name='id'][.='1.0']",
- "/response/result/doc[2]/float[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/float[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/float[@name='id'][.='2.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/float[@name='id'][.='8.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/float[@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]/float[@name='id'][.='2.0']",
- "/response/result/doc[2]/float[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/float[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/float[@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]/float[@name='id'][.='2.0']",
- "/response/result/doc[2]/float[@name='id'][.='6.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[1]/float[@name='id'][.='1.0']",
- "/response/lst[@name='expanded']/result[@name='1"+floatAppend+"']/doc[2]/float[@name='id'][.='7.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[1]/float[@name='id'][.='5.0']",
- "/response/lst[@name='expanded']/result[@name='2"+floatAppend+"']/doc[2]/float[@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/f1e2be64/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java b/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
index fd8d6ec..8f4a24d 100644
--- a/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
+++ b/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
@@ -236,7 +236,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
@Test
public void testCachingBigTerms() throws Exception {
- assertQ( req("indent","true", "q", "id:[42 TO 47]",
+ assertQ( req("indent","true", "q", "id_i1:[42 TO 47]",
"facet", "true",
"facet.field", "foo_s" // big terms should cause foo_s:A to be cached
),
@@ -270,7 +270,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
assertQ(
req(
"q", "*:*",
- "fq", "id:[2000 TO 2004]",
+ "fq", "id_i1:[2000 TO 2004]",
"group", "true",
"group.facet", "true",
"group.field", "hotel_s1",
@@ -284,7 +284,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
assertQ(
req(
"q", "*:*",
- "fq", "id:[2000 TO 2004]",
+ "fq", "id_i1:[2000 TO 2004]",
"fq", "{!tag=dus}airport_s1:dus",
"group", "true",
"group.facet", "true",
@@ -298,7 +298,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
assertQ(
req(
"q", "*:*",
- "fq", "id:[2000 TO 2004]",
+ "fq", "id_i1:[2000 TO 2004]",
"group", "true",
"group.facet", "true",
"group.field", "hotel_s1",
@@ -320,7 +320,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
assertQ(
req(
"q", "*:*",
- "fq", "id:[2000 TO 2004]",
+ "fq", "id_i1:[2000 TO 2004]",
"fq", "{!tag=dus}airport_s1:dus",
"group", "true",
"group.facet", "true",
@@ -344,7 +344,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
assertQ(
req(
"q", "*:*",
- "fq", "id:[2000 TO 2004]",
+ "fq", "id_i1:[2000 TO 2004]",
"fq", "{!tag=dus}airport_s1:dus",
"group", "true",
"group.facet", "true",
@@ -380,14 +380,14 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
private void testSimpleGroupedFacets(String facetLimit) throws Exception {
assertQ(
"Return 5 docs with id range 1937 till 1940",
- req("id:[2000 TO 2004]"),
+ req("id_i1:[2000 TO 2004]"),
"*[count(//doc)=5]"
);
assertQ(
"Return two facet counts for field airport_a and duration_i1",
req(
"q", "*:*",
- "fq", "id:[2000 TO 2004]",
+ "fq", "id_i1:[2000 TO 2004]",
"group", "true",
"group.facet", "true",
"group.field", "hotel_s1",
@@ -410,7 +410,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
"Return one facet count for field airport_a using facet.offset",
req(
"q", "*:*",
- "fq", "id:[2000 TO 2004]",
+ "fq", "id_i1:[2000 TO 2004]",
"group", "true",
"group.facet", "true",
"group.field", "hotel_s1",
@@ -427,7 +427,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
"Return two facet counts for field airport_a with fq",
req(
"q", "*:*",
- "fq", "id:[2000 TO 2004]",
+ "fq", "id_i1:[2000 TO 2004]",
"fq", "duration_i1:5",
"group", "true",
"group.facet", "true",
@@ -445,7 +445,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
"Return one facet count for field airport_s1 with prefix a",
req(
"q", "*:*",
- "fq", "id:[2000 TO 2004]",
+ "fq", "id_i1:[2000 TO 2004]",
"group", "true",
"group.facet", "true",
"group.field", "hotel_s1",
@@ -463,7 +463,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
h.query(
req(
"q", "*:*",
- "fq", "id:[2000 TO 2004]",
+ "fq", "id_i1:[2000 TO 2004]",
"group.facet", "true",
"facet", "true",
"facet.field", "airport_s1",
@@ -541,26 +541,26 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
public void testSimpleFacetCounts() {
assertQ("standard request handler returns all matches",
- req("id:[42 TO 47]"),
+ req("id_i1:[42 TO 47]"),
"*[count(//doc)=6]"
);
assertQ("filter results using fq",
- req("q","id:[42 TO 46]",
- "fq", "id:[43 TO 47]"),
+ req("q","id_i1:[42 TO 46]",
+ "fq", "id_i1:[43 TO 47]"),
"*[count(//doc)=4]"
);
assertQ("don't filter results using blank fq",
- req("q","id:[42 TO 46]",
+ req("q","id_i1:[42 TO 46]",
"fq", " "),
"*[count(//doc)=5]"
);
assertQ("filter results using multiple fq params",
- req("q","id:[42 TO 46]",
+ req("q","id_i1:[42 TO 46]",
"fq", "trait_s:Obnoxious",
- "fq", "id:[43 TO 47]"),
+ "fq", "id_i1:[43 TO 47]"),
"*[count(//doc)=1]"
);
@@ -570,19 +570,19 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
for(String[] methodParam : new String[][]{ none, uifSwitch}){
assertQ("check counts for facet queries",
req(methodParam
- ,"q", "id:[42 TO 47]"
+ ,"q", "id_i1:[42 TO 47]"
,"facet", "true"
,"facet.query", "trait_s:Obnoxious"
- ,"facet.query", "id:[42 TO 45]"
- ,"facet.query", "id:[43 TO 47]"
+ ,"facet.query", "id_i1:[42 TO 45]"
+ ,"facet.query", "id_i1:[43 TO 47]"
,"facet.field", "trait_s"
)
,"*[count(//doc)=6]"
,"//lst[@name='facet_counts']/lst[@name='facet_queries']"
,"//lst[@name='facet_queries']/int[@name='trait_s:Obnoxious'][.='2']"
- ,"//lst[@name='facet_queries']/int[@name='id:[42 TO 45]'][.='4']"
- ,"//lst[@name='facet_queries']/int[@name='id:[43 TO 47]'][.='5']"
+ ,"//lst[@name='facet_queries']/int[@name='id_i1:[42 TO 45]'][.='4']"
+ ,"//lst[@name='facet_queries']/int[@name='id_i1:[43 TO 47]'][.='5']"
,"//lst[@name='facet_counts']/lst[@name='facet_fields']"
,"//lst[@name='facet_fields']/lst[@name='trait_s']"
@@ -593,11 +593,11 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ("check multi-select facets with naming",
- req(methodParam, "q", "id:[42 TO 47]"
+ req(methodParam, "q", "id_i1:[42 TO 47]"
,"facet", "true"
,"facet.query", "{!ex=1}trait_s:Obnoxious"
- ,"facet.query", "{!ex=2 key=foo}id:[42 TO 45]" // tag=2 same as 1
- ,"facet.query", "{!ex=3,4 key=bar}id:[43 TO 47]" // tag=3,4 don't exist
+ ,"facet.query", "{!ex=2 key=foo}id_i1:[42 TO 45]" // tag=2 same as 1
+ ,"facet.query", "{!ex=3,4 key=bar}id_i1:[43 TO 47]" // tag=3,4 don't exist
,"facet.field", "{!ex=3,1}trait_s" // 3,1 same as 1
,"fq", "{!tag=1,2}id:47" // tagged as 1 and 2
)
@@ -629,17 +629,17 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
for(String[] methodParam : new String[][]{ none, uifSwitch}){
assertQ("check counts for applied facet queries using filtering (fq)",
req(methodParam
- ,"q", "id:[42 TO 47]"
+ ,"q", "id_i1:[42 TO 47]"
,"facet", "true"
- ,"fq", "id:[42 TO 45]"
+ ,"fq", "id_i1:[42 TO 45]"
,"facet.field", "trait_s"
- ,"facet.query", "id:[42 TO 45]"
- ,"facet.query", "id:[43 TO 47]"
+ ,"facet.query", "id_i1:[42 TO 45]"
+ ,"facet.query", "id_i1:[43 TO 47]"
)
,"*[count(//doc)=4]"
,"//lst[@name='facet_counts']/lst[@name='facet_queries']"
- ,"//lst[@name='facet_queries']/int[@name='id:[42 TO 45]'][.='4']"
- ,"//lst[@name='facet_queries']/int[@name='id:[43 TO 47]'][.='3']"
+ ,"//lst[@name='facet_queries']/int[@name='id_i1:[42 TO 45]'][.='4']"
+ ,"//lst[@name='facet_queries']/int[@name='id_i1:[43 TO 47]'][.='3']"
,"*[count(//lst[@name='trait_s']/int)=4]"
,"//lst[@name='trait_s']/int[@name='Tool'][.='2']"
,"//lst[@name='trait_s']/int[@name='Obnoxious'][.='1']"
@@ -649,11 +649,11 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
assertQ("check counts with facet.zero=false&facet.missing=true using fq",
req(methodParam
- ,"q", "id:[42 TO 47]"
+ ,"q", "id_i1:[42 TO 47]"
,"facet", "true"
,"facet.zeros", "false"
,"f.trait_s.facet.missing", "true"
- ,"fq", "id:[42 TO 45]"
+ ,"fq", "id_i1:[42 TO 45]"
,"facet.field", "trait_s"
)
,"*[count(//doc)=4]"
@@ -666,11 +666,11 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
assertQ("check counts with facet.mincount=1&facet.missing=true using fq",
req(methodParam
- ,"q", "id:[42 TO 47]"
+ ,"q", "id_i1:[42 TO 47]"
,"facet", "true"
,"facet.mincount", "1"
,"f.trait_s.facet.missing", "true"
- ,"fq", "id:[42 TO 45]"
+ ,"fq", "id_i1:[42 TO 45]"
,"facet.field", "trait_s"
)
,"*[count(//doc)=4]"
@@ -683,11 +683,11 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
assertQ("check counts with facet.mincount=2&facet.missing=true using fq",
req(methodParam
- ,"q", "id:[42 TO 47]"
+ ,"q", "id_i1:[42 TO 47]"
,"facet", "true"
,"facet.mincount", "2"
,"f.trait_s.facet.missing", "true"
- ,"fq", "id:[42 TO 45]"
+ ,"fq", "id_i1:[42 TO 45]"
,"facet.field", "trait_s"
)
,"*[count(//doc)=4]"
@@ -698,9 +698,9 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
assertQ("check sorted paging",
req(methodParam
- ,"q", "id:[42 TO 47]"
+ ,"q", "id_i1:[42 TO 47]"
,"facet", "true"
- ,"fq", "id:[42 TO 45]"
+ ,"fq", "id_i1:[42 TO 45]"
,"facet.field", "trait_s"
,"facet.mincount","0"
,"facet.offset","0"
@@ -715,9 +715,9 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
// check that the default sort is by count
assertQ("check sorted paging",
- req(methodParam, "q", "id:[42 TO 47]"
+ req(methodParam, "q", "id_i1:[42 TO 47]"
,"facet", "true"
- ,"fq", "id:[42 TO 45]"
+ ,"fq", "id_i1:[42 TO 45]"
,"facet.field", "trait_s"
,"facet.mincount","0"
,"facet.offset","0"
@@ -732,9 +732,9 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
//
// check that legacy facet.sort=true/false works
//
- assertQ(req(methodParam, "q", "id:[42 TO 47]"
+ assertQ(req(methodParam, "q", "id_i1:[42 TO 47]"
,"facet", "true"
- ,"fq", "id:[42 TO 45]"
+ ,"fq", "id_i1:[42 TO 45]"
,"facet.field", "trait_s"
,"facet.mincount","0"
,"facet.offset","0"
@@ -747,9 +747,9 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
,"//int[3][@name='Obnoxious'][.='1']"
);
- assertQ(req(methodParam, "q", "id:[42 TO 47]"
+ assertQ(req(methodParam, "q", "id_i1:[42 TO 47]"
,"facet", "true"
- ,"fq", "id:[42 TO 45]"
+ ,"fq", "id_i1:[42 TO 45]"
,"facet.field", "trait_s"
,"facet.mincount","1"
,"facet.offset","0"
@@ -764,9 +764,9 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
}
for(String method : new String[]{ "fc","uif"}){
- assertQ(req("q", "id:[42 TO 47]"
+ assertQ(req("q", "id_i1:[42 TO 47]"
,"facet", "true"
- ,"fq", "id:[42 TO 45]"
+ ,"fq", "id_i1:[42 TO 45]"
,"facet.field", "zerolen_s"
,(random().nextBoolean() ? "":"f.zerolen_s.")+"facet.method", method
)
@@ -1475,7 +1475,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
String mid = (new Double( ((double)Float.MAX_VALUE) * 2D )).toString();
assertQ(f+": checking counts for lower",
- req( "q", "id:[30 TO 60]"
+ req( "q", "id_i1:[30 TO 60]"
,"rows", "0"
,"facet", "true"
,"facet.range", f
@@ -1714,7 +1714,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
@Test
public void testNumericRangeFacetsTrieInt() {
- helpTestWholeNumberRangeFacets("id");
+ helpTestWholeNumberRangeFacets("id_i1");
}
@Test
public void testNumericRangeFacetsTrieLong() {
@@ -1723,7 +1723,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
@Test
public void testNumericRangeFacetsTrieIntDocValues() {
- helpTestWholeNumberRangeFacets("id", FacetRangeMethod.DV);
+ helpTestWholeNumberRangeFacets("id_i1", FacetRangeMethod.DV);
}
@Test
@@ -1752,7 +1752,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
String mid = (new Long( ((long)Integer.MAX_VALUE) * 2L )).toString();
assertQ(f+": checking counts for lower",
- req( "q", "id:[30 TO 60]"
+ req( "q", "id_i1:[30 TO 60]"
,"rows", "0"
,"facet", "true"
,"facet.range", f
@@ -1788,7 +1788,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
final String meta = pre + "/../";
assertQ(f+": checking counts for lower",
- req( "q", "id:[30 TO 60]"
+ req( "q", "id_i1:[30 TO 60]"
,"rows", "0"
,"facet", "true"
,"facet.range", f
@@ -1810,7 +1810,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ(f + ":checking counts for upper",
- req( "q", "id:[30 TO 60]"
+ req( "q", "id_i1:[30 TO 60]"
,"rows", "0"
,"facet", "true"
,"facet.range", f
@@ -2847,7 +2847,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
private void doTestRangeQueryHardEndParam(String field, FacetRangeMethod method) {
assertQ("Test facet.range.hardend",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -2868,7 +2868,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ("Test facet.range.hardend",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -2901,7 +2901,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
private void doTestRangeQueryOtherParam(String field, FacetRangeMethod method) {
assertQ("Test facet.range.other",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -2921,7 +2921,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ("Test facet.range.other",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -2941,7 +2941,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ("Test facet.range.other",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -2961,7 +2961,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ("Test facet.range.other",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -2982,7 +2982,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
// these should have equivilent behavior (multivalued 'other' param: top level vs local)
for (SolrQueryRequest req : new SolrQueryRequest[] {
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -2992,7 +2992,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
,"facet.range.gap","1"
,"facet.range.other",FacetRangeOther.BEFORE.toString()
,"facet.range.other",FacetRangeOther.AFTER.toString()),
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", "{!facet.range.other=before facet.range.other=after}" + field
@@ -3013,7 +3013,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
}
assertQ("Test facet.range.other",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -3035,7 +3035,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ("Test facet.range.other",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -3056,7 +3056,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ("Test facet.range.other",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -3077,7 +3077,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ("Test facet.range.other",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -3098,7 +3098,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ("Test facet.range.other",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -3119,7 +3119,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ("Test facet.range.other",
- req("q", "id:[12345 TO 12345]"
+ req("q", "id_i1:[12345 TO 12345]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -3138,7 +3138,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
);
assertQ("Test facet.range.other",
- req("q", "id:[42 TO 47]"
+ req("q", "id_i1:[42 TO 47]"
,"facet","true"
,"fl","id," + field
,"facet.range", field
@@ -3332,7 +3332,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
public void testFacetPrefixWithFacetThreads() throws Exception {
assertQ("Test facet.prefix with facet.thread",
- req("q", "id:[101 TO 102]"
+ req("q", "id_i1:[101 TO 102]"
,"facet","true"
,"facet.field", "{!key=key1 facet.prefix=foo}myfield_s"
,"facet.field", "{!key=key2 facet.prefix=bar}myfield_s"
@@ -3352,7 +3352,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
values[0] = random().nextInt(3000);
values[1] = random().nextInt(3000);
Arrays.sort(values);
- return String.format(Locale.ROOT, "id: [%d TO %d]", values[0], values[1]);
+ return String.format(Locale.ROOT, "id_i1:[%d TO %d]", values[0], values[1]);
}
@@ -3375,7 +3375,7 @@ public class SimpleFacetsTest extends SolrTestCaseJ4 {
}
private ModifiableSolrParams getRandomParamsInt() {
- String field = new String[]{"range_facet_l_dv", "range_facet_i_dv", "range_facet_l", "duration_i1", "id"}[random().nextInt(5)];
+ String field = new String[]{"range_facet_l_dv", "range_facet_i_dv", "range_facet_l", "duration_i1", "id_i1"}[random().nextInt(5)];
ModifiableSolrParams params = new ModifiableSolrParams();
Integer[] values = new Integer[2];
do {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f1e2be64/solr/core/src/test/org/apache/solr/request/TestFaceting.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/request/TestFaceting.java b/solr/core/src/test/org/apache/solr/request/TestFaceting.java
index a80669a..8933c19 100644
--- a/solr/core/src/test/org/apache/solr/request/TestFaceting.java
+++ b/solr/core/src/test/org/apache/solr/request/TestFaceting.java
@@ -64,7 +64,7 @@ public class TestFaceting extends SolrTestCaseJ4 {
void createIndex(int nTerms) {
assertU(delQ("*:*"));
for (int i=0; i<nTerms; i++) {
- assertU(adoc("id", Float.toString(i), proto.field(), t(i) ));
+ assertU(adoc("id", Integer.toString(i), proto.field(), t(i) ));
}
assertU(optimize()); // squeeze out any possible deleted docs
}
@@ -297,9 +297,9 @@ public class TestFaceting extends SolrTestCaseJ4 {
@Test
public void testFacetSortWithMinCount() {
- assertU(adoc("id", "1.0", "f_td", "-420.126"));
- assertU(adoc("id", "2.0", "f_td", "-285.672"));
- assertU(adoc("id", "3.0", "f_td", "-1.218"));
+ assertU(adoc("id", "1", "f_td", "-420.126"));
+ assertU(adoc("id", "2", "f_td", "-285.672"));
+ assertU(adoc("id", "3", "f_td", "-1.218"));
assertU(commit());
assertQ(req("q", "*:*", FacetParams.FACET, "true", FacetParams.FACET_FIELD, "f_td", "f.f_td.facet.sort", FacetParams.FACET_SORT_INDEX),
@@ -329,9 +329,9 @@ public class TestFaceting extends SolrTestCaseJ4 {
@Test
public void testFacetSortWithMinCount0() {
- assertU(adoc("id", "1.0", "f_td", "-420.126"));
- assertU(adoc("id", "2.0", "f_td", "-285.672"));
- assertU(adoc("id", "3.0", "f_td", "-1.218"));
+ assertU(adoc("id", "1", "f_td", "-420.126"));
+ assertU(adoc("id", "2", "f_td", "-285.672"));
+ assertU(adoc("id", "3", "f_td", "-1.218"));
assertU(commit());
assertQ(req("q", "id:1.0", FacetParams.FACET, "true", FacetParams.FACET_FIELD, "f_td", "f.f_td.facet.sort", FacetParams.FACET_SORT_INDEX, FacetParams.FACET_MINCOUNT, "0", FacetParams.FACET_METHOD, FacetParams.FACET_METHOD_fc),
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f1e2be64/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 b80fe95..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
@@ -64,23 +64,23 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
private void testChildDoctransformerXML() {
String test1[] = new String[] {
"//*[@numFound='1']",
- "/response/result/doc[1]/doc[1]/int[@name='id']='2'" ,
- "/response/result/doc[1]/doc[2]/int[@name='id']='3'" ,
- "/response/result/doc[1]/doc[3]/int[@name='id']='4'" ,
- "/response/result/doc[1]/doc[4]/int[@name='id']='5'" ,
- "/response/result/doc[1]/doc[5]/int[@name='id']='6'" ,
- "/response/result/doc[1]/doc[6]/int[@name='id']='7'"};
+ "/response/result/doc[1]/doc[1]/str[@name='id']='2'" ,
+ "/response/result/doc[1]/doc[2]/str[@name='id']='3'" ,
+ "/response/result/doc[1]/doc[3]/str[@name='id']='4'" ,
+ "/response/result/doc[1]/doc[4]/str[@name='id']='5'" ,
+ "/response/result/doc[1]/doc[5]/str[@name='id']='6'" ,
+ "/response/result/doc[1]/doc[6]/str[@name='id']='7'"};
String test2[] = new String[] {
"//*[@numFound='1']",
- "/response/result/doc[1]/doc[1]/int[@name='id']='2'" ,
- "/response/result/doc[1]/doc[2]/int[@name='id']='4'" ,
- "/response/result/doc[1]/doc[3]/int[@name='id']='6'" };
+ "/response/result/doc[1]/doc[1]/str[@name='id']='2'" ,
+ "/response/result/doc[1]/doc[2]/str[@name='id']='4'" ,
+ "/response/result/doc[1]/doc[3]/str[@name='id']='6'" };
String test3[] = new String[] {
"//*[@numFound='1']",
- "/response/result/doc[1]/doc[1]/int[@name='id']='3'" ,
- "/response/result/doc[1]/doc[2]/int[@name='id']='5'" };
+ "/response/result/doc[1]/doc[1]/str[@name='id']='3'" ,
+ "/response/result/doc[1]/doc[2]/str[@name='id']='5'" };
@@ -100,12 +100,12 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
final String subqueryPath = "/result[@name='children'][@numFound='6']";
test1 = new String[] {
"//*[@numFound='1']",
- "/response/result/doc[1]" + subqueryPath + "/doc[1]/int[@name='id']='2'" ,
- "/response/result/doc[1]" + subqueryPath + "/doc[2]/int[@name='id']='3'" ,
- "/response/result/doc[1]" + subqueryPath + "/doc[3]/int[@name='id']='4'" ,
- "/response/result/doc[1]" + subqueryPath + "/doc[4]/int[@name='id']='5'" ,
- "/response/result/doc[1]" + subqueryPath + "/doc[5]/int[@name='id']='6'" ,
- "/response/result/doc[1]" + subqueryPath + "/doc[6]/int[@name='id']='7'"};
+ "/response/result/doc[1]" + subqueryPath + "/doc[1]/str[@name='id']='2'" ,
+ "/response/result/doc[1]" + subqueryPath + "/doc[2]/str[@name='id']='3'" ,
+ "/response/result/doc[1]" + subqueryPath + "/doc[3]/str[@name='id']='4'" ,
+ "/response/result/doc[1]" + subqueryPath + "/doc[4]/str[@name='id']='5'" ,
+ "/response/result/doc[1]" + subqueryPath + "/doc[5]/str[@name='id']='6'" ,
+ "/response/result/doc[1]" + subqueryPath + "/doc[6]/str[@name='id']='7'"};
}
assertQ(req("q", "*:*", "fq", "subject:\"parentDocument\" ",
@@ -116,9 +116,9 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
String test2[] = new String[] {
"//*[@numFound='1']",
- "/response/result/doc[1]/result[@name='children'][@numFound='3']/doc[1]/int[@name='id']='2'" ,
- "/response/result/doc[1]/result[@name='children'][@numFound='3']/doc[2]/int[@name='id']='4'" ,
- "/response/result/doc[1]/result[@name='children'][@numFound='3']/doc[3]/int[@name='id']='6'" };
+ "/response/result/doc[1]/result[@name='children'][@numFound='3']/doc[1]/str[@name='id']='2'" ,
+ "/response/result/doc[1]/result[@name='children'][@numFound='3']/doc[2]/str[@name='id']='4'" ,
+ "/response/result/doc[1]/result[@name='children'][@numFound='3']/doc[3]/str[@name='id']='6'" };
assertQ(req("q", "*:*", "fq", "subject:\"parentDocument\" ",
"fl", "*,children:[subquery]",
@@ -130,8 +130,8 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
String test3[] = new String[] {
"//*[@numFound='1']",
- "/response/result/doc[1]/result[@name='children'][@numFound='3']/doc[1]/int[@name='id']='3'" ,
- "/response/result/doc[1]/result[@name='children'][@numFound='3']/doc[2]/int[@name='id']='5'" };
+ "/response/result/doc[1]/result[@name='children'][@numFound='3']/doc[1]/str[@name='id']='3'" ,
+ "/response/result/doc[1]/result[@name='children'][@numFound='3']/doc[2]/str[@name='id']='5'" };
assertQ(req("q", "*:*", "fq", "subject:\"parentDocument\" ",
@@ -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] + "'"
};
@@ -346,12 +346,12 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
String tests[] = new String[] {
"//*[@numFound='2']",
- "/response/result/doc[1]/int[@name='id']='1'" ,
- "/response/result/doc[1]/doc[1]/int[@name='id']='2'" ,
+ "/response/result/doc[1]/str[@name='id']='1'" ,
+ "/response/result/doc[1]/doc[1]/str[@name='id']='2'" ,
"/response/result/doc[1]/doc[1]/arr[@name='cat']/str[1]='childDocument'" ,
"/response/result/doc[1]/doc[1]/arr[@name='title']/str[1]='" + titleVals[0] + "'" ,
- "/response/result/doc[2]/int[@name='id']='4'" ,
- "/response/result/doc[2]/doc[1]/int[@name='id']='5'",
+ "/response/result/doc[2]/str[@name='id']='4'" ,
+ "/response/result/doc[2]/doc[1]/str[@name='id']='5'",
"/response/result/doc[2]/doc[1]/arr[@name='cat']/str[1]='childDocument'",
"/response/result/doc[2]/doc[1]/arr[@name='title']/str[1]='" + titleVals[1] + "'"};
@@ -372,12 +372,12 @@ public class TestChildDocTransformer extends SolrTestCaseJ4 {
String tests[] = new String[] {
"//*[@numFound='2']",
- "/response/result/doc[1]/int[@name='id']='1'" ,
- "/response/result/doc[1]/result[@name='children'][@numFound=1]/doc[1]/int[@name='id']='2'" ,
+ "/response/result/doc[1]/str[@name='id']='1'" ,
+ "/response/result/doc[1]/result[@name='children'][@numFound=1]/doc[1]/str[@name='id']='2'" ,
"/response/result/doc[1]/result[@name='children'][@numFound=1]/doc[1]/arr[@name='cat']/str[1]='childDocument'" ,
"/response/result/doc[1]/result[@name='children'][@numFound=1]/doc[1]/arr[@name='title']/str[1]='" + titleVals[0] + "'" ,
- "/response/result/doc[2]/int[@name='id']='4'" ,
- "/response/result/doc[2]/result[@name='children'][@numFound=1]/doc[1]/int[@name='id']='5'",
+ "/response/result/doc[2]/str[@name='id']='4'" ,
+ "/response/result/doc[2]/result[@name='children'][@numFound=1]/doc[1]/str[@name='id']='5'",
"/response/result/doc[2]/result[@name='children'][@numFound=1]/doc[1]/arr[@name='cat']/str[1]='childDocument'",
"/response/result/doc[2]/result[@name='children'][@numFound=1]/doc[1]/arr[@name='title']/str[1]='" + titleVals[1] + "'"};
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f1e2be64/solr/core/src/test/org/apache/solr/rest/TestRestManager.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/rest/TestRestManager.java b/solr/core/src/test/org/apache/solr/rest/TestRestManager.java
index a39e774..31e7f28 100644
--- a/solr/core/src/test/org/apache/solr/rest/TestRestManager.java
+++ b/solr/core/src/test/org/apache/solr/rest/TestRestManager.java
@@ -277,4 +277,4 @@ public class TestRestManager extends SolrRestletTestBase {
String resourceId = RestManager.ManagedEndpoint.resolveResourceId(testRequest);
assertEquals(resourceId, "/schema/analysis/synonyms/de/Ändern");
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f1e2be64/solr/core/src/test/org/apache/solr/schema/AbstractCurrencyFieldTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/AbstractCurrencyFieldTest.java b/solr/core/src/test/org/apache/solr/schema/AbstractCurrencyFieldTest.java
index a195794..be719db 100644
--- a/solr/core/src/test/org/apache/solr/schema/AbstractCurrencyFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/AbstractCurrencyFieldTest.java
@@ -230,11 +230,11 @@ public abstract class AbstractCurrencyFieldTest extends SolrTestCaseJ4 {
assertU(adoc("id", "" + 1, field(), "10.00,USD"));
assertU(adoc("id", "" + 2, field(), "15.00,MXN"));
assertU(commit());
- assertQ(req("fl", "*,score", "q", field()+":10.00,USD"), "//int[@name='id']='1'");
+ assertQ(req("fl", "*,score", "q", field()+":10.00,USD"), "//str[@name='id']='1'");
assertQ(req("fl", "*,score", "q", field()+":9.99,USD"), "//*[@numFound='0']");
assertQ(req("fl", "*,score", "q", field()+":10.01,USD"), "//*[@numFound='0']");
- assertQ(req("fl", "*,score", "q", field()+":15.00,MXN"), "//int[@name='id']='2'");
- assertQ(req("fl", "*,score", "q", field()+":7.50,USD"), "//int[@name='id']='2'");
+ assertQ(req("fl", "*,score", "q", field()+":15.00,MXN"), "//str[@name='id']='2'");
+ assertQ(req("fl", "*,score", "q", field()+":7.50,USD"), "//str[@name='id']='2'");
assertQ(req("fl", "*,score", "q", field()+":7.49,USD"), "//*[@numFound='0']");
assertQ(req("fl", "*,score", "q", field()+":7.51,USD"), "//*[@numFound='0']");
}
@@ -293,8 +293,8 @@ public abstract class AbstractCurrencyFieldTest extends SolrTestCaseJ4 {
assertU(adoc("id", "" + 5, field(), "2.00,GBP"));
assertU(commit());
- assertQ(req("fl", "*,score", "q", "*:*", "sort", field()+" desc", "limit", "1"), "//int[@name='id']='4'");
- assertQ(req("fl", "*,score", "q", "*:*", "sort", field()+" asc", "limit", "1"), "//int[@name='id']='3'");
+ assertQ(req("fl", "*,score", "q", "*:*", "sort", field()+" desc", "limit", "1"), "//str[@name='id']='4'");
+ assertQ(req("fl", "*,score", "q", "*:*", "sort", field()+" asc", "limit", "1"), "//str[@name='id']='3'");
}
public void testFunctionUsage() throws Exception {
@@ -324,21 +324,21 @@ public abstract class AbstractCurrencyFieldTest extends SolrTestCaseJ4 {
assertQ(req("fl", "id,score,"+field(),
"q", "{!frange u=500}"+field())
,"//*[@numFound='5']"
- ,"//int[@name='id']='1'"
- ,"//int[@name='id']='2'"
- ,"//int[@name='id']='3'"
- ,"//int[@name='id']='4'"
- ,"//int[@name='id']='5'"
+ ,"//str[@name='id']='1'"
+ ,"//str[@name='id']='2'"
+ ,"//str[@name='id']='3'"
+ ,"//str[@name='id']='4'"
+ ,"//str[@name='id']='5'"
);
assertQ(req("fl", "id,score,"+field(),
"q", "{!frange l=500 u=1000}"+field())
,"//*[@numFound='6']"
- ,"//int[@name='id']='5'"
- ,"//int[@name='id']='6'"
- ,"//int[@name='id']='7'"
- ,"//int[@name='id']='8'"
- ,"//int[@name='id']='9'"
- ,"//int[@name='id']='10'"
+ ,"//str[@name='id']='5'"
+ ,"//str[@name='id']='6'"
+ ,"//str[@name='id']='7'"
+ ,"//str[@name='id']='8'"
+ ,"//str[@name='id']='9'"
+ ,"//str[@name='id']='10'"
);
// use the currency function to convert to default (USD)
@@ -356,22 +356,22 @@ public abstract class AbstractCurrencyFieldTest extends SolrTestCaseJ4 {
"f", field(),
"q", "{!frange u=5}currency($f)")
,"//*[@numFound='5']"
- ,"//int[@name='id']='1'"
- ,"//int[@name='id']='2'"
- ,"//int[@name='id']='3'"
- ,"//int[@name='id']='4'"
- ,"//int[@name='id']='5'"
+ ,"//str[@name='id']='1'"
+ ,"//str[@name='id']='2'"
+ ,"//str[@name='id']='3'"
+ ,"//str[@name='id']='4'"
+ ,"//str[@name='id']='5'"
);
assertQ(req("fl", "id,score"+field(),
"f", field(),
"q", "{!frange l=5 u=10}currency($f)")
,"//*[@numFound='6']"
- ,"//int[@name='id']='5'"
- ,"//int[@name='id']='6'"
- ,"//int[@name='id']='7'"
- ,"//int[@name='id']='8'"
- ,"//int[@name='id']='9'"
- ,"//int[@name='id']='10'"
+ ,"//str[@name='id']='5'"
+ ,"//str[@name='id']='6'"
+ ,"//str[@name='id']='7'"
+ ,"//str[@name='id']='8'"
+ ,"//str[@name='id']='9'"
+ ,"//str[@name='id']='10'"
);
// use the currency function to convert to MXN
@@ -389,22 +389,22 @@ public abstract class AbstractCurrencyFieldTest extends SolrTestCaseJ4 {
"f", field(),
"q", "{!frange u=10}currency($f,MXN)")
,"//*[@numFound='5']"
- ,"//int[@name='id']='1'"
- ,"//int[@name='id']='2'"
- ,"//int[@name='id']='3'"
- ,"//int[@name='id']='4'"
- ,"//int[@name='id']='5'"
+ ,"//str[@name='id']='1'"
+ ,"//str[@name='id']='2'"
+ ,"//str[@name='id']='3'"
+ ,"//str[@name='id']='4'"
+ ,"//str[@name='id']='5'"
);
assertQ(req("fl", "*,score,"+field(),
"f", field(),
"q", "{!frange l=10 u=20}currency($f,MXN)")
,"//*[@numFound='6']"
- ,"//int[@name='id']='5'"
- ,"//int[@name='id']='6'"
- ,"//int[@name='id']='7'"
- ,"//int[@name='id']='8'"
- ,"//int[@name='id']='9'"
- ,"//int[@name='id']='10'"
+ ,"//str[@name='id']='5'"
+ ,"//str[@name='id']='6'"
+ ,"//str[@name='id']='7'"
+ ,"//str[@name='id']='8'"
+ ,"//str[@name='id']='9'"
+ ,"//str[@name='id']='10'"
);
}
@@ -418,9 +418,9 @@ public abstract class AbstractCurrencyFieldTest extends SolrTestCaseJ4 {
assertU(adoc("id", "3", "mock_amount", "1.00,NOK"));
assertU(commit());
- assertQ(req("fl", "*,score", "q", "mock_amount:5.0,NOK"), "//*[@numFound='1']", "//int[@name='id']='1'");
- assertQ(req("fl", "*,score", "q", "mock_amount:1.2,USD"), "//*[@numFound='1']", "//int[@name='id']='2'");
- assertQ(req("fl", "*,score", "q", "mock_amount:0.2,USD"), "//*[@numFound='1']", "//int[@name='id']='3'");
+ assertQ(req("fl", "*,score", "q", "mock_amount:5.0,NOK"), "//*[@numFound='1']", "//str[@name='id']='1'");
+ assertQ(req("fl", "*,score", "q", "mock_amount:1.2,USD"), "//*[@numFound='1']", "//str[@name='id']='2'");
+ assertQ(req("fl", "*,score", "q", "mock_amount:0.2,USD"), "//*[@numFound='1']", "//str[@name='id']='3'");
assertQ(req("fl", "*,score", "q", "mock_amount:99,USD"), "//*[@numFound='0']");
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f1e2be64/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java b/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java
index d95f144..86a8aca 100644
--- a/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java
@@ -134,7 +134,7 @@ public class CopyFieldTest extends SolrTestCaseJ4 {
assertQ("Make sure they got in", req
,"//*[@numFound='1']"
- ,"//result/doc[1]/int[@name='id'][.='5']"
+ ,"//result/doc[1]/str[@name='id'][.='5']"
);
args = new HashMap<>();
@@ -143,7 +143,7 @@ public class CopyFieldTest extends SolrTestCaseJ4 {
req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
assertQ("dynamic source", req
,"//*[@numFound='1']"
- ,"//result/doc[1]/int[@name='id'][.='5']"
+ ,"//result/doc[1]/str[@name='id'][.='5']"
,"//result/doc[1]/arr[@name='highlight']/str[.='this is a simple test of ']"
);
@@ -194,7 +194,7 @@ public class CopyFieldTest extends SolrTestCaseJ4 {
SolrQueryRequest req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
assertQ("sku2 copied to text", req
,"//*[@numFound='1']"
- ,"//result/doc[1]/int[@name='id'][.='5']"
+ ,"//result/doc[1]/str[@name='id'][.='5']"
);
args = new HashMap<>();
@@ -203,7 +203,7 @@ public class CopyFieldTest extends SolrTestCaseJ4 {
req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
assertQ("sku1 copied to dynamic dest *_s", req
,"//*[@numFound='1']"
- ,"//result/doc[1]/int[@name='id'][.='5']"
+ ,"//result/doc[1]/str[@name='id'][.='5']"
,"//result/doc[1]/arr[@name='sku1']/str[.='10-1839ACX-93']"
);
@@ -242,7 +242,7 @@ public class CopyFieldTest extends SolrTestCaseJ4 {
SolrQueryRequest req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
assertQ("sku2 copied to text", req
,"//*[@numFound='1']"
- ,"//result/doc[1]/int[@name='id'][.='5']"
+ ,"//result/doc[1]/str[@name='id'][.='5']"
);
}
@@ -257,7 +257,7 @@ public class CopyFieldTest extends SolrTestCaseJ4 {
for (String q : new String[] {"5", "10-1839ACX-93", "AAM46" }) {
assertQ(req("q","catchall_t:" + q)
,"//*[@numFound='1']"
- ,"//result/doc[1]/int[@name='id'][.='5']");
+ ,"//result/doc[1]/str[@name='id'][.='5']");
}
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f1e2be64/solr/core/src/test/org/apache/solr/schema/CurrencyFieldXmlFileTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/CurrencyFieldXmlFileTest.java b/solr/core/src/test/org/apache/solr/schema/CurrencyFieldXmlFileTest.java
index f3872d0..e8bffe7 100644
--- a/solr/core/src/test/org/apache/solr/schema/CurrencyFieldXmlFileTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/CurrencyFieldXmlFileTest.java
@@ -33,8 +33,8 @@ public class CurrencyFieldXmlFileTest extends AbstractCurrencyFieldTest {
assertU(adoc("id", "" + 2, field(), "15.00,EUR"));
assertU(commit());
- assertQ(req("fl", "*,score", "q", field()+":15.00,EUR"), "//int[@name='id']='2'");
- assertQ(req("fl", "*,score", "q", field()+":7.50,USD"), "//int[@name='id']='2'");
+ assertQ(req("fl", "*,score", "q", field()+":15.00,EUR"), "//str[@name='id']='2'");
+ assertQ(req("fl", "*,score", "q", field()+":7.50,USD"), "//str[@name='id']='2'");
assertQ(req("fl", "*,score", "q", field()+":7.49,USD"), "//*[@numFound='0']");
assertQ(req("fl", "*,score", "q", field()+":7.51,USD"), "//*[@numFound='0']");
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f1e2be64/solr/core/src/test/org/apache/solr/schema/DateRangeFieldTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/DateRangeFieldTest.java b/solr/core/src/test/org/apache/solr/schema/DateRangeFieldTest.java
index e76f821..edd25b0 100644
--- a/solr/core/src/test/org/apache/solr/schema/DateRangeFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/DateRangeFieldTest.java
@@ -119,7 +119,7 @@ public class DateRangeFieldTest extends SolrTestCaseJ4 {
if (docIds != null && docIds.length > 0) {
int i = 1;
for (int docId : docIds) {
- tests[i++] = "//result/doc/int[@name='id'][.='" + docId + "']";
+ tests[i++] = "//result/doc/str[@name='id'][.='" + docId + "']";
}
}
return tests;