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/08/27 17:15:01 UTC
svn commit: r1162375 - in /lucene/dev/trunk/lucene/src:
java/org/apache/lucene/index/ java/org/apache/lucene/index/values/
java/org/apache/lucene/store/ test-framework/org/apache/lucene/store/
test/org/apache/lucene/index/
Author: mikemccand
Date: Sat Aug 27 15:15:01 2011
New Revision: 1162375
URL: http://svn.apache.org/viewvc?rev=1162375&view=rev
Log:
LUCENE-3404: fix cases where we were incorrectly passing true as first arg to IOUtils.closeSafely
Modified:
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/FixedStraightBytesImpl.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/VarStraightBytesImpl.java
lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/CompoundFileDirectory.java
lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/store/MockDirectoryWrapper.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java?rev=1162375&r1=1162374&r2=1162375&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocFieldProcessor.java Sat Aug 27 15:15:01 2011
@@ -87,7 +87,7 @@ final class DocFieldProcessor extends Do
consumers.finish(state.numDocs);
};
// close perDocConsumer during flush to ensure all files are flushed due to PerCodec CFS
- IOUtils.closeSafely(true, perDocConsumers.values());
+ IOUtils.closeSafely(false, perDocConsumers.values());
}
@Override
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java?rev=1162375&r1=1162374&r2=1162375&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java Sat Aug 27 15:15:01 2011
@@ -2606,7 +2606,7 @@ public class IndexWriter implements Clos
}
}
} finally {
- IOUtils.closeSafely(true, cfsdir);
+ IOUtils.closeSafely(false, cfsdir);
}
info.dir = directory;
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/FixedStraightBytesImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/FixedStraightBytesImpl.java?rev=1162375&r1=1162374&r2=1162375&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/FixedStraightBytesImpl.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/FixedStraightBytesImpl.java Sat Aug 27 15:15:01 2011
@@ -104,41 +104,39 @@ class FixedStraightBytesImpl {
datOut = getDataOut();
boolean success = false;
try {
- if (state.liveDocs == null && state.reader instanceof Reader) {
- Reader reader = (Reader) state.reader;
- final int maxDocs = reader.maxDoc;
- if (maxDocs == 0) {
- return;
- }
- if (size == -1) {
- size = reader.size;
- datOut.writeInt(size);
- }
- if (lastDocID+1 < state.docBase) {
- fill(datOut, state.docBase);
- lastDocID = state.docBase-1;
- }
- // TODO should we add a transfer to API to each reader?
- final IndexInput cloneData = reader.cloneData();
- try {
- datOut.copyBytes(cloneData, size * maxDocs);
- } finally {
- IOUtils.closeSafely(true, cloneData);
- }
+ if (state.liveDocs == null && state.reader instanceof Reader) {
+ Reader reader = (Reader) state.reader;
+ final int maxDocs = reader.maxDoc;
+ if (maxDocs == 0) {
+ return;
+ }
+ if (size == -1) {
+ size = reader.size;
+ datOut.writeInt(size);
+ }
+ if (lastDocID+1 < state.docBase) {
+ fill(datOut, state.docBase);
+ lastDocID = state.docBase-1;
+ }
+ // TODO should we add a transfer to API to each reader?
+ final IndexInput cloneData = reader.cloneData();
+ try {
+ datOut.copyBytes(cloneData, size * maxDocs);
+ } finally {
+ IOUtils.closeSafely(false, cloneData);
+ }
- lastDocID += maxDocs;
- } else {
- super.merge(state);
- }
- success = true;
+ lastDocID += maxDocs;
+ } else {
+ super.merge(state);
+ }
+ success = true;
} finally {
if (!success) {
IOUtils.closeSafely(!success, datOut);
}
}
}
-
-
@Override
protected void mergeDoc(int docID) throws IOException {
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/VarStraightBytesImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/VarStraightBytesImpl.java?rev=1162375&r1=1162374&r2=1162375&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/VarStraightBytesImpl.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/VarStraightBytesImpl.java Sat Aug 27 15:15:01 2011
@@ -128,13 +128,13 @@ class VarStraightBytesImpl {
address += numDataBytes; // this is the address after all addr pointers are updated
iter.close();
} finally {
- IOUtils.closeSafely(true, cloneIdx);
+ IOUtils.closeSafely(false, cloneIdx);
}
final IndexInput cloneData = reader.cloneData();
try {
datOut.copyBytes(cloneData, numDataBytes);
} finally {
- IOUtils.closeSafely(true, cloneData);
+ IOUtils.closeSafely(false, cloneData);
}
} else {
super.merge(state);
Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/CompoundFileDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/CompoundFileDirectory.java?rev=1162375&r1=1162374&r2=1162375&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/CompoundFileDirectory.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/store/CompoundFileDirectory.java Sat Aug 27 15:15:01 2011
@@ -95,10 +95,10 @@ public final class CompoundFileDirectory
if (firstInt == CompoundFileWriter.FORMAT_CURRENT) {
IndexInput input = null;
try {
- input = dir.openInput(IndexFileNames.segmentFileName(
- IndexFileNames.stripExtension(name), "",
- IndexFileNames.COMPOUND_FILE_ENTRIES_EXTENSION),
- IOContext.READONCE);
+ final String entriesFileName = IndexFileNames.segmentFileName(
+ IndexFileNames.stripExtension(name), "",
+ IndexFileNames.COMPOUND_FILE_ENTRIES_EXTENSION);
+ input = dir.openInput(entriesFileName, IOContext.READONCE);
final int readInt = input.readInt(); // unused right now
assert readInt == CompoundFileWriter.ENTRY_FORMAT_CURRENT;
final int numEntries = input.readVInt();
@@ -112,7 +112,7 @@ public final class CompoundFileDirectory
}
return mapping;
} finally {
- IOUtils.closeSafely(true, input);
+ IOUtils.closeSafely(false, input);
}
} else {
// TODO remove once 3.x is not supported anymore
Modified: lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/store/MockDirectoryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/store/MockDirectoryWrapper.java?rev=1162375&r1=1162374&r2=1162375&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/store/MockDirectoryWrapper.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/store/MockDirectoryWrapper.java Sat Aug 27 15:15:01 2011
@@ -153,7 +153,10 @@ public class MockDirectoryWrapper extend
@Override
public String toString() {
- maybeYield();
+ // NOTE: do not maybeYield here, since it consumes
+ // randomness and can thus (unexpectedly during
+ // debugging) change the behavior of a seed
+ // maybeYield();
return "MockDirWrapper(" + delegate + ")";
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java?rev=1162375&r1=1162374&r2=1162375&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java Sat Aug 27 15:15:01 2011
@@ -132,7 +132,13 @@ public class TestIndexWriterOnDiskFull e
}
}
}
-
+
+ // TODO: make @Nightly variant that provokes more disk
+ // fulls
+
+ // TODO: have test fail if on any given top
+ // iter there was not a single IOE hit
+
/*
Test: make sure when we run out of disk space or hit
random IOExceptions in any of the addIndexes(*) calls