#266 #295 Clearing TDB instead of delete its folder: ending transacti…

…on before clearing the dataset

sparql-anything-it/src/test/java/io/github/sparqlanything/it/IssuesTest.java

@@ -628,22 +628,6 @@ public void testIssue291() {
 
 	}
 
-	@Test
-	@Ignore
-	public void playWithTDBLoc() throws IOException {
-		String testFolder = "tmp/testTDB";
-		Dataset d1 = TDB2Factory.connectDataset(testFolder);
-		Txn.executeWrite(d1, ()->{
-			RDFDataMgr.read(d1, "https://www.w3.org/1999/02/22-rdf-syntax-ns#");
-		});
-
-		Txn.executeRead(d1, ()->{
-			RDFDataMgr.write(System.out, d1, Lang.TRIG);
-		});
-		d1.close();
-		FileUtils.deleteDirectory(new File(testFolder));
-	}
-
 
 	/**
 	 * See <a href="https://github.com/SPARQL-Anything/sparql.anything/issues/295">...</a>
@@ -681,7 +665,11 @@ public void testIssue295() throws URISyntaxException, IOException {
 		}
 		ds.end();
 		assertEquals(expectedNames, actualNames);
-		FileUtils.deleteDirectory(tmpTBDFolder);
+		try {
+			FileUtils.deleteDirectory(tmpTBDFolder);
+		}catch(IOException e){
+			log.warn("Unable to delete {}, delete it once the program terminates.",tmpTBDFolder.getAbsolutePath());
+		}
 	}
 
 

sparql-anything-model/src/main/java/io/github/sparqlanything/model/BaseFacadeXGraphBuilder.java

@@ -25,6 +25,7 @@
 import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.sparql.core.DatasetGraph;
 import org.apache.jena.sparql.core.DatasetGraphFactory;
+import org.apache.jena.system.Txn;
 import org.apache.jena.tdb.TDBFactory;
 import org.apache.jena.tdb2.DatabaseMgr;
 import org.apache.jena.tdb2.TDB2Factory;
@@ -61,7 +62,9 @@ private void initialiseDatasetGraph(Properties properties) {
 					FileUtils.deleteDirectory(ondiskFile);
 				} catch (IOException e) {
 					if (TDBFactory.inUseLocation(ondiskPath)) {
-						TDB2Factory.connectDataset(ondiskPath).asDatasetGraph().clear();
+						DatasetGraph dg = TDB2Factory.connectDataset(ondiskPath).asDatasetGraph();
+						dg.end();
+						Txn.executeWrite(dg, dg::clear);
 						log.warn("Clearing TBD instead of deleting the TDB folder.");
 					} else {
 						throw new RuntimeException(e);