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/08/09 17:15:53 UTC
svn commit: r1371247 - in /jena/trunk/jena-tdb/src:
main/java/com/hp/hpl/jena/tdb/ main/java/com/hp/hpl/jena/tdb/setup/
main/java/com/hp/hpl/jena/tdb/store/ main/java/com/hp/hpl/jena/tdb/sys/
main/java/tdb/cmdline/ test/java/com/hp/hpl/jena/tdb/ test/j...
Author: andy
Date: Thu Aug 9 15:15:52 2012
New Revision: 1371247
URL: http://svn.apache.org/viewvc?rev=1371247&view=rev
Log:
Tidy up making DatasetGraphs for TDB. Remove old (pre-transaction) caching code.
Added:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/TDBMaker.java
Removed:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/CachingTDBMaker.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/DatasetGraphMakerTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/DatasetGraphSetup.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/TDBMakerTxn.java
Modified:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/TDBInternal.java
jena/trunk/jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TestTDBFactory.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystemMultiDatasets.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/QueryTestTDB.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/TestFactoryTDB.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDBPersist.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestLoader.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestSuiteGraphTDB.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransRestart.java
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java?rev=1371247&r1=1371246&r2=1371247&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/StoreConnection.java Thu Aug 9 15:15:52 2012
@@ -28,7 +28,6 @@ import com.hp.hpl.jena.sparql.mgt.ARQMgt
import com.hp.hpl.jena.tdb.base.file.Location ;
import com.hp.hpl.jena.tdb.setup.DatasetBuilderStd ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
-import com.hp.hpl.jena.tdb.sys.TDBMaker ;
import com.hp.hpl.jena.tdb.transaction.* ;
/** Interface to the TDB transaction mechanism. */
@@ -115,7 +114,16 @@ public class StoreConnection
/**
- * Begin a transaction, giving it a label. Terminate a write transaction
+ * Begin a transact// 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() ;
+// }
+
+ion, giving it a label. Terminate a write transaction
* with {@link Transaction#commit()} or {@link Transaction#abort()}.
* Terminate a write transaction with {@link Transaction#close()}.
*/
@@ -197,25 +205,6 @@ public class StoreConnection
return sConn ;
}
-// /**
-// * Return a StoreConnection for a particular connection. This is used to
-// * create transactions for the database at the location.
-// */
-// public static synchronized StoreConnection make(DatasetGraphTDB dsg)
-// {
-// if (dsg instanceof DatasetGraphTxn)
-// {
-// // ((DatasetGraphTxn)dsg).getTransaction().getBaseDataset() ;
-// throw new TDBTransactionException(
-// "Can't make a StoreConnection from a transaction instance - need the base storage DatasetGraphTDB") ;
-// }
-// Location location = dsg.getLocation() ;
-//
-// StoreConnection sConn = cache.get(location) ;
-// if (sConn == null) sConn = _makeAndCache(dsg) ;
-// return sConn ;
-// }
-
/**
* Return the StoreConnection if one already exists for this location, else
* return null
@@ -228,8 +217,6 @@ public class StoreConnection
private static StoreConnection _makeAndCache(DatasetGraphTDB dsg)
{
Location location = dsg.getLocation() ;
- // Just in case ... also poke the old-style cache.
- TDBMaker.releaseLocation(dsg.getLocation()) ;
StoreConnection sConn = cache.get(location) ;
if (sConn == null)
{
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java?rev=1371247&r1=1371246&r2=1371247&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java Thu Aug 9 15:15:52 2012
@@ -52,7 +52,6 @@ import com.hp.hpl.jena.tdb.solver.StageG
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
import com.hp.hpl.jena.tdb.sys.EnvTDB ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
-import com.hp.hpl.jena.tdb.sys.TDBMaker ;
import com.hp.hpl.jena.tdb.transaction.DatasetGraphTransaction ;
public class TDB
@@ -104,7 +103,6 @@ public class TDB
*/
public static void closedown()
{
- TDBMaker.reset() ;
StoreConnection.reset() ;
}
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java?rev=1371247&r1=1371246&r2=1371247&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBFactory.java Thu Aug 9 15:15:52 2012
@@ -29,7 +29,7 @@ import com.hp.hpl.jena.sparql.core.assem
import com.hp.hpl.jena.tdb.assembler.VocabTDB ;
import com.hp.hpl.jena.tdb.base.file.Location ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
-import com.hp.hpl.jena.tdb.sys.TDBMakerTxn ;
+import com.hp.hpl.jena.tdb.sys.TDBMaker ;
import com.hp.hpl.jena.tdb.transaction.DatasetGraphTransaction ;
/** Public factory for creating objects datasets backed by TDB storage */
@@ -96,24 +96,24 @@ public class TDBFactory
*/
public static void reset()
{
- TDBMakerTxn.reset() ;
+ TDBMaker.reset() ;
}
private static DatasetGraph _createDatasetGraph(Location location)
{
- return TDBMakerTxn.createDatasetGraph(location) ;
+ return TDBMaker.createDatasetGraphTransaction(location) ;
}
private static DatasetGraph _createDatasetGraph()
{
- return TDBMakerTxn.createDatasetGraph() ;
+ return TDBMaker.createDatasetGraphTransaction() ;
}
private static void _release(Location location)
{
if ( location == null )
return ;
- TDBMakerTxn.releaseLocation(location) ;
+ TDBMaker.releaseLocation(location) ;
}
/** Return the location of a dataset if it is backed by TDB, else null */
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java?rev=1371247&r1=1371246&r2=1371247&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java Thu Aug 9 15:15:52 2012
@@ -71,9 +71,7 @@ public class DatasetBuilderStd implement
public static DatasetGraphTDB build()
{
- DatasetBuilderStd x = new DatasetBuilderStd() ;
- x.setStd() ;
- return x.build(Location.mem(), null) ;
+ return build(Location.mem()) ;
}
public static DatasetBuilderStd stdBuilder()
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java?rev=1371247&r1=1371246&r2=1371247&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java Thu Aug 9 15:15:52 2012
@@ -40,7 +40,6 @@ import com.hp.hpl.jena.sparql.modify.Gra
import com.hp.hpl.jena.tdb.base.file.Location ;
import com.hp.hpl.jena.tdb.lib.NodeLib ;
import com.hp.hpl.jena.tdb.sys.Session ;
-import com.hp.hpl.jena.tdb.sys.TDBMaker ;
import com.hp.hpl.jena.tdb.transaction.DatasetGraphTransaction ;
import com.hp.hpl.jena.tdb.transaction.DatasetGraphTxn ;
import com.hp.hpl.jena.update.GraphStore ;
@@ -176,9 +175,6 @@ public class DatasetGraphTDB extends Dat
tripleTable = null ;
quadTable = null ;
prefixes = null ;
-
- // To be removed.
- TDBMaker.releaseDataset(this) ;
}
@Override
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java?rev=1371247&r1=1371246&r2=1371247&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java Thu Aug 9 15:15:52 2012
@@ -29,19 +29,15 @@ import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
import com.hp.hpl.jena.query.ARQ ;
-import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.engine.optimizer.reorder.ReorderLib ;
import com.hp.hpl.jena.sparql.engine.optimizer.reorder.ReorderTransformation ;
import com.hp.hpl.jena.sparql.util.Symbol ;
-import com.hp.hpl.jena.sparql.util.Utils ;
import com.hp.hpl.jena.tdb.TDB ;
import com.hp.hpl.jena.tdb.TDBException ;
import com.hp.hpl.jena.tdb.base.block.FileMode ;
import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
import com.hp.hpl.jena.tdb.index.IndexType ;
-import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
import com.hp.hpl.jena.tdb.store.NodeId ;
-import com.hp.hpl.jena.tdb.transaction.DatasetGraphTransaction ;
public class SystemTDB
{
@@ -236,16 +232,6 @@ public class SystemTDB
return allocSymbol(SystemTDB.symbolNamespace, shortName) ;
}
- /** Return a DatasetGraphTDB that uses the raw storage for tables(so it's not transactional).
- * Use with care.
- * */
- public static DatasetGraphTDB getBaseDatasetGraphTDB(DatasetGraph datasetGraph)
- {
- if ( datasetGraph instanceof DatasetGraphTransaction )
- return ((DatasetGraphTransaction)datasetGraph).getBaseDatasetGraph() ;
- throw new TDBException("Not a suitable DatasetGraph to get it's base storage: "+Utils.classShortName(datasetGraph.getClass())) ;
- }
-
private static Symbol allocSymbol(String namespace, String shortName)
{
return Symbol.create(namespace+shortName) ;
@@ -299,7 +285,6 @@ public class SystemTDB
return p ;
}
-
// --------
public static final boolean isWindows = determineIfWindows() ; // Memory mapped files behave differently.
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/TDBInternal.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/TDBInternal.java?rev=1371247&r1=1371246&r2=1371247&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/TDBInternal.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/TDBInternal.java Thu Aug 9 15:15:52 2012
@@ -21,6 +21,8 @@ package com.hp.hpl.jena.tdb.sys;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
+import com.hp.hpl.jena.sparql.util.Utils ;
+import com.hp.hpl.jena.tdb.TDBException ;
import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
import com.hp.hpl.jena.tdb.store.NodeId ;
@@ -98,5 +100,16 @@ public class TDBInternal
return null ;
}
+ /** Return a DatasetGraphTDB that uses the raw storage for tables
+ * Use with care.
+ */
+ public static DatasetGraphTDB getBaseDatasetGraphTDB(DatasetGraph datasetGraph)
+ {
+ if ( datasetGraph instanceof DatasetGraphTransaction )
+ return ((DatasetGraphTransaction)datasetGraph).getBaseDatasetGraph() ;
+ throw new TDBException("Not a suitable DatasetGraph to get it's base storage: "+Utils.classShortName(datasetGraph.getClass())) ;
+ }
+
+
}
Added: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/TDBMaker.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/TDBMaker.java?rev=1371247&view=auto
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/TDBMaker.java (added)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/TDBMaker.java Thu Aug 9 15:15:52 2012
@@ -0,0 +1,118 @@
+/*
+ * 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.sys;
+
+import com.hp.hpl.jena.sparql.core.DatasetGraph ;
+import com.hp.hpl.jena.tdb.StoreConnection ;
+import com.hp.hpl.jena.tdb.TDBFactory ;
+import com.hp.hpl.jena.tdb.base.file.Location ;
+import com.hp.hpl.jena.tdb.setup.DatasetBuilderStd ;
+import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
+import com.hp.hpl.jena.tdb.transaction.DatasetGraphTransaction ;
+
+/** Make datasets in various ways. */
+
+public class TDBMaker
+{
+ // ---- Transactional
+ // This hides details from the top level TDB Factory
+
+ /** Create a DatasetGraph that supports transactions */
+ public static DatasetGraphTransaction createDatasetGraphTransaction(String location)
+ {
+ return createDatasetGraphTransaction(new Location(location)) ;
+ }
+
+ /** Create a Dataset that supports transactions */
+ public static DatasetGraphTransaction createDatasetGraphTransaction(Location location)
+ {
+ return _create(location) ;
+ }
+
+ /** Create a Dataset that supports transactions but runs in-memory (for creating test cases)*/
+ public static DatasetGraphTransaction createDatasetGraphTransaction()
+ {
+ return createDatasetGraphTransaction(Location.mem()) ;
+ }
+
+ private static DatasetGraphTransaction _create(Location location)
+ {
+ // No need to cache StoreConnection does all that.
+ return new DatasetGraphTransaction(location) ;
+ }
+
+ public static void releaseLocation(Location location)
+ {
+ StoreConnection.release(location) ;
+ }
+
+ public static void reset()
+ {
+ StoreConnection.reset() ;
+ }
+
+ // ---- Base storage.
+
+ /* The one we are using */
+ private static DatasetGraphMakerTDB builder = new BuilderStd() ;
+
+ public static DatasetGraphTDB createDatasetGraphTDB(Location loc)
+ { return builder.createDatasetGraph(loc) ; }
+
+ // -- Different ways of doing it.
+
+ /** Interface to maker of the actual implementations of TDB datasets */
+ private interface DatasetGraphMakerTDB
+ {
+ /** Create a TDB-backed dataset at a given location */
+ public DatasetGraphTDB createDatasetGraph(Location location) ;
+ }
+
+ /** Make directly the base DatasetGraphTDB */
+ private static class BuilderStd implements DatasetGraphMakerTDB
+ {
+ @Override
+ public DatasetGraphTDB createDatasetGraph(Location location)
+ {
+ return DatasetBuilderStd.build(location) ;
+ }
+ }
+
+ /** Make by creating the normal, transactional one and finding the base */
+ private static class BuilderBase implements DatasetGraphMakerTDB
+ {
+ @Override
+ public DatasetGraphTDB createDatasetGraph(Location location)
+ {
+ DatasetGraph dsg = TDBFactory.createDatasetGraph(location) ;
+ return TDBInternal.getBaseDatasetGraphTDB(dsg) ;
+ }
+ }
+
+ /** The StoreConenction-cached base DatasetGraphTDB.*/
+ private static class BuilderStoreConnectionBase implements DatasetGraphMakerTDB
+ {
+ @Override
+ public DatasetGraphTDB createDatasetGraph(Location location)
+ {
+ return StoreConnection.make(location).getBaseDataset() ;
+ }
+ }
+
+}
Modified: jena/trunk/jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java?rev=1371247&r1=1371246&r2=1371247&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java Thu Aug 9 15:15:52 2012
@@ -30,7 +30,7 @@ import com.hp.hpl.jena.tdb.TDB ;
import com.hp.hpl.jena.tdb.base.file.Location ;
import com.hp.hpl.jena.tdb.setup.DatasetBuilderStd ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
-import com.hp.hpl.jena.tdb.sys.SystemTDB ;
+import com.hp.hpl.jena.tdb.sys.TDBInternal ;
public abstract class CmdTDB extends CmdARQ
{
@@ -103,7 +103,7 @@ public abstract class CmdTDB extends Cmd
protected DatasetGraphTDB getDatasetGraphTDB()
{
DatasetGraph dsg = getDatasetGraph() ;
- return SystemTDB.getBaseDatasetGraphTDB(dsg) ;
+ return TDBInternal.getBaseDatasetGraphTDB(dsg) ;
}
protected Dataset getDataset()
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TestTDBFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TestTDBFactory.java?rev=1371247&r1=1371246&r2=1371247&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TestTDBFactory.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TestTDBFactory.java Thu Aug 9 15:15:52 2012
@@ -28,11 +28,8 @@ import com.hp.hpl.jena.sparql.core.Datas
import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.sparql.sse.SSE ;
import com.hp.hpl.jena.tdb.base.file.Location ;
-import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
-import com.hp.hpl.jena.tdb.sys.DatasetGraphMakerTDB ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
import com.hp.hpl.jena.tdb.sys.TDBMaker ;
-import com.hp.hpl.jena.tdb.sys.TDBMakerTxn ;
import com.hp.hpl.jena.tdb.transaction.DatasetGraphTransaction ;
public class TestTDBFactory extends BaseTest
@@ -73,9 +70,9 @@ public class TestTDBFactory extends Base
@Test public void testTDBMakerTxn1()
{
- TDBMakerTxn.reset() ;
- DatasetGraph dg1 = TDBMakerTxn.createDatasetGraph(DIR) ;
- DatasetGraph dg2 = TDBMakerTxn.createDatasetGraph(DIR) ;
+ TDBMaker.reset() ;
+ DatasetGraph dg1 = TDBMaker.createDatasetGraphTransaction(DIR) ;
+ DatasetGraph dg2 = TDBMaker.createDatasetGraphTransaction(DIR) ;
DatasetGraph dgBase1 = ((DatasetGraphTransaction)dg1).getBaseDatasetGraph() ;
DatasetGraph dgBase2 = ((DatasetGraphTransaction)dg2).getBaseDatasetGraph() ;
@@ -85,9 +82,10 @@ public class TestTDBFactory extends Base
@Test public void testTDBMakerTxn2()
{
- TDBMakerTxn.reset() ;
- DatasetGraph dg1 = TDBMakerTxn.createDatasetGraph(Location.mem("FOO")) ;
- DatasetGraph dg2 = TDBMakerTxn.createDatasetGraph(Location.mem("FOO")) ;
+ // Named memory locations
+ TDBMaker.reset() ;
+ DatasetGraph dg1 = TDBMaker.createDatasetGraphTransaction(Location.mem("FOO")) ;
+ DatasetGraph dg2 = TDBMaker.createDatasetGraphTransaction(Location.mem("FOO")) ;
DatasetGraph dgBase1 = ((DatasetGraphTransaction)dg1).getBaseDatasetGraph() ;
DatasetGraph dgBase2 = ((DatasetGraphTransaction)dg2).getBaseDatasetGraph() ;
@@ -95,42 +93,17 @@ public class TestTDBFactory extends Base
assertSame(dgBase1, dgBase2) ;
}
- @Test public void testTDBMaker1()
- {
- TDBMaker.reset() ;
- DatasetGraph dg1 = TDBMaker._createDatasetGraph(Location.mem()) ;
- DatasetGraph dg2 = TDBMaker._createDatasetGraph(Location.mem()) ;
- assertSame(dg1, dg2) ;
- }
-
- @Test public void testTDBMaker2()
- {
- TDBMaker.reset() ;
- DatasetGraph dg1 = TDBMaker._createDatasetGraph(DIR) ;
- DatasetGraph dg2 = TDBMaker._createDatasetGraph(DIR) ;
- assertSame(dg1, dg2) ;
- }
-
- @Test public void testTDBMaker3()
+ @Test public void testTDBMakerTxn3()
{
+ // Un-named memory locations
TDBMaker.reset() ;
+ DatasetGraph dg1 = TDBMaker.createDatasetGraphTransaction(Location.mem()) ;
+ DatasetGraph dg2 = TDBMaker.createDatasetGraphTransaction(Location.mem()) ;
- DatasetGraphMakerTDB f = TDBMaker.getImplFactory() ;
-
+ DatasetGraph dgBase1 = ((DatasetGraphTransaction)dg1).getBaseDatasetGraph() ;
+ DatasetGraph dgBase2 = ((DatasetGraphTransaction)dg2).getBaseDatasetGraph() ;
- DatasetGraphTDB dg0 = TDBMaker._createDatasetGraph(Location.mem()) ;
-
- // Uncached.
- TDBMaker.setImplFactory(TDBMaker.uncachedFactory) ;
- DatasetGraphTDB dg1 = TDBMaker._createDatasetGraph(Location.mem()) ;
- DatasetGraphTDB dg2 = TDBMaker._createDatasetGraph(Location.mem()) ;
- assertNotSame(dg1, dg2) ;
-
- // Switch back to cached.
- TDBMaker.setImplFactory(f) ;
- DatasetGraphTDB dg3 = TDBMaker._createDatasetGraph(Location.mem()) ;
- assertNotSame(dg3, dg1) ;
- assertNotSame(dg3, dg2) ;
- assertSame(dg3, dg0) ;
+ assertNotSame(dgBase1, dgBase2) ;
}
+
}
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystemMultiDatasets.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystemMultiDatasets.java?rev=1371247&r1=1371246&r2=1371247&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystemMultiDatasets.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystemMultiDatasets.java Thu Aug 9 15:15:52 2012
@@ -51,7 +51,6 @@ import com.hp.hpl.jena.tdb.TDBFactory ;
import com.hp.hpl.jena.tdb.base.block.FileMode ;
import com.hp.hpl.jena.tdb.base.file.Location ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
-import com.hp.hpl.jena.tdb.sys.TDBMaker ;
import com.hp.hpl.jena.tdb.transaction.DatasetGraphTxn ;
import com.hp.hpl.jena.tdb.transaction.SysTxnState ;
import com.hp.hpl.jena.tdb.transaction.TransactionManager ;
@@ -140,10 +139,7 @@ public class T_TransSystemMultiDatasets
private static void clean()
{
for ( Location location : LOCATIONS ) {
- if ( USE_TRANSACTIONS )
- StoreConnection.release(location) ;
- else
- TDBMaker.releaseLocation(location) ;
+ StoreConnection.release(location) ;
if ( ! location.isMem() )
FileOps.clearDirectory(location.getDirectoryPath()) ;
}
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/QueryTestTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/QueryTestTDB.java?rev=1371247&r1=1371246&r2=1371247&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/QueryTestTDB.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/QueryTestTDB.java Thu Aug 9 15:15:52 2012
@@ -18,29 +18,24 @@
package com.hp.hpl.jena.tdb.junit;
-import java.util.List;
+import java.util.List ;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
-import com.hp.hpl.jena.rdf.model.Model;
-
-import com.hp.hpl.jena.util.FileManager;
-
-import com.hp.hpl.jena.sparql.engine.QueryEngineFactory;
-import com.hp.hpl.jena.sparql.engine.QueryExecutionBase;
-import com.hp.hpl.jena.sparql.engine.ref.QueryEngineRef;
-import com.hp.hpl.jena.sparql.junit.EarlReport;
-import com.hp.hpl.jena.sparql.junit.EarlTestCase;
-import com.hp.hpl.jena.sparql.junit.TestItem;
+import com.hp.hpl.jena.query.* ;
+import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.sparql.engine.QueryEngineFactory ;
+import com.hp.hpl.jena.sparql.engine.QueryExecutionBase ;
+import com.hp.hpl.jena.sparql.engine.ref.QueryEngineRef ;
+import com.hp.hpl.jena.sparql.junit.EarlReport ;
+import com.hp.hpl.jena.sparql.junit.EarlTestCase ;
+import com.hp.hpl.jena.sparql.junit.TestItem ;
import com.hp.hpl.jena.sparql.resultset.ResultSetCompare ;
-import com.hp.hpl.jena.sparql.resultset.ResultSetRewindable;
+import com.hp.hpl.jena.sparql.resultset.ResultSetRewindable ;
import com.hp.hpl.jena.sparql.resultset.SPARQLResult ;
-
-import com.hp.hpl.jena.query.*;
-
-import com.hp.hpl.jena.tdb.TDBFactory;
-import com.hp.hpl.jena.tdb.sys.DatasetGraphMakerTDB;
+import com.hp.hpl.jena.tdb.TDBFactory ;
+import com.hp.hpl.jena.util.FileManager ;
public class QueryTestTDB extends EarlTestCase
{
@@ -57,19 +52,17 @@ public class QueryTestTDB extends EarlTe
final String queryFile ;
final SPARQLResult results ;
- final private DatasetGraphMakerTDB factory ;
-
// Track what's currently loaded in the GraphLocation
private static List<String> currentDefaultGraphs = null ;
private static List<String> currentNamedGraphs = null ;
// Old style (Junit3)
- public QueryTestTDB(String testName, EarlReport report, TestItem item, DatasetGraphMakerTDB factory)
+ public QueryTestTDB(String testName, EarlReport report, TestItem item)
{
this(testName, report, item.getURI(),
item.getDefaultGraphURIs(), item.getNamedGraphURIs(),
- item.getResults(), item.getQueryFile(),
- factory) ;
+ item.getResults(), item.getQueryFile()
+ ) ;
}
public QueryTestTDB(String testName, EarlReport report,
@@ -77,15 +70,14 @@ public class QueryTestTDB extends EarlTe
List<String> dftGraphs,
List<String> namedGraphs,
SPARQLResult rs,
- String queryFile,
- DatasetGraphMakerTDB factory)
+ String queryFile
+ )
{
super(testName, uri, report) ;
this.defaultGraphURIs = dftGraphs ;
this.namedGraphURIs = namedGraphs ;
this.queryFile = queryFile ;
this.results = rs ;
- this.factory = factory ;
}
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/TestFactoryTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/TestFactoryTDB.java?rev=1371247&r1=1371246&r2=1371247&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/TestFactoryTDB.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/TestFactoryTDB.java Thu Aug 9 15:15:52 2012
@@ -18,37 +18,33 @@
package com.hp.hpl.jena.tdb.junit;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.util.junit.TestFactoryManifest;
-
-import com.hp.hpl.jena.sparql.core.DataFormat;
-import com.hp.hpl.jena.sparql.junit.EarlReport;
-import com.hp.hpl.jena.sparql.junit.SurpressedTest;
-import com.hp.hpl.jena.sparql.junit.TestItem;
-import com.hp.hpl.jena.sparql.vocabulary.TestManifestX;
-
-import com.hp.hpl.jena.query.Syntax;
-
-import com.hp.hpl.jena.tdb.sys.DatasetGraphMakerTDB;
+import junit.framework.Test ;
+import junit.framework.TestCase ;
+import junit.framework.TestSuite ;
+
+import com.hp.hpl.jena.query.Syntax ;
+import com.hp.hpl.jena.rdf.model.Resource ;
+import com.hp.hpl.jena.sparql.core.DataFormat ;
+import com.hp.hpl.jena.sparql.junit.EarlReport ;
+import com.hp.hpl.jena.sparql.junit.SurpressedTest ;
+import com.hp.hpl.jena.sparql.junit.TestItem ;
+import com.hp.hpl.jena.sparql.vocabulary.TestManifestX ;
+import com.hp.hpl.jena.util.junit.TestFactoryManifest ;
public class TestFactoryTDB extends TestFactoryManifest
{
public static EarlReport report = null ;
- public static void make(TestSuite ts, String manifestFile, String testRootName, DatasetGraphMakerTDB factory)
+ public static void make(TestSuite ts, String manifestFile, String testRootName)
{
// for each graph type do
- TestSuite ts2 = makeSuite(manifestFile, testRootName, factory) ;
+ TestSuite ts2 = makeSuite(manifestFile, testRootName) ;
ts.addTest(ts2) ;
}
- public static TestSuite makeSuite(String manifestFile, String testRootName, DatasetGraphMakerTDB factory)
+ public static TestSuite makeSuite(String manifestFile, String testRootName)
{
- TestFactoryTDB f = new TestFactoryTDB(testRootName, factory) ;
+ TestFactoryTDB f = new TestFactoryTDB(testRootName) ;
TestSuite ts = f.process(manifestFile) ;
if ( testRootName != null )
ts.setName(testRootName+ts.getName()) ;
@@ -58,12 +54,10 @@ public class TestFactoryTDB extends Test
// Factory
public String testRootName ;
- private DatasetGraphMakerTDB factory ;
- public TestFactoryTDB(String testRootName, DatasetGraphMakerTDB factory)
+ public TestFactoryTDB(String testRootName)
{
this.testRootName = testRootName ;
- this.factory = factory ;
}
@Override
@@ -79,7 +73,7 @@ public class TestFactoryTDB extends Test
if ( testItem.getTestType() != null )
{
if ( testItem.getTestType().equals(TestManifestX.TestQuery) )
- test = new QueryTestTDB(testName, report, testItem, factory) ;
+ test = new QueryTestTDB(testName, report, testItem) ;
if ( testItem.getTestType().equals(TestManifestX.TestSurpressed) )
test = new SurpressedTest(testName, report, testItem) ;
@@ -89,7 +83,7 @@ public class TestFactoryTDB extends Test
}
// Default
if ( test == null )
- test = new QueryTestTDB(testName, report, testItem, factory) ;
+ test = new QueryTestTDB(testName, report, testItem) ;
return test ;
}
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDBPersist.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDBPersist.java?rev=1371247&r1=1371246&r2=1371247&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDBPersist.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDBPersist.java Thu Aug 9 15:15:52 2012
@@ -41,7 +41,6 @@ import com.hp.hpl.jena.tdb.StoreConnecti
import com.hp.hpl.jena.tdb.base.file.Location ;
import com.hp.hpl.jena.tdb.junit.GraphLocation ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
-import com.hp.hpl.jena.tdb.sys.TDBMaker ;
/** Testing persistence */
public class TestDatasetTDBPersist extends BaseTest
@@ -69,7 +68,6 @@ public class TestDatasetTDBPersist exten
@After public void after()
{
- TDBMaker.reset() ;
if ( graphLocation != null )
graphLocation.release() ;
graphLocation.clearDirectory() ; // Does not have the desired effect on Windows.
@@ -80,7 +78,6 @@ public class TestDatasetTDBPersist exten
@Test public void dataset1()
{
Dataset ds = graphLocation.getDataset() ;
- //assertTrue( ds.asDatasetGraph() instanceof DatasetGraphTDB ) ;
assertTrue( ds.getDefaultModel().getGraph() instanceof GraphTriplesTDB ) ;
assertTrue( ds.getNamedModel("http://example/").getGraph() instanceof GraphNamedTDB ) ;
}
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestLoader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestLoader.java?rev=1371247&r1=1371246&r2=1371247&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestLoader.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestLoader.java Thu Aug 9 15:15:52 2012
@@ -35,6 +35,7 @@ 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.TDBLoader ;
+import com.hp.hpl.jena.tdb.base.file.Location ;
import com.hp.hpl.jena.tdb.sys.TDBMaker ;
public class TestLoader extends BaseTest
@@ -48,9 +49,11 @@ public class TestLoader extends BaseTest
@BeforeClass static public void beforeClass() { Log.disable(ARQ.logExecName) ; Log.disable(TDB.logLoaderName) ; }
@AfterClass static public void afterClass() { Log.enable(ARQ.logExecName) ; Log.enable(TDB.logLoaderName) ; }
+ static DatasetGraphTDB fresh() { return TDBMaker.createDatasetGraphTDB(Location.mem()) ; }
+
@Test public void load_dataset_01()
{
- DatasetGraphTDB dsg = TDBMaker._createDatasetGraph() ;
+ DatasetGraphTDB dsg = fresh() ;
TDBLoader.load(dsg, DIR+"data-1.nq", false) ;
assertTrue(dsg.getDefaultGraph().isEmpty()) ;
assertEquals(1, dsg.getGraph(g).size()) ;
@@ -58,7 +61,7 @@ public class TestLoader extends BaseTest
@Test public void load_dataset_02()
{
- DatasetGraphTDB dsg = TDBMaker._createDatasetGraph() ;
+ DatasetGraphTDB dsg = fresh() ;
InputStream in = IO.openFile(DIR+"data-1.nq") ;
TDBLoader.load(dsg, in, false) ;
assertTrue(dsg.getDefaultGraph().isEmpty()) ;
@@ -67,21 +70,21 @@ public class TestLoader extends BaseTest
@Test public void load_graph_01()
{
- DatasetGraphTDB dsg = TDBMaker._createDatasetGraph() ;
+ DatasetGraphTDB dsg = fresh() ;
TDBLoader.load(dsg, DIR+"data-2.nt", false) ;
assertEquals(1, dsg.getDefaultGraph().size()) ;
}
@Test public void load_graph_02()
{
- DatasetGraphTDB dsg = TDBMaker._createDatasetGraph() ;
+ DatasetGraphTDB dsg = fresh() ;
TDBLoader.load(dsg.getDefaultGraphTDB(), DIR+"data-2.nt", false) ;
assertEquals(1, dsg.getDefaultGraph().size()) ;
}
@Test public void load_graph_03()
{
- DatasetGraphTDB dsg = TDBMaker._createDatasetGraph() ;
+ DatasetGraphTDB dsg = fresh() ;
TDBLoader.load(dsg.getGraphTDB(g), DIR+"data-2.nt", false) ;
assertEquals(0, dsg.getDefaultGraph().size()) ;
assertEquals(1, dsg.getGraph(g).size()) ;
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestSuiteGraphTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestSuiteGraphTDB.java?rev=1371247&r1=1371246&r2=1371247&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestSuiteGraphTDB.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestSuiteGraphTDB.java Thu Aug 9 15:15:52 2012
@@ -18,12 +18,11 @@
package com.hp.hpl.jena.tdb.store;
-import junit.framework.TestSuite;
-import org.junit.runner.RunWith;
-import org.junit.runners.AllTests;
+import junit.framework.TestSuite ;
+import org.junit.runner.RunWith ;
+import org.junit.runners.AllTests ;
-import com.hp.hpl.jena.tdb.junit.TestFactoryTDB;
-import com.hp.hpl.jena.tdb.sys.TDBMaker;
+import com.hp.hpl.jena.tdb.junit.TestFactoryTDB ;
/** Scripted test generation */
@@ -37,6 +36,6 @@ public class TestSuiteGraphTDB extends T
private TestSuiteGraphTDB()
{
super("TDB-Scripts") ;
- TestFactoryTDB.make(this, manifestMain, "TDB-", TDBMaker.stdFactory) ;
+ TestFactoryTDB.make(this, manifestMain, "TDB-") ;
}
}
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransRestart.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransRestart.java?rev=1371247&r1=1371246&r2=1371247&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransRestart.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransRestart.java Thu Aug 9 15:15:52 2012
@@ -42,6 +42,7 @@ import com.hp.hpl.jena.tdb.base.objectfi
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
import com.hp.hpl.jena.tdb.sys.Names ;
import com.hp.hpl.jena.tdb.sys.SystemTDB ;
+import com.hp.hpl.jena.tdb.sys.TDBMaker ;
/** Test of re-attaching to a pre-existing database */
public class TestTransRestart extends BaseTest {
@@ -55,7 +56,7 @@ public class TestTransRestart extends Ba
private final String path = ( SystemTDB.isWindows ? ConfigTest.getTestingDirUnique() : "/tmp/TDB" ) ;
private Location location = new Location (path) ;
- private static boolean useTransactionsSetup = false ;
+ private static boolean useTransactionsSetup = true ;
private static Quad quad1 = SSE.parseQuad("(_ <foo:bar> rdfs:label 'foo')") ;
private static Quad quad2 = SSE.parseQuad("(_ <foo:bar> rdfs:label 'bar')") ;
@@ -73,13 +74,14 @@ public class TestTransRestart extends Ba
cleanup() ;
}
+ private static DatasetGraphTDB createPlain(Location location) { return TDBMaker.createDatasetGraphTDB(location) ; }
+
private void setupPlain() {
// Make without transactions.
- DatasetGraphTDB dsg = com.hp.hpl.jena.tdb.sys.TDBMaker._createDatasetGraph(location) ;
+ DatasetGraphTDB dsg = createPlain(location) ;
dsg.add(quad1) ;
dsg.close() ;
- // Normally done via close() but be explicit.
- com.hp.hpl.jena.tdb.sys.TDBMaker.releaseDataset(dsg) ;
+ StoreConnection.release(location) ;
return ;
}
@@ -107,7 +109,6 @@ public class TestTransRestart extends Ba
@Test
public void testTxn() {
assertEquals (3, countRDFNodes()) ;
-
StoreConnection sc = StoreConnection.make(location) ;
DatasetGraphTxn dsg = sc.begin(ReadWrite.WRITE) ;
assertTrue(dsg.contains(quad1)) ;
@@ -121,12 +122,12 @@ public class TestTransRestart extends Ba
@Test
public void testPlain() {
assertEquals (3, countRDFNodes()) ;
- DatasetGraphTDB dsg = com.hp.hpl.jena.tdb.sys.TDBMaker._createDatasetGraph(location) ;
+ DatasetGraphTDB dsg = createPlain(location) ;
assertTrue(dsg.contains(quad1)) ;
dsg.add(quad2) ;
assertTrue(dsg.contains(quad2)) ;
- dsg.close() ;
- com.hp.hpl.jena.tdb.sys.TDBMaker.releaseDataset(dsg) ;
+ dsg.close() ;
+ StoreConnection.release(location) ;
assertEquals (4, countRDFNodes()) ;
}