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 00:03:51 UTC

svn commit: r1202921 - in /incubator/jena: Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDBFactoryTxn.java Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java Scratch/AFS/Jena-Dev/trunk/tdb.ttl

Author: andy
Date: Wed Nov 16 23:03:51 2011
New Revision: 1202921

URL: http://svn.apache.org/viewvc?rev=1202921&view=rev
Log:
TDBFactoryTxn.assembleDataset

Added:
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/tdb.ttl
Modified:
    incubator/jena/Jena2/TDB/trunk/src/main/java/com/hp/hpl/jena/tdb/TDBFactoryTxn.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java

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=1202921&r1=1202920&r2=1202921&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 Wed Nov 16 23:03:51 2011
@@ -20,11 +20,16 @@ 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.assembler.AssemblerUtils ;
+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 ;
 
 /** Public factory for creating objects datasets backed by TDB storage which support transactions */
 public class TDBFactoryTxn
 {
+    // This is TDBFactory with a different maker.??
+    
     // Assembler versions
     
     /** Create a Dataset that supports transactions */  
@@ -45,7 +50,25 @@ public class TDBFactoryTxn
         return createDataset(Location.mem()) ;
     }
     
-
+    /** Read the assembler file and create a dataset with transctional capabilities.
+     * Assumes the file contains exactly one definition of a TDB dataset.  
+     */ 
+    public static Dataset assembleDataset(String assemblerFile)
+    {
+        // A bit of a kludge for now but it does mean we can reuse the same 
+        // (original) assembler definitions.  
+        // Downside is opening files, then reopening them.
+        // Eventually, we will combine old and new worlds.
+        // Maybe:
+        // 1 - StoreConnection that takes over a DatasetGraphTDB
+        // 2 - reuse the assembler machinery to directly create a StoreConenction.
+        // 3 - Flip: Make as a transactional and downgrade to old style. 
+        Dataset ds = (Dataset)AssemblerUtils.build(assemblerFile, VocabTDB.tDatasetTDB) ;
+        DatasetGraphTDB dsg = (DatasetGraphTDB)(ds.asDatasetGraph()) ;
+        Location location = dsg.getLocation() ;
+        return createDataset(location) ;
+    }
+    
     /** Create a DatasetGraph that supports transactions */  
     public static DatasetGraphTransaction createDatasetGraph(String location)
     {

Modified: incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java?rev=1202921&r1=1202920&r2=1202921&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java (original)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java Wed Nov 16 23:03:51 2011
@@ -33,7 +33,6 @@ import com.hp.hpl.jena.sparql.function.F
 import com.hp.hpl.jena.sparql.lang.SyntaxVarScope ;
 import com.hp.hpl.jena.sparql.sse.SSE ;
 import com.hp.hpl.jena.tdb.* ;
-import com.hp.hpl.jena.tdb.base.file.Location ;
 import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
 import com.hp.hpl.jena.util.FileManager ;
 
@@ -43,10 +42,11 @@ public class Run extends RunBase
     
     public static void main(String[] argv) throws Exception
     {
-        if ( false )
+        if ( true )
         {
             // And TDBFactory.create
-            Dataset ds = TDBFactoryTxn.createDataset(Location.mem()) ;
+            //Dataset ds = TDBFactoryTxn.createDataset(Location.mem()) ;
+            Dataset ds = TDBFactoryTxn.assembleDataset("tdb.ttl") ;
             ds.begin(ReadWrite.WRITE) ;
             FileManager.get().readModel(ds.getDefaultModel(), "D.nt") ;
             ds.commit() ;

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/tdb.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/tdb.ttl?rev=1202921&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/tdb.ttl (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/tdb.ttl Wed Nov 16 23:03:51 2011
@@ -0,0 +1,21 @@
+@prefix tdb:     <http://jena.hpl.hp.com/2008/tdb#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix ja:      <http://jena.hpl.hp.com/2005/11/Assembler#> .
+
+[] ja:loadClass "com.hp.hpl.jena.tdb.TDB" .
+tdb:DatasetTDB  rdfs:subClassOf  ja:RDFDataset .
+tdb:GraphTDB    rdfs:subClassOf  ja:Model .
+
+ <#dataset> rdf:type      tdb:DatasetTDB ;
+     tdb:location "DB" ;
+##     tdb:unionDefaultGraph true ;
+     .
+
+## <#dataset> rdf:type      ja:RDFDataset ;
+##     ja:defaultGraph <#graph> ;
+##     . 
+## 
+## <#graph> rdf:type tdb:GraphTDB ;
+##     tdb:location "DB" ;
+##     .