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 17:59:43 UTC
[4/5] lucene-solr:branch_6x: SOLR-10834: Fixed tests and test configs
to stop using numeric uniqueKey fields
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/CursorPagingTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/CursorPagingTest.java b/solr/core/src/test/org/apache/solr/CursorPagingTest.java
index b204677..4ba5387 100644
--- a/solr/core/src/test/org/apache/solr/CursorPagingTest.java
+++ b/solr/core/src/test/org/apache/solr/CursorPagingTest.java
@@ -191,17 +191,17 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==9"
,"/response/start==0"
- ,"/response/docs==[{'id':9},{'id':8},{'id':7},{'id':6}]"
+ ,"/response/docs==[{'id':'9'},{'id':'8'},{'id':'7'},{'id':'6'}]"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==9"
,"/response/start==0"
- ,"/response/docs==[{'id':5},{'id':3},{'id':2},{'id':1}]"
+ ,"/response/docs==[{'id':'5'},{'id':'3'},{'id':'2'},{'id':'1'}]"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==9"
,"/response/start==0"
- ,"/response/docs==[{'id':0}]"
+ ,"/response/docs==[{'id':'0'}]"
);
// no more, so no change to cursorMark, and no new docs
assertEquals(cursorMark,
@@ -223,13 +223,13 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==7"
,"/response/start==0"
- ,"/response/docs==[{'id':6},{'id':1},{'id':8},{'id':5}]"
+ ,"/response/docs==[{'id':'6'},{'id':'1'},{'id':'8'},{'id':'5'}]"
,"/facet_counts/facet_fields/str=={'a':4,'b':3,'c':0}"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==7"
,"/response/start==0"
- ,"/response/docs==[{'id':4},{'id':3},{'id':0}]"
+ ,"/response/docs==[{'id':'4'},{'id':'3'},{'id':'0'}]"
,"/facet_counts/facet_fields/str=={'a':4,'b':3,'c':0}"
);
// no more, so no change to cursorMark, and no new docs
@@ -253,19 +253,19 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':7},{'id':0},{'id':3}]"
+ ,"/response/docs==[{'id':'7'},{'id':'0'},{'id':'3'}]"
,"/facet_counts/facet_fields/str=={'a':4,'b':1,'c':3}"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':4},{'id':1},{'id':6}]"
+ ,"/response/docs==[{'id':'4'},{'id':'1'},{'id':'6'}]"
,"/facet_counts/facet_fields/str=={'a':4,'b':1,'c':3}"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':9},{'id':2}]"
+ ,"/response/docs==[{'id':'9'},{'id':'2'}]"
,"/facet_counts/facet_fields/str=={'a':4,'b':1,'c':3}"
);
// no more, so no change to cursorMark, and no new docs
@@ -287,17 +287,17 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':3},{'id':7},{'id':0}]"
+ ,"/response/docs==[{'id':'3'},{'id':'7'},{'id':'0'}]"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':4},{'id':1},{'id':6}]"
+ ,"/response/docs==[{'id':'4'},{'id':'1'},{'id':'6'}]"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':9},{'id':2}]"
+ ,"/response/docs==[{'id':'9'},{'id':'2'}]"
);
// no more, so no change to cursorMark, and no new docs
assertEquals(cursorMark,
@@ -317,17 +317,17 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':7},{'id':0},{'id':4}]"
+ ,"/response/docs==[{'id':'7'},{'id':'0'},{'id':'4'}]"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':1},{'id':6},{'id':9}]"
+ ,"/response/docs==[{'id':'1'},{'id':'6'},{'id':'9'}]"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':2},{'id':3}]"
+ ,"/response/docs==[{'id':'2'},{'id':'3'}]"
);
// no more, so no change to cursorMark, and no new docs
assertEquals(cursorMark,
@@ -346,12 +346,12 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==10"
,"/response/start==0"
- ,"/response/docs==[{'id':6},{'id':4},{'id':3},{'id':1},{'id':8},{'id':5}]"
+ ,"/response/docs==[{'id':'6'},{'id':'4'},{'id':'3'},{'id':'1'},{'id':'8'},{'id':'5'}]"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==10"
,"/response/start==0"
- ,"/response/docs==[{'id':0},{'id':9},{'id':7},{'id':2}]"
+ ,"/response/docs==[{'id':'0'},{'id':'9'},{'id':'7'},{'id':'2'}]"
);
// no more, so no change to cursorMark, and no new docs
assertEquals(cursorMark,
@@ -370,27 +370,27 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==10"
,"/response/start==0"
- ,"/response/docs==[{'id':2},{'id':9}]"
+ ,"/response/docs==[{'id':'2'},{'id':'9'}]"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==10"
,"/response/start==0"
- ,"/response/docs==[{'id':7},{'id':4}]"
+ ,"/response/docs==[{'id':'7'},{'id':'4'}]"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==10"
,"/response/start==0"
- ,"/response/docs==[{'id':3},{'id':8}]"
+ ,"/response/docs==[{'id':'3'},{'id':'8'}]"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==10"
,"/response/start==0"
- ,"/response/docs==[{'id':5},{'id':6}]"
+ ,"/response/docs==[{'id':'5'},{'id':'6'}]"
);
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==10"
,"/response/start==0"
- ,"/response/docs==[{'id':1},{'id':0}]"
+ ,"/response/docs==[{'id':'1'},{'id':'0'}]"
);
// we've exactly exhausted all the results, but solr had no way of know that
// no more, so no change to cursorMark, and no new docs
@@ -410,7 +410,7 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==2"
,"/response/start==0"
- ,"/response/docs==[{'id':7},{'id':3}]"
+ ,"/response/docs==[{'id':'7'},{'id':'3'}]"
);
// no more, so no change to cursorMark, and no new docs
assertEquals(cursorMark,
@@ -455,7 +455,7 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==10"
,"/response/start==0"
- ,"/response/docs==[{'id':1},{'id':3}]"
+ ,"/response/docs==[{'id':'1'},{'id':'3'}]"
);
// delete the last guy we got
assertU(delI("3"));
@@ -463,7 +463,7 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==9"
,"/response/start==0"
- ,"/response/docs==[{'id':4},{'id':6}]"
+ ,"/response/docs==[{'id':'4'},{'id':'6'}]"
);
// delete the next guy we expect
assertU(delI("0"));
@@ -471,7 +471,7 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':5},{'id':8}]"
+ ,"/response/docs==[{'id':'5'},{'id':'8'}]"
);
// update a doc we've already seen so it repeats
assertU(adoc("id", "5", "str", "c"));
@@ -479,7 +479,7 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':2},{'id':5}]"
+ ,"/response/docs==[{'id':'2'},{'id':'5'}]"
);
// update the next doc we expect so it's now in the past
assertU(adoc("id", "7", "str", "a"));
@@ -487,7 +487,7 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark = assertCursor(req(params, CURSOR_MARK_PARAM, cursorMark)
,"/response/numFound==8"
,"/response/start==0"
- ,"/response/docs==[{'id':9}]"
+ ,"/response/docs==[{'id':'9'}]"
);
// no more, so no change to cursorMark, and no new docs
assertEquals(cursorMark,
@@ -684,7 +684,7 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark, nextCursorMark);
}
for (Map<Object,Object> doc : docs) {
- int id = ((Long)doc.get("id")).intValue();
+ int id = Integer.parseInt(doc.get("id").toString());
assertFalse("walk already seen: " + id, ids.exists(id));
ids.put(id);
assertFalse("id set bigger then max allowed ("+maxSize+"): " + ids.size(),
@@ -773,7 +773,7 @@ public class CursorPagingTest extends SolrTestCaseJ4 {
cursorMark, nextCursorMark);
}
for (Map<Object,Object> doc : docs) {
- int id = ((Long)doc.get("id")).intValue();
+ int id = Integer.parseInt(doc.get("id").toString());
assertFalse("walk already seen: " + id, ids.exists(id));
ids.put(id);
assertFalse("id set bigger then max allowed ("+maxSize+"): " + ids.size(),
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java
index 8d1b758..faf67b4 100644
--- a/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java
@@ -85,9 +85,9 @@ public class DisMaxRequestHandlerTest extends SolrTestCaseJ4 {
assertQ("basic cross field matching, boost on same field matching",
req("cool stuff")
,"//*[@numFound='3']"
- ,"//result/doc[1]/int[@name='id'][.='42']"
- ,"//result/doc[2]/int[@name='id'][.='666']"
- ,"//result/doc[3]/int[@name='id'][.='8675309']"
+ ,"//result/doc[1]/str[@name='id'][.='42']"
+ ,"//result/doc[2]/str[@name='id'][.='666']"
+ ,"//result/doc[3]/str[@name='id'][.='8675309']"
);
assertQ("multi qf",
@@ -112,9 +112,9 @@ public class DisMaxRequestHandlerTest extends SolrTestCaseJ4 {
,"bq", "subject:hell^400"
)
,"//*[@numFound='3']"
- ,"//result/doc[1]/int[@name='id'][.='666']"
- ,"//result/doc[2]/int[@name='id'][.='42']"
- ,"//result/doc[3]/int[@name='id'][.='8675309']"
+ ,"//result/doc[1]/str[@name='id'][.='666']"
+ ,"//result/doc[2]/str[@name='id'][.='42']"
+ ,"//result/doc[3]/str[@name='id'][.='8675309']"
);
assertQ("multi boost query",
@@ -126,16 +126,16 @@ public class DisMaxRequestHandlerTest extends SolrTestCaseJ4 {
, CommonParams.DEBUG_QUERY, "true"
)
,"//*[@numFound='3']"
- ,"//result/doc[1]/int[@name='id'][.='666']"
- ,"//result/doc[2]/int[@name='id'][.='8675309']"
- ,"//result/doc[3]/int[@name='id'][.='42']"
+ ,"//result/doc[1]/str[@name='id'][.='666']"
+ ,"//result/doc[2]/str[@name='id'][.='8675309']"
+ ,"//result/doc[3]/str[@name='id'][.='42']"
);
assertQ("minimum mm is three",
req("cool stuff traveling")
,"//*[@numFound='2']"
- ,"//result/doc[1]/int[@name='id'][. ='42']"
- ,"//result/doc[2]/int[@name='id'][. ='666']"
+ ,"//result/doc[1]/str[@name='id'][. ='42']"
+ ,"//result/doc[2]/str[@name='id'][. ='666']"
);
assertQ("at 4 mm allows one missing ",
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/SampleTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/SampleTest.java b/solr/core/src/test/org/apache/solr/SampleTest.java
index cea23ee..244272f 100644
--- a/solr/core/src/test/org/apache/solr/SampleTest.java
+++ b/solr/core/src/test/org/apache/solr/SampleTest.java
@@ -61,7 +61,7 @@ public class SampleTest extends SolrTestCaseJ4 {
assertQ("couldn't find subject hoss",
req("subject:Hoss")
,"//result[@numFound=1]"
- ,"//int[@name='id'][.='4055']"
+ ,"//str[@name='id'][.='4055']"
);
}
@@ -94,7 +94,7 @@ public class SampleTest extends SolrTestCaseJ4 {
assertQ("couldn't find subject hoss",
req
,"//result[@numFound=1]"
- ,"//int[@name='id'][.='4055']"
+ ,"//str[@name='id'][.='4055']"
);
/* make your own LocalRequestFactory to build a request
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java b/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
index ca7f9ee..d187da8 100644
--- a/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
+++ b/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
@@ -264,23 +264,23 @@ public class TestDistributedGrouping extends BaseDistributedSearchTestCase {
// We validate distributed grouping with scoring as first sort.
// note: this 'q' matches all docs and returns the 'id' as the score, which is unique and so our results should be deterministic.
handle.put("maxScore", SKIP);// TODO see SOLR-6612
- query("q", "{!func}id", "rows", 100, "fl", "score,id," + i1, "group", "true", "group.field", i1, "group.limit", -1, "sort", i1 + " desc", "group.sort", "score desc"); // SOLR-2955
- query("q", "{!func}id", "rows", 100, "fl", "score,id," + i1, "group", "true", "group.field", i1, "group.limit", -1, "sort", "score desc, _docid_ asc, id asc");
- query("q", "{!func}id", "rows", 100, "fl", "score,id," + i1, "group", "true", "group.field", i1, "group.limit", -1);
+ query("q", "{!func}id_i1", "rows", 100, "fl", "score,id," + i1, "group", "true", "group.field", i1, "group.limit", -1, "sort", i1 + " desc", "group.sort", "score desc"); // SOLR-2955
+ query("q", "{!func}id_i1", "rows", 100, "fl", "score,id," + i1, "group", "true", "group.field", i1, "group.limit", -1, "sort", "score desc, _docid_ asc, id asc");
+ query("q", "{!func}id_i1", "rows", 100, "fl", "score,id," + i1, "group", "true", "group.field", i1, "group.limit", -1);
// some explicit checks of non default sorting, and sort/group.sort with diff clauses
- query("q", "{!func}id", "rows", 100, "fl", tlong + ",id," + i1, "group", "true",
+ query("q", "{!func}id_i1", "rows", 100, "fl", tlong + ",id," + i1, "group", "true",
"group.field", i1, "group.limit", -1,
"sort", tlong+" asc, id desc");
- query("q", "{!func}id", "rows", 100, "fl", tlong + ",id," + i1, "group", "true",
+ query("q", "{!func}id_i1", "rows", 100, "fl", tlong + ",id," + i1, "group", "true",
"group.field", i1, "group.limit", -1,
"sort", "id asc",
"group.sort", tlong+" asc, id desc");
- query("q", "{!func}id", "rows", 100, "fl", tlong + ",id," + i1, "group", "true",
+ query("q", "{!func}id_i1", "rows", 100, "fl", tlong + ",id," + i1, "group", "true",
"group.field", i1, "group.limit", -1,
"sort", tlong+" asc, id desc",
"group.sort", "id asc");
- rsp = query("q", "{!func}id", "fq", oddField+":[* TO *]",
+ rsp = query("q", "{!func}id_i1", "fq", oddField+":[* TO *]",
"rows", 100, "fl", tlong + ",id," + i1, "group", "true",
"group.field", i1, "group.limit", -1,
"sort", tlong+" asc",
@@ -293,8 +293,8 @@ public class TestDistributedGrouping extends BaseDistributedSearchTestCase {
assertEquals(rsp.toString(), 232, nl.get("groupValue"));
SolrDocumentList docs = (SolrDocumentList) nl.get("doclist");
assertEquals(docs.toString(), 5, docs.getNumFound());
- assertEquals(docs.toString(), 22, docs.get(0).getFirstValue("id"));
- assertEquals(docs.toString(), 21, docs.get(4).getFirstValue("id"));
+ assertEquals(docs.toString(), "22", docs.get(0).getFirstValue("id"));
+ assertEquals(docs.toString(), "21", docs.get(4).getFirstValue("id"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java b/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java
index 7a91c83..378ad0d 100644
--- a/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java
+++ b/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java
@@ -104,13 +104,13 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
// sint1_ml desc sort pos: 7 8 10 11 3 12 6 2 9 1 13 4 5
QueryResponse rsp = query("q","*:*", "sort", sint1_ml + " desc", "rows", "13");
- assertFieldValues(rsp.getResults(), id, 10, 8, 5, 12, 13, 7, 1, 2, 9, 3, 4, 6, 11);
+ assertFieldValues(rsp.getResults(), "id_i", 10, 8, 5, 12, 13, 7, 1, 2, 9, 3, 4, 6, 11);
rsp = query("q","*:*", "sort", sint1_ml + " asc", "rows", "13");
- assertFieldValues(rsp.getResults(), id, 11, 6, 4, 3, 9, 2, 1, 7, 13, 12, 5, 8, 10);
+ assertFieldValues(rsp.getResults(), "id_i", 11, 6, 4, 3, 9, 2, 1, 7, 13, 12, 5, 8, 10);
- rsp = query("q","*:*", "sort", sint1_ml + " desc," + id + " asc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ rsp = query("q","*:*", "sort", sint1_ml + " desc, id_i asc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
10, 8, 5, 12, 13, 7, 1, 2, 9, 3, 4, 6, 11,
14, 15, 16, 17,
100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
@@ -119,8 +119,8 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
140, 141, 142, 143, 144, 145, 146, 147, 148, 149);
- rsp = query("q","*:*", "sort", sint1_ml + " asc," + id + " desc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ rsp = query("q","*:*", "sort", sint1_ml + " asc, id_i desc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
11, 6, 4, 3, 9, 2, 1, 7, 13, 12, 5, 8, 10,
149, 148, 147, 146, 145, 144, 143, 142, 141, 140,
139, 138, 137, 136, 135, 134, 133, 132, 131, 130,
@@ -135,13 +135,13 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
// long1_ml desc sort pos: 7 8 10 11 3 12 6 2 9 1 13 4 5
rsp = query("q","*:*", "sort", long1_ml + " desc", "rows", "13");
- assertFieldValues(rsp.getResults(), id, 10, 8, 5, 12, 13, 7, 1, 2, 9, 3, 4, 6, 11);
+ assertFieldValues(rsp.getResults(), "id_i", 10, 8, 5, 12, 13, 7, 1, 2, 9, 3, 4, 6, 11);
rsp = query("q","*:*", "sort", long1_ml + " asc", "rows", "13");
- assertFieldValues(rsp.getResults(), id, 11, 6, 4, 3, 9, 2, 1, 7, 13, 12, 5, 8, 10);
+ assertFieldValues(rsp.getResults(), "id_i", 11, 6, 4, 3, 9, 2, 1, 7, 13, 12, 5, 8, 10);
- rsp = query("q","*:*", "sort", long1_ml + " desc," + id + " asc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ rsp = query("q","*:*", "sort", long1_ml + " desc, id_i asc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
10, 8, 5, 12, 13, 7, 1, 2, 9, 3, 4, 6, 11,
14, 15, 16, 17,
100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
@@ -150,8 +150,8 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
140, 141, 142, 143, 144, 145, 146, 147, 148, 149);
- rsp = query("q","*:*", "sort", long1_ml + " asc," + id + " desc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ rsp = query("q","*:*", "sort", long1_ml + " asc, id_i desc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
11, 6, 4, 3, 9, 2, 1, 7, 13, 12, 5, 8, 10,
149, 148, 147, 146, 145, 144, 143, 142, 141, 140,
139, 138, 137, 136, 135, 134, 133, 132, 131, 130,
@@ -167,13 +167,13 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
// string1_ml desc sort pos: 12 13 10 9 1 3 8 5 6 7 2 4 11
rsp = query("q","*:*", "sort", string1_ml + " desc", "rows", "13");
- assertFieldValues(rsp.getResults(), id, 5, 11, 6, 12, 8, 9, 10, 7, 4, 3, 13, 1, 2);
+ assertFieldValues(rsp.getResults(), "id_i", 5, 11, 6, 12, 8, 9, 10, 7, 4, 3, 13, 1, 2);
rsp = query("q","*:*", "sort", string1_ml + " asc", "rows", "13");
- assertFieldValues(rsp.getResults(), id, 2, 1, 13, 3, 4, 7, 10, 9, 8, 12, 6, 11, 5);
+ assertFieldValues(rsp.getResults(), "id_i", 2, 1, 13, 3, 4, 7, 10, 9, 8, 12, 6, 11, 5);
- rsp = query("q","*:*", "sort", string1_ml + " desc," + id + " asc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ rsp = query("q","*:*", "sort", string1_ml + " desc, id_i asc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
5, 11, 6, 12, 8, 9, 10, 7, 4, 3, 13, 1, 2,
// missing field string1_ml="a_s1", ascending id sort
14, 15, 16, 17,
@@ -183,8 +183,8 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
130, 131, 132, 133, 134, 135, 136, 137, 138, 139,
140, 141, 142, 143, 144, 145, 146, 147, 148, 149);
- rsp = query("q","*:*", "sort", string1_ml + " asc," + id + " desc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ rsp = query("q","*:*", "sort", string1_ml + " asc, id_i desc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
2, 1, 13, 3, 4, 7, 10, 9, 8, 12, 6, 11, 5,
// missing field string1_ml="a_s1", descending id sort
149, 148, 147, 146, 145, 144, 143, 142, 141, 140,
@@ -201,8 +201,8 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
// sint1_mf asc sort pos: 7 6 4 3 11 2 8 12 5 13 1 10 9
// sint1_mf desc sort pos: 7 8 10 11 3 12 6 2 9 1 13 4 5
- QueryResponse rsp = query("q","*:*", "sort", sint1_mf + " desc," + id + " asc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ QueryResponse rsp = query("q","*:*", "sort", sint1_mf + " desc, id_i asc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
14, 15, 16, 17,
100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
@@ -211,8 +211,8 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
10, 8, 5, 12, 13, 7, 1, 2, 9, 3, 4, 6, 11);
- rsp = query("q","*:*", "sort", sint1_mf + " asc," + id + " desc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ rsp = query("q","*:*", "sort", sint1_mf + " asc, id_i desc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
149, 148, 147, 146, 145, 144, 143, 142, 141, 140,
139, 138, 137, 136, 135, 134, 133, 132, 131, 130,
129, 128, 127, 126, 125, 124, 123, 122, 121, 120,
@@ -227,8 +227,8 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
// long1_mf asc sort pos: 7 6 4 3 11 2 8 12 5 13 1 10 9
// long1_mf desc sort pos: 7 8 10 11 3 12 6 2 9 1 13 4 5
- rsp = query("q","*:*", "sort", long1_mf + " desc," + id + " asc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ rsp = query("q","*:*", "sort", long1_mf + " desc, id_i asc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
14, 15, 16, 17,
100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
@@ -237,8 +237,8 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
10, 8, 5, 12, 13, 7, 1, 2, 9, 3, 4, 6, 11);
- rsp = query("q","*:*", "sort", long1_mf + " asc," + id + " desc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ rsp = query("q","*:*", "sort", long1_mf + " asc, id_i desc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
149, 148, 147, 146, 145, 144, 143, 142, 141, 140,
139, 138, 137, 136, 135, 134, 133, 132, 131, 130,
129, 128, 127, 126, 125, 124, 123, 122, 121, 120,
@@ -253,8 +253,8 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
// string1_mf asc sort pos: 2 1 4 5 13 11 6 9 8 7 12 10 3
// string1_mf desc sort pos: 12 13 10 9 1 3 8 5 6 7 2 4 11
- rsp = query("q","*:*", "sort", string1_mf + " desc," + id + " asc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ rsp = query("q","*:*", "sort", string1_mf + " desc, id_i asc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
// missing field string1_mf="a_s1_mf", ascending id sort
14, 15, 16, 17,
100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
@@ -264,8 +264,8 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
5, 11, 6, 12, 8, 9, 10, 7, 4, 3, 13, 1, 2);
- rsp = query("q","*:*", "sort", string1_mf + " asc," + id + " desc", "rows", "200");
- assertFieldValues(rsp.getResults(), id,
+ rsp = query("q","*:*", "sort", string1_mf + " asc, id_i desc", "rows", "200");
+ assertFieldValues(rsp.getResults(), "id_i",
// missing field string1_mf="a_s1_mf", descending id sort
149, 148, 147, 146, 145, 144, 143, 142, 141, 140,
139, 138, 137, 136, 135, 134, 133, 132, 131, 130,
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
index b867dd0..126e892 100644
--- a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
+++ b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
@@ -232,7 +232,7 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
"facet.field", tdate_b, "facet.field", tdate_a);
assertEquals(2, rsp.getFacetFields().size());
- String facetQuery = "id:[1 TO 15]";
+ String facetQuery = "id_i1:[1 TO 15]";
// simple range facet on one field
query("q",facetQuery, "rows",100, "facet","true",
@@ -380,7 +380,7 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
// we want a random query and not just *:* so we'll get zero counts in facets also
// TODO: do a better random query
- String q = random().nextBoolean() ? "*:*" : "id:(1 3 5 7 9 11 13) OR id:[100 TO " + random().nextInt(50) + "]";
+ String q = random().nextBoolean() ? "*:*" : "id:(1 3 5 7 9 11 13) OR id_i1:[100 TO " + random().nextInt(50) + "]";
int nolimit = random().nextBoolean() ? -1 : 10000; // these should be equivalent
@@ -402,7 +402,7 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
,"facet.field","{!key=other ex=b}"+t1
,"facet.field","{!key=again ex=a,b}"+t1
,"facet.field",t1
- ,"fq","{!tag=a}id:[1 TO 7]", "fq","{!tag=b}id:[3 TO 9]"
+ ,"fq","{!tag=a}id_i1:[1 TO 7]", "fq","{!tag=b}id_i1:[3 TO 9]"
);
queryAndCompareUIF("q", "*:*", "facet", "true", "facet.field", "{!ex=t1}SubjectTerms_mfacet", "fq", "{!tag=t1}SubjectTerms_mfacet:(test 1)", "facet.limit", "10", "facet.mincount", "1");
@@ -512,7 +512,7 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
"stats.field", "{!key=special_key}stats_dt");
query("q","*:*", "sort",i1+" desc", "stats", "true",
"f.stats_dt.stats.calcdistinct", "true",
- "fq", "{!tag=xxx}id:[3 TO 9]",
+ "fq", "{!tag=xxx}id_i1:[3 TO 9]",
"stats.field", "{!key=special_key}stats_dt",
"stats.field", "{!ex=xxx}stats_dt");
@@ -910,20 +910,20 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
handle.put("time", SKIPVAL);
handle.put("track", SKIP); //track is not included in single node search
query("q","now their fox sat had put","fl","*,score",CommonParams.DEBUG_QUERY, "true");
- query("q", "id:[1 TO 5]", CommonParams.DEBUG_QUERY, "true");
- query("q", "id:[1 TO 5]", CommonParams.DEBUG, CommonParams.TIMING);
- query("q", "id:[1 TO 5]", CommonParams.DEBUG, CommonParams.RESULTS);
- query("q", "id:[1 TO 5]", CommonParams.DEBUG, CommonParams.QUERY);
+ query("q", "id_i1:[1 TO 5]", CommonParams.DEBUG_QUERY, "true");
+ query("q", "id_i1:[1 TO 5]", CommonParams.DEBUG, CommonParams.TIMING);
+ query("q", "id_i1:[1 TO 5]", CommonParams.DEBUG, CommonParams.RESULTS);
+ query("q", "id_i1:[1 TO 5]", CommonParams.DEBUG, CommonParams.QUERY);
// SOLR-6545, wild card field list
indexr(id, "19", "text", "d", "cat_a_sS", "1" ,t1, "2");
commit();
rsp = query("q", "id:19", "fl", "id", "fl", "*a_sS");
- assertFieldValues(rsp.getResults(), "id", 19);
+ assertFieldValues(rsp.getResults(), "id", "19");
rsp = query("q", "id:19", "fl", "id," + t1 + ",cat*");
- assertFieldValues(rsp.getResults(), "id", 19);
+ assertFieldValues(rsp.getResults(), "id", "19");
// Check Info is added to for each shard
ModifiableSolrParams q = new ModifiableSolrParams();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/TestTolerantSearch.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/TestTolerantSearch.java b/solr/core/src/test/org/apache/solr/TestTolerantSearch.java
index cb485d0..ec1f16c 100644
--- a/solr/core/src/test/org/apache/solr/TestTolerantSearch.java
+++ b/solr/core/src/test/org/apache/solr/TestTolerantSearch.java
@@ -150,7 +150,7 @@ public class TestTolerantSearch extends SolrJettyTestBase {
}
}
assertTrue(foundError);
- assertEquals(1, response.getResults().get(0).getFieldValue("id"));
+ assertEquals("1", response.getResults().get(0).getFieldValue("id"));
assertEquals("batman", response.getResults().get(0).getFirstValue("subject"));
unIgnoreException("Dummy exception in BadResponseWriter");
}
@@ -199,7 +199,7 @@ public class TestTolerantSearch extends SolrJettyTestBase {
}
assertTrue(foundError);
- assertEquals(1, response.getResults().get(0).getFieldValue("id"));
+ assertEquals("1", response.getResults().get(0).getFieldValue("id"));
assertEquals("batman", response.getResults().get(0).getFirstValue("subject"));
unIgnoreException("Dummy exception in BadResponseWriter");
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/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/625b1cba/solr/core/src/test/org/apache/solr/analysis/TestCharFilters.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/analysis/TestCharFilters.java b/solr/core/src/test/org/apache/solr/analysis/TestCharFilters.java
index 984ad12..646bdbb 100644
--- a/solr/core/src/test/org/apache/solr/analysis/TestCharFilters.java
+++ b/solr/core/src/test/org/apache/solr/analysis/TestCharFilters.java
@@ -46,12 +46,12 @@ public class TestCharFilters extends SolrTestCaseJ4 {
assertQ("Query analysis: ",
req("fl", "id", "q", "content:ab", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=1]"
+ "//result/doc[1]/str[@name='id'][.=1]"
);
assertQ("Query analysis: ",
req("fl", "id", "q", "content:aba", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=2]"
+ "//result/doc[1]/str[@name='id'][.=2]"
);
}
@@ -65,12 +65,12 @@ public class TestCharFilters extends SolrTestCaseJ4 {
assertQ("Index analysis: ",
req("fl", "id", "q", "content2:aab", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=3]"
+ "//result/doc[1]/str[@name='id'][.=3]"
);
assertQ("Index analysis: ",
req("fl", "id", "q", "content2:aabaa", "sort", "id asc"),
"//*[@numFound='1']",
- "//result/doc[1]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=4]"
);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
index 582c8b4..39557a1 100644
--- a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
+++ b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
@@ -457,10 +457,10 @@ public class BasicDistributedZk2Test extends AbstractFullDistribZkTestBase {
handle.put("track", SKIP);
query("q", "now their fox sat had put", "fl", "*,score",
CommonParams.DEBUG_QUERY, "true");
- query("q", "id:[1 TO 5]", CommonParams.DEBUG_QUERY, "true");
- query("q", "id:[1 TO 5]", CommonParams.DEBUG, CommonParams.TIMING);
- query("q", "id:[1 TO 5]", CommonParams.DEBUG, CommonParams.RESULTS);
- query("q", "id:[1 TO 5]", CommonParams.DEBUG, CommonParams.QUERY);
+ query("q", "id_i1:[1 TO 5]", CommonParams.DEBUG_QUERY, "true");
+ query("q", "id_i1:[1 TO 5]", CommonParams.DEBUG, CommonParams.TIMING);
+ query("q", "id_i1:[1 TO 5]", CommonParams.DEBUG, CommonParams.RESULTS);
+ query("q", "id_i1:[1 TO 5]", CommonParams.DEBUG, CommonParams.QUERY);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
index 1dcc1d1..8c8d3aa 100644
--- a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
@@ -263,7 +263,7 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {
,"facet.field","{!key=other ex=b}"+t1
,"facet.field","{!key=again ex=a,b}"+t1
,"facet.field",t1
- ,"fq","{!tag=a}id:[1 TO 7]", "fq","{!tag=b}id:[3 TO 9]"}
+ ,"fq","{!tag=a}id_i1:[1 TO 7]", "fq","{!tag=b}id_i1:[3 TO 9]"}
);
query(false, new Object[] {"q", "*:*", "facet", "true", "facet.field", "{!ex=t1}SubjectTerms_mfacet", "fq", "{!tag=t1}SubjectTerms_mfacet:(test 1)", "facet.limit", "10", "facet.mincount", "1"});
@@ -313,10 +313,10 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {
handle.put("time", SKIPVAL);
handle.put("track", SKIP);
query(false, new Object[] {"q","now their fox sat had put","fl","*,score",CommonParams.DEBUG_QUERY, "true"});
- query(false, new Object[] {"q", "id:[1 TO 5]", CommonParams.DEBUG_QUERY, "true"});
- query(false, new Object[] {"q", "id:[1 TO 5]", CommonParams.DEBUG, CommonParams.TIMING});
- query(false, new Object[] {"q", "id:[1 TO 5]", CommonParams.DEBUG, CommonParams.RESULTS});
- query(false, new Object[] {"q", "id:[1 TO 5]", CommonParams.DEBUG, CommonParams.QUERY});
+ query(false, new Object[] {"q", "id_i1:[1 TO 5]", CommonParams.DEBUG_QUERY, "true"});
+ query(false, new Object[] {"q", "id_i1:[1 TO 5]", CommonParams.DEBUG, CommonParams.TIMING});
+ query(false, new Object[] {"q", "id_i1:[1 TO 5]", CommonParams.DEBUG, CommonParams.RESULTS});
+ query(false, new Object[] {"q", "id_i1:[1 TO 5]", CommonParams.DEBUG, CommonParams.QUERY});
// try add commitWithin
long before = cloudClient.query(new SolrQuery("*:*")).getResults().getNumFound();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java
index 26fa325..11f644d 100644
--- a/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java
@@ -67,10 +67,10 @@ public class BasicZkTest extends AbstractZkTestCase {
assertU("does commit work?", commit());
assertQ("backslash escaping semicolon", request("id:42 AND val_s:aa\\;bb"),
- "//*[@numFound='1']", "//int[@name='id'][.='42']");
+ "//*[@numFound='1']", "//str[@name='id'][.='42']");
assertQ("quote escaping semicolon", request("id:42 AND val_s:\"aa;bb\""),
- "//*[@numFound='1']", "//int[@name='id'][.='42']");
+ "//*[@numFound='1']", "//str[@name='id'][.='42']");
assertQ("no escaping semicolon", request("id:42 AND val_s:aa"),
"//*[@numFound='0']");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java b/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
index 0742ac7..5de766f 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
@@ -556,7 +556,7 @@ public class DistribCursorPagingTest extends AbstractFullDistribZkTestBase {
if (ids.size() < numInitialDocs) {
message.append("Missing doc(s): ");
for (SolrInputDocument doc : initialDocs) {
- int id = ((Integer)doc.get("id").getValue()).intValue();
+ int id = Integer.parseInt(doc.getFieldValue("id").toString());
if ( ! ids.exists(id)) {
QueryResponse rsp = cloudClient.query(params("q", "id:" + id,
"rows", "1"));
@@ -664,12 +664,12 @@ public class DistribCursorPagingTest extends AbstractFullDistribZkTestBase {
* "id" of the list of documents returned matches the expected list
* @see org.apache.solr.client.solrj.SolrClient#query
*/
- private void assertDocList(QueryResponse rsp, Object... ids) {
+ private void assertDocList(QueryResponse rsp, int... ids) {
SolrDocumentList docs = extractDocList(rsp);
assertEquals("Wrong number of docs in response", ids.length, docs.size());
int i = 0;
- for (Object id : ids) {
- assertEquals(rsp.toString(), id, docs.get(i).get("id"));
+ for (int id : ids) {
+ assertEquals(rsp.toString(), ""+id, docs.get(i).get("id"));
i++;
}
}
@@ -730,7 +730,7 @@ public class DistribCursorPagingTest extends AbstractFullDistribZkTestBase {
}
for (SolrDocument doc : docs) {
- int id = ((Integer)doc.get("id")).intValue();
+ int id = Integer.parseInt(doc.getFieldValue("id").toString());
if (ids.exists(id)) {
String msg = "(" + p + ") walk already seen: " + id;
try {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/cloud/DistribJoinFromCollectionTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/DistribJoinFromCollectionTest.java b/solr/core/src/test/org/apache/solr/cloud/DistribJoinFromCollectionTest.java
index 3c055ab..7c55113 100644
--- a/solr/core/src/test/org/apache/solr/cloud/DistribJoinFromCollectionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/DistribJoinFromCollectionTest.java
@@ -62,7 +62,7 @@ public class DistribJoinFromCollectionTest extends SolrCloudTestCase{
private static String toColl = "to_2x2";
private static String fromColl = "from_1x4";
- private static Integer toDocId;
+ private static String toDocId;
@BeforeClass
public static void setupCluster() throws Exception {
@@ -140,7 +140,7 @@ public class DistribJoinFromCollectionTest extends SolrCloudTestCase{
log.info("DistribJoinFromCollectionTest succeeded ... shutting down now!");
}
- private void testJoins(String toColl, String fromColl, Integer toDocId, boolean isScoresTest)
+ private void testJoins(String toColl, String fromColl, String toDocId, boolean isScoresTest)
throws SolrServerException, IOException {
// verify the join with fromIndex works
final String fromQ = "match_s:c match_s:not_1_0_score_after_weight_normalization";
@@ -219,12 +219,12 @@ public class DistribJoinFromCollectionTest extends SolrCloudTestCase{
}
}
- protected static Integer indexDoc(String collection, int id, String joinField, String matchField, String getField) throws Exception {
+ protected static String indexDoc(String collection, int id, String joinField, String matchField, String getField) throws Exception {
UpdateRequest up = new UpdateRequest();
up.setCommitWithin(50);
up.setParam("collection", collection);
SolrInputDocument doc = new SolrInputDocument();
- Integer docId = new Integer(id);
+ String docId = "" + id;
doc.addField("id", docId);
doc.addField("join_s", joinField);
if (matchField != null)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
index ca95091..22ac178 100644
--- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
@@ -616,7 +616,7 @@ public class HttpPartitionTest extends AbstractFullDistribZkTestBase {
@SuppressWarnings("rawtypes")
protected void assertDocExists(HttpSolrClient solr, String coll, String docId) throws Exception {
NamedList rsp = realTimeGetDocId(solr, docId);
- String match = JSONTestUtil.matchObj("/id", rsp.get("doc"), new Integer(docId));
+ String match = JSONTestUtil.matchObj("/id", rsp.get("doc"), docId);
assertTrue("Doc with id=" + docId + " not found in " + solr.getBaseURL()
+ " due to: " + match + "; rsp="+rsp, match == null);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java b/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java
index 3fe12ed..8fc1243 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java
@@ -106,8 +106,10 @@ class SegmentTerminateEarlyTestState {
// check correctness of the first result
if (rsp.getResults().getNumFound() > 0) {
final SolrDocument solrDocument0 = rsp.getResults().get(0);
- TestMiniSolrCloudCluster.assertTrue(keyField+" of ("+solrDocument0+") is not in maxTimestampDocKeys("+maxTimestampDocKeys+")",
- maxTimestampDocKeys.contains(solrDocument0.getFieldValue(keyField)));
+ final Integer idAsInt = Integer.parseInt(solrDocument0.getFieldValue(keyField).toString());
+ TestMiniSolrCloudCluster.assertTrue
+ (keyField +"="+idAsInt+" of ("+solrDocument0+") is not in maxTimestampDocKeys("+maxTimestampDocKeys+")",
+ maxTimestampDocKeys.contains(idAsInt));
TestMiniSolrCloudCluster.assertEquals(oddField, oddFieldValue, solrDocument0.getFieldValue(oddField));
}
// check segmentTerminatedEarly flag
@@ -136,8 +138,10 @@ class SegmentTerminateEarlyTestState {
// check correctness of the first result
if (rsp.getResults().getNumFound() > 0) {
final SolrDocument solrDocument0 = rsp.getResults().get(0);
- TestMiniSolrCloudCluster.assertTrue(keyField+" of ("+solrDocument0+") is not in maxTimestampDocKeys("+maxTimestampDocKeys+")",
- maxTimestampDocKeys.contains(solrDocument0.getFieldValue(keyField)));
+ final Integer idAsInt = Integer.parseInt(solrDocument0.getFieldValue(keyField).toString());
+ TestMiniSolrCloudCluster.assertTrue
+ (keyField +"="+idAsInt+" of ("+solrDocument0+") is not in maxTimestampDocKeys("+maxTimestampDocKeys+")",
+ maxTimestampDocKeys.contains(idAsInt));
TestMiniSolrCloudCluster.assertEquals(oddField, oddFieldValue, rsp.getResults().get(0).getFieldValue(oddField));
}
// check segmentTerminatedEarly flag
@@ -182,8 +186,10 @@ class SegmentTerminateEarlyTestState {
// check correctness of the first result
if (rsp.getResults().getNumFound() > 0) {
final SolrDocument solrDocument0 = rsp.getResults().get(0);
- TestMiniSolrCloudCluster.assertTrue(keyField+" of ("+solrDocument0+") is not in maxTimestampDocKeys("+maxTimestampDocKeys+")",
- maxTimestampDocKeys.contains(solrDocument0.getFieldValue(keyField)));
+ final Integer idAsInt = Integer.parseInt(solrDocument0.getFieldValue(keyField).toString());
+ TestMiniSolrCloudCluster.assertTrue
+ (keyField +"="+idAsInt+" of ("+solrDocument0+") is not in maxTimestampDocKeys("+maxTimestampDocKeys+")",
+ maxTimestampDocKeys.contains(idAsInt));
TestMiniSolrCloudCluster.assertEquals(oddField, oddFieldValue, rsp.getResults().get(0).getFieldValue(oddField));
}
// check segmentTerminatedEarly flag
@@ -226,8 +232,10 @@ class SegmentTerminateEarlyTestState {
// check correctness of the first result
if (rsp.getGroupResponse().getValues().get(0).getMatches() > 0) {
final SolrDocument solrDocument = rsp.getGroupResponse().getValues().get(0).getValues().get(0).getResult().get(0);
- TestMiniSolrCloudCluster.assertTrue(keyField+" of ("+solrDocument+") is not in maxTimestampDocKeys("+maxTimestampDocKeys+")",
- maxTimestampDocKeys.contains(solrDocument.getFieldValue(keyField)));
+ final Integer idAsInt = Integer.parseInt(solrDocument.getFieldValue(keyField).toString());
+ TestMiniSolrCloudCluster.assertTrue
+ (keyField +"="+idAsInt+" of ("+solrDocument+") is not in maxTimestampDocKeys("+maxTimestampDocKeys+")",
+ maxTimestampDocKeys.contains(idAsInt));
TestMiniSolrCloudCluster.assertEquals(oddField, oddFieldValue, solrDocument.getFieldValue(oddField));
}
// check segmentTerminatedEarly flag
@@ -251,8 +259,10 @@ class SegmentTerminateEarlyTestState {
// check correctness of the first result
if (rsp.getResults().getNumFound() > 0) {
final SolrDocument solrDocument0 = rsp.getResults().get(0);
- TestMiniSolrCloudCluster.assertTrue(keyField+" of ("+solrDocument0+") is not in minTimestampDocKeys("+minTimestampDocKeys+")",
- minTimestampDocKeys.contains(solrDocument0.getFieldValue(keyField)));
+ final Integer idAsInt = Integer.parseInt(solrDocument0.getFieldValue(keyField).toString());
+ TestMiniSolrCloudCluster.assertTrue
+ (keyField +"="+idAsInt+" of ("+solrDocument0+") is not in minTimestampDocKeys("+minTimestampDocKeys+")",
+ minTimestampDocKeys.contains(idAsInt));
TestMiniSolrCloudCluster.assertEquals(oddField, oddFieldValue, solrDocument0.getFieldValue(oddField));
}
// check segmentTerminatedEarly flag
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/core/HelloStream.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/HelloStream.java b/solr/core/src/test/org/apache/solr/core/HelloStream.java
index d1c5ced..be285e5 100644
--- a/solr/core/src/test/org/apache/solr/core/HelloStream.java
+++ b/solr/core/src/test/org/apache/solr/core/HelloStream.java
@@ -97,4 +97,4 @@ public class HelloStream extends TupleStream implements Expressible{
.withExpressionType(Explanation.ExpressionType.STREAM_SOURCE)
.withExpression("--non-expressible--");
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/core/SOLR749Test.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/SOLR749Test.java b/solr/core/src/test/org/apache/solr/core/SOLR749Test.java
index 446c506..2eda77d 100644
--- a/solr/core/src/test/org/apache/solr/core/SOLR749Test.java
+++ b/solr/core/src/test/org/apache/solr/core/SOLR749Test.java
@@ -52,29 +52,29 @@ public class SOLR749Test extends SolrTestCaseJ4 {
// NOTE: we can't rely on the default lucene syntax because "FooQParser" is registered as "lucene"
assertQ(req("q","{!notfoo}*:*"), "//result[@numFound=100]");
- assertQ(req("q","{!notfoo}id:[* TO 49]"), "//result[@numFound=50]");
+ assertQ(req("q","{!notfoo}id_i1:[* TO 49]"), "//result[@numFound=50]");
try {
assertQ("query wrapped in boost func should only eval func for query matches",
- req("q","{!boost b=$boostFunc defType=notfoo}id:[* TO 49]",
+ req("q","{!boost b=$boostFunc defType=notfoo}id_i1:[* TO 49]",
"boostFunc", "countUsage('boost_func',3.4)"),
"//result[@numFound=50]");
assertEquals(50, CountUsageValueSourceParser.getAndClearCount("boost_func"));
assertQ("func query that is filtered should be evaled only for filtered docs",
- req("q","{!func}product(id,countUsage('func_q',4.5))",
- "fq", "{!notfoo}id:[30 TO 59]"),
+ req("q","{!func}product(id_i1,countUsage('func_q',4.5))",
+ "fq", "{!notfoo}id_i1:[30 TO 59]"),
"//result[@numFound=30]");
assertEquals(30, CountUsageValueSourceParser.getAndClearCount("func_q"));
assertQ("func query that wraps a query which is also used as a should be evaled only for filtered docs",
req("q","{!func}product(query($qq),countUsage('func_q_wrapping_fq',4.5))",
- "qq", "{!notfoo}id:[20 TO 39]",
+ "qq", "{!notfoo}id_i1:[20 TO 39]",
"fq", "{!query v=$qq}"),
"//result[@numFound=20]");
assertEquals(20, CountUsageValueSourceParser.getAndClearCount("func_q_wrapping_fq"));
assertQ("frange in complex bq w/ other mandatory clauses to check skipping",
- req("q","{!notfoo}(+id:[20 TO 39] -id:25 +{!frange l=4.5 u=4.5 v='countUsage(frange_in_bq,4.5)'})"),
+ req("q","{!notfoo}(+id_i1:[20 TO 39] -id:25 +{!frange l=4.5 u=4.5 v='countUsage(frange_in_bq,4.5)'})"),
"//result[@numFound=19]");
// don't assume specific clause evaluation ordering.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java
index 592200d..b65863e 100644
--- a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java
+++ b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCloudSnapshots.java
@@ -305,4 +305,4 @@ public class TestSolrCloudSnapshots extends SolrCloudTestCase {
}
return result;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java
index 7a9b0bb..d508050 100644
--- a/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java
+++ b/solr/core/src/test/org/apache/solr/core/snapshots/TestSolrCoreSnapshots.java
@@ -309,4 +309,4 @@ public class TestSolrCoreSnapshots extends SolrCloudTestCase {
return Collections.emptyList();
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
index 8e9c170..6da06b1 100644
--- a/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java
@@ -86,19 +86,19 @@ public class MoreLikeThisHandlerTest extends SolrTestCaseJ4 {
SolrQueryRequest mltreq = new LocalSolrQueryRequest( core, params);
assertQ("morelikethis - tom cruise",mltreq
- ,"//result/doc[1]/int[@name='id'][.='46']"
- ,"//result/doc[2]/int[@name='id'][.='43']");
+ ,"//result/doc[1]/str[@name='id'][.='46']"
+ ,"//result/doc[2]/str[@name='id'][.='43']");
params.set(MoreLikeThisParams.BOOST, "true");
mltreq.close(); mltreq = new LocalSolrQueryRequest( core, params);
assertQ("morelikethis - tom cruise",mltreq
- ,"//result/doc[1]/int[@name='id'][.='46']"
- ,"//result/doc[2]/int[@name='id'][.='43']");
+ ,"//result/doc[1]/str[@name='id'][.='46']"
+ ,"//result/doc[2]/str[@name='id'][.='43']");
params.set(CommonParams.Q, "id:44");
mltreq.close(); mltreq = new LocalSolrQueryRequest(h.getCore(), params);
assertQ("morelike this - harrison ford",mltreq
- ,"//result/doc[1]/int[@name='id'][.='45']");
+ ,"//result/doc[1]/str[@name='id'][.='45']");
// test MoreLikeThis debug
params.set(CommonParams.DEBUG_QUERY, "true");
@@ -115,14 +115,14 @@ public class MoreLikeThisHandlerTest extends SolrTestCaseJ4 {
params.set(CommonParams.Q, "{!field f=id}44");
mltreq.close(); mltreq = new LocalSolrQueryRequest(h.getCore(), params);
assertQ(mltreq
- ,"//result/doc[1]/int[@name='id'][.='45']");
+ ,"//result/doc[1]/str[@name='id'][.='45']");
params.set(CommonParams.Q, "id:42");
params.set(MoreLikeThisParams.QF,"name^5.0 subword^0.1");
mltreq.close(); mltreq = new LocalSolrQueryRequest(h.getCore(), params);
assertQ("morelikethis with weights",mltreq
- ,"//result/doc[1]/int[@name='id'][.='43']"
- ,"//result/doc[2]/int[@name='id'][.='46']");
+ ,"//result/doc[1]/str[@name='id'][.='43']"
+ ,"//result/doc[2]/str[@name='id'][.='46']");
// test that qparser plugins work w/ the MoreLikeThisHandler
@@ -130,14 +130,14 @@ public class MoreLikeThisHandlerTest extends SolrTestCaseJ4 {
params.set(CommonParams.Q, "{!field f=id}44");
mltreq.close(); mltreq = new LocalSolrQueryRequest(h.getCore(), params);
assertQ(mltreq
- ,"//result/doc[1]/int[@name='id'][.='45']");
+ ,"//result/doc[1]/str[@name='id'][.='45']");
// test that debugging works (test for MoreLikeThis*Handler*)
params.set(CommonParams.QT, "/mlt");
params.set(CommonParams.DEBUG_QUERY, "true");
mltreq.close(); mltreq = new LocalSolrQueryRequest(h.getCore(), params);
assertQ(mltreq
- ,"//result/doc[1]/int[@name='id'][.='45']"
+ ,"//result/doc[1]/str[@name='id'][.='45']"
,"//lst[@name='debug']/lst[@name='explain']"
);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java
index 82e8cde..668fefd 100644
--- a/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java
@@ -49,16 +49,16 @@ public class StandardRequestHandlerTest extends AbstractSolrTestCase {
assertQ(req("q", "title:test", "sort","val_s1 asc")
,"//*[@numFound='3']"
- ,"//result/doc[1]/int[@name='id'][.='10']"
- ,"//result/doc[2]/int[@name='id'][.='11']"
- ,"//result/doc[3]/int[@name='id'][.='12']"
+ ,"//result/doc[1]/str[@name='id'][.='10']"
+ ,"//result/doc[2]/str[@name='id'][.='11']"
+ ,"//result/doc[3]/str[@name='id'][.='12']"
);
assertQ(req("q", "title:test", "sort","val_s1 desc")
,"//*[@numFound='3']"
- ,"//result/doc[1]/int[@name='id'][.='12']"
- ,"//result/doc[2]/int[@name='id'][.='11']"
- ,"//result/doc[3]/int[@name='id'][.='10']"
+ ,"//result/doc[1]/str[@name='id'][.='12']"
+ ,"//result/doc[2]/str[@name='id'][.='11']"
+ ,"//result/doc[3]/str[@name='id'][.='10']"
);
// Make sure score parsing works
@@ -73,16 +73,16 @@ public class StandardRequestHandlerTest extends AbstractSolrTestCase {
// Using legacy ';' param
assertQ(req("q", "title:test; val_s1 desc", "defType","lucenePlusSort")
,"//*[@numFound='3']"
- ,"//result/doc[1]/int[@name='id'][.='12']"
- ,"//result/doc[2]/int[@name='id'][.='11']"
- ,"//result/doc[3]/int[@name='id'][.='10']"
+ ,"//result/doc[1]/str[@name='id'][.='12']"
+ ,"//result/doc[2]/str[@name='id'][.='11']"
+ ,"//result/doc[3]/str[@name='id'][.='10']"
);
assertQ(req("q", "title:test; val_s1 asc", "defType","lucenePlusSort")
,"//*[@numFound='3']"
- ,"//result/doc[1]/int[@name='id'][.='10']"
- ,"//result/doc[2]/int[@name='id'][.='11']"
- ,"//result/doc[3]/int[@name='id'][.='12']"
+ ,"//result/doc[1]/str[@name='id'][.='10']"
+ ,"//result/doc[2]/str[@name='id'][.='11']"
+ ,"//result/doc[3]/str[@name='id'][.='12']"
);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java b/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
index 4889c90..78bdbe0 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
@@ -172,7 +172,7 @@ public class TestSQLHandler extends AbstractFullDistribZkTestBase {
assert(tuple.get("str_s").equals("a"));
//Assert field order
- assertResponseContains(clients.get(0), sParams, "{\"docs\":[{\"id\":8,\"field_i\":60,\"str_s\":\"c\"}");
+ assertResponseContains(clients.get(0), sParams, "{\"docs\":[{\"id\":\"8\",\"field_i\":60,\"str_s\":\"c\"}");
//Test unlimited unsorted result. Should sort on _version_ desc
sParams = mapParams(CommonParams.QT, "/sql", "stmt", "select id, field_i, str_s from collection1 where text='XXXX'");
@@ -375,7 +375,7 @@ public class TestSQLHandler extends AbstractFullDistribZkTestBase {
assertEquals(1, tuples.size());
Tuple tuple = tuples.get(0);
- assertEquals(1L, tuple.get("id"));
+ assertEquals("1", tuple.get("id"));
// Not Equals <>
sParams = mapParams(CommonParams.QT, "/sql",
@@ -387,19 +387,19 @@ public class TestSQLHandler extends AbstractFullDistribZkTestBase {
assertEquals(7, tuples.size());
tuple = tuples.get(0);
- assertEquals(2L, tuple.get("id"));
+ assertEquals("2", tuple.get("id"));
tuple = tuples.get(1);
- assertEquals(3L, tuple.get("id"));
+ assertEquals("3", tuple.get("id"));
tuple = tuples.get(2);
- assertEquals(4L, tuple.get("id"));
+ assertEquals("4", tuple.get("id"));
tuple = tuples.get(3);
- assertEquals(5L, tuple.get("id"));
+ assertEquals("5", tuple.get("id"));
tuple = tuples.get(4);
- assertEquals(6L, tuple.get("id"));
+ assertEquals("6", tuple.get("id"));
tuple = tuples.get(5);
- assertEquals(7L, tuple.get("id"));
+ assertEquals("7", tuple.get("id"));
tuple = tuples.get(6);
- assertEquals(8L, tuple.get("id"));
+ assertEquals("8", tuple.get("id"));
// TODO requires different Calcite SQL conformance level
// Not Equals !=
@@ -436,7 +436,7 @@ public class TestSQLHandler extends AbstractFullDistribZkTestBase {
assertEquals(1, tuples.size());
tuple = tuples.get(0);
- assertEquals(1L, tuple.get("id"));
+ assertEquals("1", tuple.get("id"));
// Less than equal
sParams = mapParams(CommonParams.QT, "/sql",
@@ -448,9 +448,9 @@ public class TestSQLHandler extends AbstractFullDistribZkTestBase {
assertEquals(2, tuples.size());
tuple = tuples.get(0);
- assertEquals(1L, tuple.get("id"));
+ assertEquals("1", tuple.get("id"));
tuple = tuples.get(1);
- assertEquals(2L, tuple.get("id"));
+ assertEquals("2", tuple.get("id"));
// Greater than
sParams = mapParams(CommonParams.QT, "/sql",
@@ -462,7 +462,7 @@ public class TestSQLHandler extends AbstractFullDistribZkTestBase {
assertEquals(1, tuples.size());
tuple = tuples.get(0);
- assertEquals(8L, tuple.get("id"));
+ assertEquals("8", tuple.get("id"));
// Greater than equal
sParams = mapParams(CommonParams.QT, "/sql",
@@ -474,9 +474,9 @@ public class TestSQLHandler extends AbstractFullDistribZkTestBase {
assertEquals(2, tuples.size());
tuple = tuples.get(0);
- assertEquals(7L, tuple.get("id"));
+ assertEquals("7", tuple.get("id"));
tuple = tuples.get(1);
- assertEquals(8L, tuple.get("id"));
+ assertEquals("8", tuple.get("id"));
} finally {
delete();
@@ -511,7 +511,7 @@ public class TestSQLHandler extends AbstractFullDistribZkTestBase {
assert(tuples.size() == 8);
Tuple tuple;
-
+
tuple = tuples.get(0);
assert(tuple.getLong("id") == 8);
assert(tuple.getLong("Field_i") == 60);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java
index 7062b43..fb7bd19 100644
--- a/solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java
@@ -90,7 +90,7 @@ public class XsltUpdateRequestHandlerTest extends SolrTestCaseJ4 {
assertQ("test document was correctly committed", req("q","*:*")
, "//result[@numFound='1']"
- , "//int[@name='id'][.='12345']"
+ , "//str[@name='id'][.='12345']"
);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/handler/admin/PropertiesRequestHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/PropertiesRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/PropertiesRequestHandlerTest.java
index 1a959a4..34ab7eb 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/PropertiesRequestHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/PropertiesRequestHandlerTest.java
@@ -70,4 +70,4 @@ public class PropertiesRequestHandlerTest extends SolrTestCaseJ4 {
return (NamedList<NamedList<NamedList<Object>>>)
parser.processResponse(new StringReader(xml)).get("system.properties");
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/handler/component/DistributedExpandComponentTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedExpandComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedExpandComponentTest.java
index 5ca527f..5633c46 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedExpandComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedExpandComponentTest.java
@@ -102,10 +102,10 @@ public class DistributedExpandComponentTest extends BaseDistributedSearchTestCas
QueryResponse rsp = queryServer(params);
Map<String, SolrDocumentList> results = rsp.getExpandedResults();
assertExpandGroups(results, "group1","group2", "group3", "group4");
- assertExpandGroupCountAndOrder("group1", 2, results, "1.0", "7.0");
- assertExpandGroupCountAndOrder("group2", 2, results, "5.0", "8.0");
- assertExpandGroupCountAndOrder("group3", 2, results, "11.0", "9.0");
- assertExpandGroupCountAndOrder("group4", 2, results, "12.0", "14.0");
+ assertExpandGroupCountAndOrder("group1", 2, results, "1", "7");
+ assertExpandGroupCountAndOrder("group2", 2, results, "5", "8");
+ assertExpandGroupCountAndOrder("group3", 2, results, "11", "9");
+ assertExpandGroupCountAndOrder("group4", 2, results, "12", "14");
//Test expand.sort
@@ -121,10 +121,10 @@ public class DistributedExpandComponentTest extends BaseDistributedSearchTestCas
rsp = queryServer(params);
results = rsp.getExpandedResults();
assertExpandGroups(results, "group1","group2", "group3", "group4");
- assertExpandGroupCountAndOrder("group1", 2, results, "7.0", "1.0");
- assertExpandGroupCountAndOrder("group2", 2, results, "8.0", "5.0");
- assertExpandGroupCountAndOrder("group3", 2, results, "9.0", "11.0");
- assertExpandGroupCountAndOrder("group4", 2, results, "14.0", "12.0");
+ assertExpandGroupCountAndOrder("group1", 2, results, "7", "1");
+ assertExpandGroupCountAndOrder("group2", 2, results, "8", "5");
+ assertExpandGroupCountAndOrder("group3", 2, results, "9", "11");
+ assertExpandGroupCountAndOrder("group4", 2, results, "14", "12");
//Test expand.rows
@@ -141,10 +141,10 @@ public class DistributedExpandComponentTest extends BaseDistributedSearchTestCas
rsp = queryServer(params);
results = rsp.getExpandedResults();
assertExpandGroups(results, "group1","group2", "group3", "group4");
- assertExpandGroupCountAndOrder("group1", 1, results, "7.0");
- assertExpandGroupCountAndOrder("group2", 1, results, "8.0");
- assertExpandGroupCountAndOrder("group3", 1, results, "9.0");
- assertExpandGroupCountAndOrder("group4", 1, results, "14.0");
+ assertExpandGroupCountAndOrder("group1", 1, results, "7");
+ assertExpandGroupCountAndOrder("group2", 1, results, "8");
+ assertExpandGroupCountAndOrder("group3", 1, results, "9");
+ assertExpandGroupCountAndOrder("group4", 1, results, "14");
//Test key-only fl
@@ -161,10 +161,10 @@ public class DistributedExpandComponentTest extends BaseDistributedSearchTestCas
rsp = queryServer(params);
results = rsp.getExpandedResults();
assertExpandGroups(results, "group1","group2", "group3", "group4");
- assertExpandGroupCountAndOrder("group1", 2, results, "1.0", "7.0");
- assertExpandGroupCountAndOrder("group2", 2, results, "5.0", "8.0");
- assertExpandGroupCountAndOrder("group3", 2, results, "11.0", "9.0");
- assertExpandGroupCountAndOrder("group4", 2, results, "12.0", "14.0");
+ assertExpandGroupCountAndOrder("group1", 2, results, "1", "7");
+ assertExpandGroupCountAndOrder("group2", 2, results, "5", "8");
+ assertExpandGroupCountAndOrder("group3", 2, results, "11", "9");
+ assertExpandGroupCountAndOrder("group4", 2, results, "12", "14");
//Test distrib.singlePass true
@@ -180,10 +180,10 @@ public class DistributedExpandComponentTest extends BaseDistributedSearchTestCas
rsp = queryServer(params);
results = rsp.getExpandedResults();
assertExpandGroups(results, "group1","group2", "group3", "group4");
- assertExpandGroupCountAndOrder("group1", 2, results, "1.0", "7.0");
- assertExpandGroupCountAndOrder("group2", 2, results, "5.0", "8.0");
- assertExpandGroupCountAndOrder("group3", 2, results, "11.0", "9.0");
- assertExpandGroupCountAndOrder("group4", 2, results, "12.0", "14.0");
+ assertExpandGroupCountAndOrder("group1", 2, results, "1", "7");
+ assertExpandGroupCountAndOrder("group2", 2, results, "5", "8");
+ assertExpandGroupCountAndOrder("group3", 2, results, "11", "9");
+ assertExpandGroupCountAndOrder("group4", 2, results, "12", "14");
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.java
index 10116b9..157d6a7 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.java
@@ -140,28 +140,28 @@ public class DistributedMLTComponentTest extends BaseDistributedSearchTestCase {
// we ask for an mlt.count of 20 to ensure both include all results
query("q", "lowerfilt:moon", "fl", id, MoreLikeThisParams.MIN_TERM_FREQ, 2,
- MoreLikeThisParams.MIN_DOC_FREQ, 1, "sort", "id desc", "mlt", "true",
+ MoreLikeThisParams.MIN_DOC_FREQ, 1, "sort", "id_i1 desc", "mlt", "true",
"mlt.fl", "lowerfilt", "qt", requestHandlerName, "shards.qt",
requestHandlerName, "mlt.count", "20");
query("q", "lowerfilt:fox", "fl", id, MoreLikeThisParams.MIN_TERM_FREQ, 1,
- MoreLikeThisParams.MIN_DOC_FREQ, 1, "sort", "id desc", "mlt", "true",
+ MoreLikeThisParams.MIN_DOC_FREQ, 1, "sort", "id_i1 desc", "mlt", "true",
"mlt.fl", "lowerfilt", "qt", requestHandlerName, "shards.qt",
requestHandlerName, "mlt.count", "20");
query("q", "lowerfilt:the red fox", "fl", id, MoreLikeThisParams.MIN_TERM_FREQ, 1,
- MoreLikeThisParams.MIN_DOC_FREQ, 1, "sort", "id desc", "mlt", "true",
+ MoreLikeThisParams.MIN_DOC_FREQ, 1, "sort", "id_i1 desc", "mlt", "true",
"mlt.fl", "lowerfilt", "qt", requestHandlerName, "shards.qt",
requestHandlerName, "mlt.count", "20");
query("q", "lowerfilt:blue moon", "fl", id, MoreLikeThisParams.MIN_TERM_FREQ, 1,
- MoreLikeThisParams.MIN_DOC_FREQ, 1, "sort", "id desc", "mlt", "true",
+ MoreLikeThisParams.MIN_DOC_FREQ, 1, "sort", "id_i1 desc", "mlt", "true",
"mlt.fl", "lowerfilt", "qt", requestHandlerName, "shards.qt",
requestHandlerName, "mlt.count", "20");
// let's query by specifying multiple mlt.fl as comma-separated values
QueryResponse response = query("q", "lowerfilt:moon", "fl", id, MoreLikeThisParams.MIN_TERM_FREQ, 2,
- MoreLikeThisParams.MIN_DOC_FREQ, 1, "sort", "id desc", "mlt", "true",
+ MoreLikeThisParams.MIN_DOC_FREQ, 1, "sort", "id_i1 desc", "mlt", "true",
"mlt.fl", "lowerfilt1,lowerfilt", "qt", requestHandlerName, "shards.qt",
requestHandlerName, "mlt.count", "20");
NamedList<Object> moreLikeThis = (NamedList<Object>) response.getResponse().get("moreLikeThis");
@@ -173,7 +173,7 @@ public class DistributedMLTComponentTest extends BaseDistributedSearchTestCase {
// let's query by specifying multiple mlt.fl as multiple request parameters
response = query("q", "lowerfilt:moon", "fl", id, MoreLikeThisParams.MIN_TERM_FREQ, 2,
- MoreLikeThisParams.MIN_DOC_FREQ, 1, "sort", "id desc", "mlt", "true",
+ MoreLikeThisParams.MIN_DOC_FREQ, 1, "sort", "id_i1 desc", "mlt", "true",
"mlt.fl", "lowerfilt1", "mlt.fl", "lowerfilt", "qt", requestHandlerName, "shards.qt",
requestHandlerName, "mlt.count", "20");
moreLikeThis = (NamedList<Object>) response.getResponse().get("moreLikeThis");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/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/625b1cba/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 960021e..7006716 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
@@ -120,7 +120,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]"));
}