svn commit: r943935 - in /lucene/dev/trunk/lucene/src: java/org/apache/lucene/index/FilterIndexReader.java test/org/apache/lucene/index/TestFilterIndexReader.java

[mi...@apache.org]

Author: mikemccand
Date: Thu May 13 16:51:18 2010
New Revision: 943935

URL: http://svn.apache.org/viewvc?rev=943935&view=rev
Log:
LUCENE-2459: fix FilterIndexReader to (by default) emulate flex API on top of pre-flex API

Modified:
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java

Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java?rev=943935&r1=943934&r2=943935&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java Thu May 13 16:51:18 2010
@@ -119,7 +119,7 @@ public class FilterIndexReader extends I
   
   @Override
   public Bits getDeletedDocs() throws IOException {
-    return in.getDeletedDocs();
+    return MultiFields.getDeletedDocs(in);
   }
   
   @Override
@@ -291,7 +291,18 @@ public class FilterIndexReader extends I
   
   @Override
   public IndexReader[] getSequentialSubReaders() {
-    return in.getSequentialSubReaders();
+    return null;
+  }
+
+  /* Flex API wrappers. */
+  @Override
+  public Fields fields() throws IOException {
+    return new LegacyFields(this);
+  }
+
+  @Override
+  public Terms terms(String field) throws IOException {
+    return new LegacyTerms(this, field);
   }
 
   /** If the subclass of FilteredIndexReader modifies the

Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java?rev=943935&r1=943934&r2=943935&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestFilterIndexReader.java Thu May 13 16:51:18 2010
@@ -113,7 +113,15 @@ public class TestFilterIndexReader exten
 
     writer.close();
 
+    //IndexReader reader = new TestReader(IndexReader.open(directory, true));
+    RAMDirectory target = new MockRAMDirectory();
+    writer = new IndexWriter(target, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer()));
     IndexReader reader = new TestReader(IndexReader.open(directory, true));
+    writer.addIndexes(reader);
+    writer.close();
+    reader.close();
+    reader = IndexReader.open(target, true);
+    
 
     assertTrue(reader.isOptimized());