You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2011/10/28 19:53:31 UTC
svn commit: r1190472 - in /lucene/dev/branches/lucene2621/lucene:
contrib/misc/src/java/org/apache/lucene/index/codecs/appending/
contrib/misc/src/test/org/apache/lucene/index/
contrib/misc/src/test/org/apache/lucene/search/
src/java/org/apache/lucene/...
Author: mikemccand
Date: Fri Oct 28 17:53:30 2011
New Revision: 1190472
URL: http://svn.apache.org/viewvc?rev=1190472&view=rev
Log:
don't have Codec set possible extensions
Modified:
lucene/dev/branches/lucene2621/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingPostingsFormat.java
lucene/dev/branches/lucene2621/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java
lucene/dev/branches/lucene2621/lucene/contrib/misc/src/test/org/apache/lucene/search/TestSearcherManager.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexFileDeleter.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexFileNameFilter.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexFileNames.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsReader.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsReader.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/Codec.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/CodecProvider.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesConsumer.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesFormat.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DefaultFieldsFormat.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DocValuesFormat.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/FieldsFormat.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexReader.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/PostingsFormat.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/TermsIndexReaderBase.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/VariableGapTermsIndexReader.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xCodec.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xPostingsFormat.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40Codec.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40PostingsFormat.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/memory/MemoryPostingsFormat.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/perfield/PerFieldPostingsFormat.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsFormat.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/sep/SepDocValuesConsumer.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsWriter.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextPostingsFormat.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockFixedIntBlockPostingsFormat.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockVariableIntBlockPostingsFormat.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mockrandom/MockRandomPostingsFormat.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSepPostingsFormat.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/TestExternalCodecs.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocTermOrds.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/pulsing/TestPulsingReuse.java
Modified: lucene/dev/branches/lucene2621/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingPostingsFormat.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingPostingsFormat.java (original)
+++ lucene/dev/branches/lucene2621/lucene/contrib/misc/src/java/org/apache/lucene/index/codecs/appending/AppendingPostingsFormat.java Fri Oct 28 17:53:30 2011
@@ -130,9 +130,4 @@ class AppendingPostingsFormat extends Po
BlockTermsReader.files(dir, segmentInfo, formatId, files);
FixedGapTermsIndexReader.files(dir, segmentInfo, formatId, files);
}
-
- @Override
- public void getExtensions(Set<String> extensions) {
- Lucene40PostingsFormat.getStandardExtensions(extensions);
- }
}
Modified: lucene/dev/branches/lucene2621/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java (original)
+++ lucene/dev/branches/lucene2621/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java Fri Oct 28 17:53:30 2011
@@ -28,6 +28,7 @@ import org.apache.lucene.search.TermQuer
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.NRTCachingDirectory;
+@UseNoMemoryExpensiveCodec
public class TestNRTManager extends ThreadedIndexingAndSearchingTestCase {
private final ThreadLocal<Long> lastGens = new ThreadLocal<Long>();
Modified: lucene/dev/branches/lucene2621/lucene/contrib/misc/src/test/org/apache/lucene/search/TestSearcherManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/contrib/misc/src/test/org/apache/lucene/search/TestSearcherManager.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/contrib/misc/src/test/org/apache/lucene/search/TestSearcherManager.java (original)
+++ lucene/dev/branches/lucene2621/lucene/contrib/misc/src/test/org/apache/lucene/search/TestSearcherManager.java Fri Oct 28 17:53:30 2011
@@ -37,6 +37,7 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.util.NamedThreadFactory;
import org.apache.lucene.util._TestUtil;
+@UseNoMemoryExpensiveCodec
public class TestSearcherManager extends ThreadedIndexingAndSearchingTestCase {
boolean warmCalled;
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexFileDeleter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexFileDeleter.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexFileDeleter.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexFileDeleter.java Fri Oct 28 17:53:30 2011
@@ -122,8 +122,6 @@ final class IndexFileDeleter {
infoStream.println("IFD [" + new Date() + "; " + Thread.currentThread().getName() + "]: " + message);
}
- private final FilenameFilter indexFilenameFilter;
-
// called only from assert
private boolean locked() {
return writer == null || Thread.holdsLock(writer);
@@ -154,7 +152,6 @@ final class IndexFileDeleter {
// First pass: walk the files and initialize our ref
// counts:
long currentGen = segmentInfos.getGeneration();
- indexFilenameFilter = new IndexFileNameFilter(codecs);
CommitPoint currentCommitPoint = null;
String[] files = null;
@@ -167,7 +164,7 @@ final class IndexFileDeleter {
for (String fileName : files) {
- if ((indexFilenameFilter.accept(null, fileName)) && !fileName.endsWith("write.lock") && !fileName.equals(IndexFileNames.SEGMENTS_GEN)) {
+ if ((IndexFileNameFilter.INSTANCE.accept(null, fileName)) && !fileName.endsWith("write.lock") && !fileName.equals(IndexFileNames.SEGMENTS_GEN)) {
// Add this file to refCounts with initial count 0:
getRefCount(fileName);
@@ -373,7 +370,7 @@ final class IndexFileDeleter {
for(int i=0;i<files.length;i++) {
String fileName = files[i];
if ((segmentName == null || fileName.startsWith(segmentPrefix1) || fileName.startsWith(segmentPrefix2)) &&
- indexFilenameFilter.accept(null, fileName) &&
+ IndexFileNameFilter.INSTANCE.accept(null, fileName) &&
!refCounts.containsKey(fileName) &&
!fileName.equals(IndexFileNames.SEGMENTS_GEN)) {
// Unreferenced file, so remove it
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexFileNameFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexFileNameFilter.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexFileNameFilter.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexFileNameFilter.java Fri Oct 28 17:53:30 2011
@@ -20,50 +20,44 @@ package org.apache.lucene.index;
import java.io.File;
import java.io.FilenameFilter;
import java.util.HashSet;
+import java.util.regex.Pattern;
import org.apache.lucene.index.codecs.CodecProvider;
/**
- * Filename filter that accept filenames and extensions only
- * created by Lucene.
+ * Filename filter that attempts to accept only filenames
+ * created by Lucene. Note that this is a "best effort"
+ * process. If a file is used in a Lucene index, it will
+ * always match the file; but if a file is not used in a
+ * Lucene index but is named in a similar way to Lucene's
+ * files then this filter may accept the file.
+ *
+ * <p>This does not accept <code>*-write.lock</code> files.
*
* @lucene.internal
*/
public class IndexFileNameFilter implements FilenameFilter {
- private final HashSet<String> extensions;
-
- public IndexFileNameFilter(CodecProvider codecs) {
- extensions = new HashSet<String>();
- for (String ext : IndexFileNames.INDEX_EXTENSIONS) {
- extensions.add(ext);
- }
- if (codecs != null) {
- for(String ext : codecs.getAllExtensions()) {
- extensions.add(ext);
- }
- }
+ public static final FilenameFilter INSTANCE = new IndexFileNameFilter();
+
+ private IndexFileNameFilter() {
}
+ // nocommit -- test: make sure iw.rollback() doesn't remove write.lock!?
+
+ // nocommit: untested!!
+ private final Pattern luceneFilePattern = Pattern.compile("^_[a-z0-9]+(_[a-z0-9]+)?\\.[a-z0-9]+$");
+
/* (non-Javadoc)
* @see java.io.FilenameFilter#accept(java.io.File, java.lang.String)
*/
public boolean accept(File dir, String name) {
- int i = name.lastIndexOf('.');
- if (i != -1) {
- String extension = name.substring(1+i);
- if (extensions.contains(extension)) {
- return true;
- } else if (extension.startsWith("f") &&
- extension.matches("f\\d+")) {
- return true;
- } else if (extension.startsWith("s") &&
- extension.matches("s\\d+")) {
- return true;
- }
+ if (name.lastIndexOf('.') != -1) {
+ // Has an extension
+ return luceneFilePattern.matcher(name).matches();
} else {
- if (name.startsWith(IndexFileNames.SEGMENTS)) return true;
+ // No extension -- only segments_N file;
+ return name.startsWith(IndexFileNames.SEGMENTS);
}
- return false;
}
}
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexFileNames.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexFileNames.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexFileNames.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexFileNames.java Fri Oct 28 17:53:30 2011
@@ -21,6 +21,9 @@ import java.util.regex.Pattern;
import org.apache.lucene.index.codecs.PostingsFormat; // for javadocs
+// nocommit -- can we remove all the static extensions here?
+// these are codec private now
+
/**
* This class contains useful constants representing filenames and extensions
* used by lucene, as well as convenience methods for querying whether a file
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsReader.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsReader.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsReader.java Fri Oct 28 17:53:30 2011
@@ -198,10 +198,6 @@ public class BlockTermsReader extends Fi
files.add(IndexFileNames.segmentFileName(segmentInfo.name, id, BlockTermsWriter.TERMS_EXTENSION));
}
- public static void getExtensions(Collection<String> extensions) {
- extensions.add(BlockTermsWriter.TERMS_EXTENSION);
- }
-
@Override
public FieldsEnum iterator() {
return new TermFieldsEnum();
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsReader.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsReader.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsReader.java Fri Oct 28 17:53:30 2011
@@ -211,11 +211,6 @@ public class BlockTreeTermsReader extend
files.add(IndexFileNames.segmentFileName(segmentInfo.name, codecID, BlockTreeTermsWriter.TERMS_INDEX_EXTENSION));
}
- public static void getExtensions(Collection<String> extensions) {
- extensions.add(BlockTreeTermsWriter.TERMS_EXTENSION);
- extensions.add(BlockTreeTermsWriter.TERMS_INDEX_EXTENSION);
- }
-
@Override
public FieldsEnum iterator() {
return new TermFieldsEnum();
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/Codec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/Codec.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/Codec.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/Codec.java Fri Oct 28 17:53:30 2011
@@ -37,12 +37,6 @@ public abstract class Codec {
return name;
}
- public void getExtensions(Set<String> extensions) {
- postingsFormat().getExtensions(extensions);
- //TODO: not yet fieldsFormat().getExtensions(extensions);
- docValuesFormat().getExtensions(extensions);
- }
-
public void files(Directory dir, SegmentInfo info, Set<String> files) throws IOException {
postingsFormat().files(dir, info, 0, files);
//TODO: not yet fieldsFormat().files(dir, info, files);
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/CodecProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/CodecProvider.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/CodecProvider.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/CodecProvider.java Fri Oct 28 17:53:30 2011
@@ -40,9 +40,6 @@ public abstract class CodecProvider {
private final HashMap<String, Codec> codecs = new HashMap<String, Codec>();
- private final Set<String> knownExtensions = new HashSet<String>();
-
-
public final static String[] CORE_CODECS = new String[] { "Lucene40", "Lucene3x" };
public synchronized void register(Codec codec) {
@@ -51,7 +48,6 @@ public abstract class CodecProvider {
}
if (!codecs.containsKey(codec.getName())) {
codecs.put(codec.getName(), codec);
- codec.getExtensions(knownExtensions);
} else if (codecs.get(codec.getName()) != codec) {
throw new IllegalArgumentException("codec '" + codec.getName() + "' is already registered as a different codec instance");
}
@@ -77,10 +73,6 @@ public abstract class CodecProvider {
return codecs.keySet();
}
- public Collection<String> getAllExtensions() {
- return knownExtensions;
- }
-
public synchronized Codec lookup(String name) {
final Codec codec = codecs.get(name);
if (codec == null) {
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesConsumer.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesConsumer.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesConsumer.java Fri Oct 28 17:53:30 2011
@@ -67,9 +67,4 @@ public class DefaultDocValuesConsumer ex
}
}
}
-
- public static void getExtensions(Set<String> extensions) {
- extensions.add(IndexFileNames.COMPOUND_FILE_ENTRIES_EXTENSION);
- extensions.add(IndexFileNames.COMPOUND_FILE_EXTENSION);
- }
}
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesFormat.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesFormat.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DefaultDocValuesFormat.java Fri Oct 28 17:53:30 2011
@@ -38,11 +38,6 @@ public class DefaultDocValuesFormat exte
}
@Override
- public void getExtensions(Set<String> extensions) {
- DefaultDocValuesConsumer.getExtensions(extensions);
- }
-
- @Override
public void files(Directory dir, SegmentInfo info, int formatId, Set<String> files) throws IOException {
DefaultDocValuesConsumer.files(dir, info, formatId, files);
}
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DefaultFieldsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DefaultFieldsFormat.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DefaultFieldsFormat.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DefaultFieldsFormat.java Fri Oct 28 17:53:30 2011
@@ -42,12 +42,6 @@ public class DefaultFieldsFormat extends
}
@Override
- public void getExtensions(Set<String> extensions) {
- extensions.add(DefaultFieldsWriter.FIELDS_EXTENSION);
- extensions.add(DefaultFieldsWriter.FIELDS_INDEX_EXTENSION);
- }
-
- @Override
public void files(Directory dir, SegmentInfo info, Set<String> files) throws IOException {
// TODO!
}
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DocValuesFormat.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DocValuesFormat.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/DocValuesFormat.java Fri Oct 28 17:53:30 2011
@@ -28,6 +28,5 @@ import org.apache.lucene.store.Directory
public abstract class DocValuesFormat {
public abstract PerDocConsumer docsConsumer(PerDocWriteState state) throws IOException;
public abstract PerDocValues docsProducer(SegmentReadState state) throws IOException;
- public abstract void getExtensions(Set<String> extensions);
public abstract void files(Directory dir, SegmentInfo info, int formatId, Set<String> files) throws IOException;
}
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/FieldsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/FieldsFormat.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/FieldsFormat.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/FieldsFormat.java Fri Oct 28 17:53:30 2011
@@ -31,6 +31,5 @@ import org.apache.lucene.store.IOContext
public abstract class FieldsFormat {
public abstract FieldsReader fieldsReader(Directory directory, String segment, FieldInfos fn, IOContext context, int docStoreOffset, int size) throws IOException;
public abstract FieldsWriter fieldsWriter(Directory directory, String segment, IOContext context) throws IOException;
- public abstract void getExtensions(Set<String> extensions);
public abstract void files(Directory dir, SegmentInfo info, Set<String> files) throws IOException;
}
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexReader.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexReader.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexReader.java Fri Oct 28 17:53:30 2011
@@ -391,15 +391,6 @@ public class FixedGapTermsIndexReader ex
files.add(IndexFileNames.segmentFileName(info.name, id, FixedGapTermsIndexWriter.TERMS_INDEX_EXTENSION));
}
- public static void getIndexExtensions(Collection<String> extensions) {
- extensions.add(FixedGapTermsIndexWriter.TERMS_INDEX_EXTENSION);
- }
-
- @Override
- public void getExtensions(Collection<String> extensions) {
- getIndexExtensions(extensions);
- }
-
@Override
public void close() throws IOException {
if (in != null && !indexLoaded) {
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/PostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/PostingsFormat.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/PostingsFormat.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/PostingsFormat.java Fri Oct 28 17:53:30 2011
@@ -66,9 +66,6 @@ public abstract class PostingsFormat {
*/
public abstract void files(Directory dir, SegmentInfo segmentInfo, int id, Set<String> files) throws IOException;
- /** Records all file extensions this codec uses */
- public abstract void getExtensions(Set<String> extensions);
-
@Override
public String toString() {
return name;
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/TermsIndexReaderBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/TermsIndexReaderBase.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/TermsIndexReaderBase.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/TermsIndexReaderBase.java Fri Oct 28 17:53:30 2011
@@ -45,8 +45,6 @@ public abstract class TermsIndexReaderBa
public abstract void close() throws IOException;
- public abstract void getExtensions(Collection<String> extensions);
-
public abstract boolean supportsOrd();
public abstract int getDivisor();
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/VariableGapTermsIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/VariableGapTermsIndexReader.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/VariableGapTermsIndexReader.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/VariableGapTermsIndexReader.java Fri Oct 28 17:53:30 2011
@@ -219,15 +219,6 @@ public class VariableGapTermsIndexReader
files.add(IndexFileNames.segmentFileName(info.name, id, VariableGapTermsIndexWriter.TERMS_INDEX_EXTENSION));
}
- public static void getIndexExtensions(Collection<String> extensions) {
- extensions.add(VariableGapTermsIndexWriter.TERMS_INDEX_EXTENSION);
- }
-
- @Override
- public void getExtensions(Collection<String> extensions) {
- getIndexExtensions(extensions);
- }
-
@Override
public void close() throws IOException {
if (in != null && !indexLoaded) {
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xCodec.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xCodec.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xCodec.java Fri Oct 28 17:53:30 2011
@@ -58,9 +58,6 @@ public class Lucene3xCodec extends Codec
}
@Override
- public void getExtensions(Set<String> extensions) {}
-
- @Override
public void files(Directory dir, SegmentInfo info, int formatId, Set<String> files) throws IOException {}
};
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xPostingsFormat.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xPostingsFormat.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xPostingsFormat.java Fri Oct 28 17:53:30 2011
@@ -70,12 +70,4 @@ public class Lucene3xPostingsFormat exte
// preflex fields have no codec ID - we ignore it here
Lucene3xFields.files(dir, info, files);
}
-
- @Override
- public void getExtensions(Set<String> extensions) {
- extensions.add(FREQ_EXTENSION);
- extensions.add(PROX_EXTENSION);
- extensions.add(TERMS_EXTENSION);
- extensions.add(TERMS_INDEX_EXTENSION);
- }
}
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40Codec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40Codec.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40Codec.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40Codec.java Fri Oct 28 17:53:30 2011
@@ -22,6 +22,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.index.codecs.DefaultDocValuesFormat;
import org.apache.lucene.index.codecs.DefaultFieldsFormat;
@@ -62,8 +63,8 @@ public class Lucene40Codec extends Codec
postingsFormat = new PerFieldPostingsFormat() {
@Override
- protected String getPostingsFormatForField(String fieldName) {
- String format = perFieldMap.get(fieldName);
+ protected String getPostingsFormatForField(FieldInfo field) {
+ String format = perFieldMap.get(field.name);
if (format == null) {
format = defaultPostingsFormat;
}
@@ -71,7 +72,7 @@ public class Lucene40Codec extends Codec
}
@Override
- protected String getPostingsFormat(String formatName) {
+ protected PostingsFormat getPostingsFormat(String formatName) {
return CORE_FORMATS.get(formatName);
}
};
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40PostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40PostingsFormat.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40PostingsFormat.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40PostingsFormat.java Fri Oct 28 17:53:30 2011
@@ -108,17 +108,6 @@ public class Lucene40PostingsFormat exte
}
@Override
- public void getExtensions(Set<String> extensions) {
- getStandardExtensions(extensions);
- }
-
- public static void getStandardExtensions(Set<String> extensions) {
- extensions.add(FREQ_EXTENSION);
- extensions.add(PROX_EXTENSION);
- BlockTreeTermsReader.getExtensions(extensions);
- }
-
- @Override
public String toString() {
return name + "(minBlockSize=" + minBlockSize + " maxBlockSize=" + maxBlockSize + ")";
}
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/memory/MemoryPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/memory/MemoryPostingsFormat.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/memory/MemoryPostingsFormat.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/memory/MemoryPostingsFormat.java Fri Oct 28 17:53:30 2011
@@ -798,9 +798,4 @@ public class MemoryPostingsFormat extend
public void files(Directory dir, SegmentInfo segmentInfo, int id, Set<String> files) throws IOException {
files.add(IndexFileNames.segmentFileName(segmentInfo.name, id, EXTENSION));
}
-
- @Override
- public void getExtensions(Set<String> extensions) {
- extensions.add(EXTENSION);
- }
}
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/perfield/PerFieldPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/perfield/PerFieldPostingsFormat.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/perfield/PerFieldPostingsFormat.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/perfield/PerFieldPostingsFormat.java Fri Oct 28 17:53:30 2011
@@ -48,6 +48,9 @@ import org.apache.lucene.index.codecs.Te
import org.apache.lucene.index.values.IndexDocValues;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
+import org.apache.lucene.store.IndexInput;
+import org.apache.lucene.store.IndexOutput;
+import org.apache.lucene.util.CodecUtil;
import org.apache.lucene.util.IOUtils;
// nocommit: should we allow embedding of PerField in
@@ -143,12 +146,12 @@ public abstract class PerFieldPostingsFo
// Write _X.per:
final String mapFileName = IndexFileNames.segmentFileName(segmentWriteState.segmentName, segmentWriteState.formatId, PER_FIELD_EXTENSION);
- final IndexOutput out = segmentWriteState.directory.createOutput(termsFileName, segmentWriteState.context);
+ final IndexOutput out = segmentWriteState.directory.createOutput(mapFileName, segmentWriteState.context);
boolean success = false;
try {
- codecUtil.writeHeader(out, PER_FIELD_NAME, VERSION_LATEST);
+ CodecUtil.writeHeader(out, PER_FIELD_NAME, VERSION_LATEST);
out.writeVInt(formats.size());
- for(Map.Entry<String,FieldsConsumerAndID> ent : formats.entries()) {
+ for(Map.Entry<String,FieldsConsumerAndID> ent : formats.entrySet()) {
out.writeVInt(ent.getValue().formatID);
out.writeString(ent.getKey());
}
@@ -173,10 +176,10 @@ public abstract class PerFieldPostingsFo
// Read _X.per and init each format:
boolean success = false;
try {
- new VisitPerFieldFile(readState.dir, readState.segmentName) {
+ new VisitPerFieldFile(readState.dir, readState.segmentInfo.name) {
@Override
protected void visitOneFormat(String formatName, int formatID, PostingsFormat postingsFormat) throws IOException {
- formats.put(formatName, postingsFormat.fieldsProducer(new SegmentReadState(segmentReadState, formatID)));
+ formats.put(formatName, postingsFormat.fieldsProducer(new SegmentReadState(readState, formatID)));
}
};
success = true;
@@ -191,12 +194,11 @@ public abstract class PerFieldPostingsFo
try {
for (FieldInfo fi : readState.fieldInfos) {
if (fi.isIndexed) {
- fields.add(fi.name);
- String formatName = getPostingsFormatForField(fi.name);
+ String formatName = getPostingsFormatForField(fi);
FieldsProducer fieldsProducer = formats.get(formatName);
// Better be defined, because it was defined
// during indexing:
- assert fieldsProduder != null;
+ assert fieldsProducer != null;
fields.put(fi.name, fieldsProducer);
}
}
@@ -217,7 +219,7 @@ public abstract class PerFieldPostingsFo
private String current;
public FieldsIterator() {
- it = fields.iterator();
+ it = fields.keySet().iterator();
}
@Override
@@ -249,8 +251,8 @@ public abstract class PerFieldPostingsFo
@Override
public Terms terms(String field) throws IOException {
- FieldsProducer fields = fields.get(field);
- return fields == null ? null : fields.terms(field);
+ FieldsProducer fieldsProducer = fields.get(field);
+ return fieldsProducer == null ? null : fieldsProducer.terms(field);
}
@Override
@@ -265,13 +267,12 @@ public abstract class PerFieldPostingsFo
return new FieldsReader(state);
}
- private static abstract class VisitPerFieldFile {
- public VisitPerFieldFile(Directory dir, String segmentName) {
+ private abstract class VisitPerFieldFile {
+ public VisitPerFieldFile(Directory dir, String segmentName) throws IOException {
// nocommit -- should formatID be a String not int?
// so we can embed one PFPF in another? ie just keep
// appending _N to it...
- final String mapFileName = IndexFileNames.segmentFileName(segmentName, formatId, PER_FIELD_EXTENSION);
- files.add(mapFileName);
+ final String mapFileName = IndexFileNames.segmentFileName(segmentName, 0, PER_FIELD_EXTENSION);
final IndexInput in = dir.openInput(mapFileName, IOContext.READONCE);
boolean success = false;
try {
@@ -289,14 +290,14 @@ public abstract class PerFieldPostingsFo
success = true;
} finally {
if (!success) {
- IOUtils.closeWhileHandlingExcpetion(in);
+ IOUtils.closeWhileHandlingException(in);
} else {
IOUtils.close(in);
}
}
}
- protected abstract void visitOneFormat(PostingsFormat format) throws IOException;
+ protected abstract void visitOneFormat(String formatName, int formatID, PostingsFormat format) throws IOException;
}
@Override
@@ -314,17 +315,6 @@ public abstract class PerFieldPostingsFo
};
}
- @Override
- public void getExtensions(final Directory dir, final SegmentInfo info, final Set<String> extensions) {
- extensions.add(PER_FIELD_EXTENSION);
- new VisitPerFieldFile(dir, info.name) {
- @Override
- protected void visitOneFormat(String formatName, int formatID, PostingsFormat format) throws IOException {
- format.getExtension(dir, info, extensions);
- }
- };
- }
-
protected abstract String getPostingsFormatForField(FieldInfo field);
protected abstract PostingsFormat getPostingsFormat(String formatName);
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsFormat.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsFormat.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsFormat.java Fri Oct 28 17:53:30 2011
@@ -130,9 +130,4 @@ public class PulsingPostingsFormat exten
Lucene40PostingsReader.files(dir, segmentInfo, codecID, files);
BlockTreeTermsReader.files(dir, segmentInfo, codecID, files);
}
-
- @Override
- public void getExtensions(Set<String> extensions) {
- Lucene40PostingsFormat.getStandardExtensions(extensions);
- }
}
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/sep/SepDocValuesConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/sep/SepDocValuesConsumer.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/sep/SepDocValuesConsumer.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/sep/SepDocValuesConsumer.java Fri Oct 28 17:53:30 2011
@@ -83,9 +83,4 @@ public class SepDocValuesConsumer extend
}
}
}
-
- public static void getExtensions(Set<String> extensions) {
- extensions.add(Writer.DATA_EXTENSION);
- extensions.add(Writer.INDEX_EXTENSION);
- }
}
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsWriter.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsWriter.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/sep/SepPostingsWriter.java Fri Oct 28 17:53:30 2011
@@ -391,12 +391,4 @@ public final class SepPostingsWriter ext
public void close() throws IOException {
IOUtils.close(docOut, skipOut, freqOut, posOut, payloadOut);
}
-
- public static void getExtensions(Set<String> extensions) {
- extensions.add(DOC_EXTENSION);
- extensions.add(FREQ_EXTENSION);
- extensions.add(SKIP_EXTENSION);
- extensions.add(POS_EXTENSION);
- extensions.add(PAYLOAD_EXTENSION);
- }
}
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextPostingsFormat.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextPostingsFormat.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextPostingsFormat.java Fri Oct 28 17:53:30 2011
@@ -65,9 +65,4 @@ public class SimpleTextPostingsFormat ex
public void files(Directory dir, SegmentInfo segmentInfo, int id, Set<String> files) throws IOException {
files.add(getPostingsFileName(segmentInfo.name, id));
}
-
- @Override
- public void getExtensions(Set<String> extensions) {
- extensions.add(POSTINGS_EXTENSION);
- }
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java Fri Oct 28 17:53:30 2011
@@ -35,9 +35,6 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.codecs.Codec;
-import org.apache.lucene.index.codecs.CodecProvider;
-import org.apache.lucene.index.codecs.perfield.PerFieldCodec;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.PhraseQuery;
import org.apache.lucene.search.Query;
@@ -434,19 +431,6 @@ public abstract class ThreadedIndexingAn
final long t0 = System.currentTimeMillis();
- // nocommit: make some kind of idiom for this?
- // or can we just use the annotation?
- Codec codec = CodecProvider.getDefault().getDefaultCodec();
-
- if (codec instanceof PerFieldCodec) {
- PerFieldCodec perField = (PerFieldCodec) codec;
- final String defaultFormat = perField.getDefaultPostingsFormat();
- if (defaultFormat.equals("SimpleText") || defaultFormat.equals("Memory")) {
- // no
- CodecProvider.setDefault(_TestUtil.alwaysCodec("Lucene40"));
- }
- }
-
final LineFileDocs docs = new LineFileDocs(random);
final File tempDir = _TestUtil.getTempDir(testName);
dir = newFSDirectory(tempDir);
Modified: lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockFixedIntBlockPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockFixedIntBlockPostingsFormat.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockFixedIntBlockPostingsFormat.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockFixedIntBlockPostingsFormat.java Fri Oct 28 17:53:30 2011
@@ -211,14 +211,6 @@ public class MockFixedIntBlockPostingsFo
}
@Override
- public void getExtensions(Set<String> extensions) {
- SepPostingsWriter.getExtensions(extensions);
- BlockTermsReader.getExtensions(extensions);
- FixedGapTermsIndexReader.getIndexExtensions(extensions);
- SepDocValuesConsumer.getExtensions(extensions);
- }
-
- @Override
public PerDocConsumer docsConsumer(PerDocWriteState state) throws IOException {
return new SepDocValuesConsumer(state);
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockVariableIntBlockPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockVariableIntBlockPostingsFormat.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockVariableIntBlockPostingsFormat.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mockintblock/MockVariableIntBlockPostingsFormat.java Fri Oct 28 17:53:30 2011
@@ -234,14 +234,6 @@ public class MockVariableIntBlockPosting
}
@Override
- public void getExtensions(Set<String> extensions) {
- SepPostingsWriter.getExtensions(extensions);
- BlockTermsReader.getExtensions(extensions);
- FixedGapTermsIndexReader.getIndexExtensions(extensions);
- SepDocValuesConsumer.getExtensions(extensions);
- }
-
- @Override
public PerDocConsumer docsConsumer(PerDocWriteState state) throws IOException {
return new SepDocValuesConsumer(state);
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mockrandom/MockRandomPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mockrandom/MockRandomPostingsFormat.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mockrandom/MockRandomPostingsFormat.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mockrandom/MockRandomPostingsFormat.java Fri Oct 28 17:53:30 2011
@@ -442,22 +442,6 @@ public class MockRandomPostingsFormat ex
//System.out.println("MockRandom.files return " + files);
}
- @Override
- public void getExtensions(Set<String> extensions) {
- SepPostingsWriter.getExtensions(extensions);
- BlockTermsReader.getExtensions(extensions);
- BlockTreeTermsReader.getExtensions(extensions);
- FixedGapTermsIndexReader.getIndexExtensions(extensions);
- VariableGapTermsIndexReader.getIndexExtensions(extensions);
- if (useSepDocValues) {
- SepDocValuesConsumer.getExtensions(extensions);
- } else {
- DefaultDocValuesConsumer.getExtensions(extensions);
- }
- extensions.add(SEED_EXT);
- //System.out.println("MockRandom.getExtensions return " + extensions);
- }
-
// can we make this more evil?
@Override
public PerDocConsumer docsConsumer(PerDocWriteState state) throws IOException {
Modified: lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSepPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSepPostingsFormat.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSepPostingsFormat.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/codecs/mocksep/MockSepPostingsFormat.java Fri Oct 28 17:53:30 2011
@@ -143,18 +143,6 @@ public class MockSepPostingsFormat exten
}
@Override
- public void getExtensions(Set<String> extensions) {
- getSepExtensions(extensions);
- }
-
- public static void getSepExtensions(Set<String> extensions) {
- SepPostingsWriter.getExtensions(extensions);
- BlockTermsReader.getExtensions(extensions);
- FixedGapTermsIndexReader.getIndexExtensions(extensions);
- SepDocValuesConsumer.getExtensions(extensions);
- }
-
- @Override
public PerDocConsumer docsConsumer(PerDocWriteState state) throws IOException {
return new SepDocValuesConsumer(state);
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/TestExternalCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/TestExternalCodecs.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/TestExternalCodecs.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/TestExternalCodecs.java Fri Oct 28 17:53:30 2011
@@ -498,10 +498,6 @@ public class TestExternalCodecs extends
}
@Override
- public void getExtensions(Set<String> extensions) {
- }
-
- @Override
public void files(Directory dir, SegmentInfo segmentInfo, int codecId, Set<String> files) {
}
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocTermOrds.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocTermOrds.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocTermOrds.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDocTermOrds.java Fri Oct 28 17:53:30 2011
@@ -230,18 +230,6 @@ public class TestDocTermOrds extends Luc
BlockTermsReader.files(dir, segmentInfo, id, files);
FixedGapTermsIndexReader.files(dir, segmentInfo, id, files);
}
-
- @Override
- public void getExtensions(Set<String> extensions) {
- getStandardExtensions(extensions);
- }
-
- public static void getStandardExtensions(Set<String> extensions) {
- extensions.add(FREQ_EXTENSION);
- extensions.add(PROX_EXTENSION);
- BlockTermsReader.getExtensions(extensions);
- FixedGapTermsIndexReader.getIndexExtensions(extensions);
- }
}
public void testRandom() throws Exception {
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/pulsing/TestPulsingReuse.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/pulsing/TestPulsingReuse.java?rev=1190472&r1=1190471&r2=1190472&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/pulsing/TestPulsingReuse.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/codecs/pulsing/TestPulsingReuse.java Fri Oct 28 17:53:30 2011
@@ -195,10 +195,5 @@ public class TestPulsingReuse extends Lu
Lucene40PostingsReader.files(dir, segmentInfo, id, files);
BlockTreeTermsReader.files(dir, segmentInfo, id, files);
}
-
- @Override
- public void getExtensions(Set<String> extensions) {
- Lucene40PostingsFormat.getStandardExtensions(extensions);
- }
}
}