You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/10/30 02:59:14 UTC
svn commit: r1195088 - in /lucene/dev/branches/lucene2621:
lucene/contrib/misc/src/java/org/apache/lucene/index/
lucene/src/java/org/apache/lucene/index/
lucene/src/java/org/apache/lucene/index/codecs/perfield/
lucene/src/test-framework/org/apache/luce...
Author: rmuir
Date: Sun Oct 30 01:59:13 2011
New Revision: 1195088
URL: http://svn.apache.org/viewvc?rev=1195088&view=rev
Log:
LUCENE-3490: clean up use of CodecProvider.getDefault, so its more obvious when its being used
Modified:
lucene/dev/branches/lucene2621/lucene/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java
lucene/dev/branches/lucene2621/lucene/contrib/misc/src/java/org/apache/lucene/index/IndexSplitter.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/CheckIndex.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DirectoryReader.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/IndexReader.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentInfo.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentInfos.java
lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/codecs/perfield/PerFieldPostingsFormat.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestGlobalFieldNumbers.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReader.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterOptimize.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSegmentInfo.java
lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSizeBoundedOptimize.java
lucene/dev/branches/lucene2621/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
Modified: lucene/dev/branches/lucene2621/lucene/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java?rev=1195088&r1=1195087&r2=1195088&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java (original)
+++ lucene/dev/branches/lucene2621/lucene/contrib/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java Sun Oct 30 01:59:13 2011
@@ -22,6 +22,8 @@ import java.io.IOException;
import java.util.Collections;
import java.util.Map;
+import org.apache.lucene.index.codecs.CodecProvider;
+
/**
* Merge policy that tries to balance not doing large
* segment merges with not accumulating too many segments in
@@ -252,7 +254,8 @@ public class BalancedSegmentMergePolicy
if(numLargeSegs < numSegs) {
// hack to create a shallow sub-range as SegmentInfos instance,
// it does not clone all metadata, but LogMerge does not need it
- final SegmentInfos smallSegments = new SegmentInfos();
+ // nocommit
+ final SegmentInfos smallSegments = new SegmentInfos(CodecProvider.getDefault());
smallSegments.rollbackSegmentInfos(infos.asList().subList(numLargeSegs, numSegs));
spec = super.findMergesToExpungeDeletes(smallSegments);
}
@@ -319,7 +322,8 @@ public class BalancedSegmentMergePolicy
} else {
// hack to create a shallow sub-range as SegmentInfos instance,
// it does not clone all metadata, but LogMerge does not need it
- final SegmentInfos smallSegments = new SegmentInfos();
+ // nocommit
+ final SegmentInfos smallSegments = new SegmentInfos(CodecProvider.getDefault());
smallSegments.rollbackSegmentInfos(infos.asList().subList(numLargeSegs, numSegs));
MergeSpecification spec = super.findMerges(smallSegments);
Modified: lucene/dev/branches/lucene2621/lucene/contrib/misc/src/java/org/apache/lucene/index/IndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/contrib/misc/src/java/org/apache/lucene/index/IndexSplitter.java?rev=1195088&r1=1195087&r2=1195088&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/contrib/misc/src/java/org/apache/lucene/index/IndexSplitter.java (original)
+++ lucene/dev/branches/lucene2621/lucene/contrib/misc/src/java/org/apache/lucene/index/IndexSplitter.java Sun Oct 30 01:59:13 2011
@@ -106,7 +106,7 @@ public class IndexSplitter {
this.codecs = codecs;
fsDir = FSDirectory.open(dir);
infos = new SegmentInfos(codecs);
- infos.read(fsDir, codecs);
+ infos.read(fsDir);
}
public void listSegments() throws IOException {
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/CheckIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/CheckIndex.java?rev=1195088&r1=1195087&r2=1195088&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/CheckIndex.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/CheckIndex.java Sun Oct 30 01:59:13 2011
@@ -346,7 +346,7 @@ public class CheckIndex {
Status result = new Status();
result.dir = dir;
try {
- sis.read(dir, codecs);
+ sis.read(dir);
} catch (Throwable t) {
msg("ERROR: could not read any segments file in directory");
result.missingSegments = true;
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DirectoryReader.java?rev=1195088&r1=1195087&r2=1195088&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DirectoryReader.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/DirectoryReader.java Sun Oct 30 01:59:13 2011
@@ -78,15 +78,14 @@ class DirectoryReader extends IndexReade
// }
static IndexReader open(final Directory directory, final IndexDeletionPolicy deletionPolicy, final IndexCommit commit, final boolean readOnly,
- final int termInfosIndexDivisor, CodecProvider codecs) throws CorruptIndexException, IOException {
- final CodecProvider codecProvider = codecs == null ? CodecProvider.getDefault()
- : codecs;
+ final int termInfosIndexDivisor, final CodecProvider codecs) throws CorruptIndexException, IOException {
+ assert codecs != null;
return (IndexReader) new SegmentInfos.FindSegmentsFile(directory) {
@Override
protected Object doBody(String segmentFileName) throws CorruptIndexException, IOException {
- SegmentInfos infos = new SegmentInfos(codecProvider);
- infos.read(directory, segmentFileName, codecProvider);
- return new DirectoryReader(directory, infos, deletionPolicy, readOnly, termInfosIndexDivisor, codecProvider);
+ SegmentInfos infos = new SegmentInfos(codecs);
+ infos.read(directory, segmentFileName);
+ return new DirectoryReader(directory, infos, deletionPolicy, readOnly, termInfosIndexDivisor, codecs);
}
}.run(commit);
}
@@ -103,11 +102,8 @@ class DirectoryReader extends IndexReade
this.segmentInfos = sis;
this.deletionPolicy = deletionPolicy;
this.termInfosIndexDivisor = termInfosIndexDivisor;
- if (codecs == null) {
- this.codecs = CodecProvider.getDefault();
- } else {
- this.codecs = codecs;
- }
+ this.codecs = codecs;
+ assert codecs != null;
readerFinishedListeners = new MapBackedSet<ReaderFinishedListener>(new ConcurrentHashMap<ReaderFinishedListener,Boolean>());
applyAllDeletes = false;
@@ -147,11 +143,8 @@ class DirectoryReader extends IndexReade
this.applyAllDeletes = applyAllDeletes; // saved for reopen
this.termInfosIndexDivisor = writer.getConfig().getReaderTermsIndexDivisor();
- if (codecs == null) {
- this.codecs = CodecProvider.getDefault();
- } else {
- this.codecs = codecs;
- }
+ this.codecs = codecs;
+ assert codecs != null;
readerFinishedListeners = writer.getReaderFinishedListeners();
// IndexWriter synchronizes externally before calling
@@ -209,12 +202,8 @@ class DirectoryReader extends IndexReade
this.readerFinishedListeners = readerFinishedListeners;
applyAllDeletes = false;
- if (codecs == null) {
- this.codecs = CodecProvider.getDefault();
- } else {
- this.codecs = codecs;
- }
-
+ assert codecs != null;
+ this.codecs = codecs;
// we put the old SegmentReaders in a map, that allows us
// to lookup a reader using its segment name
@@ -499,7 +488,7 @@ class DirectoryReader extends IndexReade
@Override
protected Object doBody(String segmentFileName) throws CorruptIndexException, IOException {
final SegmentInfos infos = new SegmentInfos(codecs);
- infos.read(directory, segmentFileName, codecs);
+ infos.read(directory, segmentFileName);
return doOpenIfChanged(infos, false, openReadOnly);
}
}.run(commit);
@@ -935,7 +924,7 @@ class DirectoryReader extends IndexReade
List<IndexCommit> commits = new ArrayList<IndexCommit>();
SegmentInfos latest = new SegmentInfos(codecs);
- latest.read(dir, codecs);
+ latest.read(dir);
final long currentGen = latest.getGeneration();
commits.add(new ReaderCommit(latest, dir));
@@ -952,7 +941,7 @@ class DirectoryReader extends IndexReade
try {
// IOException allowed to throw there, in case
// segments_N is corrupt
- sis.read(dir, fileName, codecs);
+ sis.read(dir, fileName);
} catch (FileNotFoundException fnfe) {
// LUCENE-948: on NFS (and maybe others), if
// you have writers switching back and forth
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=1195088&r1=1195087&r2=1195088&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 Sun Oct 30 01:59:13 2011
@@ -18,7 +18,6 @@ package org.apache.lucene.index;
*/
import java.io.FileNotFoundException;
-import java.io.FilenameFilter;
import java.io.IOException;
import java.io.PrintStream;
import java.util.ArrayList;
@@ -179,7 +178,7 @@ final class IndexFileDeleter {
}
SegmentInfos sis = new SegmentInfos(codecs);
try {
- sis.read(directory, fileName, codecs);
+ sis.read(directory, fileName);
} catch (FileNotFoundException e) {
// LUCENE-948: on NFS (and maybe others), if
// you have writers switching back and forth
@@ -252,7 +251,7 @@ final class IndexFileDeleter {
// try now to explicitly open this commit point:
SegmentInfos sis = new SegmentInfos(codecs);
try {
- sis.read(directory, currentSegmentsFile, codecs);
+ sis.read(directory, currentSegmentsFile);
} catch (IOException e) {
throw new CorruptIndexException("failed to locate current segments_N file");
}
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexReader.java?rev=1195088&r1=1195087&r2=1195088&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexReader.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexReader.java Sun Oct 30 01:59:13 2011
@@ -312,7 +312,7 @@ public abstract class IndexReader implem
* @throws IOException if there is a low-level IO error
*/
public static IndexReader open(final Directory directory) throws CorruptIndexException, IOException {
- return open(directory, null, null, true, DEFAULT_TERMS_INDEX_DIVISOR, null);
+ return open(directory, null, null, true, DEFAULT_TERMS_INDEX_DIVISOR, CodecProvider.getDefault());
}
/** Returns an IndexReader reading the index in the given
@@ -326,7 +326,7 @@ public abstract class IndexReader implem
* @throws IOException if there is a low-level IO error
*/
public static IndexReader open(final Directory directory, boolean readOnly) throws CorruptIndexException, IOException {
- return open(directory, null, null, readOnly, DEFAULT_TERMS_INDEX_DIVISOR, null);
+ return open(directory, null, null, readOnly, DEFAULT_TERMS_INDEX_DIVISOR, CodecProvider.getDefault());
}
/**
@@ -363,7 +363,7 @@ public abstract class IndexReader implem
* @throws IOException if there is a low-level IO error
*/
public static IndexReader open(final IndexCommit commit, boolean readOnly) throws CorruptIndexException, IOException {
- return open(commit.getDirectory(), null, commit, readOnly, DEFAULT_TERMS_INDEX_DIVISOR, null);
+ return open(commit.getDirectory(), null, commit, readOnly, DEFAULT_TERMS_INDEX_DIVISOR, CodecProvider.getDefault());
}
/** Expert: returns an IndexReader reading the index in
@@ -381,7 +381,7 @@ public abstract class IndexReader implem
* @throws IOException if there is a low-level IO error
*/
public static IndexReader open(final Directory directory, IndexDeletionPolicy deletionPolicy, boolean readOnly) throws CorruptIndexException, IOException {
- return open(directory, deletionPolicy, null, readOnly, DEFAULT_TERMS_INDEX_DIVISOR, null);
+ return open(directory, deletionPolicy, null, readOnly, DEFAULT_TERMS_INDEX_DIVISOR, CodecProvider.getDefault());
}
/** Expert: returns an IndexReader reading the index in
@@ -409,7 +409,7 @@ public abstract class IndexReader implem
* @throws IOException if there is a low-level IO error
*/
public static IndexReader open(final Directory directory, IndexDeletionPolicy deletionPolicy, boolean readOnly, int termInfosIndexDivisor) throws CorruptIndexException, IOException {
- return open(directory, deletionPolicy, null, readOnly, termInfosIndexDivisor, null);
+ return open(directory, deletionPolicy, null, readOnly, termInfosIndexDivisor, CodecProvider.getDefault());
}
/** Expert: returns an IndexReader reading the index in
@@ -429,7 +429,7 @@ public abstract class IndexReader implem
* @throws IOException if there is a low-level IO error
*/
public static IndexReader open(final IndexCommit commit, IndexDeletionPolicy deletionPolicy, boolean readOnly) throws CorruptIndexException, IOException {
- return open(commit.getDirectory(), deletionPolicy, commit, readOnly, DEFAULT_TERMS_INDEX_DIVISOR, null);
+ return open(commit.getDirectory(), deletionPolicy, commit, readOnly, DEFAULT_TERMS_INDEX_DIVISOR, CodecProvider.getDefault());
}
/** Expert: returns an IndexReader reading the index in
@@ -462,7 +462,7 @@ public abstract class IndexReader implem
* @throws IOException if there is a low-level IO error
*/
public static IndexReader open(final IndexCommit commit, IndexDeletionPolicy deletionPolicy, boolean readOnly, int termInfosIndexDivisor) throws CorruptIndexException, IOException {
- return open(commit.getDirectory(), deletionPolicy, commit, readOnly, termInfosIndexDivisor, null);
+ return open(commit.getDirectory(), deletionPolicy, commit, readOnly, termInfosIndexDivisor, CodecProvider.getDefault());
}
/** Expert: returns an IndexReader reading the index in
@@ -530,9 +530,7 @@ public abstract class IndexReader implem
private static IndexReader open(final Directory directory, final IndexDeletionPolicy deletionPolicy, final IndexCommit commit, final boolean readOnly, int termInfosIndexDivisor,
CodecProvider codecs) throws CorruptIndexException, IOException {
- if (codecs == null) {
- codecs = CodecProvider.getDefault();
- }
+ assert codecs != null;
return DirectoryReader.open(directory, deletionPolicy, commit, readOnly, termInfosIndexDivisor, codecs);
}
@@ -953,12 +951,7 @@ public abstract class IndexReader implem
* @throws IOException if there is a problem with accessing the index
*/
public static boolean indexExists(Directory directory) throws IOException {
- try {
- new SegmentInfos().read(directory);
- return true;
- } catch (IOException ioe) {
- return false;
- }
+ return indexExists(directory, CodecProvider.getDefault());
}
/**
@@ -970,7 +963,7 @@ public abstract class IndexReader implem
*/
public static boolean indexExists(Directory directory, CodecProvider codecProvider) throws IOException {
try {
- new SegmentInfos().read(directory, codecProvider);
+ new SegmentInfos(codecProvider).read(directory);
return true;
} catch (IOException ioe) {
return false;
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexWriter.java?rev=1195088&r1=1195087&r2=1195088&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/IndexWriter.java Sun Oct 30 01:59:13 2011
@@ -871,7 +871,7 @@ public class IndexWriter implements Clos
// searching. In this case we write the next
// segments_N file with no segments:
try {
- segmentInfos.read(directory, codecs);
+ segmentInfos.read(directory);
segmentInfos.clear();
} catch (IOException e) {
// Likely this means it's a fresh directory
@@ -882,7 +882,7 @@ public class IndexWriter implements Clos
changeCount++;
segmentInfos.changed();
} else {
- segmentInfos.read(directory, codecs);
+ segmentInfos.read(directory);
IndexCommit commit = conf.getIndexCommit();
if (commit != null) {
@@ -894,7 +894,7 @@ public class IndexWriter implements Clos
if (commit.getDirectory() != directory)
throw new IllegalArgumentException("IndexCommit's directory doesn't match my directory");
SegmentInfos oldInfos = new SegmentInfos(codecs);
- oldInfos.read(directory, commit.getSegmentsFileName(), codecs);
+ oldInfos.read(directory, commit.getSegmentsFileName());
segmentInfos.replace(oldInfos);
changeCount++;
segmentInfos.changed();
@@ -2482,7 +2482,7 @@ public class IndexWriter implements Clos
message("addIndexes: process directory " + dir);
}
SegmentInfos sis = new SegmentInfos(codecs); // read infos from dir
- sis.read(dir, codecs);
+ sis.read(dir);
final Set<String> dsFilesCopied = new HashSet<String>();
final Map<String, String> dsNames = new HashMap<String, String>();
for (SegmentInfo info : sis) {
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentInfo.java?rev=1195088&r1=1195087&r2=1195088&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentInfo.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentInfo.java Sun Oct 30 01:59:13 2011
@@ -226,7 +226,7 @@ public final class SegmentInfo implement
String codecName = input.readString();
codec = codecs.lookup(codecName);
if (codec == null) {
- throw new IllegalArgumentException("Required codec '" + codec + "' not found!");
+ throw new IllegalArgumentException("Required codec '" + codecName + "' not found!");
}
} else {
// TODO what todo if preflex is not available in the provider? register it or fail?
Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentInfos.java?rev=1195088&r1=1195087&r2=1195088&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentInfos.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentInfos.java Sun Oct 30 01:59:13 2011
@@ -84,7 +84,7 @@ public final class SegmentInfos implemen
public Map<String,String> userData = Collections.<String,String>emptyMap(); // Opaque Map<String, String> that user can specify during IndexWriter.commit
- private CodecProvider codecs;
+ private final CodecProvider codecs;
private int format;
@@ -101,10 +101,6 @@ public final class SegmentInfos implemen
*/
private static PrintStream infoStream = null;
- public SegmentInfos() {
- this(CodecProvider.getDefault());
- }
-
public SegmentInfos(CodecProvider codecs) {
this.codecs = codecs;
}
@@ -241,9 +237,7 @@ public final class SegmentInfos implemen
* @throws CorruptIndexException if the index is corrupt
* @throws IOException if there is a low-level IO error
*/
- public final void read(Directory directory, String segmentFileName,
- CodecProvider codecs) throws CorruptIndexException, IOException {
- this.codecs = codecs;
+ public final void read(Directory directory, String segmentFileName) throws CorruptIndexException, IOException {
boolean success = false;
// Clear any previous segments:
@@ -267,25 +261,14 @@ public final class SegmentInfos implemen
}
}
- /**
- * This version of read uses the retry logic (for lock-less
- * commits) to find the right segments file to load.
- * @throws CorruptIndexException if the index is corrupt
- * @throws IOException if there is a low-level IO error
- */
public final void read(Directory directory) throws CorruptIndexException, IOException {
- read(directory, CodecProvider.getDefault());
- }
-
- public final void read(Directory directory, final CodecProvider codecs) throws CorruptIndexException, IOException {
generation = lastGeneration = -1;
- this.codecs = codecs;
new FindSegmentsFile(directory) {
@Override
protected Object doBody(String segmentFileName) throws CorruptIndexException, IOException {
- read(directory, segmentFileName, codecs);
+ read(directory, segmentFileName);
return null;
}
}.run();
@@ -418,7 +401,7 @@ public final class SegmentInfos implemen
// yet commit), then the reader will still see itself as
// current:
SegmentInfos sis = new SegmentInfos(codecs);
- sis.read(directory, codecs);
+ sis.read(directory);
return sis.version;
}
@@ -430,7 +413,7 @@ public final class SegmentInfos implemen
public static Map<String,String> readCurrentUserData(Directory directory, CodecProvider codecs)
throws CorruptIndexException, IOException {
SegmentInfos sis = new SegmentInfos(codecs);
- sis.read(directory, codecs);
+ sis.read(directory);
return sis.getUserData();
}
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=1195088&r1=1195087&r2=1195088&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 Sun Oct 30 01:59:13 2011
@@ -190,7 +190,7 @@ public abstract class PerFieldPostingsFo
FieldsProducer fieldsProducer = formats.get(formatName);
// Better be defined, because it was defined
// during indexing:
- assert fieldsProducer != null;
+ assert fieldsProducer != null : formatName + " not defined";
fields.put(fi.name, fieldsProducer);
}
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java?rev=1195088&r1=1195087&r2=1195088&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java Sun Oct 30 01:59:13 2011
@@ -46,6 +46,10 @@ import org.apache.lucene.index.MergeSche
import org.apache.lucene.index.TieredMergePolicy;
import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.index.codecs.CoreCodecProvider;
+import org.apache.lucene.index.codecs.DefaultDocValuesFormat;
+import org.apache.lucene.index.codecs.DefaultFieldsFormat;
+import org.apache.lucene.index.codecs.DocValuesFormat;
+import org.apache.lucene.index.codecs.FieldsFormat;
import org.apache.lucene.index.codecs.PostingsFormat;
import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.index.codecs.lucene40.Lucene40Codec;
@@ -359,6 +363,7 @@ public class _TestUtil {
return new CoreCodecProvider() {
@Override
public Codec lookup(String name) {
+ //System.out.println(name);
// can't do this until we fix PreFlexRW to not
//impersonate PreFlex:
if (name.equals(c.getName())) {
@@ -380,10 +385,11 @@ public class _TestUtil {
* format. */
// nocommit rename to .alwaysPostingsFormat?
public static CodecProvider alwaysFormat(final PostingsFormat format) {
- final Codec codec = new Lucene40Codec() {
+ return alwaysCodec(new Lucene40Codec() {
+
@Override
public PostingsFormat getPostingsFormat(String formatName) {
- if (formatName == format.name) {
+ if (formatName.equals(format.name)) {
return format;
} else {
return super.getPostingsFormat(formatName);
@@ -394,23 +400,8 @@ public class _TestUtil {
public String getPostingsFormatForField(String field) {
return format.name;
}
- };
-
- return new CoreCodecProvider() {
- @Override
- public Codec getDefaultCodec() {
- return codec;
- }
-
- @Override
- public Codec lookup(String name) {
- if (name == codec.getName()) {
- return codec;
- } else {
- return super.lookup(name);
- }
- }
- };
+
+ });
}
public static String getPostingsFormat(String field) {
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=1195088&r1=1195087&r2=1195088&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Sun Oct 30 01:59:13 2011
@@ -35,6 +35,7 @@ import org.apache.lucene.document.String
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.FieldInfo.IndexOptions;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
+import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.IndexSearcher;
@@ -725,7 +726,7 @@ public class TestBackwardsCompatibility
}
private int checkAllSegmentsUpgraded(Directory dir) throws IOException {
- final SegmentInfos infos = new SegmentInfos();
+ final SegmentInfos infos = new SegmentInfos(CodecProvider.getDefault());
infos.read(dir);
if (VERBOSE) {
System.out.println("checkAllSegmentsUpgraded: " + infos);
@@ -737,7 +738,7 @@ public class TestBackwardsCompatibility
}
private int getNumberOfSegments(Directory dir) throws IOException {
- final SegmentInfos infos = new SegmentInfos();
+ final SegmentInfos infos = new SegmentInfos(CodecProvider.getDefault());
infos.read(dir);
return infos.size();
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java?rev=1195088&r1=1195087&r2=1195088&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java Sun Oct 30 01:59:13 2011
@@ -26,6 +26,7 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
import org.junit.Test;
@@ -61,7 +62,7 @@ public class TestConsistentFieldNumbers
writer.close();
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
assertEquals(2, sis.size());
@@ -79,7 +80,7 @@ public class TestConsistentFieldNumbers
writer.optimize();
writer.close();
- sis = new SegmentInfos();
+ sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
assertEquals(1, sis.size());
@@ -124,7 +125,7 @@ public class TestConsistentFieldNumbers
writer.addIndexes(dir2);
writer.close();
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir1);
assertEquals(2, sis.size());
@@ -143,7 +144,7 @@ public class TestConsistentFieldNumbers
writer.optimize();
writer.close();
- sis = new SegmentInfos();
+ sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir1);
assertEquals(1, sis.size());
@@ -172,7 +173,7 @@ public class TestConsistentFieldNumbers
d.add(new Field("f2", "d1 second field", TextField.TYPE_STORED));
writer.addDocument(d);
writer.close();
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
assertEquals(1, sis.size());
FieldInfos fis1 = sis.info(0).getFieldInfos();
@@ -192,7 +193,7 @@ public class TestConsistentFieldNumbers
d.add(new BinaryField("f3", new byte[] { 1, 2, 3 }));
writer.addDocument(d);
writer.close();
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
assertEquals(2, sis.size());
FieldInfos fis1 = sis.info(0).getFieldInfos();
@@ -217,7 +218,7 @@ public class TestConsistentFieldNumbers
d.add(new BinaryField("f3", new byte[] { 1, 2, 3, 4, 5 }));
writer.addDocument(d);
writer.close();
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
assertEquals(3, sis.size());
FieldInfos fis1 = sis.info(0).getFieldInfos();
@@ -255,7 +256,7 @@ public class TestConsistentFieldNumbers
assertFalse(" field numbers got mixed up", writer.anyNonBulkMerges);
writer.close();
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
assertEquals(1, sis.size());
FieldInfos fis1 = sis.info(0).getFieldInfos();
@@ -296,7 +297,7 @@ public class TestConsistentFieldNumbers
writer.optimize();
writer.close();
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
for (SegmentInfo si : sis) {
FieldInfos fis = si.getFieldInfos();
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java?rev=1195088&r1=1195087&r2=1195088&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestDirectoryReader.java Sun Oct 30 01:59:13 2011
@@ -23,6 +23,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
+import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
@@ -46,7 +47,7 @@ public class TestDirectoryReader extends
DocHelper.setupDoc(doc2);
DocHelper.writeDoc(random, dir, doc1);
DocHelper.writeDoc(random, dir, doc2);
- sis = new SegmentInfos();
+ sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestGlobalFieldNumbers.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestGlobalFieldNumbers.java?rev=1195088&r1=1195087&r2=1195088&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestGlobalFieldNumbers.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestGlobalFieldNumbers.java Sun Oct 30 01:59:13 2011
@@ -33,6 +33,7 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.FieldInfos.FieldNumberBiMap;
+import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.index.codecs.DefaultSegmentInfosWriter;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.LockObtainFailedException;
@@ -356,7 +357,7 @@ public class TestGlobalFieldNumbers exte
new LogByteSizeMergePolicy()));
w.optimize();
w.close();
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(base);
SegmentInfo segmentInfo = sis.info(sis.size() - 1);// last segment must
// have all fields with
@@ -382,7 +383,7 @@ public class TestGlobalFieldNumbers exte
_TestUtil
.unzip(getDataFile("index." + oldNames[i] + ".zip"), oldIndxeDir);
dir = newFSDirectory(oldIndxeDir);
- SegmentInfos infos = new SegmentInfos();
+ SegmentInfos infos = new SegmentInfos(CodecProvider.getDefault());
infos.read(dir);
SortedMap<Integer, String> sortedMap = new TreeMap<Integer, String>();
@@ -432,7 +433,7 @@ public class TestGlobalFieldNumbers exte
writer.close();
// we don't merge here since we use NoMergePolicy
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(base);
// check that the latest global field numbers are consistent and carried
// over from the 4.0 index
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReader.java?rev=1195088&r1=1195087&r2=1195088&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReader.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexReader.java Sun Oct 30 01:59:13 2011
@@ -78,7 +78,7 @@ public class TestIndexReader extends Luc
IndexCommit c = r.getIndexCommit();
r.close();
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(d);
IndexReader r2 = IndexReader.open(d, false);
assertEquals(c.getUserData(), commitUserData);
@@ -947,8 +947,8 @@ public class TestIndexReader extends Luc
addDocumentWithFields(writer);
writer.close();
- SegmentInfos sis = new SegmentInfos();
- sis.read(d, CodecProvider.getDefault());
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
+ sis.read(d);
IndexReader r = IndexReader.open(d, false);
IndexCommit c = r.getIndexCommit();
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1195088&r1=1195087&r2=1195088&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java Sun Oct 30 01:59:13 2011
@@ -41,6 +41,7 @@ import org.apache.lucene.document.FieldT
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
+import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.IndexSearcher;
@@ -143,7 +144,7 @@ public class TestIndexWriter extends Luc
public static void assertNoUnreferencedFiles(Directory dir, String message) throws IOException {
String[] startFiles = dir.listAll();
- SegmentInfos infos = new SegmentInfos();
+ SegmentInfos infos = new SegmentInfos(CodecProvider.getDefault());
infos.read(dir);
new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))).rollback();
String[] endFiles = dir.listAll();
@@ -605,7 +606,7 @@ public class TestIndexWriter extends Luc
writer.addDocument(doc);
writer.flush(false, true);
writer.close();
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
// Since we flushed w/o allowing merging we should now
// have 10 segments
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java?rev=1195088&r1=1195087&r2=1195088&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java Sun Oct 30 01:59:13 2011
@@ -34,6 +34,7 @@ import org.apache.lucene.document.FieldT
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
+import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.PhraseQuery;
@@ -1290,7 +1291,7 @@ public class TestIndexWriterExceptions e
IndexReader reader = IndexReader.open(dir);
assertTrue(reader.numDocs() > 0);
reader.close();
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
for (SegmentInfo segmentInfo : sis) {
assertFalse(segmentInfo.getHasVectors());
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterOptimize.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterOptimize.java?rev=1195088&r1=1195087&r2=1195088&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterOptimize.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestIndexWriterOptimize.java Sun Oct 30 01:59:13 2011
@@ -23,6 +23,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
+import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.LuceneTestCase;
@@ -48,7 +49,7 @@ public class TestIndexWriterOptimize ext
writer.addDocument(doc);
writer.close();
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
final int segCount = sis.size();
@@ -59,7 +60,7 @@ public class TestIndexWriterOptimize ext
writer.optimize(3);
writer.close();
- sis = new SegmentInfos();
+ sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
final int optSegCount = sis.size();
@@ -92,7 +93,7 @@ public class TestIndexWriterOptimize ext
writer.waitForMerges();
writer.commit();
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
final int segCount = sis.size();
@@ -101,7 +102,7 @@ public class TestIndexWriterOptimize ext
writer.commit();
writer.waitForMerges();
- sis = new SegmentInfos();
+ sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
final int optSegCount = sis.size();
@@ -201,7 +202,7 @@ public class TestIndexWriterOptimize ext
assertTrue(!reader.isOptimized());
reader.close();
- SegmentInfos infos = new SegmentInfos();
+ SegmentInfos infos = new SegmentInfos(CodecProvider.getDefault());
infos.read(dir);
assertEquals(2, infos.size());
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSegmentInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSegmentInfo.java?rev=1195088&r1=1195087&r2=1195088&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSegmentInfo.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSegmentInfo.java Sun Oct 30 01:59:13 2011
@@ -4,6 +4,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -36,7 +37,7 @@ public class TestSegmentInfo extends Luc
writer.addDocument(doc);
writer.close();
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
SegmentInfo si = sis.info(0);
long sizeInBytesNoStore = si.sizeInBytes(false);
Modified: lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSizeBoundedOptimize.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSizeBoundedOptimize.java?rev=1195088&r1=1195087&r2=1195088&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSizeBoundedOptimize.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test/org/apache/lucene/index/TestSizeBoundedOptimize.java Sun Oct 30 01:59:13 2011
@@ -20,6 +20,7 @@ package org.apache.lucene.index;
import java.io.IOException;
import org.apache.lucene.document.Document;
+import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
@@ -57,7 +58,7 @@ public class TestSizeBoundedOptimize ext
}
writer.close();
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
double min = sis.info(0).sizeInBytes(true);
@@ -71,7 +72,7 @@ public class TestSizeBoundedOptimize ext
writer.close();
// Should only be 3 segments in the index, because one of them exceeds the size limit
- sis = new SegmentInfos();
+ sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
assertEquals(3, sis.size());
}
@@ -104,7 +105,7 @@ public class TestSizeBoundedOptimize ext
writer.close();
// Should only be 3 segments in the index, because one of them exceeds the size limit
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
assertEquals(3, sis.size());
}
@@ -131,7 +132,7 @@ public class TestSizeBoundedOptimize ext
writer.optimize();
writer.close();
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
assertEquals(2, sis.size());
}
@@ -158,7 +159,7 @@ public class TestSizeBoundedOptimize ext
writer.optimize();
writer.close();
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
assertEquals(2, sis.size());
}
@@ -185,7 +186,7 @@ public class TestSizeBoundedOptimize ext
writer.optimize();
writer.close();
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
assertEquals(1, sis.size());
}
@@ -211,7 +212,7 @@ public class TestSizeBoundedOptimize ext
writer.optimize();
writer.close();
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
assertEquals(3, sis.size());
}
@@ -238,7 +239,7 @@ public class TestSizeBoundedOptimize ext
writer.optimize();
writer.close();
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
assertEquals(4, sis.size());
}
@@ -271,7 +272,7 @@ public class TestSizeBoundedOptimize ext
// Should only be 4 segments in the index, because of the merge factor and
// max merge docs settings.
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
assertEquals(4, sis.size());
}
@@ -303,7 +304,7 @@ public class TestSizeBoundedOptimize ext
writer.close();
// Verify that the last segment does not have deletions.
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
assertEquals(3, sis.size());
assertFalse(sis.info(2).hasDeletions());
@@ -329,7 +330,7 @@ public class TestSizeBoundedOptimize ext
writer.close();
// Verify that the last segment does not have deletions.
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
assertEquals(1, sis.size());
}
@@ -359,7 +360,7 @@ public class TestSizeBoundedOptimize ext
writer.close();
// Verify that the last segment does not have deletions.
- SegmentInfos sis = new SegmentInfos();
+ SegmentInfos sis = new SegmentInfos(CodecProvider.getDefault());
sis.read(dir);
assertEquals(1, sis.size());
assertTrue(sis.info(0).hasDeletions());
Modified: lucene/dev/branches/lucene2621/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java?rev=1195088&r1=1195087&r2=1195088&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java (original)
+++ lucene/dev/branches/lucene2621/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java Sun Oct 30 01:59:13 2011
@@ -52,6 +52,7 @@ import org.apache.lucene.index.SegmentIn
import org.apache.lucene.index.SerialMergeScheduler;
import org.apache.lucene.index.TermFreqVector;
import org.apache.lucene.index.TermsEnum;
+import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.search.FieldCache.DocTermsIndex;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.store.Directory;
@@ -856,7 +857,7 @@ public class TestPerfTasksLogic extends
ir.close();
// Make sure we have 3 segments:
- SegmentInfos infos = new SegmentInfos();
+ SegmentInfos infos = new SegmentInfos(CodecProvider.getDefault());
infos.read(benchmark.getRunData().getDirectory());
assertEquals(3, infos.size());
}