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/03/24 01:30:07 UTC
[1/2] lucene-solr:master: Fix test to stop asserting specific order
when secondary sort is unspecified,
add new checks that do assert an explicit order when secondary sort IS
specified.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x a94c6235a -> 2adbd76a9
refs/heads/master c221ef0fd -> 6665aed95
Fix test to stop asserting specific order when secondary sort is unspecified, add new checks that do assert an explicit order when secondary sort IS specified.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6665aed9
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6665aed9
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6665aed9
Branch: refs/heads/master
Commit: 6665aed952f6bdd741ff22638fc7d21d46a5aaf4
Parents: c221ef0
Author: Chris Hostetter <ho...@apache.org>
Authored: Thu Mar 23 18:28:10 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Thu Mar 23 18:28:10 2017 -0700
----------------------------------------------------------------------
.../apache/solr/schema/NumericFieldsTest.java | 108 ++++++++++++++++---
1 file changed, 95 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6665aed9/solr/core/src/test/org/apache/solr/schema/NumericFieldsTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/NumericFieldsTest.java b/solr/core/src/test/org/apache/solr/schema/NumericFieldsTest.java
index fe5975e..17ded2f 100644
--- a/solr/core/src/test/org/apache/solr/schema/NumericFieldsTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/NumericFieldsTest.java
@@ -51,12 +51,15 @@ public class NumericFieldsTest extends SolrTestCaseJ4 {
public void testSortMissingFirstLast() {
clearIndex();
+ // NOTE: segments may be merged in any order, so we can't make any assumptions about
+ // the relative order of M1 vs M2 unless we have a secondary sort
assertU(adoc("id", "M1"));
assertU(adoc(getDoc("+4", 4, "2011-04-04T00:00:00Z")));
assertU(adoc(getDoc("+5", 5, "2011-05-05T00:00:00Z")));
assertU(adoc(getDoc("-3", -3, "2011-01-01T00:00:00Z")));
assertU(adoc("id", "M2"));
assertU(commit());
+
// 'normal' sorting. Missing Values are 0
String suffix = "";
for (String t : types) {
@@ -64,8 +67,8 @@ public class NumericFieldsTest extends SolrTestCaseJ4 {
assertQ("Sorting Asc: " + t + suffix,
req("fl", "id", "q", "*:*", "sort", (t + suffix) + " asc"),
"//*[@numFound='5']",
- "//result/doc[1]/str[@name='id'][.='M1']",
- "//result/doc[2]/str[@name='id'][.='M2']",
+ "//result/doc[1]/str[@name='id'][starts-with(.,'M')]",
+ "//result/doc[2]/str[@name='id'][starts-with(.,'M')]",
"//result/doc[3]/str[@name='id'][.='-3']",
"//result/doc[4]/str[@name='id'][.='+4']",
"//result/doc[5]/str[@name='id'][.='+5']"
@@ -77,6 +80,26 @@ public class NumericFieldsTest extends SolrTestCaseJ4 {
"//result/doc[1]/str[@name='id'][.='+5']",
"//result/doc[2]/str[@name='id'][.='+4']",
"//result/doc[3]/str[@name='id'][.='-3']",
+ "//result/doc[4]/str[@name='id'][starts-with(.,'M')]",
+ "//result/doc[5]/str[@name='id'][starts-with(.,'M')]"
+ );
+
+ assertQ("Sorting Asc w/secondary on id desc: " + t + suffix,
+ req("fl", "id", "q", "*:*", "sort", (t + suffix) + " asc, id desc"),
+ "//*[@numFound='5']",
+ "//result/doc[1]/str[@name='id'][.='M2']",
+ "//result/doc[2]/str[@name='id'][.='M1']",
+ "//result/doc[3]/str[@name='id'][.='-3']",
+ "//result/doc[4]/str[@name='id'][.='+4']",
+ "//result/doc[5]/str[@name='id'][.='+5']"
+ );
+
+ assertQ("Sorting Desc w/secondary on id asc: " + t + suffix,
+ req("fl", "id", "q", "*:*", "sort", (t + suffix) + " desc, id asc"),
+ "//*[@numFound='5']",
+ "//result/doc[1]/str[@name='id'][.='+5']",
+ "//result/doc[2]/str[@name='id'][.='+4']",
+ "//result/doc[3]/str[@name='id'][.='-3']",
"//result/doc[4]/str[@name='id'][.='M1']",
"//result/doc[5]/str[@name='id'][.='M2']"
);
@@ -85,8 +108,8 @@ public class NumericFieldsTest extends SolrTestCaseJ4 {
req("fl", "id", "q", "*:*", "sort", (t + suffix) + " asc"),
"//*[@numFound='5']",
"//result/doc[1]/str[@name='id'][.='-3']",
- "//result/doc[2]/str[@name='id'][.='M1']",
- "//result/doc[3]/str[@name='id'][.='M2']",
+ "//result/doc[2]/str[@name='id'][starts-with(.,'M')]",
+ "//result/doc[3]/str[@name='id'][starts-with(.,'M')]",
"//result/doc[4]/str[@name='id'][.='+4']",
"//result/doc[5]/str[@name='id'][.='+5']"
);
@@ -96,6 +119,26 @@ public class NumericFieldsTest extends SolrTestCaseJ4 {
"//*[@numFound='5']",
"//result/doc[1]/str[@name='id'][.='+5']",
"//result/doc[2]/str[@name='id'][.='+4']",
+ "//result/doc[3]/str[@name='id'][starts-with(.,'M')]",
+ "//result/doc[4]/str[@name='id'][starts-with(.,'M')]",
+ "//result/doc[5]/str[@name='id'][.='-3']"
+ );
+
+ assertQ("Sorting Asc w/secondary on id desc: " + t + suffix,
+ req("fl", "id", "q", "*:*", "sort", (t + suffix) + " asc, id desc"),
+ "//*[@numFound='5']",
+ "//result/doc[1]/str[@name='id'][.='-3']",
+ "//result/doc[2]/str[@name='id'][.='M2']",
+ "//result/doc[3]/str[@name='id'][.='M1']",
+ "//result/doc[4]/str[@name='id'][.='+4']",
+ "//result/doc[5]/str[@name='id'][.='+5']"
+ );
+
+ assertQ("Sorting Desc w/secondary on id asc: " + t + suffix,
+ req("fl", "id", "q", "*:*", "sort", (t + suffix) + " desc, id asc"),
+ "//*[@numFound='5']",
+ "//result/doc[1]/str[@name='id'][.='+5']",
+ "//result/doc[2]/str[@name='id'][.='+4']",
"//result/doc[3]/str[@name='id'][.='M1']",
"//result/doc[4]/str[@name='id'][.='M2']",
"//result/doc[5]/str[@name='id'][.='-3']"
@@ -114,13 +157,32 @@ public class NumericFieldsTest extends SolrTestCaseJ4 {
"//result/doc[1]/str[@name='id'][.='-3']",
"//result/doc[2]/str[@name='id'][.='+4']",
"//result/doc[3]/str[@name='id'][.='+5']",
- "//result/doc[4]/str[@name='id'][.='M1']",
- "//result/doc[5]/str[@name='id'][.='M2']"
+ "//result/doc[4]/str[@name='id'][starts-with(.,'M')]",
+ "//result/doc[5]/str[@name='id'][starts-with(.,'M')]"
);
- // This does not match
assertQ("Sorting Desc: " + t + suffix,
- req("fl", "id", "q", "*:*", "sort", (t + suffix) + " desc", "indent", "on"),
+ req("fl", "id", "q", "*:*", "sort", (t + suffix) + " desc"),
+ "//*[@numFound='5']",
+ "//result/doc[1]/str[@name='id'][.='+5']",
+ "//result/doc[2]/str[@name='id'][.='+4']",
+ "//result/doc[3]/str[@name='id'][.='-3']",
+ "//result/doc[4]/str[@name='id'][starts-with(.,'M')]",
+ "//result/doc[5]/str[@name='id'][starts-with(.,'M')]"
+ );
+
+ assertQ("Sorting Asc w/secondary on id desc: " + t + suffix,
+ req("fl", "id", "q", "*:*", "sort", (t + suffix) + " asc, id desc"),
+ "//*[@numFound='5']",
+ "//result/doc[1]/str[@name='id'][.='-3']",
+ "//result/doc[2]/str[@name='id'][.='+4']",
+ "//result/doc[3]/str[@name='id'][.='+5']",
+ "//result/doc[4]/str[@name='id'][.='M2']",
+ "//result/doc[5]/str[@name='id'][.='M1']"
+ );
+
+ assertQ("Sorting Desc w/secondary on id asc: " + t + suffix,
+ req("fl", "id", "q", "*:*", "sort", (t + suffix) + " desc, id asc"),
"//*[@numFound='5']",
"//result/doc[1]/str[@name='id'][.='+5']",
"//result/doc[2]/str[@name='id'][.='+4']",
@@ -134,18 +196,37 @@ public class NumericFieldsTest extends SolrTestCaseJ4 {
suffix = "_first";
for (String t : types) {
assertQ("Sorting Asc: " + t + suffix,
- req("fl", "id", "q", "*:*", "sort", (t + suffix) + " asc", "indent", "on"),
+ req("fl", "id", "q", "*:*", "sort", (t + suffix) + " asc"),
"//*[@numFound='5']",
- "//result/doc[1]/str[@name='id'][.='M1']",
- "//result/doc[2]/str[@name='id'][.='M2']",
+ "//result/doc[1]/str[@name='id'][starts-with(.,'M')]",
+ "//result/doc[2]/str[@name='id'][starts-with(.,'M')]",
"//result/doc[3]/str[@name='id'][.='-3']",
"//result/doc[4]/str[@name='id'][.='+4']",
"//result/doc[5]/str[@name='id'][.='+5']"
);
- // This does not match
assertQ("Sorting Desc: " + t + suffix,
- req("fl", "id", "q", "*:*", "sort", (t + suffix) + " desc", "indent", "on"),
+ req("fl", "id", "q", "*:*", "sort", (t + suffix) + " desc"),
+ "//*[@numFound='5']",
+ "//result/doc[1]/str[@name='id'][starts-with(.,'M')]",
+ "//result/doc[2]/str[@name='id'][starts-with(.,'M')]",
+ "//result/doc[3]/str[@name='id'][.='+5']",
+ "//result/doc[4]/str[@name='id'][.='+4']",
+ "//result/doc[5]/str[@name='id'][.='-3']"
+ );
+
+ assertQ("Sorting Asc w/secondary on id desc: " + t + suffix,
+ req("fl", "id", "q", "*:*", "sort", (t + suffix) + " asc, id desc"),
+ "//*[@numFound='5']",
+ "//result/doc[1]/str[@name='id'][.='M2']",
+ "//result/doc[2]/str[@name='id'][.='M1']",
+ "//result/doc[3]/str[@name='id'][.='-3']",
+ "//result/doc[4]/str[@name='id'][.='+4']",
+ "//result/doc[5]/str[@name='id'][.='+5']"
+ );
+
+ assertQ("Sorting Desc w/secondary on id asc: " + t + suffix,
+ req("fl", "id", "q", "*:*", "sort", (t + suffix) + " desc, id asc"),
"//*[@numFound='5']",
"//result/doc[1]/str[@name='id'][.='M1']",
"//result/doc[2]/str[@name='id'][.='M2']",
@@ -153,6 +234,7 @@ public class NumericFieldsTest extends SolrTestCaseJ4 {
"//result/doc[4]/str[@name='id'][.='+4']",
"//result/doc[5]/str[@name='id'][.='-3']"
);
+
}
}
}
[2/2] lucene-solr:branch_6x: Fix test to stop asserting specific
order when secondary sort is unspecified,
add new checks that do assert an explicit order when secondary sort IS
specified.
Posted by ho...@apache.org.
Fix test to stop asserting specific order when secondary sort is unspecified, add new checks that do assert an explicit order when secondary sort IS specified.
(cherry picked from commit 6665aed952f6bdd741ff22638fc7d21d46a5aaf4)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2adbd76a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2adbd76a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2adbd76a
Branch: refs/heads/branch_6x
Commit: 2adbd76a9892efdb9d55fbe016e272fbc9e64c24
Parents: a94c623
Author: Chris Hostetter <ho...@apache.org>
Authored: Thu Mar 23 18:28:10 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Thu Mar 23 18:28:24 2017 -0700
----------------------------------------------------------------------
.../apache/solr/schema/NumericFieldsTest.java | 108 ++++++++++++++++---
1 file changed, 95 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2adbd76a/solr/core/src/test/org/apache/solr/schema/NumericFieldsTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/NumericFieldsTest.java b/solr/core/src/test/org/apache/solr/schema/NumericFieldsTest.java
index fe5975e..17ded2f 100644
--- a/solr/core/src/test/org/apache/solr/schema/NumericFieldsTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/NumericFieldsTest.java
@@ -51,12 +51,15 @@ public class NumericFieldsTest extends SolrTestCaseJ4 {
public void testSortMissingFirstLast() {
clearIndex();
+ // NOTE: segments may be merged in any order, so we can't make any assumptions about
+ // the relative order of M1 vs M2 unless we have a secondary sort
assertU(adoc("id", "M1"));
assertU(adoc(getDoc("+4", 4, "2011-04-04T00:00:00Z")));
assertU(adoc(getDoc("+5", 5, "2011-05-05T00:00:00Z")));
assertU(adoc(getDoc("-3", -3, "2011-01-01T00:00:00Z")));
assertU(adoc("id", "M2"));
assertU(commit());
+
// 'normal' sorting. Missing Values are 0
String suffix = "";
for (String t : types) {
@@ -64,8 +67,8 @@ public class NumericFieldsTest extends SolrTestCaseJ4 {
assertQ("Sorting Asc: " + t + suffix,
req("fl", "id", "q", "*:*", "sort", (t + suffix) + " asc"),
"//*[@numFound='5']",
- "//result/doc[1]/str[@name='id'][.='M1']",
- "//result/doc[2]/str[@name='id'][.='M2']",
+ "//result/doc[1]/str[@name='id'][starts-with(.,'M')]",
+ "//result/doc[2]/str[@name='id'][starts-with(.,'M')]",
"//result/doc[3]/str[@name='id'][.='-3']",
"//result/doc[4]/str[@name='id'][.='+4']",
"//result/doc[5]/str[@name='id'][.='+5']"
@@ -77,6 +80,26 @@ public class NumericFieldsTest extends SolrTestCaseJ4 {
"//result/doc[1]/str[@name='id'][.='+5']",
"//result/doc[2]/str[@name='id'][.='+4']",
"//result/doc[3]/str[@name='id'][.='-3']",
+ "//result/doc[4]/str[@name='id'][starts-with(.,'M')]",
+ "//result/doc[5]/str[@name='id'][starts-with(.,'M')]"
+ );
+
+ assertQ("Sorting Asc w/secondary on id desc: " + t + suffix,
+ req("fl", "id", "q", "*:*", "sort", (t + suffix) + " asc, id desc"),
+ "//*[@numFound='5']",
+ "//result/doc[1]/str[@name='id'][.='M2']",
+ "//result/doc[2]/str[@name='id'][.='M1']",
+ "//result/doc[3]/str[@name='id'][.='-3']",
+ "//result/doc[4]/str[@name='id'][.='+4']",
+ "//result/doc[5]/str[@name='id'][.='+5']"
+ );
+
+ assertQ("Sorting Desc w/secondary on id asc: " + t + suffix,
+ req("fl", "id", "q", "*:*", "sort", (t + suffix) + " desc, id asc"),
+ "//*[@numFound='5']",
+ "//result/doc[1]/str[@name='id'][.='+5']",
+ "//result/doc[2]/str[@name='id'][.='+4']",
+ "//result/doc[3]/str[@name='id'][.='-3']",
"//result/doc[4]/str[@name='id'][.='M1']",
"//result/doc[5]/str[@name='id'][.='M2']"
);
@@ -85,8 +108,8 @@ public class NumericFieldsTest extends SolrTestCaseJ4 {
req("fl", "id", "q", "*:*", "sort", (t + suffix) + " asc"),
"//*[@numFound='5']",
"//result/doc[1]/str[@name='id'][.='-3']",
- "//result/doc[2]/str[@name='id'][.='M1']",
- "//result/doc[3]/str[@name='id'][.='M2']",
+ "//result/doc[2]/str[@name='id'][starts-with(.,'M')]",
+ "//result/doc[3]/str[@name='id'][starts-with(.,'M')]",
"//result/doc[4]/str[@name='id'][.='+4']",
"//result/doc[5]/str[@name='id'][.='+5']"
);
@@ -96,6 +119,26 @@ public class NumericFieldsTest extends SolrTestCaseJ4 {
"//*[@numFound='5']",
"//result/doc[1]/str[@name='id'][.='+5']",
"//result/doc[2]/str[@name='id'][.='+4']",
+ "//result/doc[3]/str[@name='id'][starts-with(.,'M')]",
+ "//result/doc[4]/str[@name='id'][starts-with(.,'M')]",
+ "//result/doc[5]/str[@name='id'][.='-3']"
+ );
+
+ assertQ("Sorting Asc w/secondary on id desc: " + t + suffix,
+ req("fl", "id", "q", "*:*", "sort", (t + suffix) + " asc, id desc"),
+ "//*[@numFound='5']",
+ "//result/doc[1]/str[@name='id'][.='-3']",
+ "//result/doc[2]/str[@name='id'][.='M2']",
+ "//result/doc[3]/str[@name='id'][.='M1']",
+ "//result/doc[4]/str[@name='id'][.='+4']",
+ "//result/doc[5]/str[@name='id'][.='+5']"
+ );
+
+ assertQ("Sorting Desc w/secondary on id asc: " + t + suffix,
+ req("fl", "id", "q", "*:*", "sort", (t + suffix) + " desc, id asc"),
+ "//*[@numFound='5']",
+ "//result/doc[1]/str[@name='id'][.='+5']",
+ "//result/doc[2]/str[@name='id'][.='+4']",
"//result/doc[3]/str[@name='id'][.='M1']",
"//result/doc[4]/str[@name='id'][.='M2']",
"//result/doc[5]/str[@name='id'][.='-3']"
@@ -114,13 +157,32 @@ public class NumericFieldsTest extends SolrTestCaseJ4 {
"//result/doc[1]/str[@name='id'][.='-3']",
"//result/doc[2]/str[@name='id'][.='+4']",
"//result/doc[3]/str[@name='id'][.='+5']",
- "//result/doc[4]/str[@name='id'][.='M1']",
- "//result/doc[5]/str[@name='id'][.='M2']"
+ "//result/doc[4]/str[@name='id'][starts-with(.,'M')]",
+ "//result/doc[5]/str[@name='id'][starts-with(.,'M')]"
);
- // This does not match
assertQ("Sorting Desc: " + t + suffix,
- req("fl", "id", "q", "*:*", "sort", (t + suffix) + " desc", "indent", "on"),
+ req("fl", "id", "q", "*:*", "sort", (t + suffix) + " desc"),
+ "//*[@numFound='5']",
+ "//result/doc[1]/str[@name='id'][.='+5']",
+ "//result/doc[2]/str[@name='id'][.='+4']",
+ "//result/doc[3]/str[@name='id'][.='-3']",
+ "//result/doc[4]/str[@name='id'][starts-with(.,'M')]",
+ "//result/doc[5]/str[@name='id'][starts-with(.,'M')]"
+ );
+
+ assertQ("Sorting Asc w/secondary on id desc: " + t + suffix,
+ req("fl", "id", "q", "*:*", "sort", (t + suffix) + " asc, id desc"),
+ "//*[@numFound='5']",
+ "//result/doc[1]/str[@name='id'][.='-3']",
+ "//result/doc[2]/str[@name='id'][.='+4']",
+ "//result/doc[3]/str[@name='id'][.='+5']",
+ "//result/doc[4]/str[@name='id'][.='M2']",
+ "//result/doc[5]/str[@name='id'][.='M1']"
+ );
+
+ assertQ("Sorting Desc w/secondary on id asc: " + t + suffix,
+ req("fl", "id", "q", "*:*", "sort", (t + suffix) + " desc, id asc"),
"//*[@numFound='5']",
"//result/doc[1]/str[@name='id'][.='+5']",
"//result/doc[2]/str[@name='id'][.='+4']",
@@ -134,18 +196,37 @@ public class NumericFieldsTest extends SolrTestCaseJ4 {
suffix = "_first";
for (String t : types) {
assertQ("Sorting Asc: " + t + suffix,
- req("fl", "id", "q", "*:*", "sort", (t + suffix) + " asc", "indent", "on"),
+ req("fl", "id", "q", "*:*", "sort", (t + suffix) + " asc"),
"//*[@numFound='5']",
- "//result/doc[1]/str[@name='id'][.='M1']",
- "//result/doc[2]/str[@name='id'][.='M2']",
+ "//result/doc[1]/str[@name='id'][starts-with(.,'M')]",
+ "//result/doc[2]/str[@name='id'][starts-with(.,'M')]",
"//result/doc[3]/str[@name='id'][.='-3']",
"//result/doc[4]/str[@name='id'][.='+4']",
"//result/doc[5]/str[@name='id'][.='+5']"
);
- // This does not match
assertQ("Sorting Desc: " + t + suffix,
- req("fl", "id", "q", "*:*", "sort", (t + suffix) + " desc", "indent", "on"),
+ req("fl", "id", "q", "*:*", "sort", (t + suffix) + " desc"),
+ "//*[@numFound='5']",
+ "//result/doc[1]/str[@name='id'][starts-with(.,'M')]",
+ "//result/doc[2]/str[@name='id'][starts-with(.,'M')]",
+ "//result/doc[3]/str[@name='id'][.='+5']",
+ "//result/doc[4]/str[@name='id'][.='+4']",
+ "//result/doc[5]/str[@name='id'][.='-3']"
+ );
+
+ assertQ("Sorting Asc w/secondary on id desc: " + t + suffix,
+ req("fl", "id", "q", "*:*", "sort", (t + suffix) + " asc, id desc"),
+ "//*[@numFound='5']",
+ "//result/doc[1]/str[@name='id'][.='M2']",
+ "//result/doc[2]/str[@name='id'][.='M1']",
+ "//result/doc[3]/str[@name='id'][.='-3']",
+ "//result/doc[4]/str[@name='id'][.='+4']",
+ "//result/doc[5]/str[@name='id'][.='+5']"
+ );
+
+ assertQ("Sorting Desc w/secondary on id asc: " + t + suffix,
+ req("fl", "id", "q", "*:*", "sort", (t + suffix) + " desc, id asc"),
"//*[@numFound='5']",
"//result/doc[1]/str[@name='id'][.='M1']",
"//result/doc[2]/str[@name='id'][.='M2']",
@@ -153,6 +234,7 @@ public class NumericFieldsTest extends SolrTestCaseJ4 {
"//result/doc[4]/str[@name='id'][.='+4']",
"//result/doc[5]/str[@name='id'][.='-3']"
);
+
}
}
}