From 022a4ddfacfc20183f5c2b9290a7646e42cdf432 Mon Sep 17 00:00:00 2001 From: Andy Seaborne Date: Wed, 21 Nov 2018 18:50:06 +0000 Subject: [PATCH] Don't forget StoreParams. --- .../org/apache/jena/tdb2/sys/DatabaseConnection.java | 4 ++-- .../java/org/apache/jena/tdb2/sys/DatabaseOps.java | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/sys/DatabaseConnection.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/sys/DatabaseConnection.java index ec5d09f21b7..c8dfb6dde56 100644 --- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/sys/DatabaseConnection.java +++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/sys/DatabaseConnection.java @@ -68,7 +68,7 @@ public synchronized static DatabaseConnection connectCreate(Location location, S private synchronized static DatabaseConnection make(Location location, StoreParams params) { if ( location.isMemUnique() ) { // Uncached, in-memory. - DatasetGraph dsg = DatabaseOps.create(location); + DatasetGraph dsg = DatabaseOps.create(location, params); DatabaseConnection dbConn = new DatabaseConnection(dsg, location, null); return dbConn; } @@ -87,7 +87,7 @@ private static DatabaseConnection buildForCache(Location location, StoreParams p // Take the lock. This is atomic. lock.lockEx(); } - DatasetGraph dsg = DatabaseOps.create(location); + DatasetGraph dsg = DatabaseOps.create(location, params); return new DatabaseConnection(dsg, location, lock) ; } diff --git a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/sys/DatabaseOps.java b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/sys/DatabaseOps.java index a673e94be52..ce23c221dd5 100644 --- a/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/sys/DatabaseOps.java +++ b/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/sys/DatabaseOps.java @@ -73,12 +73,12 @@ public class DatabaseOps { * It is important to go via {@code DatabaseConnection} to avoid * duplicate {@code DatasetGraphSwitchable}s for the same location. */ - /*package*/ static DatasetGraph create(Location location) { + /*package*/ static DatasetGraph create(Location location, StoreParams params) { // Hide implementation class. - return createSwitchable(location); + return createSwitchable(location, params); } - private static DatasetGraphSwitchable createSwitchable(Location location) { + private static DatasetGraphSwitchable createSwitchable(Location location, StoreParams params) { if ( location.isMem() ) { DatasetGraph dsg = StoreConnection.connectCreate(location).getDatasetGraph(); return new DatasetGraphSwitchable(null, location, dsg); @@ -89,14 +89,12 @@ private static DatasetGraphSwitchable createSwitchable(Location location) { Path path = IOX.asPath(location); // Scan for DBs Path db = findLocation(path, dbPrefix); - // XXX [StoreParams] - StoreParams params; if ( db == null ) { db = path.resolve(dbPrefix+SEP+startCount); IOX.createDirectory(db); } Location loc2 = IOX.asLocation(db); - DatasetGraphTDB dsg = StoreConnection.connectCreate(loc2).getDatasetGraphTDB(); + DatasetGraphTDB dsg = StoreConnection.connectCreate(loc2, params).getDatasetGraphTDB(); DatasetGraphSwitchable appDSG = new DatasetGraphSwitchable(path, location, dsg); return appDSG; }