svn commit: r1566742 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/core/ solr/core/src/test/org/apache/solr/CursorPagingTest.java

[sa...@apache.org]

Author: sarowe
Date: Mon Feb 10 20:59:48 2014
New Revision: 1566742

URL: http://svn.apache.org/r1566742
Log:
SOLR-5652: in cursor tests, don't sort on 'plain' docvalue fields (i.e., those using standard Lucene sorting for missing values) when the codec doesn't support missing docvalues. (merged trunk r1566741)

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/core/   (props changed)
    lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/CursorPagingTest.java

Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/CursorPagingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/CursorPagingTest.java?rev=1566742&r1=1566741&r2=1566742&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/CursorPagingTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/CursorPagingTest.java Mon Feb 10 20:59:48 2014
@@ -636,21 +636,24 @@ public class CursorPagingTest extends So
    * </p>
    * <ul>
    *  <li><code>_version_</code> is removed</li>
-   *  <li><code>dv_last</code> and <code>dv_first</code> fields are removed 
-   *      if the codec doesn't support them</li>
+   *  <li>
+   *    <code>*_dv_last</code>, <code>*_dv_first</code> and <code>*_dv</code>
+   *    fields are removed if the codec doesn't support missing DocValues
+   *  </li>
    * </ul>
    * @see #defaultCodecSupportsMissingDocValues
    */
   public static List<String> pruneAndDeterministicallySort(Collection<String> raw) {
 
-    final boolean prune_dv_missing = ! defaultCodecSupportsMissingDocValues();
+    final boolean prune_dv = ! defaultCodecSupportsMissingDocValues();
 
     ArrayList<String> names = new ArrayList<String>(37);
     for (String f : raw) {
       if (f.equals("_version_")) {
         continue;
       }
-      if (prune_dv_missing && (f.endsWith("_dv_last") || f.endsWith("_dv_first")) ) {
+      if (prune_dv && (f.endsWith("_dv_last") || f.endsWith("_dv_first"))
+                       || f.endsWith("_dv")) {
         continue;
       }
       names.add(f);