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/04/10 19:32:03 UTC

[1/2] lucene-solr:master: SOLR-10474: TestPointFields.testPointFieldReturn() depends on order of unsorted hits

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x 5cc50c13f -> f6d323976
  refs/heads/master ce66ca93c -> e02a1f159


SOLR-10474: TestPointFields.testPointFieldReturn() depends on order of unsorted hits


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e02a1f15
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e02a1f15
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e02a1f15

Branch: refs/heads/master
Commit: e02a1f159ee05fdf23309d633a32059b13a3bb4f
Parents: ce66ca9
Author: Steve Rowe <sa...@gmail.com>
Authored: Mon Apr 10 15:26:28 2017 -0400
Committer: Steve Rowe <sa...@gmail.com>
Committed: Mon Apr 10 15:26:28 2017 -0400

----------------------------------------------------------------------
 solr/CHANGES.txt                                               | 2 ++
 solr/core/src/test/org/apache/solr/schema/TestPointFields.java | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e02a1f15/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 6fb914a..7752a16 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -169,6 +169,8 @@ Bug Fixes
 * SOLR-8807: fix Spellcheck "collateMaxCollectDocs" parameter to work with queries that have the 
   CollpasingQParserPlugin applied.  (James Dyer)
 
+* SOLR-10474: TestPointFields.testPointFieldReturn() depends on order of unsorted hits. (Steve Rowe)
+
 Other Changes
 ----------------------
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e02a1f15/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 e5dc990..1d7f1e5 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
@@ -1140,8 +1140,8 @@ public class TestPointFields extends SolrTestCaseJ4 {
     assertU(commit());
     String[] expected = new String[values.length + 1];
     expected[0] = "//*[@numFound='" + values.length + "']"; 
-    for (int i = 1; i <= values.length; i++) {
-      expected[i] = "//result/doc[" + i + "]/" + type + "[@name='" + field + "'][.='" + values[i-1] + "']";
+    for (int i = 0; i < values.length; i++) {
+      expected[i + 1] = "//result/doc[str[@name='id']='" + i + "']/" + type + "[@name='" + field + "'][.='" + values[i] + "']";
     }
     assertQ(req("q", "*:*", "fl", "id, " + field, "rows", String.valueOf(values.length)), expected);
 


[2/2] lucene-solr:branch_6x: SOLR-10474: TestPointFields.testPointFieldReturn() depends on order of unsorted hits

Posted by sa...@apache.org.
SOLR-10474: TestPointFields.testPointFieldReturn() depends on order of unsorted hits


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f6d32397
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f6d32397
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f6d32397

Branch: refs/heads/branch_6x
Commit: f6d32397606eec9313052bba5181be5d20ee5189
Parents: 5cc50c1
Author: Steve Rowe <sa...@gmail.com>
Authored: Mon Apr 10 15:26:28 2017 -0400
Committer: Steve Rowe <sa...@gmail.com>
Committed: Mon Apr 10 15:26:46 2017 -0400

----------------------------------------------------------------------
 solr/CHANGES.txt                                               | 2 ++
 solr/core/src/test/org/apache/solr/schema/TestPointFields.java | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f6d32397/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 9079b69..3ee2181 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -91,6 +91,8 @@ Bug Fixes
 * SOLR-8807: fix Spellcheck "collateMaxCollectDocs" parameter to work with queries that have the 
   CollpasingQParserPlugin applied.  (James Dyer)
 
+* SOLR-10474: TestPointFields.testPointFieldReturn() depends on order of unsorted hits. (Steve Rowe)
+
 Other Changes
 ----------------------
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f6d32397/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 133d63a..8ba100a 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestPointFields.java
@@ -1139,8 +1139,8 @@ public class TestPointFields extends SolrTestCaseJ4 {
     assertU(commit());
     String[] expected = new String[values.length + 1];
     expected[0] = "//*[@numFound='" + values.length + "']"; 
-    for (int i = 1; i <= values.length; i++) {
-      expected[i] = "//result/doc[" + i + "]/" + type + "[@name='" + field + "'][.='" + values[i-1] + "']";
+    for (int i = 0; i < values.length; i++) {
+      expected[i + 1] = "//result/doc[str[@name='id']='" + i + "']/" + type + "[@name='" + field + "'][.='" + values[i] + "']";
     }
     assertQ(req("q", "*:*", "fl", "id, " + field, "rows", String.valueOf(values.length)), expected);