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/20 18:11:58 UTC
svn commit: r1234007 - in /incubator/jena/Jena2/TDB/trunk/src:
main/java/com/hp/hpl/jena/tdb/TDBFactory.java
main/java/com/hp/hpl/jena/tdb/assembler/DatasetAssemblerTDB.java
test/java/com/hp/hpl/jena/tdb/assembler/TestTDBAssembler.java
Author: andy
Date: Fri Jan 20 17:11:57 2012
New Revision: 1234007
URL: http://svn.apache.org/viewvc?rev=1234007&view=rev
Log:
TDB Assembler was tied to non-transactional dataset building.
Test now expect the dataset built to be a transactional one.
Modified:
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/assembler/DatasetAssemblerTDB.java
incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/assembler/TestTDBAssembler.java
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=1234007&r1=1234006&r2=1234007&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 Fri Jan 20 17:11:57 2012
@@ -62,7 +62,7 @@ public class TDBFactory
{ return createDataset(createDatasetGraph()) ; }
/** Create a dataset around a DatasetGraphTDB */
- public static Dataset createDataset(DatasetGraph datasetGraph)
+ private static Dataset createDataset(DatasetGraph datasetGraph)
{ return DatasetFactory.create(datasetGraph) ; }
// Meaningless unless there is only one in-memory dataset */
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=1234007&r1=1234006&r2=1234007&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 Fri Jan 20 17:11:57 2012
@@ -21,7 +21,7 @@ package com.hp.hpl.jena.tdb.assembler;
import static com.hp.hpl.jena.sparql.util.graph.GraphUtils.exactlyOneProperty ;
import static com.hp.hpl.jena.sparql.util.graph.GraphUtils.getStringValue ;
import static com.hp.hpl.jena.tdb.assembler.VocabTDB.pLocation ;
-import static com.hp.hpl.jena.tdb.assembler.VocabTDB.* ;
+import static com.hp.hpl.jena.tdb.assembler.VocabTDB.pUnionDefaultGraph ;
import org.openjena.atlas.logging.Log ;
import com.hp.hpl.jena.assembler.Assembler ;
@@ -29,14 +29,14 @@ import com.hp.hpl.jena.assembler.Mode ;
import com.hp.hpl.jena.assembler.exceptions.AssemblerException ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.query.Dataset ;
+import com.hp.hpl.jena.query.DatasetFactory ;
import com.hp.hpl.jena.rdf.model.Resource ;
+import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.assembler.DatasetAssembler ;
import com.hp.hpl.jena.sparql.expr.NodeValue ;
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
{
@@ -56,7 +56,8 @@ public class DatasetAssemblerTDB extends
String dir = getStringValue(root, pLocation) ;
Location loc = new Location(dir) ;
- DatasetGraphTDB dsg = TDBMaker._createDatasetGraph(loc) ;
+ // ARQ 2.9.0 does not have Dataset.getContext
+ DatasetGraph dsg = TDBFactory.createDatasetGraph(loc) ;
if ( root.hasProperty(pUnionDefaultGraph) )
{
@@ -77,7 +78,7 @@ public class DatasetAssemblerTDB extends
tdb:unionGraph true ; # or "true"
*/
- return TDBFactory.createDataset(dsg) ;
+ return DatasetFactory.create(dsg) ;
}
}
Modified: incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/assembler/TestTDBAssembler.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/assembler/TestTDBAssembler.java?rev=1234007&r1=1234006&r2=1234007&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/assembler/TestTDBAssembler.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/assembler/TestTDBAssembler.java Fri Jan 20 17:11:57 2012
@@ -18,27 +18,25 @@
package com.hp.hpl.jena.tdb.assembler;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.AfterClass ;
+import org.junit.Before ;
+import org.junit.BeforeClass ;
+import org.junit.Test ;
import org.openjena.atlas.junit.BaseTest ;
import org.openjena.atlas.lib.FileOps ;
-import com.hp.hpl.jena.assembler.JA;
+import com.hp.hpl.jena.assembler.JA ;
import com.hp.hpl.jena.assembler.exceptions.AssemblerException ;
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.query.Dataset;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.sparql.core.assembler.AssemblerUtils;
-import com.hp.hpl.jena.sparql.core.assembler.DatasetAssemblerVocab;
-import com.hp.hpl.jena.tdb.ConfigTest;
+import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.query.Dataset ;
+import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.rdf.model.Resource ;
+import com.hp.hpl.jena.sparql.core.assembler.AssemblerUtils ;
+import com.hp.hpl.jena.sparql.core.assembler.DatasetAssemblerVocab ;
+import com.hp.hpl.jena.tdb.ConfigTest ;
import com.hp.hpl.jena.tdb.StoreConnection ;
-import com.hp.hpl.jena.tdb.store.DatasetGraphTDB;
-import com.hp.hpl.jena.tdb.store.GraphNamedTDB;
-import com.hp.hpl.jena.tdb.store.GraphTDB;
-import com.hp.hpl.jena.tdb.store.GraphTDBBase;
-import com.hp.hpl.jena.tdb.store.GraphTriplesTDB;
+import com.hp.hpl.jena.tdb.store.* ;
+import com.hp.hpl.jena.tdb.transaction.DatasetGraphTransaction ;
public class TestTDBAssembler extends BaseTest
{
@@ -64,23 +62,23 @@ public class TestTDBAssembler extends Ba
@Test public void createDatasetDirect()
{
- String f = dirAssem+"/tdb-dataset.ttl" ;
- Object thing = AssemblerUtils.build( f, VocabTDB.tDatasetTDB) ;
- assertTrue(thing instanceof Dataset) ;
- Dataset ds = (Dataset)thing ;
- ds.asDatasetGraph() ;
- assertTrue(((Dataset)thing).asDatasetGraph() instanceof DatasetGraphTDB) ;
- ds.close() ;
+ createTest(dirAssem+"/tdb-dataset.ttl", VocabTDB.tDatasetTDB) ;
}
@Test public void createDatasetEmbed()
{
- String f = dirAssem+"/tdb-dataset-embed.ttl" ;
- Object thing = AssemblerUtils.build( f, DatasetAssemblerVocab.tDataset) ;
+ createTest(dirAssem+"/tdb-dataset-embed.ttl", DatasetAssemblerVocab.tDataset) ;
+ }
+
+ private void createTest(String filename, Resource type)
+ {
+ Object thing = AssemblerUtils.build( filename, type) ;
assertTrue(thing instanceof Dataset) ;
Dataset ds = (Dataset)thing ;
- assertTrue(ds.asDatasetGraph() instanceof DatasetGraphTDB) ;
+ assertTrue(ds.asDatasetGraph() instanceof DatasetGraphTransaction) ;
+ assertTrue(ds.supportsTransactions()) ;
ds.close();
+
}
@Test public void createGraphDirect()