lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mikemcc...@apache.org
Subject svn commit: r1029402 - in /lucene/java/branches/lucene_2_9_back_compat_tests/src: java/org/apache/lucene/index/ test/org/apache/lucene/index/
Date Sun, 31 Oct 2010 16:36:17 GMT
Author: mikemccand
Date: Sun Oct 31 16:36:16 2010
New Revision: 1029402

URL: http://svn.apache.org/viewvc?rev=1029402&view=rev
Log:
LUCENE-2328: fix bw branch due to internal API changes

Modified:
    lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/index/DirectoryReader.java
    lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/index/IndexFileDeleter.java
    lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/index/IndexWriter.java
    lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/index/TestIndexReader.java
    lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/index/TestIndexWriter.java
    lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/index/TestIndexWriterDelete.java

Modified: lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/index/DirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/index/DirectoryReader.java?rev=1029402&r1=1029401&r2=1029402&view=diff
==============================================================================
--- lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/index/DirectoryReader.java
(original)
+++ lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/index/DirectoryReader.java
Sun Oct 31 16:36:16 2010
@@ -699,7 +699,7 @@ class DirectoryReader extends IndexReade
       // KeepOnlyLastCommitDeleter:
       IndexFileDeleter deleter = new IndexFileDeleter(directory,
                                                       deletionPolicy == null ? new KeepOnlyLastCommitDeletionPolicy()
: deletionPolicy,
-                                                      segmentInfos, null, null);
+                                                      segmentInfos, null, null, null);
 
       // Checkpoint the state we are about to change, in
       // case we have to roll back:

Modified: lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/index/IndexFileDeleter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/index/IndexFileDeleter.java?rev=1029402&r1=1029401&r2=1029402&view=diff
==============================================================================
--- lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/index/IndexFileDeleter.java
(original)
+++ lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/index/IndexFileDeleter.java
Sun Oct 31 16:36:16 2010
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.io.FileNotFoundException;
 import java.io.PrintStream;
 import java.util.Map;
+import java.util.Set;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -129,7 +130,7 @@ final class IndexFileDeleter {
    * @throws CorruptIndexException if the index is corrupt
    * @throws IOException if there is a low-level IO error
    */
-  public IndexFileDeleter(Directory directory, IndexDeletionPolicy policy, SegmentInfos segmentInfos,
PrintStream infoStream, DocumentsWriter docWriter)
+  public IndexFileDeleter(Directory directory, IndexDeletionPolicy policy, SegmentInfos segmentInfos,
PrintStream infoStream, DocumentsWriter docWriter, Set ignored)
     throws CorruptIndexException, IOException {
 
     this.docWriter = docWriter;

Modified: lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/index/IndexWriter.java?rev=1029402&r1=1029401&r2=1029402&view=diff
==============================================================================
--- lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/index/IndexWriter.java
(original)
+++ lucene/java/branches/lucene_2_9_back_compat_tests/src/java/org/apache/lucene/index/IndexWriter.java
Sun Oct 31 16:36:16 2010
@@ -1326,7 +1326,7 @@ public class IndexWriter {
       // KeepOnlyLastCommitDeleter:
       deleter = new IndexFileDeleter(directory,
                                      deletionPolicy == null ? new KeepOnlyLastCommitDeletionPolicy()
: deletionPolicy,
-                                     segmentInfos, infoStream, docWriter);
+                                     segmentInfos, infoStream, docWriter, null);
 
       if (deleter.startingCommitDeleted)
         // Deletion policy deleted the "head" commit point.

Modified: lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/index/TestIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/index/TestIndexReader.java?rev=1029402&r1=1029401&r2=1029402&view=diff
==============================================================================
--- lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/index/TestIndexReader.java
(original)
+++ lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/index/TestIndexReader.java
Sun Oct 31 16:36:16 2010
@@ -989,7 +989,7 @@ public class TestIndexReader extends Luc
           String[] startFiles = dir.listAll();
           SegmentInfos infos = new SegmentInfos();
           infos.read(dir);
-          new IndexFileDeleter(dir, new KeepOnlyLastCommitDeletionPolicy(), infos, null,
null);
+          new IndexFileDeleter(dir, new KeepOnlyLastCommitDeletionPolicy(), infos, null,
null, null);
           String[] endFiles = dir.listAll();
 
           Arrays.sort(startFiles);

Modified: lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1029402&r1=1029401&r2=1029402&view=diff
==============================================================================
--- lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/index/TestIndexWriter.java
(original)
+++ lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/index/TestIndexWriter.java
Sun Oct 31 16:36:16 2010
@@ -533,7 +533,7 @@ public class TestIndexWriter extends Bas
       String[] startFiles = dir.listAll();
       SegmentInfos infos = new SegmentInfos();
       infos.read(dir);
-      new IndexFileDeleter(dir, new KeepOnlyLastCommitDeletionPolicy(), infos, null, null);
+      new IndexFileDeleter(dir, new KeepOnlyLastCommitDeletionPolicy(), infos, null, null,
null);
       String[] endFiles = dir.listAll();
 
       Arrays.sort(startFiles);

Modified: lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/index/TestIndexWriterDelete.java?rev=1029402&r1=1029401&r2=1029402&view=diff
==============================================================================
--- lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
(original)
+++ lucene/java/branches/lucene_2_9_back_compat_tests/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
Sun Oct 31 16:36:16 2010
@@ -785,7 +785,7 @@ public class TestIndexWriterDelete exten
       String[] startFiles = dir.listAll();
       SegmentInfos infos = new SegmentInfos();
       infos.read(dir);
-      new IndexFileDeleter(dir, new KeepOnlyLastCommitDeletionPolicy(), infos, null, null);
+      new IndexFileDeleter(dir, new KeepOnlyLastCommitDeletionPolicy(), infos, null, null,
null);
       String[] endFiles = dir.listAll();
 
       if (!Arrays.equals(startFiles, endFiles)) {



Mime
View raw message