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/06/28 15:36:20 UTC
svn commit: r1140603 - in /incubator/jena/Experimental/TxTDB/trunk:
src-dev/tx/DevTx.java
src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileStorage.java
src/test/java/com/hp/hpl/jena/tdb/base/objectfile/TestObjectFileBuffering.java
Author: andy
Date: Tue Jun 28 13:36:20 2011
New Revision: 1140603
URL: http://svn.apache.org/viewvc?rev=1140603&view=rev
Log: (empty)
Modified:
incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DevTx.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileStorage.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/objectfile/TestObjectFileBuffering.java
Modified: incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DevTx.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DevTx.java?rev=1140603&r1=1140602&r2=1140603&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DevTx.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DevTx.java Tue Jun 28 13:36:20 2011
@@ -2,11 +2,8 @@ package tx;
public class DevTx
{
- // DatasetGraphBuilder.
- // 1 - Call "register(ObjectFile)" / "register(BlockMgr)" on every create.
- // 2a - NodeTable has caching over ObjectFile => cope with this.
- // 2b - NodeTable needs reintegrating on txn end.
- // 3 - DatasetBuilderTxn registers transactional components
+ // DatasetGraphBuilder3
+ // Parallel stacks or "add txn" layer
// DatasetGraphTDB : read-only mode (when transaction active)
// Prefixes as well.
@@ -15,8 +12,6 @@ public class DevTx
// Every sync hits the NodeTupleTable sync the node table repeatedly - keep dirty flag?
- // Delete BlockMgrFile.
-
// In-memory datasets.
// Config
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=1140603&r1=1140602&r2=1140603&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 Tue Jun 28 13:36:20 2011
@@ -214,7 +214,7 @@ public class ObjectFileStorage implement
// Maybe it's in the in the write buffer.
// Maybe the write buffer should keep more structure?
- if ( loc > filesize )
+ if ( loc >= filesize )
{
if ( loc >= filesize+writeBuffer.position() )
throw new IllegalArgumentException("ObjectFile.read: Bad read: "+loc) ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/objectfile/TestObjectFileBuffering.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/objectfile/TestObjectFileBuffering.java?rev=1140603&r1=1140602&r2=1140603&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/objectfile/TestObjectFileBuffering.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/objectfile/TestObjectFileBuffering.java Tue Jun 28 13:36:20 2011
@@ -40,7 +40,7 @@ public class TestObjectFileBuffering ext
fill(bb[i]) ;
loc[i] = file.write(bb[i]) ;
}
-
+ //file.sync() ;
for ( int i = 0 ; i < N ; i++ )
{
read[i] = file.read(loc[i]) ;