Updated TDB examples.

castagna · Mar 29, 2012 · 27837b3 · 27837b3
1 parent 995d7ac
commit 27837b3
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 43 deletions.
diff --git a/src/main/java/org/apache/jena/examples/ExampleTDB_01.java b/src/main/java/org/apache/jena/examples/ExampleTDB_01.java
@@ -21,12 +21,13 @@
 import java.io.InputStream;
 import java.util.Iterator;
 
-import com.hp.hpl.jena.shared.Lock;
+import com.hp.hpl.jena.query.Dataset;
+import com.hp.hpl.jena.query.ReadWrite;
 import com.hp.hpl.jena.sparql.core.Quad;
 import com.hp.hpl.jena.tdb.TDBFactory;
 import com.hp.hpl.jena.tdb.TDBLoader;
 import com.hp.hpl.jena.tdb.base.file.Location;
-import com.hp.hpl.jena.tdb.store.DatasetGraphTDB;
+import com.hp.hpl.jena.tdb.sys.SystemTDB;
 import com.hp.hpl.jena.util.FileManager;
 
 public class ExampleTDB_01 {
@@ -36,24 +37,23 @@ public static void main(String[] args) {
         fm.addLocatorClassLoader(ExampleTDB_01.class.getClassLoader());
         InputStream in = fm.open("data/data.nt");
 
-        Location location = new Location ("tmp/TDB");
-        DatasetGraphTDB dsg = (DatasetGraphTDB)TDBFactory.createDatasetGraph(location);
+        Location location = new Location ("target/TDB");
 
-        TDBLoader.load(dsg, in, false);
-
-        Lock lock = dsg.getLock();
-        lock.enterCriticalSection(Lock.READ);
+        // Load some initial data
+        TDBLoader.load(SystemTDB.getBaseDatasetGraphTDB(TDBFactory.createDatasetGraph(location)), in, false);
+
+        Dataset dataset = TDBFactory.createDataset(location);
+        dataset.begin(ReadWrite.READ);
         try {
-            Iterator<Quad> iter = dsg.find();
+            Iterator<Quad> iter = dataset.asDatasetGraph().find();
             while ( iter.hasNext() ) {
                 Quad quad = iter.next();
                 System.out.println(quad);
             }
         } finally {
-            lock.leaveCriticalSection();
+            dataset.end();
         }
 
-        dsg.close();
     }
 
 }
diff --git a/src/main/java/org/apache/jena/examples/ExampleTDB_02.java b/src/main/java/org/apache/jena/examples/ExampleTDB_02.java
@@ -20,18 +20,19 @@
 
 import java.io.InputStream;
 
+import com.hp.hpl.jena.query.Dataset;
 import com.hp.hpl.jena.query.Query;
 import com.hp.hpl.jena.query.QueryExecution;
 import com.hp.hpl.jena.query.QueryExecutionFactory;
 import com.hp.hpl.jena.query.QueryFactory;
 import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.query.ReadWrite;
 import com.hp.hpl.jena.query.ResultSet;
 import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.shared.Lock;
 import com.hp.hpl.jena.tdb.TDBFactory;
 import com.hp.hpl.jena.tdb.TDBLoader;
 import com.hp.hpl.jena.tdb.base.file.Location;
-import com.hp.hpl.jena.tdb.store.DatasetGraphTDB;
+import com.hp.hpl.jena.tdb.sys.SystemTDB;
 import com.hp.hpl.jena.util.FileManager;
 
 public class ExampleTDB_02 {
@@ -41,10 +42,10 @@ public static void main(String[] args) {
         fm.addLocatorClassLoader(ExampleTDB_02.class.getClassLoader());
         InputStream in = fm.open("data/data.nt");
 
-        Location location = new Location ("tmp/TDB");
-        DatasetGraphTDB dsg = (DatasetGraphTDB)TDBFactory.createDatasetGraph(location);
+        Location location = new Location ("target/TDB");
 
-        TDBLoader.load(dsg, in, false);
+        // Load some initial data
+        TDBLoader.load(SystemTDB.getBaseDatasetGraphTDB(TDBFactory.createDatasetGraph(location)), in, false);
 
         String queryString = 
             "PREFIX foaf: <http://xmlns.com/foaf/0.1/> " +
@@ -53,11 +54,11 @@ public static void main(String[] args) {
             "    ?person foaf:name ?name . " +
             "}";
 
-        Lock lock = dsg.getLock();
-        lock.enterCriticalSection(Lock.READ);
+        Dataset dataset = TDBFactory.createDataset(location);
+        dataset.begin(ReadWrite.READ);
         try {
             Query query = QueryFactory.create(queryString);
-            QueryExecution qexec = QueryExecutionFactory.create(query, dsg.toDataset());
+            QueryExecution qexec = QueryExecutionFactory.create(query, dataset);
             try {
                 ResultSet results = qexec.execSelect();
                 while ( results.hasNext() ) {
@@ -69,10 +70,9 @@ public static void main(String[] args) {
                 qexec.close();
             }
         } finally {
-            lock.leaveCriticalSection();
+            dataset.end();
         }
 
-        dsg.close();
     }
 
 }
diff --git a/src/main/java/org/apache/jena/examples/ExampleTDB_03.java b/src/main/java/org/apache/jena/examples/ExampleTDB_03.java
@@ -21,12 +21,13 @@
 import java.io.InputStream;
 import java.util.Iterator;
 
+import com.hp.hpl.jena.query.Dataset;
 import com.hp.hpl.jena.query.ReadWrite;
 import com.hp.hpl.jena.sparql.core.Quad;
-import com.hp.hpl.jena.tdb.StoreConnection;
+import com.hp.hpl.jena.tdb.TDBFactory;
 import com.hp.hpl.jena.tdb.TDBLoader;
 import com.hp.hpl.jena.tdb.base.file.Location;
-import com.hp.hpl.jena.tdb.transaction.DatasetGraphTxn;
+import com.hp.hpl.jena.tdb.sys.SystemTDB;
 import com.hp.hpl.jena.util.FileManager;
 
 public class ExampleTDB_03 {
@@ -36,35 +37,28 @@ public static void main(String[] args) {
         fm.addLocatorClassLoader(ExampleTDB_03.class.getClassLoader());
         InputStream in = fm.open("data/data.nt");
 
-        Location location = new Location ("tmp/TDB");
-        StoreConnection sConn = StoreConnection.make(location);
-
-        DatasetGraphTxn dsgTx = null;
+        Location location = new Location ("target/TDB");
+        Dataset dataset = TDBFactory.createDataset(location);
+        dataset.begin(ReadWrite.WRITE);
         try {
-            dsgTx = sConn.begin(ReadWrite.WRITE);
-            TDBLoader.load(dsgTx, in, false);
+            TDBLoader.load(SystemTDB.getBaseDatasetGraphTDB(dataset.asDatasetGraph()), in, false);
+            dataset.commit();
         } catch (Exception e) {
-            if ( dsgTx != null ) dsgTx.abort();
+            dataset.abort();
         } finally {
-            if ( dsgTx != null ) dsgTx.commit();
-        }       
-
+            dataset.end();
+        }
 
+        dataset.begin(ReadWrite.READ);
         try {
-            dsgTx = sConn.begin(ReadWrite.READ);
-            Iterator<Quad> iter = dsgTx.find();
+            Iterator<Quad> iter = dataset.asDatasetGraph().find();
             while ( iter.hasNext() ) {
                 Quad quad = iter.next();
                 System.out.println(quad);
             }
-        } catch (Exception e) {
-            if ( dsgTx != null ) dsgTx.abort();
         } finally {
-            if ( dsgTx != null ) dsgTx.commit();
-        }       
-
-
-
+            dataset.end();
+        }
     }
 
 }
diff --git a/src/main/java/org/apache/jena/examples/ExampleTDB_04.java b/src/main/java/org/apache/jena/examples/ExampleTDB_04.java
@@ -33,6 +33,7 @@
 import com.hp.hpl.jena.tdb.TDBFactory;
 import com.hp.hpl.jena.tdb.TDBLoader;
 import com.hp.hpl.jena.tdb.store.DatasetGraphTDB;
+import com.hp.hpl.jena.tdb.sys.SystemTDB;
 import com.hp.hpl.jena.util.FileManager;
 import com.hp.hpl.jena.vocabulary.RDFS;
 
@@ -43,7 +44,7 @@ public static void main(String[] args) {
         fm.addLocatorClassLoader(ExampleTDB_04.class.getClassLoader());
         InputStream in = fm.open("data/data.nt");
 
-        DatasetGraphTDB dsg = (DatasetGraphTDB)TDBFactory.createDatasetGraph();
+        DatasetGraphTDB dsg = SystemTDB.getBaseDatasetGraphTDB(TDBFactory.createDatasetGraph());
 
         GraphListener listener = new MyListener();
         dsg.getDefaultGraph().getEventManager().register(listener);