You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2018/11/21 22:47:10 UTC
[1/2] jena git commit: Don't forget StoreParams.
Repository: jena
Updated Branches:
refs/heads/master ba6b878d9 -> df9b41df5
Don't forget StoreParams.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/022a4ddf
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/022a4ddf
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/022a4ddf
Branch: refs/heads/master
Commit: 022a4ddfacfc20183f5c2b9290a7646e42cdf432
Parents: ba6b878
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Nov 21 18:50:06 2018 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Nov 21 18:50:06 2018 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/tdb2/sys/DatabaseConnection.java | 4 ++--
.../main/java/org/apache/jena/tdb2/sys/DatabaseOps.java | 10 ++++------
2 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/022a4ddf/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/sys/DatabaseConnection.java
----------------------------------------------------------------------
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 ec5d09f..c8dfb6d 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 class DatabaseConnection {
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 @@ public class DatabaseConnection {
// 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) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/022a4ddf/jena-db/jena-tdb2/src/main/java/org/apache/jena/tdb2/sys/DatabaseOps.java
----------------------------------------------------------------------
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 a673e94..ce23c22 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 @@ public class DatabaseOps {
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;
}
[2/2] jena git commit: Merge commit 'refs/pull/494/head' of
https://github.com/apache/jena
Posted by an...@apache.org.
Merge commit 'refs/pull/494/head' of https://github.com/apache/jena
This closes #494.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/df9b41df
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/df9b41df
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/df9b41df
Branch: refs/heads/master
Commit: df9b41df55e82fd3e646b8602294ddc7ec2d82b8
Parents: ba6b878 022a4dd
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Nov 21 22:46:52 2018 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Nov 21 22:46:52 2018 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/tdb2/sys/DatabaseConnection.java | 4 ++--
.../main/java/org/apache/jena/tdb2/sys/DatabaseOps.java | 10 ++++------
2 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------