jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1178429 - in /incubator/jena/Experimental/TxTDB/trunk: src-dev/tx/TestNodeTableObjectFileCorruption.java src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileStorage.java
Date Mon, 03 Oct 2011 15:21:46 GMT
Author: andy
Date: Mon Oct  3 15:21:46 2011
New Revision: 1178429

URL: http://svn.apache.org/viewvc?rev=1178429&view=rev
Log:
Set position of file (ObjectFileStorage) when opened.  JENA-91

Modified:
    incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestNodeTableObjectFileCorruption.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-dev/tx/TestNodeTableObjectFileCorruption.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestNodeTableObjectFileCorruption.java?rev=1178429&r1=1178428&r2=1178429&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestNodeTableObjectFileCorruption.java
(original)
+++ incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestNodeTableObjectFileCorruption.java
Mon Oct  3 15:21:46 2011
@@ -26,13 +26,13 @@ import java.nio.ByteBuffer ;
 import java.util.Iterator ;
 
 import org.junit.After ;
+import org.junit.AfterClass ;
 import org.junit.Before ;
 import org.junit.Test ;
 import org.openjena.atlas.lib.FileOps ;
 import org.openjena.atlas.lib.Pair ;
 
 import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.shared.Lock ;
 import com.hp.hpl.jena.sparql.core.DatasetGraph ;
 import com.hp.hpl.jena.sparql.core.Quad ;
 import com.hp.hpl.jena.tdb.DatasetGraphTxn ;
@@ -43,19 +43,43 @@ import com.hp.hpl.jena.tdb.TDBFactory ;
 import com.hp.hpl.jena.tdb.base.file.FileFactory ;
 import com.hp.hpl.jena.tdb.base.file.Location ;
 import com.hp.hpl.jena.tdb.base.objectfile.ObjectFile ;
+import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
 import com.hp.hpl.jena.tdb.sys.Names ;
+import com.hp.hpl.jena.tdb.sys.TDBMaker ;
 import com.hp.hpl.jena.vocabulary.RDFS ;
 
 public class TestNodeTableObjectFileCorruption {
 
-    // private static final String path = System.getProperty("java.io.tmpdir") + File.separator
+ "DB" ;
+    //private static final String path = System.getProperty("java.io.tmpdir") + File.separator
+ "DB" ;
     private static final String path = "tmp/DB" ;
     private static Location location = new Location (path) ;
-    
+    private static boolean useTransactionsSetup = false ;
+
     @Before public void setup() {
         cleanup() ;
-
         FileOps.ensureDir(path) ;
+        if (  useTransactionsSetup )
+            setupTxn() ;
+        else
+            setupPlain() ;
+    }
+    
+    @After public void teardown()
+    {
+        cleanup() ;
+    }
+    
+    private static void setupPlain() {
+        // Make without transactions.
+        DatasetGraphTDB dsg = TDBFactory.createDatasetGraph(location) ;
+        //dsg.add(Quad.defaultGraphIRI, Node.createURI("foo:bar"), RDFS.label.asNode(), Node.createLiteral("bar"))
; 
+        dsg.add(Quad.defaultGraphIRI, Node.createURI("foo:bar"), RDFS.label.asNode(), Node.createLiteral("foo"))
; 
+        dsg.close() ;
+        TDBMaker.releaseDataset(dsg) ;
+        return ;
+    }
+
+    private static void setupTxn() {
         StoreConnection sc = StoreConnection.make(location) ; 
         DatasetGraphTxn dsg = sc.begin(ReadWrite.WRITE) ; 
         dsg.add(Quad.defaultGraphIRI, Node.createURI("foo:bar"), RDFS.label.asNode(), Node.createLiteral("foo"))
; 
@@ -64,11 +88,7 @@ public class TestNodeTableObjectFileCorr
         dsg.close() ; 
         StoreConnection.release(location) ; 
     }
-    
-    @After public void teardown() {
-        cleanup() ;
-    }
-
+        
     private static void cleanup() {
         File dir = new File(path) ;
         if ( dir.exists() ) {
@@ -77,36 +97,30 @@ public class TestNodeTableObjectFileCorr
         }
         assertFalse ( dir.exists() ) ;
     }
+
     
-    @Test public void test_01() {
+    @Test
+    public void testPlain() {
         assertEquals (3, countRDFNodes()) ;
-
-        StoreConnection sc = StoreConnection.make(location) ; 
-        DatasetGraphTxn dsg = sc.begin(ReadWrite.WRITE) ; 
+        DatasetGraph dsg = TDBFactory.createDatasetGraph(location) ;
         dsg.add(Quad.defaultGraphIRI, Node.createURI("foo:bar"), RDFS.label.asNode(), Node.createLiteral("bar"))
; 
-        dsg.commit() ; 
-        dsg.close() ;
-        StoreConnection.release(location) ; 
-    
+        dsg.close() ; 
         assertEquals (4, countRDFNodes()) ;
     }
-
-
-    @Test public void test_02() {
+    
+    @Test
+    public void testTxn() {
         assertEquals (3, countRDFNodes()) ;
 
-        DatasetGraph dsg = TDBFactory.createDatasetGraph(location) ;
-        Lock lock = dsg.getLock() ;
-        lock.enterCriticalSection(Lock.WRITE) ;
-        dsg.add(Quad.defaultGraphIRI, Node.createURI("foo:bar"), RDFS.label.asNode(), Node.createLiteral("bar"))
;
-        lock.leaveCriticalSection() ;
-        TDB.sync(dsg) ;
+        StoreConnection sc = StoreConnection.make(location) ; 
+        DatasetGraphTxn dsg = sc.begin(ReadWrite.WRITE) ; 
+        dsg.add(Quad.defaultGraphIRI, Node.createURI("foo:bar"), RDFS.label.asNode(), Node.createLiteral("bar"))
; 
+        dsg.commit() ; 
         dsg.close() ; 
-
         assertEquals (4, countRDFNodes()) ;
     }
     
-    private int countRDFNodes() {
+    private static int countRDFNodes() {
         ObjectFile objects = FileFactory.createObjectFileDisk( location.getPath(Names.indexId2Node,
Names.extNodeData) ) ;
         int count = 0 ;
         Iterator<Pair<Long,ByteBuffer>> iter = objects.all() ; 

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=1178429&r1=1178428&r2=1178429&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
Mon Oct  3 15:21:46 2011
@@ -72,8 +72,8 @@ public class ObjectFileStorage implement
     {
         this.file = file ;
         filesize = file.size() ;
+        this.file.position(filesize) ;  // End of file.
         log("File size: 0x%X, posn: 0x%X", filesize, file.position()) ;
-        //writeBuffer = null ; 
         writeBuffer = (bufferSize >= 0) ? ByteBuffer.allocate(bufferSize) : null ;
     }
     



Mime
View raw message