Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't search for newline if already at beginning of file, fix bug causing size=0 on gz files. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1337008 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2012-05-11 02:31:45 +00:00
parent f8d2ce1aa7
commit f769cc54d0
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java
View File

@ -84,17 +84,17 @@ public class LineFileDocs implements Closeable {
private synchronized void open(Random random) throws IOException {
InputStream is = getClass().getResourceAsStream(path);
boolean needSkip = true;
long size = 0L;
long size = 0L, seekTo = 0L;
if (is == null) {
// if its not in classpath, we load it as absolute filesystem path (e.g. Hudson's home dir)
File file = new File(path);
size = file.length();
if (path.endsWith(".gz")) {
// if it is a gzip file, we need to use InputStream and slowly skipTo:
is = new FileInputStream(file);
} else {
// optimized seek using RandomAccessFile:
size = file.length();
final long seekTo = randomSeekPos(random, size);
seekTo = randomSeekPos(random, size);
final FileChannel channel = new RandomAccessFile(path, "r").getChannel();
if (LuceneTestCase.VERBOSE) {
System.out.println("TEST: LineFileDocs: file seek to fp=" + seekTo + " on open");
@ -117,23 +117,30 @@ public class LineFileDocs implements Closeable {
// If we only have an InputStream, we need to seek now,
// but this seek is a scan, so very inefficient!!!
if (needSkip) {
final long skipTo = randomSeekPos(random, size);
seekTo = randomSeekPos(random, size);
if (LuceneTestCase.VERBOSE) {
System.out.println("TEST: LineFileDocs: stream skip to fp=" + skipTo + " on open");
System.out.println("TEST: LineFileDocs: stream skip to fp=" + seekTo + " on open");
}
is.skip(skipTo);
is.skip(seekTo);
}
int b;
do {
b = is.read();
} while (b >= 0 && b != 13 && b != 10);
CharsetDecoder decoder = Charset.forName("UTF-8").newDecoder()
// if we seeked somewhere, read until newline char
if (seekTo > 0L) {
int b;
do {
b = is.read();
} while (b >= 0 && b != 13 && b != 10);
}
CharsetDecoder decoder = IOUtils.CHARSET_UTF_8.newDecoder()
.onMalformedInput(CodingErrorAction.REPORT)
.onUnmappableCharacter(CodingErrorAction.REPORT);
reader = new BufferedReader(new InputStreamReader(is, decoder), BUFFER_SIZE);
// read one more line, to make sure we are not inside a Windows linebreak (\r\n):
reader.readLine();
if (seekTo > 0L) {
// read one more line, to make sure we are not inside a Windows linebreak (\r\n):
reader.readLine();
}
}
public synchronized void reset(Random random) throws IOException {