svn commit: r1671239 [5/5] - in /lucene/dev/branches/lucene_solr_5_1: ./ dev-tools/ lucene/ lucene/analysis/ lucene/backward-codecs/ lucene/backward-codecs/src/java/org/apache/lucene/codecs/blocktree/ lucene/backward-codecs/src/java/org/apache/lucene/c...

[rm...@apache.org]

Modified: lucene/dev/branches/lucene_solr_5_1/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_1/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1671239&r1=1671238&r2=1671239&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_1/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/lucene_solr_5_1/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Sat Apr  4 01:56:45 2015
@@ -1985,11 +1985,8 @@ public abstract class LuceneTestCase ext
    * checks docs + freqs + positions + payloads, sequentially
    */
   public void assertDocsAndPositionsEnumEquals(String info, PostingsEnum leftDocs, PostingsEnum rightDocs) throws IOException {
-    if (leftDocs == null || rightDocs == null) {
-      assertNull(leftDocs);
-      assertNull(rightDocs);
-      return;
-    }
+    assertNotNull(leftDocs);
+    assertNotNull(rightDocs);
     assertEquals(info, -1, leftDocs.docID());
     assertEquals(info, -1, rightDocs.docID());
     int docid;

Modified: lucene/dev/branches/lucene_solr_5_1/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_1/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java?rev=1671239&r1=1671238&r2=1671239&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_1/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java (original)
+++ lucene/dev/branches/lucene_solr_5_1/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java Sat Apr  4 01:56:45 2015
@@ -1087,9 +1087,10 @@ public final class TestUtil {
     return docs(random, termsEnum, liveDocs, reuse, flags);
   }
 
-  // Returns a DocsEnum from a positioned TermsEnum, but
-  // randomly sometimes uses a DocsAndFreqsEnum, DocsAndPositionsEnum.
+  // Returns a PostingsEnum with random features available
   public static PostingsEnum docs(Random random, TermsEnum termsEnum, Bits liveDocs, PostingsEnum reuse, int flags) throws IOException {
+    // TODO: simplify this method? it would be easier to randomly either use the flags passed, or do the random selection,
+    // FREQS should be part fo the random selection instead of outside on its own?
     if (random.nextBoolean()) {
       if (random.nextBoolean()) {
         final int posFlags;
@@ -1099,10 +1100,7 @@ public final class TestUtil {
           case 2: posFlags = PostingsEnum.PAYLOADS; break;
           default: posFlags = PostingsEnum.ALL; break;
         }
-        PostingsEnum docsAndPositions = termsEnum.postings(liveDocs, null, posFlags);
-        if (docsAndPositions != null) {
-          return docsAndPositions;
-        }
+        return termsEnum.postings(liveDocs, null, posFlags);
       }
       flags |= PostingsEnum.FREQS;
     }

Modified: lucene/dev/branches/lucene_solr_5_1/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_1/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java?rev=1671239&r1=1671238&r2=1671239&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_1/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java (original)
+++ lucene/dev/branches/lucene_solr_5_1/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java Sat Apr  4 01:56:45 2015
@@ -693,13 +693,11 @@ public class QueryElevationComponent ext
           term.copyChars(id);
           if (seen.contains(id) == false  && termsEnum.seekExact(term.get())) {
             postingsEnum = termsEnum.postings(liveDocs, postingsEnum, PostingsEnum.NONE);
-            if (postingsEnum != null) {
-              int docId = postingsEnum.nextDoc();
-              if (docId == DocIdSetIterator.NO_MORE_DOCS ) continue;  // must have been deleted
-              termValues[ordSet.put(docId)] = term.toBytesRef();
-              seen.add(id);
-              assert postingsEnum.nextDoc() == DocIdSetIterator.NO_MORE_DOCS;
-            }
+            int docId = postingsEnum.nextDoc();
+            if (docId == DocIdSetIterator.NO_MORE_DOCS ) continue;  // must have been deleted
+            termValues[ordSet.put(docId)] = term.toBytesRef();
+            seen.add(id);
+            assert postingsEnum.nextDoc() == DocIdSetIterator.NO_MORE_DOCS;
           }
         }
       }

Modified: lucene/dev/branches/lucene_solr_5_1/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_5_1/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1671239&r1=1671238&r2=1671239&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_5_1/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/branches/lucene_solr_5_1/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java Sat Apr  4 01:56:45 2015
@@ -800,7 +800,6 @@ public class SolrIndexSearcher extends I
       return -1;
     }
     PostingsEnum docs = termsEnum.postings(leafReader.getLiveDocs(), null, PostingsEnum.NONE);
-    if (docs == null) return -1;
     int id = docs.nextDoc();
     return id == DocIdSetIterator.NO_MORE_DOCS ? -1 : id;
   }