Corrections and test for JenaTDB data source

Author: barthanssens

src/org/linkeddatafragments/datasource/JenaTDBDataSource.java

@@ -30,47 +30,54 @@ public class JenaTDBDataSource extends DataSource {
 
     private final Query query = QueryFactory.create(sparql, Syntax.syntaxSPARQL_11);
 
+
     @Override
     public TriplePatternFragment getFragment(Resource subject, Property predicate, RDFNode object, long offset, long limit) {
         checkBoundaries(offset, limit);
 
-        tdb.begin(ReadWrite.READ);
-        
         Model model = tdb.getDefaultModel();
         QuerySolutionMap map = new QuerySolutionMap();
-        map.add("s", subject);
-        map.add("p", predicate);
-        map.add("o", object);
+        if (subject != null) {
+            map.add("s", subject);
+        }
+        if (predicate != null) {
+            map.add("p", predicate);
+        }
+        if (object != null) {
+            map.add("o", object);
+        }
 
         query.setOffset(offset);
         query.setLimit(limit);
 
-        QueryExecution qexec = QueryExecutionFactory.create(query, model, map);
-        
+                
         Model triples = ModelFactory.createDefaultModel();
-        qexec.execConstruct(triples);
-        qexec.close();
+        
+        try (QueryExecution qexec = QueryExecutionFactory.create(query, model, map)) {
+            qexec.execConstruct(triples);
+        }
 
+        if (triples.isEmpty()) {
+            return new TriplePatternFragmentBase();
+        }
+        
         // Try to get an estimate
         long size = triples.size();
         long estimate = -1;
 
         GraphStatisticsHandler stats = model.getGraph().getStatisticsHandler();
         if (stats != null) {
-            estimate = stats.getStatistic(subject.asNode(), predicate.asNode(), object.asNode());
-        }
+            Node s = (subject != null) ? subject.asNode() : null;
+            Node p = (predicate != null) ? predicate.asNode() : null;
+            Node o = (object != null) ? object.asNode() : null;
+            estimate = stats.getStatistic(s, p, o);
+        } 
+        
         // No estimate or incorrect
         if (estimate < offset + size) {
             estimate = (size == limit) ? offset + size + 1 : offset + size;
         }
-        
-        tdb.end();
-
-        if (triples.isEmpty()) {
-            return new TriplePatternFragmentBase();
-        } else {
-            return new TriplePatternFragmentBase(triples, estimate);
-        }
+        return new TriplePatternFragmentBase(triples, estimate);
     }
 
 

src/test/java/org/linkeddatafragments/datasource/JenaTDBDataSource.java renamed to src/test/java/org/linkeddatafragments/datasource/JenaTDBDataSourceTest.java

@@ -15,6 +15,7 @@
 import java.io.File;
 import org.junit.After;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -26,7 +27,7 @@
  *
  * @author Bart Hanssens <[email protected]>
  */
-public class JenaTDBDataSource {
+public class JenaTDBDataSourceTest {
     private static IDataSource tdb;
     private static Dataset dataset;
     private static File jena;
@@ -38,7 +39,6 @@ public static void setUpClass() throws Exception {
         jena.mkdir();
 
         dataset = TDBFactory.createDataset(jena.getAbsolutePath());
-        Model model = ModelFactory.createDefaultModel();
 
         JsonObject config = new JsonObject();
         config.addProperty("title", "jena test");
@@ -48,7 +48,7 @@ public static void setUpClass() throws Exception {
         JsonObject settings = new JsonObject();
         settings.addProperty("directory", tmpdir);
         config.add("settings", settings);
-        
+
         tdb = DataSourceFactory.create(config);
     }
 
@@ -63,9 +63,9 @@ public void setUp() throws Exception {
         Model model = dataset.getDefaultModel();
 
         // Generate a set of statements
-        int subjs = 150;
-        int preds = 20;
-        int objs = 10;
+        int subjs = 153;
+        int preds = 29;
+        int objs = 17;
 
         for (int s = 0; s < subjs; s++) {
             Resource subj = model.createResource("http://test.ldf.org/s/" + s);
@@ -80,6 +80,10 @@ public void setUp() throws Exception {
         model.commit();
     }
 
+    /**
+     * Check if estimate is based on jena query plan, or just a fake one.
+     * 
+     */
     @Test
     public void testEstimate() {
         Model model = dataset.getDefaultModel();
@@ -93,8 +97,8 @@ public void testEstimate() {
         TriplePatternFragment fragment = 
                 tdb.getFragment(subj, pred, obj, offset, limit);
         long totalSize = fragment.getTotalSize();
-        System.out.println(totalSize);
-        
+
+        Assert.assertTrue("Estimate is fake", totalSize != 51);        
     }
 
     @After