You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2013/12/12 12:29:00 UTC
[1/3] git commit: reverted backport for MARMOTTA-401 because it
breaks Sesame compatibility (cherry picked from commit
77a532aa763272d9538e99ad4d4b19844333170a)
Updated Branches:
refs/heads/maintenance-3.1.x bfaf09d34 -> 4f30dfabb
reverted backport for MARMOTTA-401 because it breaks Sesame compatibility
(cherry picked from commit 77a532aa763272d9538e99ad4d4b19844333170a)
Signed-off-by: Jakob Frank <ja...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/61a2d534
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/61a2d534
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/61a2d534
Branch: refs/heads/maintenance-3.1.x
Commit: 61a2d53454d4eb93c733aec48740efe17df975d5
Parents: bfaf09d
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Wed Dec 11 23:39:13 2013 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Thu Dec 12 11:58:32 2013 +0100
----------------------------------------------------------------------
.../java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/61a2d534/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java
index 92bd4c8..49b0206 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiLiteral.java
@@ -163,11 +163,15 @@ public abstract class KiWiLiteral extends KiWiNode implements Literal {
@Override
public int hashCode() {
+ // not compatible with Sesame:
+ /*
int result = this.getClass().hashCode();
result = 31 * result + (locale != null ? locale.hashCode() : 0);
result = 31 * result + (type != null ? type.hashCode() : 0);
result = 31 * result + this.getLabel().hashCode();
return result;
+ */
+ return getLabel().hashCode();
}
[2/3] git commit: MARMOTTA-393: backport fix in SQL statement for
loading literals (cherry picked from commit
35513348fb521a436e5cf1cfa9bbc069d400ad08)
Posted by ja...@apache.org.
MARMOTTA-393: backport fix in SQL statement for loading literals
(cherry picked from commit 35513348fb521a436e5cf1cfa9bbc069d400ad08)
Signed-off-by: Jakob Frank <ja...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/c6478813
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/c6478813
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/c6478813
Branch: refs/heads/maintenance-3.1.x
Commit: c6478813295ff26d2f5259e3cacd3e36a0df9e52
Parents: 61a2d53
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Nov 18 12:47:17 2013 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Thu Dec 12 12:25:15 2013 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/marmotta/kiwi/loader/KiWiLoader.java | 1 +
.../org/apache/marmotta/kiwi/persistence/h2/statements.properties | 2 +-
.../apache/marmotta/kiwi/persistence/pgsql/statements.properties | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/c6478813/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/KiWiLoader.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/KiWiLoader.java b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/KiWiLoader.java
index 652e3e5..8dc761c 100644
--- a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/KiWiLoader.java
+++ b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/KiWiLoader.java
@@ -251,6 +251,7 @@ public class KiWiLoader {
final File f = new File(inFile);
String fName = f.getName();
InputStream inStream = new FileInputStream(f);
+
if (gzip || inFile.endsWith(".gz")) {
log.debug("{} seems to be gzipped", inFile);
inStream = new GZIPInputStream(inStream);
http://git-wip-us.apache.org/repos/asf/marmotta/blob/c6478813/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties
index 092cfcb..ebfff11 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties
+++ b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties
@@ -32,7 +32,7 @@ load.uri_by_uri = SELECT id,ntype,svalue,createdAt FROM nodes WHERE ntype
load.bnode_by_anonid = SELECT id,ntype,svalue,createdAt FROM nodes WHERE ntype = 'bnode' AND svalue = ?
-load.literal_by_v = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,bvalue,lang,ltype,createdAt FROM nodes WHERE svalue = ? AND lang IS NULL AND ltype IS NULL
+load.literal_by_v = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,bvalue,lang,ltype,createdAt FROM nodes WHERE ntype = 'string' AND svalue = ? AND lang IS NULL AND ltype IS NULL
load.literal_by_vl = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,bvalue,lang,ltype,createdAt FROM nodes WHERE svalue = ? AND lang = ?
load.literal_by_vt = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,bvalue,lang,ltype,createdAt FROM nodes WHERE svalue = ? AND ltype = ?
http://git-wip-us.apache.org/repos/asf/marmotta/blob/c6478813/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/statements.properties
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/statements.properties b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/statements.properties
index 2ae6fa6..8dffe88 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/statements.properties
+++ b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/pgsql/statements.properties
@@ -35,7 +35,7 @@ load.uri_by_uri = SELECT id,ntype,svalue,createdAt FROM nodes WHERE ntype
load.bnode_by_anonid = SELECT id,ntype,svalue,createdAt FROM nodes WHERE ntype = 'bnode' AND svalue = ?
-load.literal_by_v = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,bvalue,lang,ltype,createdAt FROM nodes WHERE svalue = ? AND lang IS NULL AND ltype IS NULL
+load.literal_by_v = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,bvalue,lang,ltype,createdAt FROM nodes WHERE ntype = 'string' AND svalue = ? AND lang IS NULL AND ltype IS NULL
load.literal_by_vl = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,bvalue,lang,ltype,createdAt FROM nodes WHERE svalue = ? AND lang = ?
load.literal_by_vt = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,bvalue,lang,ltype,createdAt FROM nodes WHERE svalue = ? AND ltype = ?
[3/3] git commit: MARMOTTA-404: backported the trouble maker-fix
(cherry picked from commit f14417e35a1582f56266112617bc2a9dc8b74603)
Posted by ja...@apache.org.
MARMOTTA-404: backported the trouble maker-fix
(cherry picked from commit f14417e35a1582f56266112617bc2a9dc8b74603)
Signed-off-by: Jakob Frank <ja...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/4f30dfab
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/4f30dfab
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/4f30dfab
Branch: refs/heads/maintenance-3.1.x
Commit: 4f30dfabb1f45f3a7fd5cbb8a23948ef0db58464
Parents: c647881
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Wed Dec 11 23:29:07 2013 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Thu Dec 12 12:26:38 2013 +0100
----------------------------------------------------------------------
.../org/apache/marmotta/kiwi/persistence/h2/statements.properties | 2 +-
.../apache/marmotta/kiwi/persistence/mysql/statements.properties | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/4f30dfab/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties
index ebfff11..5058fc8 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties
+++ b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties
@@ -62,7 +62,7 @@ store.namespace = INSERT INTO namespaces (id,prefix,uri,createdAt) VALUES (
#store.triple = INSERT INTO triples (id,subject,predicate,object,context,inferred,createdAt) VALUES (?,?,?,?,?,?,?)
store.triple = MERGE INTO triples (id,subject,predicate,object,context,inferred,createdAt) KEY(id) VALUES (?,?,?,?,?,?,?)
-load.triple = SELECT id FROM triples WHERE subject = ? AND predicate = ? AND object = ? AND context = ? AND deleted = false AND inferred = true
+load.triple = SELECT id FROM triples WHERE subject = ? AND predicate = ? AND object = ? AND context = ? AND deleted = false
query.size = SELECT count(*) FROM triples WHERE deleted = false AND inferred = false
http://git-wip-us.apache.org/repos/asf/marmotta/blob/4f30dfab/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/statements.properties
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/statements.properties b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/statements.properties
index a94272a..e50e512 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/statements.properties
+++ b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/statements.properties
@@ -69,7 +69,7 @@ store.tliteral = INSERT INTO nodes (id,ntype,svalue,tvalue,ltype,createdAt
store.namespace = INSERT INTO namespaces (id,prefix,uri,createdAt) VALUES (?,?,?,?)
store.triple = INSERT IGNORE INTO triples (id,subject,predicate,object,context,inferred,createdAt) VALUES (?,?,?,?,?,?,?)
-load.triple = SELECT id FROM triples WHERE subject = ? AND predicate = ? AND object = ? AND context = ? AND deleted = false AND inferred = true
+load.triple = SELECT id FROM triples WHERE subject = ? AND predicate = ? AND object = ? AND context = ? AND deleted = false
query.size = SELECT count(*) FROM triples WHERE deleted = false AND inferred = false