lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rm...@apache.org
Subject svn commit: r921812 - in /lucene/java/branches/flex_1458_3_0_back_compat_tests/src: java/org/apache/lucene/index/ java/org/apache/lucene/index/codecs/ test/org/apache/lucene/index/
Date Thu, 11 Mar 2010 11:52:48 GMT
Author: rmuir
Date: Thu Mar 11 11:52:47 2010
New Revision: 921812

URL: http://svn.apache.org/viewvc?rev=921812&view=rev
Log:
LUCENE-2111: update backwards for Codecs->CodecProvider

Added:
    lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/codecs/CodecProvider.java
      - copied, changed from r916665, lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/codecs/Codecs.java
Removed:
    lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/codecs/Codecs.java
Modified:
    lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/SegmentMerger.java
    lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/SegmentReader.java
    lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/index/TestDoc.java
    lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/index/TestSegmentMerger.java

Modified: lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/SegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/SegmentMerger.java?rev=921812&r1=921811&r2=921812&view=diff
==============================================================================
--- lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/SegmentMerger.java
(original)
+++ lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/SegmentMerger.java
Thu Mar 11 11:52:47 2010
@@ -30,7 +30,7 @@ import org.apache.lucene.store.Directory
 import org.apache.lucene.store.IndexInput;
 import org.apache.lucene.store.IndexOutput;
 import org.apache.lucene.index.codecs.Codec;
-import org.apache.lucene.index.codecs.Codecs;
+import org.apache.lucene.index.codecs.CodecProvider;
 
 /**
  * The SegmentMerger class combines two or more Segments, represented by an IndexReader ({@link
#add},
@@ -102,7 +102,7 @@ final class SegmentMerger {
   }
 
   // stub
-  SegmentMerger(Directory dir, int termIndexInterval, String name, MergePolicy.OneMerge merge,
Codecs codecs) {  
+  SegmentMerger(Directory dir, int termIndexInterval, String name, MergePolicy.OneMerge merge,
CodecProvider codecs) {  
     checkAbort = null;
   }
 

Modified: lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/SegmentReader.java?rev=921812&r1=921811&r2=921812&view=diff
==============================================================================
--- lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/SegmentReader.java
(original)
+++ lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/SegmentReader.java
Thu Mar 11 11:52:47 2010
@@ -37,7 +37,7 @@ import org.apache.lucene.store.IndexInpu
 import org.apache.lucene.store.IndexOutput;
 import org.apache.lucene.util.BitVector;
 import org.apache.lucene.util.CloseableThreadLocal;
-import org.apache.lucene.index.codecs.Codecs;
+import org.apache.lucene.index.codecs.CodecProvider;
 
 /** @version $Id */
 /**
@@ -602,7 +602,7 @@ public class SegmentReader extends Index
                                   int readBufferSize,
                                   boolean doOpenStores,
                                   int termInfosIndexDivisor,
-                                  Codecs codecs) {
+                                  CodecProvider codecs) {
     return null;
   }
 

Copied: lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/codecs/CodecProvider.java
(from r916665, lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/codecs/Codecs.java)
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/codecs/CodecProvider.java?p2=lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/codecs/CodecProvider.java&p1=lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/codecs/Codecs.java&r1=916665&r2=921812&rev=921812&view=diff
==============================================================================
--- lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/codecs/Codecs.java
(original)
+++ lucene/java/branches/flex_1458_3_0_back_compat_tests/src/java/org/apache/lucene/index/codecs/CodecProvider.java
Thu Mar 11 11:52:47 2010
@@ -18,8 +18,8 @@ package org.apache.lucene.index.codecs;
  */
 
 // stub
-public class Codecs {
-  public static Codecs getDefault() {
+public class CodecProvider {
+  public static CodecProvider getDefault() {
     return null;
   }
 }
\ No newline at end of file

Modified: lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/index/TestDoc.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/index/TestDoc.java?rev=921812&r1=921811&r2=921812&view=diff
==============================================================================
--- lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/index/TestDoc.java
(original)
+++ lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/index/TestDoc.java
Thu Mar 11 11:52:47 2010
@@ -35,7 +35,7 @@ import org.apache.lucene.document.Field;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.index.codecs.Codecs;
+import org.apache.lucene.index.codecs.CodecProvider;
 
 
 /** JUnit adaptation of an older test case DocTest. */
@@ -181,7 +181,7 @@ public class TestDoc extends LuceneTestC
       SegmentReader r1 = SegmentReader.get(true, si1, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR);
       SegmentReader r2 = SegmentReader.get(true, si2, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR);
 
-      SegmentMerger merger = new SegmentMerger(si1.dir, IndexWriter.DEFAULT_TERM_INDEX_INTERVAL,
merged, null, Codecs.getDefault());
+      SegmentMerger merger = new SegmentMerger(si1.dir, IndexWriter.DEFAULT_TERM_INDEX_INTERVAL,
merged, null, CodecProvider.getDefault());
 
       merger.add(r1);
       merger.add(r2);

Modified: lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/index/TestSegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/index/TestSegmentMerger.java?rev=921812&r1=921811&r2=921812&view=diff
==============================================================================
--- lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/index/TestSegmentMerger.java
(original)
+++ lucene/java/branches/flex_1458_3_0_back_compat_tests/src/test/org/apache/lucene/index/TestSegmentMerger.java
Thu Mar 11 11:52:47 2010
@@ -22,7 +22,7 @@ import org.apache.lucene.store.BufferedI
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.RAMDirectory;
 import org.apache.lucene.document.Document;
-import org.apache.lucene.index.codecs.Codecs;
+import org.apache.lucene.index.codecs.CodecProvider;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -65,7 +65,7 @@ public class TestSegmentMerger extends L
   }
   
   public void testMerge() throws IOException {                             
-    SegmentMerger merger = new SegmentMerger(mergedDir, IndexWriter.DEFAULT_TERM_INDEX_INTERVAL,
mergedSegment, null, Codecs.getDefault());
+    SegmentMerger merger = new SegmentMerger(mergedDir, IndexWriter.DEFAULT_TERM_INDEX_INTERVAL,
mergedSegment, null, CodecProvider.getDefault());
     merger.add(reader1);
     merger.add(reader2);
     int docsMerged = merger.merge();



Mime
View raw message