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/27 15:38:53 UTC
svn commit: r1140155 - in /incubator/jena/Experimental/TxTDB/trunk:
src-dev/tx/ src-dev/tx/base/ src-dev/tx/journal/
src/main/java/com/hp/hpl/jena/tdb/base/block/
src/main/java/com/hp/hpl/jena/tdb/base/objectfile/
src/main/java/com/hp/hpl/jena/tdb/inde...
Author: andy
Date: Mon Jun 27 13:38:52 2011
New Revision: 1140155
URL: http://svn.apache.org/viewvc?rev=1140155&view=rev
Log: (empty)
Added:
incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DatasetBuilderTxn2.java (with props)
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/FileRef.java (contents, props changed)
- copied, changed from r1140034, incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/base/FileRef.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java (with props)
Removed:
incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/IteratorSlotted.java
incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestIteratorSlotted.java
incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/base/FileRef.java
incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/base/TDBFileManager.java
incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/journal/
Modified:
incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/base/BlockRef.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/block/Block.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileStorage.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPlusTree.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTable.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableCache.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/store/QuadTable.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/store/TripleTable.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/BlockMgrJournal.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetBuilderTxn.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/JournalEntry.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/ObjectFileTrans.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/Transaction.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrMem.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TestJournal.java
Added: incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DatasetBuilderTxn2.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DatasetBuilderTxn2.java?rev=1140155&view=auto
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DatasetBuilderTxn2.java (added)
+++ incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DatasetBuilderTxn2.java Mon Jun 27 13:38:52 2011
@@ -0,0 +1,52 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tx;
+
+import java.util.Properties ;
+
+import com.hp.hpl.jena.tdb.base.file.Location ;
+import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
+
+import setup.DatasetBuilder ;
+
+/** Yet another dataset builder.
+ * This one builds the DatasetGraph and the transactional DatasetGraph toegther.
+ * It heavily assumes that there is one active transaction
+ * It does currently assume that a transaction
+ */
+public class DatasetBuilderTxn2 implements DatasetBuilder
+{
+ private static Object builderLock = new Object() ;
+
+ @Override
+ public DatasetGraphTDB build(Location location, Properties config)
+ {
+ synchronized(builderLock)
+ {
+ return _build(location, config) ;
+ }
+ }
+
+ private DatasetGraphTDB _build(Location location, Properties config)
+ {
+ return null ;
+ }
+
+}
+
Propchange: incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DatasetBuilderTxn2.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/base/BlockRef.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/base/BlockRef.java?rev=1140155&r1=1140154&r2=1140155&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/base/BlockRef.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/base/BlockRef.java Mon Jun 27 13:38:52 2011
@@ -6,6 +6,8 @@
package tx.base;
+import com.hp.hpl.jena.tdb.sys.FileRef ;
+
final
public class BlockRef
{
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/block/Block.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/block/Block.java?rev=1140155&r1=1140154&r2=1140155&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/block/Block.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/base/block/Block.java Mon Jun 27 13:38:52 2011
@@ -8,7 +8,7 @@ package com.hp.hpl.jena.tdb.base.block;
import java.nio.ByteBuffer ;
-import tx.base.BlockRef ;
+// import tx.base.BlockRef ;
import com.hp.hpl.jena.tdb.base.page.Page ;
@@ -21,7 +21,7 @@ public final class Block
// Blocks for objects are addressed by long - this is file offset so 2G is not enough.
private final Long id ; // Keep as object. It's the cache key.
- private BlockRef blockRef ;
+ //private BlockRef blockRef ;
// Information carrying these are not enforced.
@@ -43,7 +43,7 @@ public final class Block
// ByteBuffer is whole disk space from byte 0 for this disk unit.
this.id = id ;
this.byteBuffer = byteBuffer ;
- this.blockRef = null ;
+ //this.blockRef = null ;
this.readOnly = false ;
this.modified = false ;
@@ -82,7 +82,7 @@ public final class Block
this.modified = modified ;
}
- public BlockRef getBlockRef() { return blockRef ; }
+// public BlockRef getBlockRef() { return blockRef ; }
public ByteBuffer getUnderlyingByteBuffer()
{ return underlyingByteBuffer ; }
@@ -105,7 +105,7 @@ public final class Block
Block b = new Block(getId(), dstBuffer) ;
b.modified = modified ;
b.readOnly = readOnly ;
- b.blockRef = null ;
+// b.blockRef = null ;
return b ;
}
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=1140155&r1=1140154&r2=1140155&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 Jun 27 13:38:52 2011
@@ -13,9 +13,9 @@ import java.nio.ByteBuffer ;
import java.util.Iterator ;
import org.openjena.atlas.iterator.Iter ;
+import org.openjena.atlas.iterator.IteratorSlotted ;
import org.openjena.atlas.lib.Pair ;
import org.openjena.atlas.logging.Log ;
-import tx.IteratorSlotted ;
import com.hp.hpl.jena.tdb.base.block.Block ;
import com.hp.hpl.jena.tdb.base.file.BufferChannel ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPlusTree.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPlusTree.java?rev=1140155&r1=1140154&r2=1140155&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPlusTree.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPlusTree.java Mon Jun 27 13:38:52 2011
@@ -245,7 +245,7 @@ public class BPlusTree implements Iterab
// [TxTDB:PATCH-UP]
if ( root != null )
{
- //root.release() ;
+ root.release() ;
//nodeManager.release(rootNode) ;
}
if ( root != null && rootNode != root )
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTable.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTable.java?rev=1140155&r1=1140154&r2=1140155&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTable.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTable.java Mon Jun 27 13:38:52 2011
@@ -1,5 +1,6 @@
/*
* (c) Copyright 2008, 2009 Hewlett-Packard Development Company, LP
+ * (c) Copyright 2011 Epimorphics Ltd.
* All rights reserved.
* [See end of file]
*/
@@ -37,6 +38,7 @@ public interface NodeTable extends Sync,
/*
* (c) Copyright 2008, 2009 Hewlett-Packard Development Company, LP
+ * (c) Copyright 2011 Epimorphics Ltd.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableCache.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableCache.java?rev=1140155&r1=1140154&r2=1140155&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableCache.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableCache.java Mon Jun 27 13:38:52 2011
@@ -19,11 +19,12 @@ import org.openjena.atlas.logging.Log ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.tdb.store.NodeId ;
-/** Cache wrapper around a NodeTable. Assumes all access goes through this wrapper */
+/** Cache wrapper around a NodeTable.
+ * Assumes all access goes through this wrapper.
+ * Read-cache - write caching is done via the object file used by the base NodeTable.
+ */
public class NodeTableCache implements NodeTable
{
- // **** Use wrapper?
-
// These caches are updated together.
// See synchronization in _retrieveNodeByNodeId and _idForNode
private Cache<Node, NodeId> node2id_Cache = null ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java?rev=1140155&r1=1140154&r2=1140155&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java Mon Jun 27 13:38:52 2011
@@ -37,7 +37,6 @@ import com.hp.hpl.jena.update.GraphStore
public class DatasetGraphTDB extends DatasetGraphCaching
implements DatasetGraph, Sync, Closeable, GraphStore, Session
{
- // or DatasetGraphCaching
private TripleTable tripleTable ;
private QuadTable quadTable ;
private DatasetPrefixStorage prefixes ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/store/QuadTable.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/store/QuadTable.java?rev=1140155&r1=1140154&r2=1140155&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/store/QuadTable.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/store/QuadTable.java Mon Jun 27 13:38:52 2011
@@ -33,7 +33,8 @@ import com.hp.hpl.jena.tdb.sys.Concurren
public class QuadTable implements Sync, Closeable
{
- final NodeTupleTable table ;
+ final private NodeTupleTable table ;
+ private boolean syncNeeded = false ;
public QuadTable(TupleIndex[] indexes, NodeTable nodeTable, ConcurrencyPolicy policy)
{
@@ -43,39 +44,44 @@ public class QuadTable implements Sync,
/** Add a quad - return true if it was added, false if it already existed */
public boolean add( Quad quad )
{
+ //syncNeeded = true ;
return add(quad.getGraph(), quad.getSubject(), quad.getPredicate(), quad.getObject()) ;
}
/** Add a quad (as graph node and triple) - return true if it was added, false if it already existed */
public boolean add(Node gn, Triple triple )
{
+ //syncNeeded = true ;
return add(gn, triple.getSubject(), triple.getPredicate(), triple.getObject()) ;
}
/** Add a quad - return true if it was added, false if it already existed */
public boolean add(Node g, Node s, Node p, Node o)
{
+ syncNeeded = true ;
return table.addRow(g,s,p,o) ;
}
/** Delete a quad - return true if it was deleted, false if it didn't exist */
public boolean delete( Quad quad )
{
+ //syncNeeded = true ;
return delete(quad.getGraph(), quad.getSubject(), quad.getPredicate(), quad.getObject()) ;
}
/** Delete a quad (as graph node and triple) - return true if it was deleted, false if it didn't exist */
public boolean delete( Node gn, Triple triple )
{
+ //syncNeeded = true ;
return delete(gn, triple.getSubject(), triple.getPredicate(), triple.getObject()) ;
}
/** Delete a quad - return true if it was deleted, false if it didn't exist */
public boolean delete(Node g, Node s, Node p, Node o)
{
+ syncNeeded = true ;
return table.deleteRow(g, s, p, o) ;
}
-
/** Find matching quads */
public Iterator<Quad> find(Node g, Node s, Node p, Node o)
@@ -98,7 +104,13 @@ public class QuadTable implements Sync,
public NodeTupleTable getNodeTupleTable() { return table ; }
@Override
- public void sync() { table.sync() ; }
+ public void sync()
+ {
+ if ( syncNeeded )
+ table.sync() ;
+ syncNeeded = false ;
+ }
+
public boolean isEmpty() { return table.isEmpty() ; }
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/store/TripleTable.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/store/TripleTable.java?rev=1140155&r1=1140154&r2=1140155&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/store/TripleTable.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/store/TripleTable.java Mon Jun 27 13:38:52 2011
@@ -36,6 +36,7 @@ import com.hp.hpl.jena.tdb.sys.Concurren
public class TripleTable implements Sync, Closeable
{
final NodeTupleTable table ;
+ private boolean syncNeeded = false ;
public TripleTable(TupleIndex[] indexes, NodeTable nodeTable, ConcurrencyPolicy policy)
{
@@ -45,23 +46,27 @@ public class TripleTable implements Sync
public boolean add( Triple triple )
{
+ //syncNeeded = true ;
return add(triple.getSubject(), triple.getPredicate(), triple.getObject()) ;
}
public boolean add(Node s, Node p, Node o)
{
+ syncNeeded = true ;
return table.addRow(s, p, o) ;
}
/** Delete a triple - return true if it was deleted, false if it didn't exist */
public boolean delete( Triple triple )
{
- return table.deleteRow(triple.getSubject(), triple.getPredicate(), triple.getObject()) ;
+ //syncNeeded = true ;
+ return delete(triple.getSubject(), triple.getPredicate(), triple.getObject()) ;
}
/** Delete a triple - return true if it was deleted, false if it didn't exist */
public boolean delete(Node s, Node p, Node o)
{
+ syncNeeded = true ;
return table.deleteRow(s, p, o) ;
}
@@ -86,7 +91,11 @@ public class TripleTable implements Sync
@Override
public void sync()
- { table.sync() ; }
+ {
+ if ( syncNeeded )
+ table.sync() ;
+ syncNeeded = false ;
+ }
@Override
public void close()
Copied: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/FileRef.java (from r1140034, incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/base/FileRef.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/FileRef.java?p2=incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/FileRef.java&p1=incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/base/FileRef.java&r1=1140034&r2=1140155&rev=1140155&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/base/FileRef.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/FileRef.java Mon Jun 27 13:38:52 2011
@@ -4,7 +4,7 @@
* [See end of file]
*/
-package tx.base;
+package com.hp.hpl.jena.tdb.sys;
import java.util.HashMap ;
import java.util.Map ;
@@ -17,7 +17,6 @@ import org.openjena.atlas.logging.Log ;
import com.hp.hpl.jena.tdb.TDBException ;
import com.hp.hpl.jena.tdb.base.file.FileSet ;
-import com.hp.hpl.jena.tdb.sys.Names ;
Propchange: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/FileRef.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/BlockMgrJournal.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/BlockMgrJournal.java?rev=1140155&r1=1140154&r2=1140155&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/BlockMgrJournal.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/BlockMgrJournal.java Mon Jun 27 13:38:52 2011
@@ -15,11 +15,11 @@ import java.util.Set ;
import org.openjena.atlas.lib.NotImplemented ;
import org.openjena.atlas.logging.Log ;
-import tx.base.FileRef ;
import com.hp.hpl.jena.tdb.base.block.Block ;
import com.hp.hpl.jena.tdb.base.block.BlockException ;
import com.hp.hpl.jena.tdb.base.block.BlockMgr ;
+import com.hp.hpl.jena.tdb.sys.FileRef ;
public class BlockMgrJournal implements BlockMgr, Transactional
{
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetBuilderTxn.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetBuilderTxn.java?rev=1140155&r1=1140154&r2=1140155&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetBuilderTxn.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetBuilderTxn.java Mon Jun 27 13:38:52 2011
@@ -19,7 +19,6 @@ import setup.NodeTableBuilder ;
import setup.ObjectFileBuilder ;
import setup.RangeIndexBuilder ;
import setup.TupleIndexBuilder ;
-import tx.base.FileRef ;
import com.hp.hpl.jena.sparql.core.DatasetPrefixStorage ;
import com.hp.hpl.jena.tdb.base.block.BlockMgr ;
@@ -37,6 +36,7 @@ import com.hp.hpl.jena.tdb.nodetable.Nod
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
import com.hp.hpl.jena.tdb.store.DatasetPrefixStorageLogger ;
import com.hp.hpl.jena.tdb.sys.ConcurrencyPolicy ;
+import com.hp.hpl.jena.tdb.sys.FileRef ;
public class DatasetBuilderTxn extends DatasetBuilderStd
{
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=1140155&r1=1140154&r2=1140155&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 Mon Jun 27 13:38:52 2011
@@ -11,13 +11,13 @@ import static com.hp.hpl.jena.tdb.sys.Sy
import java.nio.ByteBuffer ;
import java.util.Iterator ;
+import org.openjena.atlas.iterator.IteratorSlotted ;
import org.openjena.atlas.lib.Closeable ;
import org.openjena.atlas.lib.Sync ;
-import tx.IteratorSlotted ;
-import tx.base.FileRef ;
import com.hp.hpl.jena.tdb.base.file.BufferChannel ;
+import com.hp.hpl.jena.tdb.sys.FileRef ;
/** The Journal is slightly odd - it is append-only for write but random read.
* The write performance is more important than read; reads only happen
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/JournalEntry.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/JournalEntry.java?rev=1140155&r1=1140154&r2=1140155&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/JournalEntry.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/JournalEntry.java Mon Jun 27 13:38:52 2011
@@ -8,7 +8,8 @@ package com.hp.hpl.jena.tdb.transaction;
import java.nio.ByteBuffer ;
-import tx.base.FileRef ;
+import com.hp.hpl.jena.tdb.sys.FileRef ;
+
public class JournalEntry
{
Added: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java?rev=1140155&view=auto
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java (added)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java Mon Jun 27 13:38:52 2011
@@ -0,0 +1,81 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hp.hpl.jena.tdb.transaction;
+
+import java.util.Iterator ;
+
+import org.openjena.atlas.lib.Pair ;
+
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
+import com.hp.hpl.jena.tdb.store.NodeId ;
+
+public class NodeTableTrans implements NodeTable
+{
+ private final NodeTable base ;
+ private final NodeTable other ;
+ private boolean inTransaction ;
+ private long otherAllocOffset ; // -2 means "undiscovered"
+
+ public NodeTableTrans(Transaction txn, NodeTable base, NodeTable other)
+ {
+ // The other object file must use the same allocation policy.
+ this.base = base ;
+ this.other = other ;
+ inTransaction = false ;
+ this.otherAllocOffset = -2 ;
+ }
+
+ @Override
+ public NodeId getAllocateNodeId(Node node)
+ {
+ return null ;
+ }
+
+ @Override
+ public NodeId getNodeIdForNode(Node node)
+ {
+ return null ;
+ }
+
+ @Override
+ public Node getNodeForNodeId(NodeId id)
+ {
+ return null ;
+ }
+
+ @Override
+ public Iterator<Pair<NodeId, Node>> all()
+ {
+ return null ;
+ }
+
+ @Override
+ public void sync()
+ {
+ //base.sync() ;
+ other.sync();
+ }
+
+ @Override
+ public void close()
+ {}
+
+}
+
Propchange: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/ObjectFileTrans.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/ObjectFileTrans.java?rev=1140155&r1=1140154&r2=1140155&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/ObjectFileTrans.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/ObjectFileTrans.java Mon Jun 27 13:38:52 2011
@@ -138,9 +138,7 @@ public class ObjectFileTrans implements
{
if ( passthrough ) { return base.write(buffer) ; }
// Write to auxillary
- System.out.println("***** Write") ;
long x = other.write(buffer) ;
- System.out.println("***** Write -> "+x+" ("+otherAllocOffset+")") ;
return mapFromOther(x) ;
}
@@ -148,10 +146,6 @@ public class ObjectFileTrans implements
public ByteBuffer read(long id)
{
if ( passthrough ) { return base.read(id) ; }
- // case of id=0 , startAlloc=0??? base file = alloc 0.
- if ( otherAllocOffset == 0 )
- ;
-
if ( id < otherAllocOffset )
return base.read(id) ;
long x = mapToOther(id) ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/Transaction.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/Transaction.java?rev=1140155&r1=1140154&r2=1140155&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/Transaction.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/Transaction.java Mon Jun 27 13:38:52 2011
@@ -11,7 +11,8 @@ import java.util.Collections ;
import java.util.Iterator ;
import java.util.List ;
-import tx.base.FileRef ;
+import com.hp.hpl.jena.tdb.sys.FileRef ;
+
/** A transaction handle */
public class Transaction
Modified: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrMem.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrMem.java?rev=1140155&r1=1140154&r2=1140155&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrMem.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrMem.java Mon Jun 27 13:38:52 2011
@@ -11,7 +11,7 @@ public class TestBlockMgrMem extends Abs
{
@Override
protected BlockMgr make()
- { return BlockMgrFactory.createMem(null, BlkSize) ; }
+ { return BlockMgrFactory.createMem("mem", BlkSize) ; }
}
Modified: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TestJournal.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TestJournal.java?rev=1140155&r1=1140154&r2=1140155&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TestJournal.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TestJournal.java Mon Jun 27 13:38:52 2011
@@ -13,10 +13,10 @@ import org.junit.Before ;
import org.junit.Test ;
import org.openjena.atlas.junit.BaseTest ;
import org.openjena.atlas.lib.Bytes ;
-import tx.base.FileRef ;
import com.hp.hpl.jena.tdb.base.file.BufferChannel ;
import com.hp.hpl.jena.tdb.base.file.BufferChannelMem ;
+import com.hp.hpl.jena.tdb.sys.FileRef ;
public class TestJournal extends BaseTest
{