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/07/14 23:48:30 UTC
svn commit: r1146907 - in /incubator/jena/Experimental/TxTDB/trunk:
src-dev/tx/ src/main/java/com/hp/hpl/jena/tdb/transaction/
src/test/java/com/hp/hpl/jena/tdb/transaction/
Author: andy
Date: Thu Jul 14 21:48:29 2011
New Revision: 1146907
URL: http://svn.apache.org/viewvc?rev=1146907&view=rev
Log: (empty)
Modified:
incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DevTx.java
incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TxMain.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/Journal.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/JournalControl.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestObjectFileTrans.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=1146907&r1=1146906&r2=1146907&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DevTx.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DevTx.java Thu Jul 14 21:48:29 2011
@@ -7,7 +7,9 @@ public class DevTx
// To do for release 0:
// Documentation
// StoreConnection.Location.mem ==> directory called "--mem--" and chaos.
- // Partial reply : base reader exits - replay until blocking higher reader.
+ // Partial reply : base reader exits - replay until blocking higher reader.
+ // scan to commit, enact, scne to commit, enact, ....
+
// Node writing happens during prepare() regardless of blockers and locks. Opps.
// Abort() etc truncates Journal to 0 - but that might loose a pending transaction. Opps?? Happens?
// Some kind of call after commit for clear up.
Modified: incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TxMain.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TxMain.java?rev=1146907&r1=1146906&r2=1146907&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TxMain.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TxMain.java Thu Jul 14 21:48:29 2011
@@ -123,7 +123,7 @@ public class TxMain
// A writer.
DatasetGraphTxn dsg2 = sConn.begin(ReadWrite.WRITE) ;
- load("D1.ttl", dsg2) ; // Loads 1 triples
+ //load("D1.ttl", dsg2) ; // Loads 1 triples
query("SELECT (count(*) AS ?C) { ?s ?p ?o }", dsg2) ;
//query("SELECT (count(*) AS ?C) { ?s ?p ?o }", dsgRead2) ;
query("SELECT (count(*) AS ?C) { ?s ?p ?o }", dsgRead) ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/Journal.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/Journal.java?rev=1146907&r1=1146906&r2=1146907&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/Journal.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/Journal.java Thu Jul 14 21:48:29 2011
@@ -63,7 +63,6 @@ class Journal implements Iterable<Journa
position = 0 ;
}
- synchronized
public long writeJournal(JournalEntry entry)
{
return _write(entry.getType(), entry.getFileRef(), entry.getByteBuffer(), entry.getBlock()) ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/JournalControl.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/JournalControl.java?rev=1146907&r1=1146906&r2=1146907&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/JournalControl.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/JournalControl.java Thu Jul 14 21:48:29 2011
@@ -10,13 +10,9 @@ import static com.hp.hpl.jena.tdb.sys.Sy
import static com.hp.hpl.jena.tdb.sys.SystemTDB.syslog ;
import java.io.File ;
-import java.nio.ByteBuffer ;
-import java.util.Iterator ;
import java.util.Map ;
import org.openjena.atlas.lib.FileOps ;
-import org.slf4j.Logger ;
-import org.slf4j.LoggerFactory ;
import com.hp.hpl.jena.shared.Lock ;
import com.hp.hpl.jena.tdb.DatasetGraphTxn ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java?rev=1146907&r1=1146906&r2=1146907&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java Thu Jul 14 21:48:29 2011
@@ -27,6 +27,7 @@ import com.hp.hpl.jena.tdb.nodetable.Nod
import com.hp.hpl.jena.tdb.store.NodeId ;
import com.hp.hpl.jena.tdb.transaction.NodeTableTrans ;
import com.hp.hpl.jena.tdb.transaction.Transaction ;
+import static com.hp.hpl.jena.tdb.ReadWrite.* ;
public abstract class AbstractTestNodeTableTrans extends BaseTest
{
@@ -46,7 +47,7 @@ public abstract class AbstractTestNodeTa
Transaction createTxn(long id)
{
- return new Transaction(null, null, id, null, null) ;
+ return new Transaction(null, WRITE, id, null, null) ;
}
@Test public void nodetrans_01()
Modified: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestObjectFileTrans.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestObjectFileTrans.java?rev=1146907&r1=1146906&r2=1146907&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestObjectFileTrans.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestObjectFileTrans.java Thu Jul 14 21:48:29 2011
@@ -6,6 +6,7 @@
package com.hp.hpl.jena.tdb.transaction;
+import static com.hp.hpl.jena.tdb.ReadWrite.* ;
import java.nio.ByteBuffer ;
import java.util.Iterator ;
@@ -34,7 +35,7 @@ public abstract class AbstractTestObject
@Before
public void setup()
{
- txn = new Transaction(null, null, ++count, null, null) ;
+ txn = new Transaction(null, WRITE, ++count, null, null) ;
file1 = createFile("base") ;
file2 = createFile("log") ;
}