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/11/17 16:49:27 UTC
svn commit: r1203227 - in /incubator/jena/Jena2/TDB/trunk/src:
main/java/com/hp/hpl/jena/tdb/ main/java/com/hp/hpl/jena/tdb/assembler/
main/java/com/hp/hpl/jena/tdb/store/ main/java/com/hp/hpl/jena/tdb/sys/
main/java/tdb/tools/ test/java/com/hp/hpl/jen...
Author: andy
Date: Thu Nov 17 15:49:26 2011
New Revision: 1203227
URL: http://svn.apache.org/viewvc?rev=1203227&view=rev
Log:
Tidy up around TDFactory to make later switching to always providing a transactional dataest easier.
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
incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/assembler/DatasetAssemblerTDB.java
incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/store/GraphTDBBase.java
incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/DatasetGraphMakerTDB.java
incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/TDBMaker.java
incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tools/dumpnodetable.java
incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/TestTDBFactory.java
incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/junit/GraphLocation.java
incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/store/TestLoader.java
incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransRestart.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=1203227&r1=1203226&r2=1203227&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 Thu Nov 17 15:49:26 2011
@@ -29,7 +29,7 @@ import com.hp.hpl.jena.tdb.transaction.T
* For multiple read transactions, create multiple DatasetGraphTX objects.
*/
-public class DatasetGraphTransaction extends DatasetGraphTrackActive
+public class DatasetGraphTransaction extends DatasetGraphTrackActive
{
// This is analogous to a "connection" in JDBC.
@@ -52,6 +52,8 @@ public class DatasetGraphTransaction ext
sConn = StoreConnection.make(location) ;
}
+ public Location getLocation() { return location ; }
+
@Override
protected DatasetGraph get()
{
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=1203227&r1=1203226&r2=1203227&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 Thu Nov 17 15:49:26 2011
@@ -24,6 +24,7 @@ import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
+import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.assembler.AssemblerUtils ;
import com.hp.hpl.jena.sparql.engine.optimizer.reorder.ReorderLib ;
import com.hp.hpl.jena.sparql.engine.optimizer.reorder.ReorderTransformation ;
@@ -58,6 +59,75 @@ 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)) ; }
+
+ /** Create or connect to a TDB-backed dataset */
+ public static Dataset createDataset(Location location)
+ { return createDataset(createDatasetGraph(location)) ; }
+
+ /** Create or connect to a TDB dataset backed by an in-memory block manager. For testing.*/
+ public static Dataset createDataset()
+ { return createDataset(createDatasetGraph()) ; }
+
+ /** Create a dataset around a DatasetGraphTDB */
+ public static Dataset createDataset(DatasetGraph datasetGraph)
+ { return DatasetFactory.create(datasetGraph) ; }
+
+ // 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) ; }
+
+ /** Create or connect to a TDB-backed dataset (graph-level) */
+ public static DatasetGraph createDatasetGraph(String directory)
+ { return createDatasetGraph(new Location(directory)) ; }
+
+ /** Create or connect to a TDB-backed dataset (graph-level) */
+ public static DatasetGraph createDatasetGraph(Location location)
+ { return _createDatasetGraph(location) ; }
+
+ /** Create or connect to a TDB-backed dataset (graph-level) */
+ public static DatasetGraph createDatasetGraph()
+ {
+ return _createDatasetGraph() ;
+ }
+
+ private static DatasetGraphTDB _createDatasetGraph(Location location)
+ { return TDBMaker._createDatasetGraph(location) ; }
+
+ private static DatasetGraphTDB _createDatasetGraph()
+ {
+ // Make silent by setting the optimizer to the no-opt
+ ReorderTransformation rt = SystemTDB.defaultOptimizer ;
+ if ( rt == null )
+ SystemTDB.defaultOptimizer = ReorderLib.identity() ;
+ DatasetGraphTDB dsg = TDBMaker._createDatasetGraph() ;
+ SystemTDB.defaultOptimizer = rt ;
+ return dsg ;
+ }
+
+
+ /** Return the location of a dataset if it is backed by TDB, else null */
+ public static Location location(Dataset dataset)
+ {
+ return TDBFactoryTxn.location(dataset) ;
+ }
+
+ /** Return the location of a dataset if it is backed by TDB, else null */
+ public static Location location(DatasetGraph dataset)
+ {
+ return TDBFactoryTxn.location(dataset) ;
+ }
+
/** Create a model, at the given location.
* It is better to create a dataset and get the default model from that.
*/
@@ -71,7 +141,7 @@ public class TDBFactory
* It is better to create a dataset and get the default model from that.
*/
@Deprecated
-
+
public static Model createModel(String dir)
{
return ModelFactory.createModelForGraph(createGraph(dir)) ;
@@ -79,18 +149,17 @@ public class TDBFactory
/** Create a TDB model backed by an in-memory block manager. For testing. */
@Deprecated
-
+
public static Model createModel()
{ return ModelFactory.createModelForGraph(createGraph()) ; }
-
/** Create a TDB model for named model
* It is better to create a dataset and get the named model from that.
*/
@Deprecated
public static Model createNamedModel(String name, String location)
{ return createDataset(location).getNamedModel(name) ; }
-
+
/** Create a TDB model for named model.
* It is better to create a dataset and get the named model from that.
*/
@@ -98,32 +167,11 @@ public class TDBFactory
public static Model createNamedModel(String name, Location location)
{ return createDataset(location).getNamedModel(name) ; }
- // 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)) ; }
-
- /** Create or connect to a TDB-backed dataset */
- public static Dataset createDataset(Location location)
- { return createDataset(createDatasetGraph(location)) ; }
-
- /** Create or connect to a TDB dataset backed by an in-memory block manager. For testing.*/
- public static Dataset createDataset()
- { return createDataset(createDatasetGraph()) ; }
-
- /** Create a dataset around a DatasetGraphTDB */
- public static Dataset createDataset(DatasetGraphTDB datasetGraph)
- { return DatasetFactory.create(datasetGraph) ; }
-
/** Create a graph, at the given location
* @deprecated Create a DatasetGraph and use the default graph.
*/
@Deprecated
- public static Graph createGraph(Location loc) { return TDBMaker._createGraph(loc) ; }
+ public static Graph createGraph(Location loc) { return createDatasetGraph(loc).getDefaultGraph() ; }
/** Create a graph, at the given location
* @deprecated Create a DatasetGraph and use the default graph.
@@ -137,7 +185,7 @@ public class TDBFactory
/** Create a TDB graph backed by an in-memory block manager. For testing. */
@Deprecated
- public static Graph createGraph() { return TDBMaker._createGraph() ; }
+ public static Graph createGraph() { return createDatasetGraph().getDefaultGraph() ; }
/** Create a TDB graph for named graph
* @deprecated Create a DatasetGraph and get the name graph from that.
@@ -157,24 +205,5 @@ public class TDBFactory
// /** Create a TDB model for named model for an in-memory */
// public static Graph createNamedGraph(String name)
// { return createDataset().getNamedModel(name) ; }
-
- /** Create or connect to a TDB-backed dataset (graph-level) */
- public static DatasetGraphTDB createDatasetGraph(String directory)
- { return TDBMaker._createDatasetGraph(new Location(directory)) ; }
-
- /** Create or connect to a TDB-backed dataset (graph-level) */
- public static DatasetGraphTDB createDatasetGraph(Location location)
- { return TDBMaker._createDatasetGraph(location) ; }
- /** Create or connect to a TDB-backed dataset (graph-level) */
- public static DatasetGraphTDB createDatasetGraph()
- {
- // Make silent by setting the optimizer to the no-opt
- ReorderTransformation rt = SystemTDB.defaultOptimizer ;
- if ( rt == null )
- SystemTDB.defaultOptimizer = ReorderLib.identity() ;
- DatasetGraphTDB dsg = TDBMaker._createDatasetGraph() ;
- SystemTDB.defaultOptimizer = rt ;
- return dsg ;
- }
}
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=1203227&r1=1203226&r2=1203227&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 Thu Nov 17 15:49:26 2011
@@ -20,6 +20,7 @@ package com.hp.hpl.jena.tdb;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
+import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.assembler.AssemblerUtils ;
import com.hp.hpl.jena.tdb.assembler.VocabTDB ;
import com.hp.hpl.jena.tdb.base.file.Location ;
@@ -69,6 +70,23 @@ public class TDBFactoryTxn
return createDataset(location) ;
}
+ /** Return the location of a dataset if it is backed by TDB, else null */
+ public static Location location(Dataset dataset)
+ {
+ DatasetGraph dsg = dataset.asDatasetGraph() ;
+ return location(dsg) ;
+ }
+
+ /** Return the location of a DatasetGraph if it is backed by TDB, else null */
+ public static Location location(DatasetGraph datasetGraph)
+ {
+ if ( datasetGraph instanceof DatasetGraphTDB )
+ return ((DatasetGraphTDB)datasetGraph).getLocation() ;
+ if ( datasetGraph instanceof DatasetGraphTransaction )
+ return ((DatasetGraphTransaction)datasetGraph).getLocation() ;
+ return null ;
+ }
+
/** Create a DatasetGraph that supports transactions */
public static DatasetGraphTransaction createDatasetGraph(String location)
{
Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/assembler/DatasetAssemblerTDB.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/assembler/DatasetAssemblerTDB.java?rev=1203227&r1=1203226&r2=1203227&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/assembler/DatasetAssemblerTDB.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/assembler/DatasetAssemblerTDB.java Thu Nov 17 15:49:26 2011
@@ -36,6 +36,7 @@ import com.hp.hpl.jena.tdb.TDB ;
import com.hp.hpl.jena.tdb.TDBFactory ;
import com.hp.hpl.jena.tdb.base.file.Location ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
+import com.hp.hpl.jena.tdb.sys.TDBMaker ;
public class DatasetAssemblerTDB extends DatasetAssembler
{
@@ -55,7 +56,7 @@ public class DatasetAssemblerTDB extends
String dir = getStringValue(root, pLocation) ;
Location loc = new Location(dir) ;
- DatasetGraphTDB dsg = TDBFactory.createDatasetGraph(loc) ;
+ DatasetGraphTDB dsg = TDBMaker._createDatasetGraph(loc) ;
if ( root.hasProperty(pUnionDefaultGraph) )
{
Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/store/GraphTDBBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/store/GraphTDBBase.java?rev=1203227&r1=1203226&r2=1203227&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/store/GraphTDBBase.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/store/GraphTDBBase.java Thu Nov 17 15:49:26 2011
@@ -51,6 +51,7 @@ import com.hp.hpl.jena.util.iterator.Wra
/** General operations for TDB graphs (free-standing graph, default graph and named graphs) */
public abstract class GraphTDBBase extends GraphBase2 implements GraphTDB
{
+ @SuppressWarnings("hiding")
private final QueryHandlerTDB queryHandler = new QueryHandlerTDB(this) ;
private final TransactionHandler transactionHandler = new TransactionHandlerTDB(this) ;
private final BulkUpdateHandler bulkUpdateHandler = new BulkUpdateHandlerTDB(this) ;
Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/DatasetGraphMakerTDB.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/DatasetGraphMakerTDB.java?rev=1203227&r1=1203226&r2=1203227&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/DatasetGraphMakerTDB.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/DatasetGraphMakerTDB.java Thu Nov 17 15:49:26 2011
@@ -34,5 +34,4 @@ public interface DatasetGraphMakerTDB
/** Release a TDB-backed dataset which is already closed */
public void releaseLocation(Location location) ;
-
}
Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/TDBMaker.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/TDBMaker.java?rev=1203227&r1=1203226&r2=1203227&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/TDBMaker.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/sys/TDBMaker.java Thu Nov 17 15:49:26 2011
@@ -18,11 +18,8 @@
package com.hp.hpl.jena.tdb.sys;
-
-
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.tdb.base.file.Location;
-import com.hp.hpl.jena.tdb.store.DatasetGraphTDB;
+import com.hp.hpl.jena.tdb.base.file.Location ;
+import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
/** The workhorse for TDB Factory - hides the internal operations from
* the public interface (and javadoc) of TDBFactory for clarity.
@@ -78,20 +75,23 @@ public class TDBMaker
public static void releaseLocation(Location location)
{ factory.releaseLocation(location) ; }
- public static Graph _createGraph()
- { return factory.createDatasetGraph().getDefaultGraph() ; }
-
- public static Graph _createGraph(Location loc)
- {
- // The code to choose the optimizer is in GraphTDBFactory.chooseOptimizer
- return factory.createDatasetGraph(loc).getDefaultGraph() ;
- }
+// public static Graph _createGraph()
+// { return factory.createDatasetGraph().getDefaultGraph() ; }
+//
+// public static Graph _createGraph(Location loc)
+// {
+// // The code to choose the optimizer is in GraphTDBFactory.chooseOptimizer
+// return factory.createDatasetGraph(loc).getDefaultGraph() ;
+// }
public static DatasetGraphTDB _createDatasetGraph()
{ return factory.createDatasetGraph() ; }
public static DatasetGraphTDB _createDatasetGraph(Location loc)
{ return factory.createDatasetGraph(loc) ; }
+
+ public static DatasetGraphTDB _createDatasetGraph(String loc)
+ { return _createDatasetGraph(new Location(loc)) ; }
/** Set the implementation factory. Not normally needed - only systems that wish
* to create unusually combinations of indexes and node tables need to use this call.
Modified: incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tools/dumpnodetable.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tools/dumpnodetable.java?rev=1203227&r1=1203226&r2=1203227&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tools/dumpnodetable.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/main/java/tdb/tools/dumpnodetable.java Thu Nov 17 15:49:26 2011
@@ -33,7 +33,6 @@ import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Node_Literal ;
import com.hp.hpl.jena.sparql.util.FmtUtils ;
import com.hp.hpl.jena.sparql.util.Utils ;
-import com.hp.hpl.jena.tdb.TDBFactory ;
import com.hp.hpl.jena.tdb.base.file.Location ;
import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
@@ -41,6 +40,7 @@ import com.hp.hpl.jena.tdb.store.NodeId
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.TDBMaker ;
public class dumpnodetable extends CmdGeneral
{
@@ -59,7 +59,7 @@ public class dumpnodetable extends CmdGe
List<String> quadIndexes = Arrays.asList(Names.quadIndexes) ;
Location loc = modLocation.getLocation() ;
- DatasetGraphTDB dsg = TDBFactory.createDatasetGraph(loc) ;
+ DatasetGraphTDB dsg = TDBMaker._createDatasetGraph(loc) ;
NodeTable nodeTable = dsg.getQuadTable().getNodeTupleTable().getNodeTable() ;
dump(System.out, nodeTable) ;
}
Modified: incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/TestTDBFactory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/TestTDBFactory.java?rev=1203227&r1=1203226&r2=1203227&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/TestTDBFactory.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/TestTDBFactory.java Thu Nov 17 15:49:26 2011
@@ -49,8 +49,8 @@ public class TestTDBFactory extends Base
@Test public void factory1()
{
- DatasetGraphTDB dg1 = TDBFactory.createDatasetGraph(Location.mem()) ;
- DatasetGraphTDB dg2 = TDBFactory.createDatasetGraph(Location.mem()) ;
+ DatasetGraphTDB dg1 = TDBMaker._createDatasetGraph(Location.mem()) ;
+ DatasetGraphTDB dg2 = TDBMaker._createDatasetGraph(Location.mem()) ;
assertSame(dg1, dg2) ;
}
@@ -59,17 +59,17 @@ public class TestTDBFactory extends Base
DatasetGraphMakerTDB f = TDBMaker.getImplFactory() ;
TDBMaker.clearDatasetCache() ;
- DatasetGraphTDB dg0 = TDBFactory.createDatasetGraph(Location.mem()) ;
+ DatasetGraphTDB dg0 = TDBMaker._createDatasetGraph(Location.mem()) ;
// Uncached.
TDBMaker.setImplFactory(TDBMaker.uncachedFactory) ;
- DatasetGraphTDB dg1 = TDBFactory.createDatasetGraph(Location.mem()) ;
- DatasetGraphTDB dg2 = TDBFactory.createDatasetGraph(Location.mem()) ;
+ DatasetGraphTDB dg1 = TDBMaker._createDatasetGraph(Location.mem()) ;
+ DatasetGraphTDB dg2 = TDBMaker._createDatasetGraph(Location.mem()) ;
assertNotSame(dg1, dg2) ;
// Switch back to cached.
TDBMaker.setImplFactory(f) ;
- DatasetGraphTDB dg3 = TDBFactory.createDatasetGraph(Location.mem()) ;
+ DatasetGraphTDB dg3 = TDBMaker._createDatasetGraph(Location.mem()) ;
assertNotSame(dg3, dg1) ;
assertNotSame(dg3, dg2) ;
assertSame(dg3, dg0) ;
Modified: incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/junit/GraphLocation.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/junit/GraphLocation.java?rev=1203227&r1=1203226&r2=1203227&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/junit/GraphLocation.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/junit/GraphLocation.java Thu Nov 17 15:49:26 2011
@@ -32,9 +32,9 @@ import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
+import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.tdb.TDBFactory ;
import com.hp.hpl.jena.tdb.base.file.Location ;
-import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
/** Manage a graph at a fixed location */
public class GraphLocation
@@ -42,7 +42,7 @@ public class GraphLocation
private Location loc = null ;
private Graph graph = null ;
private Model model = null ;
- private DatasetGraphTDB dsg = null ;
+ private DatasetGraph dsg = null ;
public GraphLocation(Location loc)
{
Modified: incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/store/TestLoader.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/store/TestLoader.java?rev=1203227&r1=1203226&r2=1203227&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/store/TestLoader.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/store/TestLoader.java Thu Nov 17 15:49:26 2011
@@ -34,8 +34,8 @@ import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.tdb.TDB ;
-import com.hp.hpl.jena.tdb.TDBFactory ;
import com.hp.hpl.jena.tdb.TDBLoader ;
+import com.hp.hpl.jena.tdb.sys.TDBMaker ;
public class TestLoader extends BaseTest
{
@@ -50,7 +50,7 @@ public class TestLoader extends BaseTest
@Test public void load_dataset_01()
{
- DatasetGraphTDB dsg = TDBFactory.createDatasetGraph() ;
+ DatasetGraphTDB dsg = TDBMaker._createDatasetGraph() ;
TDBLoader.load(dsg, DIR+"data-1.nq", false) ;
assertTrue(dsg.getDefaultGraph().isEmpty()) ;
assertEquals(1, dsg.getGraph(g).size()) ;
@@ -58,7 +58,7 @@ public class TestLoader extends BaseTest
@Test public void load_dataset_02()
{
- DatasetGraphTDB dsg = TDBFactory.createDatasetGraph() ;
+ DatasetGraphTDB dsg = TDBMaker._createDatasetGraph() ;
InputStream in = IO.openFile(DIR+"data-1.nq") ;
TDBLoader.load(dsg, in, false) ;
assertTrue(dsg.getDefaultGraph().isEmpty()) ;
@@ -67,21 +67,21 @@ public class TestLoader extends BaseTest
@Test public void load_graph_01()
{
- DatasetGraphTDB dsg = TDBFactory.createDatasetGraph() ;
+ DatasetGraphTDB dsg = TDBMaker._createDatasetGraph() ;
TDBLoader.load(dsg, DIR+"data-2.nt", false) ;
assertEquals(1, dsg.getDefaultGraph().size()) ;
}
@Test public void load_graph_02()
{
- DatasetGraphTDB dsg = TDBFactory.createDatasetGraph() ;
+ DatasetGraphTDB dsg = TDBMaker._createDatasetGraph() ;
TDBLoader.load(dsg.getDefaultGraphTDB(), DIR+"data-2.nt", false) ;
assertEquals(1, dsg.getDefaultGraph().size()) ;
}
@Test public void load_graph_03()
{
- DatasetGraphTDB dsg = TDBFactory.createDatasetGraph() ;
+ DatasetGraphTDB dsg = TDBMaker._createDatasetGraph() ;
TDBLoader.load(dsg.getGraphTDB(g), DIR+"data-2.nt", false) ;
assertEquals(0, dsg.getDefaultGraph().size()) ;
assertEquals(1, dsg.getGraph(g).size()) ;
Modified: incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransRestart.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransRestart.java?rev=1203227&r1=1203226&r2=1203227&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransRestart.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransRestart.java Thu Nov 17 15:49:26 2011
@@ -36,7 +36,6 @@ import com.hp.hpl.jena.tdb.ConfigTest ;
import com.hp.hpl.jena.tdb.DatasetGraphTxn ;
import com.hp.hpl.jena.tdb.StoreConnection ;
import com.hp.hpl.jena.tdb.TDB ;
-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 ;
@@ -78,7 +77,7 @@ public class TestTransRestart extends Ba
private void setupPlain() {
// Make without transactions.
- DatasetGraphTDB dsg = TDBFactory.createDatasetGraph(location) ;
+ DatasetGraphTDB dsg = TDBMaker._createDatasetGraph(location) ;
dsg.add(quad1) ;
dsg.close() ;
// Normally done via close() but be explicit.
@@ -124,7 +123,7 @@ public class TestTransRestart extends Ba
@Test
public void testPlain() {
assertEquals (3, countRDFNodes()) ;
- DatasetGraphTDB dsg = TDBFactory.createDatasetGraph(location) ;
+ DatasetGraphTDB dsg = TDBMaker._createDatasetGraph(location) ;
assertTrue(dsg.contains(quad1)) ;
dsg.add(quad2) ;
assertTrue(dsg.contains(quad2)) ;