Repository: marmotta Updated Branches: refs/heads/develop 35b98edc7 -> f79e82be7
remove the sequence name parameter of getNextSequence(), as it is no longer used Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/f79e82be Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/f79e82be Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/f79e82be Branch: refs/heads/develop Commit: f79e82be7c526bb2da9304ccac01411bd9542a84 Parents: 35b98ed Author: Sebastian Schaffert <[email protected]> Authored: Mon Oct 6 13:00:07 2014 +0200 Committer: Sebastian Schaffert <[email protected]> Committed: Mon Oct 6 13:00:07 2014 +0200 ---------------------------------------------------------------------- .../kiwi/loader/generic/KiWiBatchHandler.java | 2 +- .../kiwi/loader/generic/KiWiHandler.java | 4 +- .../persistence/KiWiReasoningConnection.java | 8 ++-- .../kiwi/persistence/KiWiConnection.java | 41 ++++---------------- .../marmotta/kiwi/sail/KiWiValueFactory.java | 2 +- .../persistence/KiWiVersioningConnection.java | 2 +- .../LDCachingKiWiPersistenceConnection.java | 2 +- 7 files changed, 18 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/f79e82be/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/generic/KiWiBatchHandler.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/generic/KiWiBatchHandler.java b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/generic/KiWiBatchHandler.java index cba7a1a..61f13c9 100644 --- a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/generic/KiWiBatchHandler.java +++ b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/generic/KiWiBatchHandler.java @@ -178,7 +178,7 @@ public abstract class KiWiBatchHandler extends KiWiHandler implements RDFHandler @Override protected void storeNode(KiWiNode node) throws SQLException { if(node.getId() < 0) { - node.setId(connection.getNextSequence("nodes")); + node.setId(connection.getNextSequence()); } nodeBacklog.add(node); http://git-wip-us.apache.org/repos/asf/marmotta/blob/f79e82be/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/generic/KiWiHandler.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/generic/KiWiHandler.java b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/generic/KiWiHandler.java index 5d5b4dd..d861cda 100644 --- a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/generic/KiWiHandler.java +++ b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/generic/KiWiHandler.java @@ -272,7 +272,7 @@ public class KiWiHandler implements RDFHandler { // triple has no id from registry or database, so we create one and flag it for reasoning if(result.getId() < 0) { - result.setId(connection.getNextSequence("seq.triples")); + result.setId(connection.getNextSequence()); result.setNewTriple(true); registry.registerKey(cacheKey, connection.getTransactionId(), result.getId()); @@ -280,7 +280,7 @@ public class KiWiHandler implements RDFHandler { storeTriple(result); } } else { - result.setId(connection.getNextSequence("triples")); + result.setId(connection.getNextSequence()); storeTriple(result); } http://git-wip-us.apache.org/repos/asf/marmotta/blob/f79e82be/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/persistence/KiWiReasoningConnection.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/persistence/KiWiReasoningConnection.java b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/persistence/KiWiReasoningConnection.java index 4688696..1e4b06a 100644 --- a/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/persistence/KiWiReasoningConnection.java +++ b/libraries/kiwi/kiwi-reasoner/src/main/java/org/apache/marmotta/kiwi/reasoner/persistence/KiWiReasoningConnection.java @@ -78,7 +78,7 @@ public class KiWiReasoningConnection extends KiWiConnection { requireJDBCConnection(); // first create a new entry in the rules table - rule.setId(getNextSequence("seq.rules")); + rule.setId(getNextSequence()); PreparedStatement insertRule = getPreparedStatement("rules.insert"); synchronized (insertRule) { @@ -242,7 +242,7 @@ public class KiWiReasoningConnection extends KiWiConnection { // 1) create a program entry in the reasoner_programs table // get sequence ID - program.setId(getNextSequence("seq.programs")); + program.setId(getNextSequence()); PreparedStatement insertProgram = getPreparedStatement("programs.insert"); synchronized (insertProgram) { @@ -394,7 +394,7 @@ public class KiWiReasoningConnection extends KiWiConnection { for(Rule rule : program.getRules()) { if(!old.getRules().contains(rule)) { - rule.setId(getNextSequence("seq.rules")); + rule.setId(getNextSequence()); insertRule.setLong(1, rule.getId()); insertRule.setString(2, rule.getName()); @@ -614,7 +614,7 @@ public class KiWiReasoningConnection extends KiWiConnection { if(j.getId() >= 0) { log.warn("justification is already stored in database, not persisting again (database ID: {})", j.getId()); } else { - j.setId(getNextSequence("seq.justifications")); + j.setId(getNextSequence()); j.setCreatedAt(new Date()); // insert an entry to the reasoner_justifications table http://git-wip-us.apache.org/repos/asf/marmotta/blob/f79e82be/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java index 3fcbf76..ccb6023 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java @@ -150,7 +150,7 @@ public class KiWiConnection implements AutoCloseable { this.bnodeLock = new ReentrantLock(); this.batchCommit = dialect.isBatchSupported(); this.deletedStatementsLog = BloomFilter.create(Funnels.longFunnel(), 100000); - this.transactionId = getNextSequence("seq.tx"); + this.transactionId = getNextSequence(); initCachePool(); initStatementCache(); @@ -310,7 +310,7 @@ public class KiWiConnection implements AutoCloseable { requireJDBCConnection(); - namespace.setId(getNextSequence("seq.namespaces")); + namespace.setId(getNextSequence()); PreparedStatement insertNamespace = getPreparedStatement("store.namespace"); insertNamespace.setLong(1,namespace.getId()); @@ -960,7 +960,7 @@ public class KiWiConnection implements AutoCloseable { // retrieve a new node id and set it in the node object if(node.getId() < 0) { - node.setId(getNextSequence("seq.nodes")); + node.setId(getNextSequence()); } // distinguish the different node types and run the appropriate updates @@ -1104,7 +1104,7 @@ public class KiWiConnection implements AutoCloseable { requireJDBCConnection(); if(triple.getId() < 0) { - triple.setId(getNextSequence("seq.triples")); + triple.setId(getNextSequence()); } if(deletedStatementsLog.mightContain(triple.getId())) { @@ -2104,38 +2104,13 @@ public class KiWiConnection implements AutoCloseable { * Get next number in a sequence; for databases without sequence support (e.g. MySQL), this method will first update a * sequence table and then return the value. * - * @param sequenceName the identifier in statements.properties for querying the sequence * @return a new sequence ID * @throws SQLException */ - public long getNextSequence(String sequenceName) throws SQLException { + public long getNextSequence() throws SQLException { return persistence.getIdGenerator().getId(); } - public long getDatabaseSequence(String sequenceName) throws SQLException { - requireJDBCConnection(); - - // retrieve a new node id and set it in the node object - - // if there is a preparation needed to update the transaction, run it first - if(dialect.hasStatement(sequenceName+".prep")) { - PreparedStatement prepNodeId = getPreparedStatement(sequenceName+".prep"); - prepNodeId.executeUpdate(); - } - - PreparedStatement queryNodeId = getPreparedStatement(sequenceName); - ResultSet resultNodeId = queryNodeId.executeQuery(); - try { - if(resultNodeId.next()) { - return resultNodeId.getLong(1); - } else { - throw new SQLException("the sequence did not return a new value"); - } - } finally { - resultNodeId.close(); - } - } - private void cacheNode(KiWiNode node) { if(node.getId() >= 0) { @@ -2400,7 +2375,7 @@ public class KiWiConnection implements AutoCloseable { } }); - this.transactionId = getNextSequence("seq.tx"); + this.transactionId = getNextSequence(); } /** @@ -2429,7 +2404,7 @@ public class KiWiConnection implements AutoCloseable { connection.rollback(); } - this.transactionId = getNextSequence("seq.tx"); + this.transactionId = getNextSequence(); } /** @@ -2514,7 +2489,7 @@ public class KiWiConnection implements AutoCloseable { for(KiWiTriple triple : tripleBatch) { // retrieve a new triple ID and set it in the object if(triple.getId() < 0) { - triple.setId(getNextSequence("seq.triples")); + triple.setId(getNextSequence()); } insertTriple.setLong(1,triple.getId()); http://git-wip-us.apache.org/repos/asf/marmotta/blob/f79e82be/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java index 68ffee9..07c0846 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java +++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java @@ -579,7 +579,7 @@ public class KiWiValueFactory implements ValueFactory { // triple has no id from registry or database, so we create one and flag it for reasoning if(result.getId() < 0) { - result.setId(connection.getNextSequence("seq.triples")); + result.setId(connection.getNextSequence()); result.setNewTriple(true); registry.registerKey(cacheKey, connection.getTransactionId(), result.getId()); http://git-wip-us.apache.org/repos/asf/marmotta/blob/f79e82be/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/persistence/KiWiVersioningConnection.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/persistence/KiWiVersioningConnection.java b/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/persistence/KiWiVersioningConnection.java index 49716e9..752c7e6 100644 --- a/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/persistence/KiWiVersioningConnection.java +++ b/libraries/kiwi/kiwi-versioning/src/main/java/org/apache/marmotta/kiwi/versioning/persistence/KiWiVersioningConnection.java @@ -79,7 +79,7 @@ public class KiWiVersioningConnection extends KiWiConnection { requireJDBCConnection(); // first create a new entry in the version table - data.setId(getNextSequence("seq.versions")); + data.setId(getNextSequence()); PreparedStatement insertVersion = getPreparedStatement("store.version"); synchronized (insertVersion) { http://git-wip-us.apache.org/repos/asf/marmotta/blob/f79e82be/libraries/ldcache/ldcache-backend-kiwi/src/main/java/org/apache/marmotta/ldcache/backend/kiwi/persistence/LDCachingKiWiPersistenceConnection.java ---------------------------------------------------------------------- diff --git a/libraries/ldcache/ldcache-backend-kiwi/src/main/java/org/apache/marmotta/ldcache/backend/kiwi/persistence/LDCachingKiWiPersistenceConnection.java b/libraries/ldcache/ldcache-backend-kiwi/src/main/java/org/apache/marmotta/ldcache/backend/kiwi/persistence/LDCachingKiWiPersistenceConnection.java index 8f0d592..9d6dec6 100644 --- a/libraries/ldcache/ldcache-backend-kiwi/src/main/java/org/apache/marmotta/ldcache/backend/kiwi/persistence/LDCachingKiWiPersistenceConnection.java +++ b/libraries/ldcache/ldcache-backend-kiwi/src/main/java/org/apache/marmotta/ldcache/backend/kiwi/persistence/LDCachingKiWiPersistenceConnection.java @@ -156,7 +156,7 @@ public class LDCachingKiWiPersistenceConnection implements Closeable { // needed before the entry can be inserted connection.flushBatch(); - kEntry.setId(connection.getNextSequence("seq.ldcache")); + kEntry.setId(connection.getNextSequence()); PreparedStatement insertEntry = connection.getPreparedStatement("store.entry"); insertEntry.setLong(1, kEntry.getId());
