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/14 02:03:10 UTC
[34/35] lucene-solr:jira/SOLR-10834: more manual cleanup of tests
that had implicit/explicit assumptions that id field was numeric
more manual cleanup of tests that had implicit/explicit assumptions that id field was numeric
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/05e8e226
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/05e8e226
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/05e8e226
Branch: refs/heads/jira/SOLR-10834
Commit: 05e8e226de359a6d7bc99219eaec161a32268f17
Parents: 6dce948
Author: Chris Hostetter <ho...@apache.org>
Authored: Tue Jun 13 16:24:49 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Tue Jun 13 16:24:49 2017 -0700
----------------------------------------------------------------------
.../solr/collection1/conf/schema-docValues.xml | 3 +
.../apache/solr/TestDistributedGrouping.java | 18 +++---
.../org/apache/solr/TestDistributedSearch.java | 20 +++---
.../solr/cloud/BasicDistributedZk2Test.java | 8 +--
.../solr/cloud/BasicDistributedZkTest.java | 10 +--
.../test/org/apache/solr/core/SOLR749Test.java | 12 ++--
.../org/apache/solr/handler/TestSQLHandler.java | 32 ++++-----
.../DistributedExpandComponentTest.java | 40 ++++++------
.../component/DistributedMLTComponentTest.java | 12 ++--
.../DistributedQueryElevationComponentTest.java | 4 +-
.../org/apache/solr/schema/DocValuesTest.java | 68 ++++++++++----------
.../solr/search/TestCollapseQParserPlugin.java | 62 +++++++++---------
.../org/apache/solr/search/TestRangeQuery.java | 4 +-
.../solr/search/TestReRankQParserPlugin.java | 2 +-
14 files changed, 149 insertions(+), 146 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/05e8e226/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml b/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml
index b7e24c7..0216791 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml
@@ -54,6 +54,9 @@
<field name="id" type="string" required="true"/>
+ <!-- int varient of id, adding this here simplifies some indexing to do numeric sorting -->
+ <field name="id_i" type="int" indexed="true" stored="true" multiValued="false" />
+ <copyField source="id" dest="id_i" />
<field name="floatdv" type="float" indexed="false" stored="false" docValues="true" default="1"/>
<field name="intdv" type="int" indexed="false" stored="false" docValues="true" default="2"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/05e8e226/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/05e8e226/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 fc48847..cde3296 100644
--- a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
+++ b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
@@ -242,7 +242,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",
@@ -390,7 +390,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
@@ -412,7 +412,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");
@@ -522,7 +522,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");
@@ -920,20 +920,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/05e8e226/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 c8e92fc..02692a0 100644
--- a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
+++ b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
@@ -463,10 +463,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/05e8e226/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 18caa58..3ed6f74 100644
--- a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
@@ -271,7 +271,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"});
@@ -321,10 +321,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/05e8e226/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/05e8e226/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/05e8e226/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/05e8e226/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/05e8e226/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/05e8e226/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java b/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
index 43d07c5..43c0006 100644
--- a/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
@@ -366,13 +366,13 @@ public class DocValuesTest extends SolrTestCaseJ4 {
assertU(commit());
// string: termquery
- assertQ(req("q", "stringdv:car", "sort", "id asc"),
+ assertQ(req("q", "stringdv:car", "sort", "id_i asc"),
"//*[@numFound='1']",
"//result/doc[1]/str[@name='id'][.=4]"
);
// string: range query
- assertQ(req("q", "stringdv:[b TO d]", "sort", "id asc"),
+ assertQ(req("q", "stringdv:[b TO d]", "sort", "id_i asc"),
"//*[@numFound='3']",
"//result/doc[1]/str[@name='id'][.=1]",
"//result/doc[2]/str[@name='id'][.=3]",
@@ -380,33 +380,33 @@ public class DocValuesTest extends SolrTestCaseJ4 {
);
// string: prefix query
- assertQ(req("q", "stringdv:c*", "sort", "id asc"),
+ assertQ(req("q", "stringdv:c*", "sort", "id_i asc"),
"//*[@numFound='2']",
"//result/doc[1]/str[@name='id'][.=3]",
"//result/doc[2]/str[@name='id'][.=4]"
);
// string: wildcard query
- assertQ(req("q", "stringdv:c?r", "sort", "id asc"),
+ assertQ(req("q", "stringdv:c?r", "sort", "id_i asc"),
"//*[@numFound='1']",
"//result/doc[1]/str[@name='id'][.=4]"
);
// string: regexp query
- assertQ(req("q", "stringdv:/c[a-b]r/", "sort", "id asc"),
+ assertQ(req("q", "stringdv:/c[a-b]r/", "sort", "id_i asc"),
"//*[@numFound='1']",
"//result/doc[1]/str[@name='id'][.=4]"
);
// float: termquery
- assertQ(req("q", "floatdv:3", "sort", "id asc"),
+ assertQ(req("q", "floatdv:3", "sort", "id_i asc"),
"//*[@numFound='2']",
"//result/doc[1]/str[@name='id'][.=3]",
"//result/doc[2]/str[@name='id'][.=4]"
);
// float: rangequery
- assertQ(req("q", "floatdv:[2 TO 3]", "sort", "id asc"),
+ assertQ(req("q", "floatdv:[2 TO 3]", "sort", "id_i asc"),
"//*[@numFound='3']",
"//result/doc[1]/str[@name='id'][.=1]",
"//result/doc[2]/str[@name='id'][.=3]",
@@ -414,59 +414,59 @@ public class DocValuesTest extends SolrTestCaseJ4 {
);
// (neg) float: termquery
- assertQ(req("q", "floatdv:\"-5\"", "sort", "id asc"),
+ assertQ(req("q", "floatdv:\"-5\"", "sort", "id_i asc"),
"//*[@numFound='1']",
"//result/doc[1]/str[@name='id'][.=2]"
);
// (neg) float: rangequery
- assertQ(req("q", "floatdv:[-6 TO -4]", "sort", "id asc"),
+ assertQ(req("q", "floatdv:[-6 TO -4]", "sort", "id_i asc"),
"//*[@numFound='1']",
"//result/doc[1]/str[@name='id'][.=2]"
);
// (cross zero bounds) float: rangequery
- assertQ(req("q", "floatdv:[-6 TO 2.1]", "sort", "id asc"),
+ assertQ(req("q", "floatdv:[-6 TO 2.1]", "sort", "id_i asc"),
"//*[@numFound='2']",
"//result/doc[1]/str[@name='id'][.=1]",
"//result/doc[2]/str[@name='id'][.=2]"
);
// int: termquery
- assertQ(req("q", "intdv:1", "sort", "id asc"),
+ assertQ(req("q", "intdv:1", "sort", "id_i asc"),
"//*[@numFound='1']",
"//result/doc[1]/str[@name='id'][.=3]"
);
// int: rangequery
- assertQ(req("q", "intdv:[3 TO 4]", "sort", "id asc"),
+ assertQ(req("q", "intdv:[3 TO 4]", "sort", "id_i asc"),
"//*[@numFound='2']",
"//result/doc[1]/str[@name='id'][.=1]",
"//result/doc[2]/str[@name='id'][.=2]"
);
// (neg) int: termquery
- assertQ(req("q", "intdv:\"-1\"", "sort", "id asc"),
+ assertQ(req("q", "intdv:\"-1\"", "sort", "id_i asc"),
"//*[@numFound='1']",
"//result/doc[1]/str[@name='id'][.=4]"
);
// (neg) int: rangequery
- assertQ(req("q", "intdv:[-1 TO 1]", "sort", "id asc"),
+ assertQ(req("q", "intdv:[-1 TO 1]", "sort", "id_i asc"),
"//*[@numFound='2']",
"//result/doc[1]/str[@name='id'][.=3]",
"//result/doc[2]/str[@name='id'][.=4]"
);
// long: termquery
- assertQ(req("q", "longdv:1", "sort", "id asc"),
+ assertQ(req("q", "longdv:1", "sort", "id_i asc"),
"//*[@numFound='2']",
"//result/doc[1]/str[@name='id'][.=3]",
"//result/doc[2]/str[@name='id'][.=4]"
);
// long: rangequery
- assertQ(req("q", "longdv:[1 TO 2]", "sort", "id asc"),
+ assertQ(req("q", "longdv:[1 TO 2]", "sort", "id_i asc"),
"//*[@numFound='3']",
"//result/doc[1]/str[@name='id'][.=2]",
"//result/doc[2]/str[@name='id'][.=3]",
@@ -474,45 +474,45 @@ public class DocValuesTest extends SolrTestCaseJ4 {
);
// double: termquery
- assertQ(req("q", "doubledv:3.1", "sort", "id asc"),
+ assertQ(req("q", "doubledv:3.1", "sort", "id_i asc"),
"//*[@numFound='1']",
"//result/doc[1]/str[@name='id'][.=1]"
);
// double: rangequery
- assertQ(req("q", "doubledv:[2 TO 3.3]", "sort", "id asc"),
+ assertQ(req("q", "doubledv:[2 TO 3.3]", "sort", "id_i asc"),
"//*[@numFound='2']",
"//result/doc[1]/str[@name='id'][.=1]",
"//result/doc[2]/str[@name='id'][.=3]"
);
// (neg) double: termquery
- assertQ(req("q", "doubledv:\"-4.3\"", "sort", "id asc"),
+ assertQ(req("q", "doubledv:\"-4.3\"", "sort", "id_i asc"),
"//*[@numFound='1']",
"//result/doc[1]/str[@name='id'][.=2]"
);
// (neg) double: rangequery
- assertQ(req("q", "doubledv:[-6 TO -4]", "sort", "id asc"),
+ assertQ(req("q", "doubledv:[-6 TO -4]", "sort", "id_i asc"),
"//*[@numFound='1']",
"//result/doc[1]/str[@name='id'][.=2]"
);
// (cross zero bounds) double: rangequery
- assertQ(req("q", "doubledv:[-6 TO 2.0]", "sort", "id asc"),
+ assertQ(req("q", "doubledv:[-6 TO 2.0]", "sort", "id_i asc"),
"//*[@numFound='2']",
"//result/doc[1]/str[@name='id'][.=2]",
"//result/doc[2]/str[@name='id'][.=4]"
);
// boolean basic queries:
- assertQ(req("q", "booldv:false", "sort", "id asc"),
+ assertQ(req("q", "booldv:false", "sort", "id_i asc"),
"//*[@numFound='2']",
"//result/doc[1]/str[@name='id'][.=1]",
"//result/doc[2]/str[@name='id'][.=3]"
);
- assertQ(req("q", "booldv:true", "sort", "id asc"),
+ assertQ(req("q", "booldv:true", "sort", "id_i asc"),
"//*[@numFound='2']",
"//result/doc[1]/str[@name='id'][.=2]",
"//result/doc[2]/str[@name='id'][.=4]"
@@ -630,7 +630,7 @@ public class DocValuesTest extends SolrTestCaseJ4 {
}
log.info("Expected: "+tests);
assertQ(req("q", fieldName[i] + ":" + (minInclusive? '[': '{') + min + " TO " + max + (maxInclusive? ']': '}'),
- "sort", "id asc", "fl", "id,"+fieldName[i]+",score"),
+ "sort", "id_i asc", "fl", "id,"+fieldName[i]+",score"),
testsArr);
}
}
@@ -654,20 +654,20 @@ public class DocValuesTest extends SolrTestCaseJ4 {
assertU(commit());
// Negative Zero to Positive
- assertQ(req("q", fieldName[i]+":[-0.0 TO 2.5]", "sort", "id asc", "fl", "id,"+fieldName[i]+",score"),
+ assertQ(req("q", fieldName[i]+":[-0.0 TO 2.5]", "sort", "id_i asc", "fl", "id,"+fieldName[i]+",score"),
"//*[@numFound='1']",
"//result/doc[1]/str[@name='id'][.=1]"
);
// Negative to Positive Zero
- assertQ(req("q", fieldName[i]+":[-6 TO 0]", "sort", "id asc", "fl", "id,"+fieldName[i]+",score"),
+ assertQ(req("q", fieldName[i]+":[-6 TO 0]", "sort", "id_i asc", "fl", "id,"+fieldName[i]+",score"),
"//*[@numFound='2']",
"//result/doc[1]/str[@name='id'][.=2]",
"//result/doc[2]/str[@name='id'][.=5]"
);
// Negative to Positive
- assertQ(req("q", fieldName[i]+":[-6 TO 2.5]", "sort", "id asc", "fl", "id,"+fieldName[i]+",score"),
+ assertQ(req("q", fieldName[i]+":[-6 TO 2.5]", "sort", "id_i asc", "fl", "id,"+fieldName[i]+",score"),
"//*[@numFound='3']",
"//result/doc[1]/str[@name='id'][.=1]",
"//result/doc[2]/str[@name='id'][.=2]",
@@ -675,7 +675,7 @@ public class DocValuesTest extends SolrTestCaseJ4 {
);
// Positive to Positive
- assertQ(req("q", fieldName[i]+":[2 TO 3]", "sort", "id asc", "fl", "id,"+fieldName[i]+",score"),
+ assertQ(req("q", fieldName[i]+":[2 TO 3]", "sort", "id_i asc", "fl", "id,"+fieldName[i]+",score"),
"//*[@numFound='3']",
"//result/doc[1]/str[@name='id'][.=1]",
"//result/doc[2]/str[@name='id'][.=3]",
@@ -683,7 +683,7 @@ public class DocValuesTest extends SolrTestCaseJ4 {
);
// Positive to POSITIVE_INF
- assertQ(req("q", fieldName[i]+":[2 TO *]", "sort", "id asc", "fl", "id,"+fieldName[i]+",score"),
+ assertQ(req("q", fieldName[i]+":[2 TO *]", "sort", "id_i asc", "fl", "id,"+fieldName[i]+",score"),
"//*[@numFound='4']",
"//result/doc[1]/str[@name='id'][.=1]",
"//result/doc[2]/str[@name='id'][.=3]",
@@ -692,14 +692,14 @@ public class DocValuesTest extends SolrTestCaseJ4 {
);
// NEGATIVE_INF to Negative
- assertQ(req("q", fieldName[i]+":[* TO -1]", "sort", "id asc", "fl", "id,"+fieldName[i]+",score"),
+ assertQ(req("q", fieldName[i]+":[* TO -1]", "sort", "id_i asc", "fl", "id,"+fieldName[i]+",score"),
"//*[@numFound='2']",
"//result/doc[1]/str[@name='id'][.=2]",
"//result/doc[2]/str[@name='id'][.=6]"
);
// NEGATIVE_INF to Positive
- assertQ(req("q", fieldName[i]+":[* TO 2]", "sort", "id asc", "fl", "id,"+fieldName[i]),
+ assertQ(req("q", fieldName[i]+":[* TO 2]", "sort", "id_i asc", "fl", "id,"+fieldName[i]),
"//*[@numFound='4']",
"//result/doc[1]/str[@name='id'][.=1]",
"//result/doc[2]/str[@name='id'][.=2]",
@@ -708,7 +708,7 @@ public class DocValuesTest extends SolrTestCaseJ4 {
);
// NEGATIVE_INF to Positive (non-inclusive)
- assertQ(req("q", fieldName[i]+":[* TO 2}", "sort", "id asc", "fl", "id,"+fieldName[i]),
+ assertQ(req("q", fieldName[i]+":[* TO 2}", "sort", "id_i asc", "fl", "id,"+fieldName[i]),
"//*[@numFound='3']",
"//result/doc[1]/str[@name='id'][.=2]",
"//result/doc[2]/str[@name='id'][.=5]",
@@ -716,7 +716,7 @@ public class DocValuesTest extends SolrTestCaseJ4 {
);
// Negative to POSITIVE_INF
- assertQ(req("q", fieldName[i]+":[-6 TO *]", "sort", "id asc", "fl", "id,"+fieldName[i]),
+ assertQ(req("q", fieldName[i]+":[-6 TO *]", "sort", "id_i asc", "fl", "id,"+fieldName[i]),
"//*[@numFound='6']",
"//result/doc[1]/str[@name='id'][.=1]",
"//result/doc[2]/str[@name='id'][.=2]",
@@ -727,7 +727,7 @@ public class DocValuesTest extends SolrTestCaseJ4 {
);
// NEGATIVE_INF to POSITIVE_INF
- assertQ(req("q", fieldName[i]+":[* TO *]", "sort", "id asc", "fl", "id,"+fieldName[i]+",score"),
+ assertQ(req("q", fieldName[i]+":[* TO *]", "sort", "id_i asc", "fl", "id,"+fieldName[i]+",score"),
"//*[@numFound='7']",
"//result/doc[1]/str[@name='id'][.=1]",
"//result/doc[2]/str[@name='id'][.=2]",
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/05e8e226/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
index 9b98dba..087c7e1 100644
--- a/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java
@@ -70,7 +70,7 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params = new ModifiableSolrParams();
params.add("q", "*:*");
params.add("fq", "{!collapse field=group_s sort=$sort}");
- params.add("sort", "test_i asc, test_l desc, id desc");
+ params.add("sort", "test_i asc, test_l desc, id_i desc");
assertQ(req(params)
, "*[count(//doc)=2]"
,"//result/doc[1]/str[@name='id'][.='7']"
@@ -80,8 +80,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
// group heads are selected using a complex sort, simpler sort used for final groups
params = new ModifiableSolrParams();
params.add("q", "*:*");
- params.add("fq", "{!collapse field=group_s sort='test_i asc, test_l desc, id desc'}");
- params.add("sort", "id asc");
+ params.add("fq", "{!collapse field=group_s sort='test_i asc, test_l desc, id_i desc'}");
+ params.add("sort", "id_i asc");
assertQ(req(params)
, "*[count(//doc)=2]"
,"//result/doc[1]/str[@name='id'][.='3']"
@@ -91,8 +91,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
// diff up the sort directions, only first clause matters with our data
params = new ModifiableSolrParams();
params.add("q", "*:*");
- params.add("fq", "{!collapse field=group_s sort='test_i desc, test_l asc, id asc'}");
- params.add("sort", "id desc");
+ params.add("fq", "{!collapse field=group_s sort='test_i desc, test_l asc, id_i asc'}");
+ params.add("sort", "id_i desc");
assertQ(req(params)
, "*[count(//doc)=2]"
,"//result/doc[1]/str[@name='id'][.='8']"
@@ -103,7 +103,7 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params = new ModifiableSolrParams();
params.add("q", "*:*");
params.add("fq", "{!collapse field=group_s sort='test_l desc'}");
- params.add("sort", "id desc");
+ params.add("sort", "id_i desc");
assertQ(req(params)
, "*[count(//doc)=2]"
,"//result/doc[1]/str[@name='id'][.='6']"
@@ -113,7 +113,7 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
// score, then tiebreakers; note top level sort by score ASCENDING (just for weirdness)
params = new ModifiableSolrParams();
params.add("q", "*:* term_s:YYYY");
- params.add("fq", "{!collapse field=group_s sort='score desc, test_l desc, test_i asc, id asc'}");
+ params.add("fq", "{!collapse field=group_s sort='score desc, test_l desc, test_i asc, id_i asc'}");
params.add("sort", "score asc");
assertQ(req(params)
, "*[count(//doc)=2]"
@@ -124,8 +124,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
// score, then tiebreakers; note no score in top level sort/fl to check needsScores logic
params = new ModifiableSolrParams();
params.add("q", "*:* term_s:YYYY");
- params.add("fq", "{!collapse field=group_s sort='score desc, test_l desc, test_i asc, id asc'}");
- params.add("sort", "id desc");
+ params.add("fq", "{!collapse field=group_s sort='score desc, test_l desc, test_i asc, id_i asc'}");
+ params.add("sort", "id_i desc");
assertQ(req(params)
, "*[count(//doc)=2]"
,"//result/doc[1]/str[@name='id'][.='5']"
@@ -136,7 +136,7 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params = new ModifiableSolrParams();
params.add("q", "*:*");
params.add("fq", "{!collapse field=group_s sort='term_s desc, test_l asc'}");
- params.add("sort", "id asc");
+ params.add("sort", "id_i asc");
assertQ(req(params)
, "*[count(//doc)=2]"
,"//result/doc[1]/str[@name='id'][.='1']"
@@ -147,7 +147,7 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params = new ModifiableSolrParams();
params.add("q", "*:*");
params.add("fq", "{!collapse field=group_s sort='term_s asc, test_l asc'}");
- params.add("sort", "id asc");
+ params.add("sort", "id_i asc");
assertQ(req(params)
, "*[count(//doc)=2]"
,"//result/doc[1]/str[@name='id'][.='1']"
@@ -158,7 +158,7 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params = new ModifiableSolrParams();
params.add("q", "*:*");
params.add("fq", "{!collapse field=test_i sort='term_s asc, group_s asc'}");
- params.add("sort", "id asc");
+ params.add("sort", "id_i asc");
assertQ(req(params)
, "*[count(//doc)=2]"
,"//result/doc[1]/str[@name='id'][.='4']"
@@ -168,8 +168,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
// collapse on term_s (very sparse) with nullPolicy=collapse
params = new ModifiableSolrParams();
params.add("q", "*:*");
- params.add("fq", "{!collapse field=term_s nullPolicy=collapse sort='test_i asc, test_l desc, id asc'}");
- params.add("sort", "test_l asc, id asc");
+ params.add("fq", "{!collapse field=term_s nullPolicy=collapse sort='test_i asc, test_l desc, id_i asc'}");
+ params.add("sort", "test_l asc, id_i asc");
assertQ(req(params)
, "*[count(//doc)=3]"
,"//result/doc[1]/str[@name='id'][.='5']"
@@ -184,7 +184,7 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "test_l asc");
params.add("qt", "/elevate");
params.add("forceElevation", "true");
- params.add("elevateIds", "4.0");
+ params.add("elevateIds", "4");
assertQ(req(params),
"*[count(//doc)=2]",
"//result/doc[1]/str[@name='id'][.='4']",
@@ -196,7 +196,7 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("sort", "test_l asc");
params.add("qt", "/elevate");
params.add("forceElevation", "true");
- params.add("elevateIds", "7.0");
+ params.add("elevateIds", "7");
assertQ(req(params),
"*[count(//doc)=2]",
"//result/doc[1]/str[@name='id'][.='7']",
@@ -427,7 +427,7 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("defType", "edismax");
params.add("bf", "field(test_i)");
params.add("fl", "id");
- params.add("sort", "id desc");
+ params.add("sort", "id_i desc");
assertQ(req(params), "*[count(//doc)=3]",
"//result/doc[1]/str[@name='id'][.='5']",
"//result/doc[2]/str[@name='id'][.='4']",
@@ -532,7 +532,7 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params = new ModifiableSolrParams();
params.add("q", "*:*");
params.add("fq", "{!collapse field="+group+" nullPolicy=collapse sort='term_s asc, test_i asc' "+hint+"}");
- params.add("sort", "id desc");
+ params.add("sort", "id_i desc");
assertQ(req(params),
"*[count(//doc)=3]",
"//result/doc[1]/str[@name='id'][.='5']",
@@ -543,7 +543,7 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params = new ModifiableSolrParams();
params.add("q", "*:*");
params.add("fq", "{!collapse field="+group+" nullPolicy=collapse sort='term_s asc, test_i desc' "+hint+"}");
- params.add("sort", "id desc");
+ params.add("sort", "id_i desc");
assertQ(req(params),
"*[count(//doc)=3]",
"//result/doc[1]/str[@name='id'][.='6']",
@@ -559,7 +559,7 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params = new ModifiableSolrParams();
params.add("q", "*:*");
params.add("fq", "{!collapse field="+group + min + hint+"}");
- params.add("sort", "id desc");
+ params.add("sort", "id_i desc");
assertQ(req(params),
"*[count(//doc)=2]",
"//result/doc[1]/str[@name='id'][.='5']",
@@ -568,7 +568,7 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params = new ModifiableSolrParams();
params.add("q", "*:*");
params.add("fq", "{!collapse field="+group + min + hint+"}");
- params.add("sort", "id asc");
+ params.add("sort", "id_i asc");
assertQ(req(params),
"*[count(//doc)=2]",
"//result/doc[1]/str[@name='id'][.='1']",
@@ -577,7 +577,7 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params = new ModifiableSolrParams();
params.add("q", "*:*");
params.add("fq", "{!collapse field="+group + min + hint+"}");
- params.add("sort", "test_l asc,id desc");
+ params.add("sort", "test_l asc,id_i desc");
assertQ(req(params),
"*[count(//doc)=2]",
"//result/doc[1]/str[@name='id'][.='5']",
@@ -586,9 +586,9 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params = new ModifiableSolrParams();
params.add("q", "*:*");
params.add("fq", "{!collapse field="+group + min + hint+"}");
- params.add("sort", "score desc,id asc");
+ params.add("sort", "score desc,id_i asc");
params.add("defType", "edismax");
- params.add("bf", "field(id)");
+ params.add("bf", "field(id_i)");
assertQ(req(params),
"*[count(//doc)=2]",
"//result/doc[1]/str[@name='id'][.='5']",
@@ -655,7 +655,7 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params.add("q", "*:*");
params.add("fq", "{!collapse field="+group+" max=test_f"+hint+"}");
params.add("defType", "edismax");
- params.add("bf", "field(id)");
+ params.add("bf", "field(id_i)");
params.add("fl", "score, id");
params.add("facet","true");
params.add("fq", "{!tag=test}term_s:YYYY");
@@ -690,8 +690,8 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
// attempting to use cscore() in sort local param should fail
assertQEx("expected error trying to sort on a function that includes cscore()",
- req(params("q", "{!func}sub(sub(test_l,1000),id)",
- "fq", "{!collapse field="+group+" sort='abs(cscore()) asc, id asc'}",
+ req(params("q", "{!func}sub(sub(test_l,1000),id_i)",
+ "fq", "{!collapse field="+group+" sort='abs(cscore()) asc, id_i asc'}",
"sort", "score asc")),
SolrException.ErrorCode.BAD_REQUEST);
@@ -728,7 +728,7 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params = new ModifiableSolrParams();
params.add("q", "*:*");
params.add("fq", "{!collapse field="+group+" max=test_f nullPolicy=expand"+hint+"}");
- params.add("sort", "id desc");
+ params.add("sort", "id_i desc");
assertQ(req(params), "*[count(//doc)=4]",
"//result/doc[1]/str[@name='id'][.='5']",
"//result/doc[2]/str[@name='id'][.='4']",
@@ -739,7 +739,7 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
params = new ModifiableSolrParams();
params.add("q", "*:*");
params.add("fq", "{!collapse field="+group+" max=test_f nullPolicy=collapse"+hint+"}");
- params.add("sort", "id desc");
+ params.add("sort", "id_i desc");
assertQ(req(params), "*[count(//doc)=3]",
"//result/doc[1]/str[@name='id'][.='5']",
"//result/doc[2]/str[@name='id'][.='4']",
@@ -850,14 +850,14 @@ public class TestCollapseQParserPlugin extends SolrTestCaseJ4 {
// w/default nullPolicy, no groups found
params = new ModifiableSolrParams();
params.add("q", "*:*");
- params.add("sort", "id desc");
+ params.add("sort", "id_i desc");
params.add("fq", "{!collapse "+group+" "+selector+"}");
assertQ(req(params), "*[count(//doc)=0]");
// w/nullPolicy=expand, every doc found
params = new ModifiableSolrParams();
params.add("q", "*:*");
- params.add("sort", "id desc");
+ params.add("sort", "id_i desc");
params.add("fq", "{!collapse field="+group+" nullPolicy=expand "+selector+"}");
assertQ(req(params)
, "*[count(//doc)=8]"
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/05e8e226/solr/core/src/test/org/apache/solr/search/TestRangeQuery.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestRangeQuery.java b/solr/core/src/test/org/apache/solr/search/TestRangeQuery.java
index 0ba716d..959386a 100644
--- a/solr/core/src/test/org/apache/solr/search/TestRangeQuery.java
+++ b/solr/core/src/test/org/apache/solr/search/TestRangeQuery.java
@@ -135,8 +135,8 @@ public class TestRangeQuery extends SolrTestCaseJ4 {
// simple test of a function rather than just the field
assertQ(req("{!frange l=0 u=2}id"), "*[count(//doc)=3]");
- assertQ(req("{!frange l=0 u=2}product(id,2)"), "*[count(//doc)=2]");
- assertQ(req("{!frange l=100 u=102}sum(id,100)"), "*[count(//doc)=3]");
+ assertQ(req("{!frange l=0 u=2}product(id_i,2)"), "*[count(//doc)=2]");
+ assertQ(req("{!frange l=100 u=102}sum(id_i,100)"), "*[count(//doc)=3]");
for (Map.Entry<String,String[]> entry : norm_fields.entrySet()) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/05e8e226/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
index 9b038ca..0fd1a4a 100644
--- a/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
@@ -441,7 +441,7 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
params = new ModifiableSolrParams();
params.add("rq", "{!"+ReRankQParserPlugin.NAME+" "+ReRankQParserPlugin.RERANK_QUERY+"=$rqq "+ReRankQParserPlugin.RERANK_DOCS+"=6}");
// function query for predictible scores (relative to id) independent of similarity
- params.add("q", "{!func}id");
+ params.add("q", "{!func}id_i");
// constant score for each clause (unique per doc) for predictible scores independent of similarity
// NOTE: biased in favor of doc id == 2
params.add("rqq", "id:1^=10 id:2^=40 id:3^=30 id:4^=40 id:5^=50 id:6^=60");