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

LUCENE-6932: improve exception messages; rename length parameter to sliceLength, and return it as the length, for clarity

This commit is contained in:
Michael McCandless 2016-01-24 06:25:45 -05:00 committed by Dawid Weiss
parent a652065c26
commit bc3e643d1f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lucene/core/src/java/org/apache/lucene/store/RAMInputStream.java
View File

@ -104,16 +104,16 @@ public class RAMInputStream extends IndexInput implements Cloneable {
bufferPosition = (int) (pos % BUFFER_SIZE); bufferPosition = (int) (pos % BUFFER_SIZE);
// This is not >= because seeking to exact end of file is OK: this is where // This is not >= because seeking to exact end of file is OK: this is where
// you'd also be if you did a readBytes of all bytes in the file) // you'd also be if you did a readBytes of all bytes in the file
if (getFilePointer() > length()) { if (getFilePointer() > length()) {
throw new EOFException("read past EOF: pos=" + getFilePointer() + " vs length=" + length() + ": " + this); throw new EOFException("seek beyond EOF: pos=" + getFilePointer() + " vs length=" + length() + ": " + this);
} }
} }
private void nextBuffer() throws IOException { private void nextBuffer() throws IOException {
// This is >= because we are called when there is at least 1 more byte to read: // This is >= because we are called when there is at least 1 more byte to read:
if (getFilePointer() >= length()) { if (getFilePointer() >= length()) {
throw new EOFException("read past EOF: pos=" + getFilePointer() + " vs length=" + length() + ": " + this); throw new EOFException("cannot read another byte at EOF: pos=" + getFilePointer() + " vs length=" + length() + ": " + this);
} }
currentBufferIndex++; currentBufferIndex++;
setCurrentBuffer(); setCurrentBuffer();
@ -133,11 +133,11 @@ public class RAMInputStream extends IndexInput implements Cloneable {
} }
@Override @Override
public IndexInput slice(String sliceDescription, final long offset, final long length) throws IOException { public IndexInput slice(String sliceDescription, final long offset, final long sliceLength) throws IOException {
if (offset < 0 || length < 0 || offset + length > this.length) { if (offset < 0 || sliceLength < 0 || offset + sliceLength > this.length) {
throw new IllegalArgumentException("slice() " + sliceDescription + " out of bounds: " + this); throw new IllegalArgumentException("slice() " + sliceDescription + " out of bounds: " + this);
} }
return new RAMInputStream(getFullSliceDescription(sliceDescription), file, offset + length) { return new RAMInputStream(getFullSliceDescription(sliceDescription), file, offset + sliceLength) {
{ {
seek(0L); seek(0L);
} }
@ -157,7 +157,7 @@ public class RAMInputStream extends IndexInput implements Cloneable {
@Override @Override
public long length() { public long length() {
return super.length() - offset; return sliceLength;
} }
@Override @Override