You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2014/10/06 16:21:01 UTC
git commit: commit transaction on endRDF in KiWiBatchHandler
Repository: marmotta
Updated Branches:
refs/heads/develop f79e82be7 -> 9cb954ea4
commit transaction on endRDF in KiWiBatchHandler
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/9cb954ea
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/9cb954ea
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/9cb954ea
Branch: refs/heads/develop
Commit: 9cb954ea4a994a7e25c39614ac7da1c3c3004c79
Parents: f79e82b
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Oct 6 16:21:26 2014 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Oct 6 16:21:26 2014 +0200
----------------------------------------------------------------------
libraries/kiwi/kiwi-loader/pom.xml | 2 +-
.../marmotta/kiwi/loader/generic/KiWiBatchHandler.java | 8 +++++---
.../org/apache/marmotta/kiwi/loader/generic/KiWiHandler.java | 4 ++++
3 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/9cb954ea/libraries/kiwi/kiwi-loader/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-loader/pom.xml b/libraries/kiwi/kiwi-loader/pom.xml
index d0bc68c..775bf86 100644
--- a/libraries/kiwi/kiwi-loader/pom.xml
+++ b/libraries/kiwi/kiwi-loader/pom.xml
@@ -53,7 +53,7 @@
<dependency>
<groupId>net.sf.supercsv</groupId>
<artifactId>super-csv</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/9cb954ea/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 61f13c9..e1a922d 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
@@ -17,6 +17,7 @@
package org.apache.marmotta.kiwi.loader.generic;
+import org.apache.marmotta.commons.sesame.model.LiteralCommons;
import org.apache.marmotta.kiwi.loader.KiWiLoaderConfiguration;
import org.apache.marmotta.kiwi.model.rdf.*;
import org.apache.marmotta.kiwi.sail.KiWiStore;
@@ -46,7 +47,7 @@ public abstract class KiWiBatchHandler extends KiWiHandler implements RDFHandler
protected List<KiWiNode> nodeBacklog;
protected List<KiWiTriple> tripleBacklog;
- protected Map<Literal,KiWiLiteral> literalBacklogLookup;
+ protected Map<String,KiWiLiteral> literalBacklogLookup;
protected Map<String,KiWiUriResource> uriBacklogLookup;
protected Map<String,KiWiAnonResource> bnodeBacklogLookup;
@@ -137,6 +138,7 @@ public abstract class KiWiBatchHandler extends KiWiHandler implements RDFHandler
public void endRDF() throws RDFHandlerException {
try {
flushBacklog();
+ connection.commit();
} catch (SQLException e) {
throw new RDFHandlerException(e);
}
@@ -159,7 +161,7 @@ public abstract class KiWiBatchHandler extends KiWiHandler implements RDFHandler
@Override
protected KiWiLiteral createLiteral(Literal l) throws ExecutionException {
- KiWiLiteral result = literalBacklogLookup.get(l);
+ KiWiLiteral result = literalBacklogLookup.get(LiteralCommons.createCacheKey(l));
if(result == null) {
result = super.createLiteral(l);
}
@@ -188,7 +190,7 @@ public abstract class KiWiBatchHandler extends KiWiHandler implements RDFHandler
} else if(node instanceof KiWiAnonResource) {
bnodeBacklogLookup.put(node.stringValue(), (KiWiAnonResource)node);
} else if(node instanceof KiWiLiteral) {
- literalBacklogLookup.put((KiWiLiteral)node, (KiWiLiteral)node);
+ literalBacklogLookup.put(LiteralCommons.createCacheKey((Literal) node), (KiWiLiteral)node);
}
nodes++;
http://git-wip-us.apache.org/repos/asf/marmotta/blob/9cb954ea/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 d861cda..176b85e 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
@@ -259,12 +259,16 @@ public class KiWiHandler implements RDFHandler {
long tripleId = registry.lookupKey(cacheKey);
if(tripleId >= 0) {
+ // the triple has already been stored
+
+ /*
// try getting id from registry
result.setId(tripleId);
registry.registerKey(cacheKey, connection.getTransactionId(), result.getId());
storeTriple(result);
+ */
} else {
// not found in registry, try loading from database
result.setId(connection.getTripleId(subject,predicate,object,context));