marmotta-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sschaff...@apache.org
Subject [1/2] git commit: bug fix in SQL statement for loading literals
Date Mon, 18 Nov 2013 11:54:18 GMT
Updated Branches:
  refs/heads/develop 189d71f2e -> efbe28d81


bug fix in SQL statement for loading literals


Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/35513348
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/35513348
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/35513348

Branch: refs/heads/develop
Commit: 35513348fb521a436e5cf1cfa9bbc069d400ad08
Parents: 42689ee
Author: Sebastian Schaffert <sschaffert@apache.org>
Authored: Mon Nov 18 12:47:17 2013 +0100
Committer: Sebastian Schaffert <sschaffert@apache.org>
Committed: Mon Nov 18 12:47:17 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/incubator-marmotta/blob/35513348/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 b72ffbe..7e51c80 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
@@ -258,6 +258,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 GzipCompressorInputStream(inStream,true);

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/35513348/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 4977ba6..931b692 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
@@ -38,7 +38,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/incubator-marmotta/blob/35513348/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 1007c03..eb7dd04 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
@@ -38,7 +38,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 = ?
 


Mime
View raw message