Corrections and test for JenaTDB data source

Author: barthanssens

.gitignore

@@ -1,4 +1,5 @@
-.settings
-target
-ldf-server.json
-/data/
+.settings
+target
+ldf-server.json
+/data/
+/nbproject/

src/org/linkeddatafragments/datasource/DataSourceFactory.java

@@ -15,8 +15,15 @@ public class DataSourceFactory {
     public final static String HDT = "HdtDatasource";
     public final static String JENA_TDB = "JenaTDBDatasource";
 
+    /**
+     * Create a datasource using a JSON config
+     * 
+     * @param config
+     * @return datasource interface
+     * @throws DataSourceException 
+     */
     public static IDataSource create(JsonObject config) throws DataSourceException {
-        String title = config.getAsJsonPrimitive("type").getAsString();
+        String title = config.getAsJsonPrimitive("title").getAsString();
         String description = config.getAsJsonPrimitive("description").getAsString();
         String type = config.getAsJsonPrimitive("type").getAsString();
 

src/org/linkeddatafragments/datasource/JenaTDBDataSource.java

@@ -25,8 +25,7 @@
  */
 public class JenaTDBDataSource extends DataSource {
     private final Dataset tdb;
-    private final String sparql = "CONSTRUCT { ?s ?p ?o } " +
-                                    "WHERE { ?s ?p ?o } " +
+    private final String sparql = "CONSTRUCT WHERE { ?s ?p ?o } " + 
                                     "ORDER BY ?s ?p ?o";
 
     private final Query query = QueryFactory.create(sparql, Syntax.syntaxSPARQL_11);
@@ -47,8 +46,10 @@ public TriplePatternFragment getFragment(Resource subject, Property predicate, R
         query.setLimit(limit);
 
         QueryExecution qexec = QueryExecutionFactory.create(query, model, map);
+        
         Model triples = ModelFactory.createDefaultModel();
         qexec.execConstruct(triples);
+        qexec.close();
 
         // Try to get an estimate
         long size = triples.size();

src/org/linkeddatafragments/servlet/TriplePatternFragmentServlet.java

@@ -259,16 +259,6 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
             Model output = fragment.getTriples();
             output.setNsPrefixes(config.getPrefixes());
 
-            // do conneg
-            String bestMatch = MIMEParse.bestMatch(mimeTypes, request.getHeader("Accept"));
-            Lang contentType = RDFLanguages.contentTypeToLang(bestMatch);
-
-            // serialize the output
-            response.setHeader("Server", "Linked Data Fragments Server");
-            response.setContentType(bestMatch);
-            response.setCharacterEncoding("utf-8");
-            RDFDataMgr.write(response.getOutputStream(), output, contentType);
-
             // add dataset metadata
             String datasetUrl = getDatasetUrl(request);
             Resource datasetId = output.createResource(datasetUrl + "#dataset");
@@ -283,12 +273,16 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
             addPages(output, fragmentId, fragmentUrl, total, limit, offset, page);           
             addControls(output, datasetId, datasetUrl);
 
-            // serialize the output as Turtle
-            response.setHeader(HttpHeaders.SERVER, "Linked Data Fragments Server");
-            response.setContentType("text/turtle");
-            response.setCharacterEncoding(CharEncoding.UTF_8);
-            
-            output.write(response.getWriter(), "Turtle", fragmentUrl);
+            // do conneg
+            String bestMatch = MIMEParse.bestMatch(mimeTypes, request.getHeader("Accept"));
+            Lang contentType = RDFLanguages.contentTypeToLang(bestMatch);
+
+            // serialize the output
+            response.setHeader("Server", "Linked Data Fragments Server");
+            response.setContentType(bestMatch);
+            response.setCharacterEncoding("utf-8");
+            RDFDataMgr.write(response.getOutputStream(), output, contentType);
+
         } catch (IOException | URISyntaxException e) {
             throw new ServletException(e);
         }

src/test/java/org/linkeddatafragments/datasource/JenaTDBDataSource.java

@@ -0,0 +1,104 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package test.java.org.linkeddatafragments.datasource;
+
+import com.google.gson.JsonObject;
+import com.hp.hpl.jena.query.Dataset;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.Property;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.tdb.TDBFactory;
+import java.io.File;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.linkeddatafragments.datasource.DataSourceFactory;
+import org.linkeddatafragments.datasource.IDataSource;
+import org.linkeddatafragments.datasource.TriplePatternFragment;
+
+/**
+ *
+ * @author Bart Hanssens <bart.hanssens@fedict.be>
+ */
+public class JenaTDBDataSource {
+    private static IDataSource tdb;
+    private static Dataset dataset;
+    private static File jena;
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        String tmpdir = System.getProperty("java.io.tmpdir");
+        jena = new File(tmpdir, "ldf-jena-test");
+        jena.mkdir();
+        
+        dataset = TDBFactory.createDataset(jena.getAbsolutePath());
+        Model model = ModelFactory.createDefaultModel();
+        
+        JsonObject config = new JsonObject();
+        config.addProperty("title", "jena test");
+        config.addProperty("description", "jena tdb test");
+        config.addProperty("type", DataSourceFactory.JENA_TDB);
+        
+        JsonObject settings = new JsonObject();
+        settings.addProperty("directory", tmpdir);
+        config.add("settings", settings);
+        
+        tdb = DataSourceFactory.create(config);
+    }
+
+    @AfterClass
+    public static void tearDownClass() throws Exception {
+        dataset.end();
+        TDBFactory.release(dataset);
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        Model model = dataset.getDefaultModel();
+        
+        // Generate a set of statements
+        int subjs = 150;
+        int preds = 20;
+        int objs = 10;
+        
+        for (int s = 0; s < subjs; s++) {
+            Resource subj = model.createResource("http://test.ldf.org/s/" + s);
+            for (int p = 0; p < preds ; p++) {
+                Property pred = model.createProperty("http://test.ldf.org/p/" + p);
+                for (int o = 0; o < objs ; o++) {
+                    Resource obj = model.createResource("http://test.ldf.org/o/" + o);
+                    model.add(subj, pred, obj);
+                }
+            }
+        }
+        model.commit();
+    }
+
+    @Test
+    public void testEstimate() {
+        Model model = dataset.getDefaultModel();
+        
+        Resource subj = model.createResource("http://test.ldf.org/s/1");
+        Property pred = null;
+        Resource obj = null;
+
+        long offset = 0;
+        long limit = 50;
+        TriplePatternFragment fragment = 
+                tdb.getFragment(subj, pred, obj, offset, limit);
+        long totalSize = fragment.getTotalSize();
+        System.out.println(totalSize);
+        
+    }
+    
+    @After
+    public void tearDown() throws Exception {
+    }
+    
+}