You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2017/07/14 20:40:54 UTC
[1/3] lucene-solr:master: SOLR-10796: fix test bugs when
RANDOM_MULTIPLIER > 1
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7_0 60fd4f291 -> 034549789
refs/heads/branch_7x b22a28d25 -> 001e7383d
refs/heads/master 65cc88de7 -> 4cb74a50e
SOLR-10796: fix test bugs when RANDOM_MULTIPLIER > 1
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4cb74a50
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4cb74a50
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4cb74a50
Branch: refs/heads/master
Commit: 4cb74a50ef8a3386a436e69da6f9cd80fe4d746d
Parents: 65cc88d
Author: Steve Rowe <sa...@apache.org>
Authored: Fri Jul 14 16:40:19 2017 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jul 14 16:40:19 2017 -0400
----------------------------------------------------------------------
.../org/apache/solr/schema/TestPointFields.java | 55 +++++++++++++-------
1 file changed, 35 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4cb74a50/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/TestPointFields.java b/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
index 994e55e..f8b6971 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
@@ -2427,16 +2427,16 @@ public class TestPointFields extends SolrTestCaseJ4 {
idAscXpathChecks[0] = assertNumFound;
idAscNegXpathChecks[0] = assertNumFound;
for (int i = 0 ; i < values.size() ; ++i) {
- assertU(adoc("id", String.valueOf(i), field, String.valueOf(values.get(i))));
+ assertU(adoc("id", Character.valueOf((char)('A' + i)).toString(), field, String.valueOf(values.get(i))));
// reminder: xpath array indexes start at 1
idAscXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/int[@name='field(" + field + ")'][.='" + values.get(i) + "']";
idAscNegXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/float[@name='product(-1," + field + ")'][.='"
+ (-1.0f * (float)values.get(i)) + "']";
}
assertU(commit());
- assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscXpathChecks);
- assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscNegXpathChecks);
List<PosVal<Integer>> ascNegPosVals
@@ -2448,8 +2448,11 @@ public class TestPointFields extends SolrTestCaseJ4 {
ascNegXpathChecks[i + 1]
= "//result/doc[" + (1 + i) + "]/int[@name='" + field + "'][.='" + values.get(posVal.pos) + "']";
}
- assertQ(req("q", "*:*", "fl", "id, " + field, "sort", "product(-1," + field + ") asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field, "rows", String.valueOf(numVals), "sort", "product(-1," + field + ") asc"),
ascNegXpathChecks);
+
+ clearIndex();
+ assertU(commit());
}
private void doTestLongPointFunctionQuery(String field) throws Exception {
@@ -2462,16 +2465,16 @@ public class TestPointFields extends SolrTestCaseJ4 {
idAscXpathChecks[0] = assertNumFound;
idAscNegXpathChecks[0] = assertNumFound;
for (int i = 0 ; i < values.size() ; ++i) {
- assertU(adoc("id", String.valueOf(i), field, String.valueOf(values.get(i))));
+ assertU(adoc("id", Character.valueOf((char)('A' + i)).toString(), field, String.valueOf(values.get(i))));
// reminder: xpath array indexes start at 1
idAscXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/long[@name='field(" + field + ")'][.='" + values.get(i) + "']";
idAscNegXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/float[@name='product(-1," + field + ")'][.='"
+ (-1.0f * (float)values.get(i)) + "']";
}
assertU(commit());
- assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscXpathChecks);
- assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscNegXpathChecks);
List<PosVal<Long>> ascNegPosVals
@@ -2483,8 +2486,11 @@ public class TestPointFields extends SolrTestCaseJ4 {
ascNegXpathChecks[i + 1]
= "//result/doc[" + (1 + i) + "]/long[@name='" + field + "'][.='" + values.get(posVal.pos) + "']";
}
- assertQ(req("q", "*:*", "fl", "id, " + field, "sort", "product(-1," + field + ") asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field, "rows", String.valueOf(numVals), "sort", "product(-1," + field + ") asc"),
ascNegXpathChecks);
+
+ clearIndex();
+ assertU(commit());
}
/**
@@ -3187,16 +3193,16 @@ public class TestPointFields extends SolrTestCaseJ4 {
idAscXpathChecks[0] = assertNumFound;
idAscNegXpathChecks[0] = assertNumFound;
for (int i = 0 ; i < values.size() ; ++i) {
- assertU(adoc("id", String.valueOf(i), field, String.valueOf(values.get(i))));
+ assertU(adoc("id", Character.valueOf((char)('A' + i)).toString(), field, String.valueOf(values.get(i))));
// reminder: xpath array indexes start at 1
idAscXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/float[@name='field(" + field + ")'][.='" + values.get(i) + "']";
idAscNegXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/float[@name='product(-1," + field + ")'][.='"
+ (-1.0f * values.get(i)) + "']";
}
assertU(commit());
- assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscXpathChecks);
- assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscNegXpathChecks);
List<PosVal<Float>> ascNegPosVals
@@ -3208,8 +3214,11 @@ public class TestPointFields extends SolrTestCaseJ4 {
ascNegXpathChecks[i + 1]
= "//result/doc[" + (1 + i) + "]/float[@name='" + field + "'][.='" + values.get(posVal.pos) + "']";
}
- assertQ(req("q", "*:*", "fl", "id, " + field, "sort", "product(-1," + field + ") asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field, "rows", String.valueOf(numVals), "sort", "product(-1," + field + ") asc"),
ascNegXpathChecks);
+
+ clearIndex();
+ assertU(commit());
}
private void doTestDoublePointFunctionQuery(String field) throws Exception {
@@ -3222,16 +3231,16 @@ public class TestPointFields extends SolrTestCaseJ4 {
idAscXpathChecks[0] = assertNumFound;
idAscNegXpathChecks[0] = assertNumFound;
for (int i = 0 ; i < values.size() ; ++i) {
- assertU(adoc("id", String.valueOf(i), field, String.valueOf(values.get(i))));
+ assertU(adoc("id", Character.valueOf((char)('A' + i)).toString(), field, String.valueOf(values.get(i))));
// reminder: xpath array indexes start at 1
idAscXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/double[@name='field(" + field + ")'][.='" + values.get(i) + "']";
idAscNegXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/float[@name='product(-1," + field + ")'][.='"
+ (-1.0f * values.get(i).floatValue()) + "']";
}
assertU(commit());
- assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscXpathChecks);
- assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscNegXpathChecks);
// Intentionally use floats here to mimic server-side function sorting
@@ -3244,8 +3253,11 @@ public class TestPointFields extends SolrTestCaseJ4 {
ascNegXpathChecks[i + 1]
= "//result/doc[" + (1 + i) + "]/double[@name='" + field + "'][.='" + values.get(posVal.pos) + "']";
}
- assertQ(req("q", "*:*", "fl", "id, " + field, "sort", "product(-1," + field + ") asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field, "rows", String.valueOf(numVals), "sort", "product(-1," + field + ") asc"),
ascNegXpathChecks);
+
+ clearIndex();
+ assertU(commit());
}
private void doTestSetQueries(String fieldName, String[] values, boolean multiValued) {
@@ -3449,7 +3461,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
idAscXpathChecks[0] = assertNumFound;
idAscNegXpathChecks[0] = assertNumFound;
for (int i = 0 ; i < values.size() ; ++i) {
- assertU(adoc("id", String.valueOf(i), field, Instant.ofEpochMilli(values.get(i)).toString()));
+ assertU(adoc("id", Character.valueOf((char)('A' + i)).toString(), field, Instant.ofEpochMilli(values.get(i)).toString()));
// reminder: xpath array indexes start at 1
idAscXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/date[@name='field(" + field
+ ")'][.='" + Instant.ofEpochMilli(values.get(i)) + "']";
@@ -3457,9 +3469,9 @@ public class TestPointFields extends SolrTestCaseJ4 {
+ (-1.0f * (float)values.get(i)) + "']";
}
assertU(commit());
- assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscXpathChecks);
- assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1,ms(" + field + "))", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1,ms(" + field + "))", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscNegXpathChecks);
List<PosVal<Long>> ascNegPosVals
@@ -3471,8 +3483,11 @@ public class TestPointFields extends SolrTestCaseJ4 {
ascNegXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/date[@name='" + field
+ "'][.='" + Instant.ofEpochMilli(values.get(posVal.pos)) + "']";
}
- assertQ(req("q", "*:*", "fl", "id, " + field, "sort", "product(-1,ms(" + field + ")) asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field, "rows", String.valueOf(numVals), "sort", "product(-1,ms(" + field + ")) asc"),
ascNegXpathChecks);
+
+ clearIndex();
+ assertU(commit());
}
private void doTestDatePointStats(String field, String dvField, String[] dates) {
[2/3] lucene-solr:branch_7x: SOLR-10796: fix test bugs when
RANDOM_MULTIPLIER > 1
Posted by sa...@apache.org.
SOLR-10796: fix test bugs when RANDOM_MULTIPLIER > 1
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/001e7383
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/001e7383
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/001e7383
Branch: refs/heads/branch_7x
Commit: 001e7383d17ac16de140fcfa4bdd637a61094c8c
Parents: b22a28d
Author: Steve Rowe <sa...@apache.org>
Authored: Fri Jul 14 16:40:19 2017 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jul 14 16:40:37 2017 -0400
----------------------------------------------------------------------
.../org/apache/solr/schema/TestPointFields.java | 55 +++++++++++++-------
1 file changed, 35 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/001e7383/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/TestPointFields.java b/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
index 994e55e..f8b6971 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
@@ -2427,16 +2427,16 @@ public class TestPointFields extends SolrTestCaseJ4 {
idAscXpathChecks[0] = assertNumFound;
idAscNegXpathChecks[0] = assertNumFound;
for (int i = 0 ; i < values.size() ; ++i) {
- assertU(adoc("id", String.valueOf(i), field, String.valueOf(values.get(i))));
+ assertU(adoc("id", Character.valueOf((char)('A' + i)).toString(), field, String.valueOf(values.get(i))));
// reminder: xpath array indexes start at 1
idAscXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/int[@name='field(" + field + ")'][.='" + values.get(i) + "']";
idAscNegXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/float[@name='product(-1," + field + ")'][.='"
+ (-1.0f * (float)values.get(i)) + "']";
}
assertU(commit());
- assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscXpathChecks);
- assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscNegXpathChecks);
List<PosVal<Integer>> ascNegPosVals
@@ -2448,8 +2448,11 @@ public class TestPointFields extends SolrTestCaseJ4 {
ascNegXpathChecks[i + 1]
= "//result/doc[" + (1 + i) + "]/int[@name='" + field + "'][.='" + values.get(posVal.pos) + "']";
}
- assertQ(req("q", "*:*", "fl", "id, " + field, "sort", "product(-1," + field + ") asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field, "rows", String.valueOf(numVals), "sort", "product(-1," + field + ") asc"),
ascNegXpathChecks);
+
+ clearIndex();
+ assertU(commit());
}
private void doTestLongPointFunctionQuery(String field) throws Exception {
@@ -2462,16 +2465,16 @@ public class TestPointFields extends SolrTestCaseJ4 {
idAscXpathChecks[0] = assertNumFound;
idAscNegXpathChecks[0] = assertNumFound;
for (int i = 0 ; i < values.size() ; ++i) {
- assertU(adoc("id", String.valueOf(i), field, String.valueOf(values.get(i))));
+ assertU(adoc("id", Character.valueOf((char)('A' + i)).toString(), field, String.valueOf(values.get(i))));
// reminder: xpath array indexes start at 1
idAscXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/long[@name='field(" + field + ")'][.='" + values.get(i) + "']";
idAscNegXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/float[@name='product(-1," + field + ")'][.='"
+ (-1.0f * (float)values.get(i)) + "']";
}
assertU(commit());
- assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscXpathChecks);
- assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscNegXpathChecks);
List<PosVal<Long>> ascNegPosVals
@@ -2483,8 +2486,11 @@ public class TestPointFields extends SolrTestCaseJ4 {
ascNegXpathChecks[i + 1]
= "//result/doc[" + (1 + i) + "]/long[@name='" + field + "'][.='" + values.get(posVal.pos) + "']";
}
- assertQ(req("q", "*:*", "fl", "id, " + field, "sort", "product(-1," + field + ") asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field, "rows", String.valueOf(numVals), "sort", "product(-1," + field + ") asc"),
ascNegXpathChecks);
+
+ clearIndex();
+ assertU(commit());
}
/**
@@ -3187,16 +3193,16 @@ public class TestPointFields extends SolrTestCaseJ4 {
idAscXpathChecks[0] = assertNumFound;
idAscNegXpathChecks[0] = assertNumFound;
for (int i = 0 ; i < values.size() ; ++i) {
- assertU(adoc("id", String.valueOf(i), field, String.valueOf(values.get(i))));
+ assertU(adoc("id", Character.valueOf((char)('A' + i)).toString(), field, String.valueOf(values.get(i))));
// reminder: xpath array indexes start at 1
idAscXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/float[@name='field(" + field + ")'][.='" + values.get(i) + "']";
idAscNegXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/float[@name='product(-1," + field + ")'][.='"
+ (-1.0f * values.get(i)) + "']";
}
assertU(commit());
- assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscXpathChecks);
- assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscNegXpathChecks);
List<PosVal<Float>> ascNegPosVals
@@ -3208,8 +3214,11 @@ public class TestPointFields extends SolrTestCaseJ4 {
ascNegXpathChecks[i + 1]
= "//result/doc[" + (1 + i) + "]/float[@name='" + field + "'][.='" + values.get(posVal.pos) + "']";
}
- assertQ(req("q", "*:*", "fl", "id, " + field, "sort", "product(-1," + field + ") asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field, "rows", String.valueOf(numVals), "sort", "product(-1," + field + ") asc"),
ascNegXpathChecks);
+
+ clearIndex();
+ assertU(commit());
}
private void doTestDoublePointFunctionQuery(String field) throws Exception {
@@ -3222,16 +3231,16 @@ public class TestPointFields extends SolrTestCaseJ4 {
idAscXpathChecks[0] = assertNumFound;
idAscNegXpathChecks[0] = assertNumFound;
for (int i = 0 ; i < values.size() ; ++i) {
- assertU(adoc("id", String.valueOf(i), field, String.valueOf(values.get(i))));
+ assertU(adoc("id", Character.valueOf((char)('A' + i)).toString(), field, String.valueOf(values.get(i))));
// reminder: xpath array indexes start at 1
idAscXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/double[@name='field(" + field + ")'][.='" + values.get(i) + "']";
idAscNegXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/float[@name='product(-1," + field + ")'][.='"
+ (-1.0f * values.get(i).floatValue()) + "']";
}
assertU(commit());
- assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscXpathChecks);
- assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscNegXpathChecks);
// Intentionally use floats here to mimic server-side function sorting
@@ -3244,8 +3253,11 @@ public class TestPointFields extends SolrTestCaseJ4 {
ascNegXpathChecks[i + 1]
= "//result/doc[" + (1 + i) + "]/double[@name='" + field + "'][.='" + values.get(posVal.pos) + "']";
}
- assertQ(req("q", "*:*", "fl", "id, " + field, "sort", "product(-1," + field + ") asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field, "rows", String.valueOf(numVals), "sort", "product(-1," + field + ") asc"),
ascNegXpathChecks);
+
+ clearIndex();
+ assertU(commit());
}
private void doTestSetQueries(String fieldName, String[] values, boolean multiValued) {
@@ -3449,7 +3461,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
idAscXpathChecks[0] = assertNumFound;
idAscNegXpathChecks[0] = assertNumFound;
for (int i = 0 ; i < values.size() ; ++i) {
- assertU(adoc("id", String.valueOf(i), field, Instant.ofEpochMilli(values.get(i)).toString()));
+ assertU(adoc("id", Character.valueOf((char)('A' + i)).toString(), field, Instant.ofEpochMilli(values.get(i)).toString()));
// reminder: xpath array indexes start at 1
idAscXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/date[@name='field(" + field
+ ")'][.='" + Instant.ofEpochMilli(values.get(i)) + "']";
@@ -3457,9 +3469,9 @@ public class TestPointFields extends SolrTestCaseJ4 {
+ (-1.0f * (float)values.get(i)) + "']";
}
assertU(commit());
- assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscXpathChecks);
- assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1,ms(" + field + "))", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1,ms(" + field + "))", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscNegXpathChecks);
List<PosVal<Long>> ascNegPosVals
@@ -3471,8 +3483,11 @@ public class TestPointFields extends SolrTestCaseJ4 {
ascNegXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/date[@name='" + field
+ "'][.='" + Instant.ofEpochMilli(values.get(posVal.pos)) + "']";
}
- assertQ(req("q", "*:*", "fl", "id, " + field, "sort", "product(-1,ms(" + field + ")) asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field, "rows", String.valueOf(numVals), "sort", "product(-1,ms(" + field + ")) asc"),
ascNegXpathChecks);
+
+ clearIndex();
+ assertU(commit());
}
private void doTestDatePointStats(String field, String dvField, String[] dates) {
[3/3] lucene-solr:branch_7_0: SOLR-10796: fix test bugs when
RANDOM_MULTIPLIER > 1
Posted by sa...@apache.org.
SOLR-10796: fix test bugs when RANDOM_MULTIPLIER > 1
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/03454978
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/03454978
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/03454978
Branch: refs/heads/branch_7_0
Commit: 034549789ebf84dc1b5bd89ae160c3a94c4c9ef6
Parents: 60fd4f2
Author: Steve Rowe <sa...@apache.org>
Authored: Fri Jul 14 16:40:19 2017 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jul 14 16:40:48 2017 -0400
----------------------------------------------------------------------
.../org/apache/solr/schema/TestPointFields.java | 55 +++++++++++++-------
1 file changed, 35 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/03454978/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/TestPointFields.java b/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
index 994e55e..f8b6971 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
@@ -2427,16 +2427,16 @@ public class TestPointFields extends SolrTestCaseJ4 {
idAscXpathChecks[0] = assertNumFound;
idAscNegXpathChecks[0] = assertNumFound;
for (int i = 0 ; i < values.size() ; ++i) {
- assertU(adoc("id", String.valueOf(i), field, String.valueOf(values.get(i))));
+ assertU(adoc("id", Character.valueOf((char)('A' + i)).toString(), field, String.valueOf(values.get(i))));
// reminder: xpath array indexes start at 1
idAscXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/int[@name='field(" + field + ")'][.='" + values.get(i) + "']";
idAscNegXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/float[@name='product(-1," + field + ")'][.='"
+ (-1.0f * (float)values.get(i)) + "']";
}
assertU(commit());
- assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscXpathChecks);
- assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscNegXpathChecks);
List<PosVal<Integer>> ascNegPosVals
@@ -2448,8 +2448,11 @@ public class TestPointFields extends SolrTestCaseJ4 {
ascNegXpathChecks[i + 1]
= "//result/doc[" + (1 + i) + "]/int[@name='" + field + "'][.='" + values.get(posVal.pos) + "']";
}
- assertQ(req("q", "*:*", "fl", "id, " + field, "sort", "product(-1," + field + ") asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field, "rows", String.valueOf(numVals), "sort", "product(-1," + field + ") asc"),
ascNegXpathChecks);
+
+ clearIndex();
+ assertU(commit());
}
private void doTestLongPointFunctionQuery(String field) throws Exception {
@@ -2462,16 +2465,16 @@ public class TestPointFields extends SolrTestCaseJ4 {
idAscXpathChecks[0] = assertNumFound;
idAscNegXpathChecks[0] = assertNumFound;
for (int i = 0 ; i < values.size() ; ++i) {
- assertU(adoc("id", String.valueOf(i), field, String.valueOf(values.get(i))));
+ assertU(adoc("id", Character.valueOf((char)('A' + i)).toString(), field, String.valueOf(values.get(i))));
// reminder: xpath array indexes start at 1
idAscXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/long[@name='field(" + field + ")'][.='" + values.get(i) + "']";
idAscNegXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/float[@name='product(-1," + field + ")'][.='"
+ (-1.0f * (float)values.get(i)) + "']";
}
assertU(commit());
- assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscXpathChecks);
- assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscNegXpathChecks);
List<PosVal<Long>> ascNegPosVals
@@ -2483,8 +2486,11 @@ public class TestPointFields extends SolrTestCaseJ4 {
ascNegXpathChecks[i + 1]
= "//result/doc[" + (1 + i) + "]/long[@name='" + field + "'][.='" + values.get(posVal.pos) + "']";
}
- assertQ(req("q", "*:*", "fl", "id, " + field, "sort", "product(-1," + field + ") asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field, "rows", String.valueOf(numVals), "sort", "product(-1," + field + ") asc"),
ascNegXpathChecks);
+
+ clearIndex();
+ assertU(commit());
}
/**
@@ -3187,16 +3193,16 @@ public class TestPointFields extends SolrTestCaseJ4 {
idAscXpathChecks[0] = assertNumFound;
idAscNegXpathChecks[0] = assertNumFound;
for (int i = 0 ; i < values.size() ; ++i) {
- assertU(adoc("id", String.valueOf(i), field, String.valueOf(values.get(i))));
+ assertU(adoc("id", Character.valueOf((char)('A' + i)).toString(), field, String.valueOf(values.get(i))));
// reminder: xpath array indexes start at 1
idAscXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/float[@name='field(" + field + ")'][.='" + values.get(i) + "']";
idAscNegXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/float[@name='product(-1," + field + ")'][.='"
+ (-1.0f * values.get(i)) + "']";
}
assertU(commit());
- assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscXpathChecks);
- assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscNegXpathChecks);
List<PosVal<Float>> ascNegPosVals
@@ -3208,8 +3214,11 @@ public class TestPointFields extends SolrTestCaseJ4 {
ascNegXpathChecks[i + 1]
= "//result/doc[" + (1 + i) + "]/float[@name='" + field + "'][.='" + values.get(posVal.pos) + "']";
}
- assertQ(req("q", "*:*", "fl", "id, " + field, "sort", "product(-1," + field + ") asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field, "rows", String.valueOf(numVals), "sort", "product(-1," + field + ") asc"),
ascNegXpathChecks);
+
+ clearIndex();
+ assertU(commit());
}
private void doTestDoublePointFunctionQuery(String field) throws Exception {
@@ -3222,16 +3231,16 @@ public class TestPointFields extends SolrTestCaseJ4 {
idAscXpathChecks[0] = assertNumFound;
idAscNegXpathChecks[0] = assertNumFound;
for (int i = 0 ; i < values.size() ; ++i) {
- assertU(adoc("id", String.valueOf(i), field, String.valueOf(values.get(i))));
+ assertU(adoc("id", Character.valueOf((char)('A' + i)).toString(), field, String.valueOf(values.get(i))));
// reminder: xpath array indexes start at 1
idAscXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/double[@name='field(" + field + ")'][.='" + values.get(i) + "']";
idAscNegXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/float[@name='product(-1," + field + ")'][.='"
+ (-1.0f * values.get(i).floatValue()) + "']";
}
assertU(commit());
- assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscXpathChecks);
- assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1," + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscNegXpathChecks);
// Intentionally use floats here to mimic server-side function sorting
@@ -3244,8 +3253,11 @@ public class TestPointFields extends SolrTestCaseJ4 {
ascNegXpathChecks[i + 1]
= "//result/doc[" + (1 + i) + "]/double[@name='" + field + "'][.='" + values.get(posVal.pos) + "']";
}
- assertQ(req("q", "*:*", "fl", "id, " + field, "sort", "product(-1," + field + ") asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field, "rows", String.valueOf(numVals), "sort", "product(-1," + field + ") asc"),
ascNegXpathChecks);
+
+ clearIndex();
+ assertU(commit());
}
private void doTestSetQueries(String fieldName, String[] values, boolean multiValued) {
@@ -3449,7 +3461,7 @@ public class TestPointFields extends SolrTestCaseJ4 {
idAscXpathChecks[0] = assertNumFound;
idAscNegXpathChecks[0] = assertNumFound;
for (int i = 0 ; i < values.size() ; ++i) {
- assertU(adoc("id", String.valueOf(i), field, Instant.ofEpochMilli(values.get(i)).toString()));
+ assertU(adoc("id", Character.valueOf((char)('A' + i)).toString(), field, Instant.ofEpochMilli(values.get(i)).toString()));
// reminder: xpath array indexes start at 1
idAscXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/date[@name='field(" + field
+ ")'][.='" + Instant.ofEpochMilli(values.get(i)) + "']";
@@ -3457,9 +3469,9 @@ public class TestPointFields extends SolrTestCaseJ4 {
+ (-1.0f * (float)values.get(i)) + "']";
}
assertU(commit());
- assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", field(" + field + ")", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscXpathChecks);
- assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1,ms(" + field + "))", "sort", "id asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field + ", product(-1,ms(" + field + "))", "rows", String.valueOf(numVals), "sort", "id asc"),
idAscNegXpathChecks);
List<PosVal<Long>> ascNegPosVals
@@ -3471,8 +3483,11 @@ public class TestPointFields extends SolrTestCaseJ4 {
ascNegXpathChecks[i + 1] = "//result/doc[" + (1 + i) + "]/date[@name='" + field
+ "'][.='" + Instant.ofEpochMilli(values.get(posVal.pos)) + "']";
}
- assertQ(req("q", "*:*", "fl", "id, " + field, "sort", "product(-1,ms(" + field + ")) asc"),
+ assertQ(req("q", "*:*", "fl", "id, " + field, "rows", String.valueOf(numVals), "sort", "product(-1,ms(" + field + ")) asc"),
ascNegXpathChecks);
+
+ clearIndex();
+ assertU(commit());
}
private void doTestDatePointStats(String field, String dvField, String[] dates) {