boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

patch for a bug that I don't understand by now.

Browse Source
pull/1/head
Michael Christen 14 years ago
parent 3eccdca63c
commit 14e45e90fd
1 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File

59
source/net/yacy/kelondro/io/CachedFileWriter.java
Unescape View File

@ -48,58 +48,65 @@ public final class CachedFileWriter extends AbstractWriter implements Writer {
this.cachelen = 0; this.cachelen = 0;
} }
@Override
public final synchronized long length() throws IOException { public final synchronized long length() throws IOException {
checkReopen(); checkReopen();
return this.RAFile.length(); return this.RAFile.length();
} }
@Override
public final synchronized void setLength(long length) throws IOException { public final synchronized void setLength(long length) throws IOException {
checkReopen(); checkReopen();
cachelen = 0; this.cachelen = 0;
RAFile.setLength(length); this.RAFile.setLength(length);
} }
@Override
public final synchronized long available() throws IOException { public final synchronized long available() throws IOException {
checkReopen(); checkReopen();
return this.length() - RAFile.getFilePointer(); return this.length() - this.RAFile.getFilePointer();
} }
@Override
public final synchronized void readFully(final byte[] b, final int off, int len) throws IOException { public final synchronized void readFully(final byte[] b, final int off, int len) throws IOException {
checkReopen(); checkReopen();
long seek = RAFile.getFilePointer(); long seek = this.RAFile.getFilePointer();
if (cache != null && cachestart <= seek && cachelen - seek + cachestart >= len) { if (this.cache != null && this.cachestart <= seek && this.cachelen - seek + this.cachestart >= len) {
// read from cache // read from cache
//System.out.println("*** DEBUG FileRA " + this.file.getName() + ": CACHE HIT at " + seek); //System.out.println("*** DEBUG FileRA " + this.file.getName() + ": CACHE HIT at " + seek);
System.arraycopy(cache, (int) (seek - cachestart), b, off, len); System.arraycopy(this.cache, (int) (seek - this.cachestart), b, off, len);
RAFile.seek(seek + len); this.RAFile.seek(seek + len);
return; return;
} }
if (cache == null || cache.length < len) { if (this.cache == null || this.cache.length < len) {
// cannot fill cache here // cannot fill cache here
RAFile.readFully(b, off, len); this.RAFile.readFully(b, off, len);
return; return;
} }
// we fill the cache here // we fill the cache here
long available = this.RAFile.length() - seek; long available = this.RAFile.length() - seek;
if (available < (long) len) throw new IOException("EOF, available = " + available + ", requested = " + len + ", this.RAFile.length() = " + this.RAFile.length() + ", seek = " + seek); if (available == -seek) return; // we don't know how this happens but we just silently ignore it by now TODO:fixme
if (cachestart + cachelen == seek && cache.length - cachelen >= len) { //System.out.println("*** available = " + available);
RAFile.readFully(cache, cachelen, len); if (available < len) throw new IOException("EOF, available = " + available + ", requested = " + len + ", this.RAFile.length() = " + this.RAFile.length() + ", seek = " + seek);
if (this.cachestart + this.cachelen == seek && this.cache.length - this.cachelen >= len) {
this.RAFile.readFully(this.cache, this.cachelen, len);
//System.out.println("*** DEBUG FileRA " + this.file.getName() + ": append fill " + len + " bytes"); //System.out.println("*** DEBUG FileRA " + this.file.getName() + ": append fill " + len + " bytes");
System.arraycopy(cache, cachelen, b, off, len); System.arraycopy(this.cache, this.cachelen, b, off, len);
cachelen += len; this.cachelen += len;
} else { } else {
// fill the cache as much as possible // fill the cache as much as possible
int m = (int) Math.min(available, (long) cache.length); int m = (int) Math.min(available, this.cache.length);
RAFile.readFully(cache, 0, m); this.RAFile.readFully(this.cache, 0, m);
cachestart = seek; this.cachestart = seek;
cachelen = m; this.cachelen = m;
if (m != len) RAFile.seek(seek + len); if (m != len) this.RAFile.seek(seek + len);
//System.out.println("*** DEBUG FileRA " + this.file.getName() + ": replace fill " + len + " bytes"); //System.out.println("*** DEBUG FileRA " + this.file.getName() + ": replace fill " + len + " bytes");
System.arraycopy(cache, 0, b, off, len); System.arraycopy(this.cache, 0, b, off, len);
} }
} }
@Override
public final synchronized void write(final byte[] b, final int off, final int len) throws IOException { public final synchronized void write(final byte[] b, final int off, final int len) throws IOException {
checkReopen(); checkReopen();
//assert len > 0; //assert len > 0;
@ -127,19 +134,21 @@ public final class CachedFileWriter extends AbstractWriter implements Writer {
// delete cache // delete cache
this.cachelen = 0; this.cachelen = 0;
} }
RAFile.write(b, off, len); this.RAFile.write(b, off, len);
} }
@Override
public final synchronized void seek(final long pos) throws IOException { public final synchronized void seek(final long pos) throws IOException {
checkReopen(); checkReopen();
RAFile.seek(pos); this.RAFile.seek(pos);
} }
@Override
public final synchronized void close() { public final synchronized void close() {
if (RAFile != null) try { if (this.RAFile != null) try {
try{RAFile.getChannel().close();} catch (IOException e) {} try{this.RAFile.getChannel().close();} catch (IOException e) {}
//System.out.println("***DEBUG*** closed file " + this.file + ", FD is " + ((RAFile.getFD().valid()) ? "VALID" : "VOID") + ", channel is " + ((RAFile.getChannel().isOpen()) ? "OPEN" : "CLOSE")); //System.out.println("***DEBUG*** closed file " + this.file + ", FD is " + ((RAFile.getFD().valid()) ? "VALID" : "VOID") + ", channel is " + ((RAFile.getChannel().isOpen()) ? "OPEN" : "CLOSE"));
RAFile.close(); this.RAFile.close();
//System.out.println("***DEBUG*** closed file " + this.file + ", FD is " + ((RAFile.getFD().valid()) ? "VALID" : "VOID") + ", channel is " + ((RAFile.getChannel().isOpen()) ? "OPEN" : "CLOSE")); //System.out.println("***DEBUG*** closed file " + this.file + ", FD is " + ((RAFile.getFD().valid()) ? "VALID" : "VOID") + ", channel is " + ((RAFile.getChannel().isOpen()) ? "OPEN" : "CLOSE"));
} catch (IOException e) { } catch (IOException e) {
Log.logException(e); Log.logException(e);

Write Preview
Loading…
Cancel
Save