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/01 00:34:28 UTC
svn commit: r1141742 - in /incubator/jena/Experimental/TxTDB/trunk:
src-dev/tx/ src/main/java/com/hp/hpl/jena/tdb/setup/
src/main/java/com/hp/hpl/jena/tdb/sys/
src/main/java/com/hp/hpl/jena/tdb/transaction/
src/test/java/com/hp/hpl/jena/tdb/transaction/
Author: andy
Date: Thu Jun 30 22:34:27 2011
New Revision: 1141742
URL: http://svn.apache.org/viewvc?rev=1141742&view=rev
Log: (empty)
Added:
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java (contents, props changed)
- copied, changed from r1141706, incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/NodeTableTrans.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java (contents, props changed)
- copied, changed from r1141706, incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/AbstractTestNodeTableTrans.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TestNodeTableTrans.java (contents, props changed)
- copied, changed from r1141706, incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestNodeTableTrans.java
Removed:
incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/AbstractTestNodeTableTrans.java
incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/NodeTableTrans.java
incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestNodeTableTrans.java
Modified:
incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/Builder.java
incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TxMain.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/Builder.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/Names.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/SetupTDB.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetBuilderTxn.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TS_Transaction.java
Modified: incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/Builder.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/Builder.java?rev=1141742&r1=1141741&r2=1141742&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/Builder.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/Builder.java Thu Jun 30 22:34:27 2011
@@ -33,6 +33,10 @@ import com.hp.hpl.jena.tdb.sys.SystemTDB
public final class Builder
{
+ // See SetupTDB
+ // This already has many statics.
+ // Reuse with defaults.
+
// Yet another attempt to have one place to "build things"
// See DatasetBuilderStd.
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=1141742&r1=1141741&r2=1141742&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TxMain.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TxMain.java Thu Jun 30 22:34:27 2011
@@ -29,6 +29,7 @@ import com.hp.hpl.jena.sparql.util.Query
import com.hp.hpl.jena.tdb.TDBFactory ;
import com.hp.hpl.jena.tdb.base.block.FileMode ;
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.base.record.Record ;
import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
@@ -39,11 +40,13 @@ import com.hp.hpl.jena.tdb.index.bplustr
import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.nodetable.NodeTableInline ;
import com.hp.hpl.jena.tdb.nodetable.NodeTupleTable ;
+import com.hp.hpl.jena.tdb.setup.DatasetBuilderStd ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
import com.hp.hpl.jena.tdb.store.DatasetPrefixesTDB ;
import com.hp.hpl.jena.tdb.store.NodeId ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
import com.hp.hpl.jena.tdb.transaction.DatasetGraphTxnTDB ;
+import com.hp.hpl.jena.tdb.transaction.NodeTableTrans ;
import com.hp.hpl.jena.tdb.transaction.TransactionManager ;
import com.hp.hpl.jena.update.UpdateAction ;
import com.hp.hpl.jena.update.UpdateFactory ;
@@ -72,6 +75,9 @@ public class TxMain
public static void main(String... args)
{
+ DatasetGraphTDB dsg00 = build() ;
+ exit(0) ;
+
execNT() ; exit(0) ;
if ( false )
@@ -217,8 +223,10 @@ public class TxMain
private static DatasetGraphTDB build()
{
- DatasetGraphTDB dsg = TDBFactory.createDatasetGraph(DBdir) ;
- return dsg ;
+ return DatasetBuilderStd.build(DBdir) ;
+
+// DatasetGraphTDB dsg = TDBFactory.createDatasetGraph(DBdir) ;
+// return dsg ;
}
private static DatasetGraphTxnTDB buildTx(DatasetGraph dsg)
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/Builder.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/Builder.java?rev=1141742&r1=1141741&r2=1141742&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/Builder.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/Builder.java Thu Jun 30 22:34:27 2011
@@ -20,6 +20,8 @@ package com.hp.hpl.jena.tdb.setup;
import static com.hp.hpl.jena.tdb.sys.SystemTDB.SizeOfNodeId ;
import org.openjena.atlas.lib.ColumnMap ;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
import com.hp.hpl.jena.tdb.base.block.BlockMgr ;
import com.hp.hpl.jena.tdb.base.block.BlockMgrFactory ;
@@ -42,7 +44,9 @@ import com.hp.hpl.jena.tdb.sys.SystemTDB
public class Builder
{
-
+ private static boolean VERBOSE = true ;
+ private static Logger log = LoggerFactory.getLogger(Builder.class) ;
+
public static class TupleIndexBuilderStd implements TupleIndexBuilder
{
private final RangeIndexBuilder rangeIndexBuilder ;
@@ -77,6 +81,9 @@ public class Builder
@Override
public NodeTable buildNodeTable(FileSet fsIndex, FileSet fsObjectFile, int sizeNode2NodeIdCache, int sizeNodeId2NodeCache)
{
+ if ( VERBOSE )
+ log.info("NodeTable: "+fsIndex+"/"+fsObjectFile) ;
+
RecordFactory recordFactory = new RecordFactory(SystemTDB.LenNodeHash, SystemTDB.SizeOfNodeId) ;
Index idx = indexBuilder.buildIndex(fsIndex, recordFactory) ;
ObjectFile objectFile = objectFileBuilder.buildObjectFile(fsObjectFile, Names.extNodeData) ;
@@ -123,6 +130,9 @@ public class Builder
@Override
public RangeIndex buildRangeIndex(FileSet fileSet, RecordFactory recordFactory)
{
+ if ( VERBOSE )
+ log.info("RangeIndex: "+fileSet) ;
+
int blkSize = SystemTDB.BlockSize ;
int order = BPlusTreeParams.calcOrder(blkSize, recordFactory.recordLength()) ;
int readCacheSize = SystemTDB.BlockReadCacheSize ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java?rev=1141742&r1=1141741&r2=1141742&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java Thu Jun 30 22:34:27 2011
@@ -29,9 +29,10 @@ import com.hp.hpl.jena.tdb.store.QuadTab
import com.hp.hpl.jena.tdb.store.TripleTable ;
import com.hp.hpl.jena.tdb.sys.ConcurrencyPolicy ;
import com.hp.hpl.jena.tdb.sys.ConcurrencyPolicyMRSW ;
+import com.hp.hpl.jena.tdb.sys.SystemTDB ;
import com.hp.hpl.jena.tdb.sys.Names ;
import com.hp.hpl.jena.tdb.sys.SetupTDB ;
-import com.hp.hpl.jena.tdb.sys.SystemTDB ;
+//import com.hp.hpl.jena.tdb.sys.SystemTDB ;
/** This class is the process of building a dataset. */
@@ -51,6 +52,13 @@ public class DatasetBuilderStd implement
private Properties config ;
+ public static DatasetGraphTDB build(String dir)
+ {
+ DatasetBuilderStd x = new DatasetBuilderStd() ;
+ x.setStd() ;
+ return x.build(new Location(dir), null) ;
+ }
+
protected DatasetBuilderStd()
{
}
@@ -70,6 +78,9 @@ public class DatasetBuilderStd implement
this.objectFileBuilder = objectFileBuilder ;
}
+
+ // Capture
+
protected void setStd()
{
ObjectFileBuilder objectFileBuilder = new Builder.ObjectFileBuilderStd() ;
@@ -119,7 +130,7 @@ public class DatasetBuilderStd implement
ConcurrencyPolicy policy = createConcurrencyPolicy() ;
NodeTable nodeTable = makeNodeTable(location,
- Names.indexNode2Id, Names.indexId2Node,
+ params.indexNode2Id, params.indexId2Node,
SystemTDB.Node2NodeIdCacheSize, SystemTDB.NodeId2NodeCacheSize) ;
TripleTable tripleTable = makeTripleTable(location, nodeTable, policy) ;
@@ -134,15 +145,15 @@ public class DatasetBuilderStd implement
protected void init(Location location)
{
- // TODO Check this.
+ // Build params.
}
// ======== Dataset level
protected TripleTable makeTripleTable(Location location, NodeTable nodeTable, ConcurrencyPolicy policy)
{
MetaFile metafile = location.getMetaFile() ;
- String dftPrimary = Names.primaryIndexTriples ;
- String[] dftIndexes = Names.tripleIndexes ;
+ String dftPrimary = params.primaryIndexTriples ;
+ String[] dftIndexes = params.tripleIndexes ;
String primary = metafile.getOrSetDefault("tdb.indexes.triples.primary", dftPrimary) ;
String x = metafile.getOrSetDefault("tdb.indexes.triples", StrUtils.strjoin(",",dftIndexes)) ;
@@ -164,8 +175,8 @@ public class DatasetBuilderStd implement
protected QuadTable makeQuadTable(Location location, NodeTable nodeTable, ConcurrencyPolicy policy)
{
MetaFile metafile = location.getMetaFile() ;
- String dftPrimary = Names.primaryIndexQuads ;
- String[] dftIndexes = Names.quadIndexes ;
+ String dftPrimary = params.primaryIndexQuads ;
+ String[] dftIndexes = params.quadIndexes ;
String primary = metafile.getOrSetDefault("tdb.indexes.quads.primary", dftPrimary) ;
String x = metafile.getOrSetDefault("tdb.indexes.quads", StrUtils.strjoin(",",dftIndexes)) ;
@@ -212,11 +223,11 @@ public class DatasetBuilderStd implement
// Some of this is also in locationMetadata.
MetaFile metafile = location.getMetaFile() ;
- String dftPrimary = Names.primaryIndexPrefix ;
- String[] dftIndexes = Names.prefixIndexes ;
+ String dftPrimary = params.primaryIndexPrefix ;
+ String[] dftIndexes = params.prefixIndexes ;
// The index using for Graph+Prefix => URI
- String indexPrefixes = metafile.getOrSetDefault("tdb.prefixes.index.file", Names.indexPrefix) ;
+ String indexPrefixes = metafile.getOrSetDefault("tdb.prefixes.index.file", params.indexPrefix) ;
String primary = metafile.getOrSetDefault("tdb.prefixes.primary", dftPrimary) ;
String x = metafile.getOrSetDefault("tdb.prefixes.indexes", StrUtils.strjoin(",",dftIndexes)) ;
String indexes[] = x.split(",") ;
@@ -226,8 +237,8 @@ public class DatasetBuilderStd implement
error(log, "Wrong number of triple table tuples indexes: "+prefixIndexes.length) ;
// The nodetable.
- String pnNode2Id = metafile.getOrSetDefault("tdb.prefixes.nodetable.mapping.node2id", Names.prefixNode2Id) ;
- String pnId2Node = metafile.getOrSetDefault("tdb.prefixes.nodetable.mapping.id2node", Names.prefixId2Node) ;
+ String pnNode2Id = metafile.getOrSetDefault("tdb.prefixes.nodetable.mapping.node2id", params.prefixNode2Id) ;
+ String pnId2Node = metafile.getOrSetDefault("tdb.prefixes.nodetable.mapping.id2node", params.prefixId2Node) ;
// No cache - the prefix mapping is a cache
NodeTable prefixNodes = makeNodeTable(location, pnNode2Id, pnId2Node, -1, -1) ;
@@ -326,6 +337,31 @@ public class DatasetBuilderStd implement
try { return Integer.parseInt(str) ; }
catch (NumberFormatException ex) { error(log, messageBase+": "+str) ; return -1 ; }
}
+
+ private static Params params = new Params() ;
+
+ // The standard setting
+ private static class Params
+ {
+ final int blockSize = SystemTDB.BlockSize ;
+ final int memBlockSize = SystemTDB.BlockSizeTestMem ;
+ final int readCacheSize = SystemTDB.BlockReadCacheSize ;
+ final int writeCacheSize = SystemTDB.BlockWriteCacheSize ;
+
+ final String indexNode2Id = Names.indexNode2Id ;
+ final String indexId2Node = Names.indexId2Node ;
+ final String primaryIndexTriples = Names.primaryIndexTriples ;
+ final String[] tripleIndexes = Names.tripleIndexes ;
+ final String primaryIndexQuads = Names.primaryIndexQuads ;
+ final String[] quadIndexes = Names.quadIndexes ;
+ final String primaryIndexPrefix = Names.primaryIndexPrefix ;
+ final String[] prefixIndexes = Names.prefixIndexes ;
+ final String indexPrefix = Names.indexPrefix ;
+
+ final String prefixNode2Id = Names.prefixNode2Id ;
+ final String prefixId2Node = Names.prefixId2Node ;
+
+ }
}
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/Names.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/Names.java?rev=1141742&r1=1141741&r2=1141742&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/Names.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/Names.java Thu Jun 30 22:34:27 2011
@@ -40,7 +40,7 @@ public class Names
/** Prefixes file */
public static final String prefixId2Node = "prefixes" ; // Prefix node table
public static final String prefixNode2Id = "prefix2id"; // Prefix node table for index Node/hash->id
- public static final String indexPrefix = "prefixIdx"; // Primary key on the prefixes table.
+ public static final String indexPrefix = "prefixIdx"; // Prefix index name
/** Optimizer / stats */
public static final String optStats = "stats.opt" ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/SetupTDB.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/SetupTDB.java?rev=1141742&r1=1141741&r2=1141742&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/SetupTDB.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/SetupTDB.java Thu Jun 30 22:34:27 2011
@@ -86,10 +86,7 @@ public class SetupTDB
// IndexBuilder for metadata files.
- // TODO Check everywhere else for non-DI constructors.
-
// Old code:
- //
// IndexBuilders. Or add a new IndexBuilder that can make from meta files.
static public final String NodeTableType = "dat" ;
@@ -193,7 +190,6 @@ public class SetupTDB
// On return, can just read the metadata key/value.
/* Semi-global
- * TODO Configure caches.
* tdb.cache.node2id.size=100000 # Smaller? Much smaller!
* tdb.cache.id2node.size=100000
* tdb.cache.blockwrite.size=2000
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=1141742&r1=1141741&r2=1141742&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 Thu Jun 30 22:34:27 2011
@@ -12,7 +12,6 @@ import java.util.Properties ;
import org.openjena.atlas.lib.FileOps ;
import org.openjena.atlas.logging.Log ;
-import tx.NodeTableTrans ;
import com.hp.hpl.jena.sparql.core.DatasetPrefixStorage ;
import com.hp.hpl.jena.tdb.base.block.BlockMgr ;
Copied: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java (from r1141706, incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/NodeTableTrans.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java?p2=incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java&p1=incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/NodeTableTrans.java&r1=1141706&r2=1141742&rev=1141742&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/NodeTableTrans.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java Thu Jun 30 22:34:27 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package tx;
+package com.hp.hpl.jena.tdb.transaction;
import java.util.Iterator ;
@@ -29,12 +29,8 @@ import com.hp.hpl.jena.tdb.base.objectfi
import com.hp.hpl.jena.tdb.index.Index ;
import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.nodetable.NodeTableCache ;
-import com.hp.hpl.jena.tdb.nodetable.NodeTableInline ;
import com.hp.hpl.jena.tdb.nodetable.NodeTableNative ;
import com.hp.hpl.jena.tdb.store.NodeId ;
-import com.hp.hpl.jena.tdb.transaction.TDBTransactionException ;
-import com.hp.hpl.jena.tdb.transaction.Transaction ;
-import com.hp.hpl.jena.tdb.transaction.Transactional ;
public class NodeTableTrans implements NodeTable, Transactional
{
@@ -55,9 +51,7 @@ public class NodeTableTrans implements N
this.nodeIndex = nodeIndex ;
this.journal = journal ;
-// this.nodeTableJournal = new NodeTableNative(tmpIndex, journal) ;
-// this.nodeTableJournal = NodeTableCache.create(nodeTableJournal, CacheSize, CacheSize) ;
-// // Do not add the inline NodeTable here - don't convert it's values by the offset!
+ this.nodeTableJournal = null ;
}
public void setPassthrough(boolean v) { passthrough = v ; }
Propchange: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java (from r1141706, incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/AbstractTestNodeTableTrans.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java?p2=incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java&p1=incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/AbstractTestNodeTableTrans.java&r1=1141706&r2=1141742&rev=1141742&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/AbstractTestNodeTableTrans.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java Thu Jun 30 22:34:27 2011
@@ -16,16 +16,16 @@
* limitations under the License.
*/
-package tx;
+package com.hp.hpl.jena.tdb.transaction;
import org.junit.Test ;
import org.openjena.atlas.junit.BaseTest ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.util.NodeFactory ;
-import com.hp.hpl.jena.tdb.junit.Base_TS ;
import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.store.NodeId ;
+import com.hp.hpl.jena.tdb.transaction.NodeTableTrans ;
import com.hp.hpl.jena.tdb.transaction.Transaction ;
public abstract class AbstractTestNodeTableTrans extends BaseTest
@@ -94,6 +94,22 @@ public abstract class AbstractTestNodeTa
assertEquals(NodeId.NodeDoesNotExist, nt0.getNodeIdForNode(node1)) ;
assertNull(nt0.getNodeForNodeId(nodeId)) ;
}
+
+ @Test public void nodetrans_04()
+ {
+ NodeTableTrans ntt = create(node1) ;
+ NodeTable nt0 = ntt.getBaseNodeTable() ;
+ Transaction txn = new Transaction(11, null) ;
+ ntt.begin(txn) ;
+ // Add a node
+ NodeId nodeId = ntt.getAllocateNodeId(node2) ;
+ // Not here
+ assertEquals(NodeId.NodeDoesNotExist, nt0.getNodeIdForNode(node2)) ;
+ // Is here
+ assertEquals(nodeId, ntt.getNodeIdForNode(node2)) ;
+ ntt.commit(txn) ;
+ assertEquals(nodeId, nt0.getNodeIdForNode(node2)) ;
+ }
}
Propchange: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TS_Transaction.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TS_Transaction.java?rev=1141742&r1=1141741&r2=1141742&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TS_Transaction.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TS_Transaction.java Thu Jun 30 22:34:27 2011
@@ -15,6 +15,7 @@ import org.junit.runners.Suite ;
, TestTransIterator.class
, TestObjectFileTransMem.class
, TestObjectFileTransStorage.class
+ , TestNodeTableTrans.class
})
public class TS_Transaction
{
Copied: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TestNodeTableTrans.java (from r1141706, incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestNodeTableTrans.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TestNodeTableTrans.java?p2=incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TestNodeTableTrans.java&p1=incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestNodeTableTrans.java&r1=1141706&r2=1141742&rev=1141742&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/TestNodeTableTrans.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TestNodeTableTrans.java Thu Jun 30 22:34:27 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package tx;
+package com.hp.hpl.jena.tdb.transaction;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.tdb.base.file.FileFactory ;
@@ -28,6 +28,7 @@ import com.hp.hpl.jena.tdb.index.IndexMa
import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.nodetable.NodeTableNative ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
+import com.hp.hpl.jena.tdb.transaction.NodeTableTrans ;
public class TestNodeTableTrans extends AbstractTestNodeTableTrans
{
Propchange: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TestNodeTableTrans.java
------------------------------------------------------------------------------
svn:mime-type = text/plain