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 2012/01/16 17:29:59 UTC
svn commit: r1232054 - in
/incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb:
DatasetGraphTransaction.java TDBFactory.java TDBFactoryTxn.java
Author: andy
Date: Mon Jan 16 16:29:59 2012
New Revision: 1232054
URL: http://svn.apache.org/viewvc?rev=1232054&view=rev
Log:
Some tidying while looking at the code.
Modified:
incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/DatasetGraphTransaction.java
incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java
incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDBFactoryTxn.java
Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/DatasetGraphTransaction.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/DatasetGraphTransaction.java?rev=1232054&r1=1232053&r2=1232054&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/DatasetGraphTransaction.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/DatasetGraphTransaction.java Mon Jan 16 16:29:59 2012
@@ -27,20 +27,16 @@ import com.hp.hpl.jena.tdb.transaction.T
/** Transactional DatasetGraph that allows one active transaction.
* For multiple read transactions, create multiple DatasetGraphTX objects.
+ * This is analogous to a "connection" in JDBC.
*/
public class DatasetGraphTransaction extends DatasetGraphTrackActive
{
- // This is analogous to a "connection" in JDBC.
-
/* Initially, the app can use this DatasetGraph non-transactionally.
* But as soon as it starts a transaction, the dataset can only be used
* inside transactions.
*/
- // TODO Concurrency
- // TODO tests
-
private DatasetGraphTxn dsgTxn = null ;
private boolean haveUsedInTransaction = false ;
private final Location location ;
@@ -67,7 +63,7 @@ public class DatasetGraphTransaction ext
if ( haveUsedInTransaction )
throw new TDBTransactionException("Not in a transaction") ;
- // Never used in a transaction - return underlying dadabase for old style (non-transactional) usage.
+ // Never used in a transaction - return underlying database for old style (non-transactional) usage.
return sConn.getBaseDataset() ;
}
Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java?rev=1232054&r1=1232053&r2=1232054&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java Mon Jan 16 16:29:59 2012
@@ -59,13 +59,6 @@ public class TDBFactory
return (Dataset)AssemblerUtils.build(assemblerFile, VocabTDB.tDatasetTDB) ;
}
-
-
- // Meaningless unless there is only one in-memeory dataset */
-// /** Create a TDB model for named model for an in-memory */
-// public static Model createNamedModel(String name)
-// { return createDataset().getNamedModel(name) ; }
-
/** Create or connect to a TDB-backed dataset */
public static Dataset createDataset(String dir)
{ return createDataset(new Location(dir)) ; }
@@ -101,12 +94,12 @@ public class TDBFactory
return _createDatasetGraph() ;
}
- private static DatasetGraphTDB _createDatasetGraph(Location location)
+ private static DatasetGraph _createDatasetGraph(Location location)
{ return TDBMaker._createDatasetGraph(location) ; }
- private static DatasetGraphTDB _createDatasetGraph()
+ private static DatasetGraph _createDatasetGraph()
{
- // Make silent by setting the optimizer to the no-opt
+ // Make silent by setting the optimizer to the no-opt
ReorderTransformation rt = SystemTDB.defaultOptimizer ;
if ( rt == null )
SystemTDB.defaultOptimizer = ReorderLib.identity() ;
@@ -130,6 +123,8 @@ public class TDBFactory
/** Create a model, at the given location.
* It is better to create a dataset and get the default model from that.
+ * This Model is not connected to the TDB transaction system.
+ * @deprecated Create a Dataset and use the default model.
*/
@Deprecated
public static Model createModel(Location loc)
@@ -139,9 +134,10 @@ public class TDBFactory
/** Create a model, at the given location
* It is better to create a dataset and get the default model from that.
+ * This Model is not connected to the TDB transaction system.
+ * @deprecated Create a Dataset and get the default model.
*/
@Deprecated
-
public static Model createModel(String dir)
{
return ModelFactory.createModelForGraph(createGraph(dir)) ;
@@ -155,6 +151,8 @@ public class TDBFactory
/** Create a TDB model for named model
* It is better to create a dataset and get the named model from that.
+ * This Model is not connected to the TDB transaction system.
+ * @deprecated Create a Dataset and get the name model.
*/
@Deprecated
public static Model createNamedModel(String name, String location)
@@ -162,6 +160,8 @@ public class TDBFactory
/** Create a TDB model for named model.
* It is better to create a dataset and get the named model from that.
+ * This Model is not connected to the TDB transaction system.
+ * @deprecated Create a Dataset and get the name model.
*/
@Deprecated
public static Model createNamedModel(String name, Location location)
@@ -200,10 +200,4 @@ public class TDBFactory
@Deprecated
public static Graph createNamedGraph(String name, Location location)
{ return createDatasetGraph(location).getGraph(Node.createURI(name)) ; }
-
- // Meaningless unless there is only one in-memory dataset */
-// /** Create a TDB model for named model for an in-memory */
-// public static Graph createNamedGraph(String name)
-// { return createDataset().getNamedModel(name) ; }
-
}
Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDBFactoryTxn.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDBFactoryTxn.java?rev=1232054&r1=1232053&r2=1232054&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDBFactoryTxn.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDBFactoryTxn.java Mon Jan 16 16:29:59 2012
@@ -27,7 +27,7 @@ import com.hp.hpl.jena.tdb.base.file.Loc
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
/** Public factory for creating objects datasets backed by TDB storage which support transactions */
-public class TDBFactoryTxn
+class TDBFactoryTxn
{
// This is TDBFactory with a different maker.??
@@ -104,12 +104,39 @@ public class TDBFactoryTxn
{
return createDatasetGraph(Location.mem()) ;
}
-
+
+ // OLD
private static DatasetGraphTransaction _create(Location location)
{
// No need to cache StoreConnection does all that.
return new DatasetGraphTransaction(location) ;
}
+
+// // NEW
+// static class TDBMakerTxn implements DatasetGraphMakerTDB
+// {
+//
+// @Override
+// public DatasetGraphTDB createDatasetGraph()
+// {
+// //return new DatasetGraphTransaction(Location.mem()) ;
+// return null ;
+// }
+//
+// @Override
+// public DatasetGraphTDB createDatasetGraph(Location location)
+// {
+// return null ;
+// }
+//
+// @Override
+// public void releaseDatasetGraph(DatasetGraphTDB dataset)
+// {}
+//
+// @Override
+// public void releaseLocation(Location location)
+// {}
+// }
}