svn commit: r1671814 - in /lucene/dev/branches/branch_5x: ./ lucene/ lucene/memory/ lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java

[rm...@apache.org]

Author: rmuir
Date: Tue Apr  7 11:38:37 2015
New Revision: 1671814

URL: http://svn.apache.org/r1671814
Log:
LUCENE-6402: MemoryIndex should pass TestUtil.checkReader

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/lucene/   (props changed)
    lucene/dev/branches/branch_5x/lucene/memory/   (props changed)
    lucene/dev/branches/branch_5x/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
    lucene/dev/branches/branch_5x/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java

Modified: lucene/dev/branches/branch_5x/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=1671814&r1=1671813&r2=1671814&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (original)
+++ lucene/dev/branches/branch_5x/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java Tue Apr  7 11:38:37 2015
@@ -441,7 +441,7 @@ public class MemoryIndex {
         sliceArray = info.sliceArray;
         sumTotalTermFreq = info.sumTotalTermFreq;
       } else {
-        fieldInfo = new FieldInfo(fieldName, fields.size(), false, false, this.storePayloads,
+        fieldInfo = new FieldInfo(fieldName, fields.size(), true, false, this.storePayloads,
             this.storeOffsets
                 ? IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS : IndexOptions.DOCS_AND_FREQS_AND_POSITIONS,
             DocValuesType.NONE, -1, Collections.<String,String>emptyMap());

Modified: lucene/dev/branches/branch_5x/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java?rev=1671814&r1=1671813&r2=1671814&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java (original)
+++ lucene/dev/branches/branch_5x/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java Tue Apr  7 11:38:37 2015
@@ -19,7 +19,9 @@ package org.apache.lucene.index.memory;
 
 import java.io.IOException;
 
+import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.MockAnalyzer;
+import org.apache.lucene.analysis.MockPayloadAnalyzer;
 import org.apache.lucene.index.FieldInvertState;
 import org.apache.lucene.index.LeafReader;
 import org.apache.lucene.index.Term;
@@ -30,6 +32,7 @@ import org.apache.lucene.search.TermQuer
 import org.apache.lucene.search.similarities.BM25Similarity;
 import org.apache.lucene.search.similarities.DefaultSimilarity;
 import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -99,6 +102,35 @@ public class TestMemoryIndex extends Luc
     TermsEnum terms = reader.fields().terms("field").iterator(null);
     terms.seekExact(0);
     assertEquals("be", terms.term().utf8ToString());
+    TestUtil.checkReader(reader);
+  }
+  
+  public void testReaderConsistency() throws IOException {
+    Analyzer analyzer = new MockPayloadAnalyzer();
+    
+    // defaults
+    MemoryIndex mi = new MemoryIndex();
+    mi.addField("field", "some terms be here", analyzer);
+    TestUtil.checkReader(mi.createSearcher().getIndexReader());
+    
+    // all combinations of offsets/payloads options
+    mi = new MemoryIndex(true, true);
+    mi.addField("field", "some terms be here", analyzer);
+    TestUtil.checkReader(mi.createSearcher().getIndexReader());
+    
+    mi = new MemoryIndex(true, false);
+    mi.addField("field", "some terms be here", analyzer);
+    TestUtil.checkReader(mi.createSearcher().getIndexReader());
+    
+    mi = new MemoryIndex(false, true);
+    mi.addField("field", "some terms be here", analyzer);
+    TestUtil.checkReader(mi.createSearcher().getIndexReader());
+    
+    mi = new MemoryIndex(false, false);
+    mi.addField("field", "some terms be here", analyzer);
+    TestUtil.checkReader(mi.createSearcher().getIndexReader());
+    
+    analyzer.close();
   }
 
   @Test
@@ -121,7 +153,7 @@ public class TestMemoryIndex extends Luc
     float n2 = reader.getNormValues("f1").get(0);
 
     assertTrue(n1 != n2);
-
+    TestUtil.checkReader(reader);
   }