Repository: marmotta Updated Branches: refs/heads/develop 28ecb7f17 -> 22644d0e0
remove unused parameter from getTripleId Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/22644d0e Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/22644d0e Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/22644d0e Branch: refs/heads/develop Commit: 22644d0e07836bc9b4113dac9ffc7c3c8a7de5f1 Parents: 28ecb7f Author: Sebastian Schaffert <[email protected]> Authored: Mon Oct 6 12:01:05 2014 +0200 Committer: Sebastian Schaffert <[email protected]> Committed: Mon Oct 6 12:01:05 2014 +0200 ---------------------------------------------------------------------- .../java/org/apache/marmotta/kiwi/loader/generic/KiWiHandler.java | 2 +- .../java/org/apache/marmotta/kiwi/persistence/KiWiConnection.java | 3 +-- .../main/java/org/apache/marmotta/kiwi/sail/KiWiValueFactory.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/22644d0e/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 23aeff7..5d5b4dd 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 @@ -267,7 +267,7 @@ public class KiWiHandler implements RDFHandler { storeTriple(result); } else { // not found in registry, try loading from database - result.setId(connection.getTripleId(subject,predicate,object,context,true)); + result.setId(connection.getTripleId(subject,predicate,object,context)); } // triple has no id from registry or database, so we create one and flag it for reasoning http://git-wip-us.apache.org/repos/asf/marmotta/blob/22644d0e/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 11e64cd..3fcbf76 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 @@ -1181,10 +1181,9 @@ public class KiWiConnection implements AutoCloseable { * @param predicate * @param object * @param context - * @param inferred * @return */ - public synchronized long getTripleId(final KiWiResource subject, final KiWiUriResource predicate, final KiWiNode object, final KiWiResource context, final boolean inferred) throws SQLException { + public synchronized long getTripleId(final KiWiResource subject, final KiWiUriResource predicate, final KiWiNode object, final KiWiResource context) throws SQLException { if(tripleBatch != null && tripleBatch.size() > 0) { Collection<KiWiTriple> batched = tripleBatch.listTriples(subject,predicate,object,context, false); if(batched.size() > 0) { http://git-wip-us.apache.org/repos/asf/marmotta/blob/22644d0e/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 3da6b66..68ffee9 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 @@ -574,7 +574,7 @@ public class KiWiValueFactory implements ValueFactory { registry.registerKey(cacheKey, connection.getTransactionId(), result.getId()); } else { // not found in registry, try loading from database - result.setId(connection.getTripleId(ksubject,kpredicate,kobject,kcontext,true)); + result.setId(connection.getTripleId(ksubject,kpredicate,kobject,kcontext)); } // triple has no id from registry or database, so we create one and flag it for reasoning
