You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2011/05/25 15:05:32 UTC
svn commit: r1127509 - in
/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base:
file/BufferChannel.java file/BufferChannelFile.java
file/BufferChannelMem.java objectfile/ObjectFileStorage.java
Author: andy
Date: Wed May 25 13:05:32 2011
New Revision: 1127509
URL: http://svn.apache.org/viewvc?rev=1127509&view=rev
Log: (empty)
Modified:
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannel.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannelFile.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannelMem.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileStorage.java
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannel.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannel.java?rev=1127509&r1=1127508&r2=1127509&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannel.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannel.java Wed May 25 13:05:32 2011
@@ -48,7 +48,7 @@ public interface BufferChannel extends S
public int write(ByteBuffer buffer, long loc) ;
/** Length of storage, in bytes.*/
- public long length() ;
+ public long size() ;
}
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannelFile.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannelFile.java?rev=1127509&r1=1127508&r2=1127509&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannelFile.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannelFile.java Wed May 25 13:05:32 2011
@@ -65,7 +65,7 @@ public class BufferChannelFile implement
}
@Override
- public long length()
+ public long size()
{
try { return file.channel.size() ; }
catch (IOException e) { IO.exception(e) ; return -1 ; }
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannelMem.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannelMem.java?rev=1127509&r1=1127508&r2=1127509&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannelMem.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannelMem.java Wed May 25 13:05:32 2011
@@ -101,11 +101,12 @@ public class BufferChannelMem implements
bytes.position((int)loc) ;
int len = write(buffer) ;
bytes.position(x) ;
+ length = Math.max(length, loc+len) ;
return len ;
}
@Override
- public long length()
+ public long size()
{
checkIfClosed() ;
return length ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileStorage.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileStorage.java?rev=1127509&r1=1127508&r2=1127509&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileStorage.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileStorage.java Wed May 25 13:05:32 2011
@@ -61,7 +61,7 @@ public class ObjectFileStorage implement
{
this.file = file ;
this.bufferSize = bufferSize ;
- filesize = file.length() ;
+ filesize = file.size() ;
writeBuffer = ByteBuffer.allocate(bufferSize) ;
}