You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2016/07/01 14:26:30 UTC
[1/5] marmotta git commit: MARMOTTA-584: moved kiwi-geosparql as a
direct dependency of kiwi-sparql
Repository: marmotta
Updated Branches:
refs/heads/MARMOTTA-584 ee9d578cf -> 0fcaf95f7
MARMOTTA-584: moved kiwi-geosparql as a direct dependency of kiwi-sparql
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/7f7c4246
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/7f7c4246
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/7f7c4246
Branch: refs/heads/MARMOTTA-584
Commit: 7f7c4246d088f460be66e65d44bb9b2ad60f217b
Parents: ee9d578
Author: Sergio Fern�ndez <wi...@apache.org>
Authored: Fri Jul 1 14:20:55 2016 +0200
Committer: Sergio Fern�ndez <wi...@apache.org>
Committed: Fri Jul 1 14:20:55 2016 +0200
----------------------------------------------------------------------
libraries/kiwi/kiwi-sparql/pom.xml | 4 ++++
platform/marmotta-sparql/pom.xml | 4 ----
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/7f7c4246/libraries/kiwi/kiwi-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/pom.xml b/libraries/kiwi/kiwi-sparql/pom.xml
index 3860d7a..6a04db1 100644
--- a/libraries/kiwi/kiwi-sparql/pom.xml
+++ b/libraries/kiwi/kiwi-sparql/pom.xml
@@ -55,6 +55,10 @@
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-triplestore</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>kiwi-geosparql</artifactId>
+ </dependency>
<!-- Logging -->
<dependency>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/7f7c4246/platform/marmotta-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/pom.xml b/platform/marmotta-sparql/pom.xml
index edb5f7f..732c47d 100644
--- a/platform/marmotta-sparql/pom.xml
+++ b/platform/marmotta-sparql/pom.xml
@@ -202,10 +202,6 @@
<artifactId>kiwi-sparql</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>kiwi-geosparql</artifactId>
- </dependency>
- <dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-query</artifactId>
</dependency>
[4/5] marmotta git commit: MARMOTTA-584: added test to check data
with geometries correctly works with other detabases that do not have
geosparql support
Posted by wi...@apache.org.
MARMOTTA-584: added test to check data with geometries correctly works with other detabases that do not have geosparql support
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/df2c80f0
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/df2c80f0
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/df2c80f0
Branch: refs/heads/MARMOTTA-584
Commit: df2c80f0e7c95a5e536e20db29b0e2cd0fc86237
Parents: 772261f
Author: Sergio Fern�ndez <wi...@apache.org>
Authored: Fri Jul 1 15:06:09 2016 +0200
Committer: Sergio Fern�ndez <wi...@apache.org>
Committed: Fri Jul 1 15:06:09 2016 +0200
----------------------------------------------------------------------
...etriesImportInNotSupportedDatabasesTest.java | 108 +++++++++++++++++++
1 file changed, 108 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/df2c80f0/libraries/kiwi/kiwi-geosparql/src/test/java/org/apache/marmotta/kiwi/sparql/geosparql/GeometriesImportInNotSupportedDatabasesTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-geosparql/src/test/java/org/apache/marmotta/kiwi/sparql/geosparql/GeometriesImportInNotSupportedDatabasesTest.java b/libraries/kiwi/kiwi-geosparql/src/test/java/org/apache/marmotta/kiwi/sparql/geosparql/GeometriesImportInNotSupportedDatabasesTest.java
new file mode 100644
index 0000000..dc2be4e
--- /dev/null
+++ b/libraries/kiwi/kiwi-geosparql/src/test/java/org/apache/marmotta/kiwi/sparql/geosparql/GeometriesImportInNotSupportedDatabasesTest.java
@@ -0,0 +1,108 @@
+package org.apache.marmotta.kiwi.sparql.geosparql;
+
+import org.apache.marmotta.kiwi.config.KiWiConfiguration;
+import org.apache.marmotta.kiwi.persistence.h2.H2Dialect;
+import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect;
+import org.apache.marmotta.kiwi.sail.KiWiStore;
+import org.apache.marmotta.kiwi.sparql.sail.KiWiSparqlSail;
+import org.apache.marmotta.kiwi.test.helper.DBConnectionChecker;
+import org.apache.marmotta.kiwi.test.junit.KiWiDatabaseRunner;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.openrdf.repository.Repository;
+import org.openrdf.repository.RepositoryConnection;
+import org.openrdf.repository.RepositoryException;
+import org.openrdf.repository.sail.SailRepository;
+import org.openrdf.rio.RDFFormat;
+import org.openrdf.rio.RDFParseException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.sql.SQLException;
+
+/**
+ * Test that geo-data imports in the geosparql non-supported databases
+ *
+ * @author Sergio Fern�ndez (wikier@apache.org)
+ */
+@RunWith(KiWiDatabaseRunner.class)
+@KiWiDatabaseRunner.ForDialects({H2Dialect.class,MySQLDialect.class})
+public class GeometriesImportInNotSupportedDatabasesTest {
+
+ final Logger log = LoggerFactory.getLogger(this.getClass());
+
+ private KiWiStore store;
+ private Repository repository;
+
+ private final KiWiConfiguration dbConfig;
+
+ public GeometriesImportInNotSupportedDatabasesTest(KiWiConfiguration dbConfig) {
+ this.dbConfig = dbConfig;
+ dbConfig.setFulltextEnabled(true);
+ dbConfig.setFulltextLanguages(new String[] {"en"});
+ DBConnectionChecker.checkDatabaseAvailability(dbConfig);
+ }
+
+ @Before
+ public void initDatabase() throws RepositoryException, IOException, RDFParseException {
+ store = new KiWiStore(dbConfig);
+ store.setDropTablesOnShutdown(true);
+ repository = new SailRepository(new KiWiSparqlSail(store));
+ repository.initialize();
+
+ log.info("load some to test...");
+ final RepositoryConnection conn = repository.getConnection();
+ try {
+ conn.begin();
+ conn.add(this.getClass().getResourceAsStream("/demo_data_spain_provinces.rdf"), "http://localhost/test/geosparql", RDFFormat.RDFXML);
+ conn.add(this.getClass().getResourceAsStream("/demo_data_spain_towns.rdf"), "http://localhost/test/geosparql", RDFFormat.RDFXML);
+ conn.add(this.getClass().getResourceAsStream("/demo_data_spain_rivers.rdf"), "http://localhost/test/geosparql", RDFFormat.RDFXML);
+ conn.commit();
+ } finally {
+ conn.close();
+ }
+ }
+
+ @After
+ public void dropDatabase() throws RepositoryException, SQLException {
+ if (store != null && store.isInitialized()) {
+ log.info("cleaning up test setup...");
+ store.getPersistence().dropDatabase();
+ repository.shutDown();
+ store = null;
+ repository = null;
+ }
+ }
+
+ private void testLoadFile(String path) throws RepositoryException, IOException, RDFParseException {
+ log.info("load test data from {}....", path);
+ final RepositoryConnection conn = repository.getConnection();
+ try {
+ conn.begin();
+ conn.add(this.getClass().getResourceAsStream(path), "http://localhost/test", RDFFormat.RDFXML);
+ conn.commit();
+ //TODO: check size
+ } finally {
+ conn.close();
+ }
+ }
+
+ @Test
+ public void testSpainshProvices() throws RepositoryException, IOException, RDFParseException {
+ testLoadFile("/demo_data_spain_provinces.rdf");
+ }
+
+ @Test
+ public void testSpainshTowns() throws RepositoryException, IOException, RDFParseException {
+ testLoadFile("/demo_data_spain_towns.rdf");
+ }
+
+ @Test
+ public void testSpainshRivers() throws RepositoryException, IOException, RDFParseException {
+ testLoadFile("/demo_data_spain_rivers.rdf");
+ }
+
+}
[5/5] marmotta git commit: MARMOTTA-584: kept compatible with h2
geosparql new storage needs in postgresql
Posted by wi...@apache.org.
MARMOTTA-584: kept compatible with h2 geosparql new storage needs in postgresql
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/0fcaf95f
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/0fcaf95f
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/0fcaf95f
Branch: refs/heads/MARMOTTA-584
Commit: 0fcaf95f78c4b3f26099cff8e15a22364939bf14
Parents: df2c80f
Author: Sergio Fern�ndez <wi...@apache.org>
Authored: Fri Jul 1 16:26:02 2016 +0200
Committer: Sergio Fern�ndez <wi...@apache.org>
Committed: Fri Jul 1 16:26:15 2016 +0200
----------------------------------------------------------------------
.../kiwi/model/rdf/KiWiGeometryLiteral.java | 2 +-
.../kiwi/persistence/KiWiConnection.java | 4 ++--
.../kiwi/persistence/h2/create_base_tables.sql | 2 ++
.../kiwi/persistence/h2/statements.properties | 23 ++++++++++----------
.../persistence/h2/upgrade_base_004_005.sql | 5 ++++-
.../persistence/pgsql/statements.properties | 2 --
6 files changed, 21 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/0fcaf95f/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiGeometryLiteral.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiGeometryLiteral.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiGeometryLiteral.java
index 4d63b48..5d059fc 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiGeometryLiteral.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/model/rdf/KiWiGeometryLiteral.java
@@ -84,7 +84,7 @@ public class KiWiGeometryLiteral extends KiWiLiteral {
}
/**
- * Return the content of the literal, using the parametrized Java type
+ * Return the SRID of the literal, using the parametrized Java type
*
* @return
*/
http://git-wip-us.apache.org/repos/asf/marmotta/blob/0fcaf95f/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 bfef466..96d2bcd 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
@@ -1161,8 +1161,9 @@ public class KiWiConnection implements AutoCloseable {
}
PreparedStatement insertNode = getPreparedStatement("store.gliteral");
+
insertNode.setLong(1, node.getId());
- insertNode.setString(2, "Geometry Resource");
+ insertNode.setString(2, "Geometry Resource"); //FIXME
insertNode.setObject(3, null);
@@ -1178,7 +1179,6 @@ public class KiWiConnection implements AutoCloseable {
insertNode.setTimestamp(7, new Timestamp(geoLiteral.getCreated().getTime()), calendarUTC);
insertNode.setString(8, gvalue);
-
insertNode.setInt(9, geoLiteral.getSRID());
insertNode.executeUpdate();
http://git-wip-us.apache.org/repos/asf/marmotta/blob/0fcaf95f/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/create_base_tables.sql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/create_base_tables.sql b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/create_base_tables.sql
index f969ead..a491af7 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/create_base_tables.sql
+++ b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/create_base_tables.sql
@@ -25,6 +25,8 @@ CREATE TABLE nodes (
ltype bigint REFERENCES nodes(id),
lang varchar(5),
createdAt timestamp NOT NULL DEFAULT now(),
+ gvalue varchar(2147483647),
+ srid INT,
PRIMARY KEY(id)
);
http://git-wip-us.apache.org/repos/asf/marmotta/blob/0fcaf95f/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 753c574..0017cc3 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
@@ -26,21 +26,21 @@ meta.get = SELECT mvalue FROM metadata WHERE mkey = ?;
# load entities
load.node_by_id = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,tzoffset,bvalue,lang,ltype,createdAt FROM nodes WHERE id = ?
-load.nodes_by_ids = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,tzoffset,bvalue,lang,ltype,createdAt FROM nodes WHERE id IN(%s) LIMIT %d
+load.nodes_by_ids = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,tzoffset,bvalue,lang,ltype,createdAt FROM nodes WHERE id IN(%s) LIMIT %d
load.uri_by_uri = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,tzoffset,bvalue,lang,ltype,createdAt FROM nodes WHERE ntype = 'uri' AND svalue = ?
load.bnode_by_anonid = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,tzoffset,bvalue,lang,ltype,createdAt FROM nodes WHERE ntype = 'bnode' AND svalue = ?
-load.literal_by_v = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,tzoffset,bvalue,lang,ltype,createdAt FROM nodes WHERE ntype = 'string' AND svalue = ? AND (lang IS NULL OR lang = '') AND ltype IS NULL
-load.literal_by_vl = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,tzoffset,bvalue,lang,ltype,createdAt FROM nodes WHERE svalue = ? AND lang = ?
-load.literal_by_vt = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,tzoffset,bvalue,lang,ltype,createdAt FROM nodes WHERE svalue = ? AND ltype = ?
+load.literal_by_v = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,tzoffset,bvalue,lang,ltype,createdAt FROM nodes WHERE ntype = 'string' AND svalue = ? AND (lang IS NULL OR lang = '') AND ltype IS NULL
+load.literal_by_vl = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,tzoffset,bvalue,lang,ltype,createdAt FROM nodes WHERE svalue = ? AND lang = ?
+load.literal_by_vt = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,tzoffset,bvalue,lang,ltype,createdAt FROM nodes WHERE svalue = ? AND ltype = ?
load.literal_by_iv = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,tzoffset,bvalue,lang,ltype,createdAt FROM nodes WHERE ivalue = ? AND (lang IS NULL OR lang = '') AND ltype = ?
load.literal_by_dv = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,tzoffset,bvalue,lang,ltype,createdAt FROM nodes WHERE dvalue = ? AND (lang IS NULL OR lang = '') AND ltype = ?
load.literal_by_tv = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,tzoffset,bvalue,lang,ltype,createdAt FROM nodes WHERE tvalue = ? AND tzoffset = ? AND (lang IS NULL OR lang = '') AND ltype = ?
load.literal_by_bv = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,tzoffset,bvalue,lang,ltype,createdAt FROM nodes WHERE bvalue = ? AND (lang IS NULL OR lang = '') AND ltype = ?
-
+load.literal_by_gv = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,tzoffset,bvalue,lang,ltype,createdAt,gvalue FROM nodes WHERE gvalue = ? AND ltype = ?
load.namespace_prefix = SELECT id,prefix,uri,createdAt FROM namespaces WHERE prefix = ?;
load.namespace_uri = SELECT id,prefix,uri,createdAt FROM namespaces WHERE uri = ?;
@@ -51,14 +51,15 @@ load.triple_by_id = SELECT id,subject,predicate,object,context,deleted,infe
# store entities
store.uri = INSERT INTO nodes (id,ntype,svalue,createdAt) VALUES (?,'uri',?,?)
store.bnode = INSERT INTO nodes (id,ntype,svalue,createdAt) VALUES (?,'bnode',?,?)
-store.sliteral = INSERT INTO nodes (id,ntype,svalue,dvalue,ivalue,lang,ltype,createdAt) VALUES (?,'string',?,?,?,?,?,?)
+store.sliteral = INSERT INTO nodes (id,ntype,svalue,dvalue,ivalue,lang,ltype,createdAt) VALUES (?,'string',?,?,?,?,?,?)
-store.iliteral = INSERT INTO nodes (id,ntype,svalue,dvalue,ivalue,ltype,createdAt) VALUES (?,'int',?,?,?,?,?)
-store.dliteral = INSERT INTO nodes (id,ntype,svalue,dvalue,ltype,createdAt) VALUES (?,'double',?,?,?,?)
-store.bliteral = INSERT INTO nodes (id,ntype,svalue,bvalue,ltype,createdAt) VALUES (?,'boolean',?,?,?,?)
-store.tliteral = INSERT INTO nodes (id,ntype,svalue,tvalue,tzoffset,ltype,createdAt) VALUES (?,'date',?,?,?,?,?)
+store.iliteral = INSERT INTO nodes (id,ntype,svalue,dvalue,ivalue,ltype,createdAt) VALUES (?,'int',?,?,?,?,?)
+store.dliteral = INSERT INTO nodes (id,ntype,svalue,dvalue,ltype,createdAt) VALUES (?,'double',?,?,?,?)
+store.bliteral = INSERT INTO nodes (id,ntype,svalue,bvalue,ltype,createdAt) VALUES (?,'boolean',?,?,?,?)
+store.tliteral = INSERT INTO nodes (id,ntype,svalue,tvalue,tzoffset,ltype,createdAt) VALUES (?,'date',?,?,?,?,?)
+store.gliteral = INSERT INTO nodes (id,ntype,svalue,dvalue,ivalue,lang,ltype,createdAt,gvalue,srid) VALUES (?,'geom',?,?,?,?,?,?,?,?)
-store.namespace = INSERT INTO namespaces (id,prefix,uri,createdAt) VALUES (?,?,?,?)
+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 (?,?,?,?,?,?,?)
http://git-wip-us.apache.org/repos/asf/marmotta/blob/0fcaf95f/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/upgrade_base_004_005.sql
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/upgrade_base_004_005.sql b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/upgrade_base_004_005.sql
index f177498..452a238 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/upgrade_base_004_005.sql
+++ b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/upgrade_base_004_005.sql
@@ -15,4 +15,7 @@
ALTER TABLE nodes ADD tzoffset int default 0 AFTER tvalue;
-UPDATE METADATA SET mvalue = '3' WHERE mkey = 'version';
\ No newline at end of file
+-- TODO: new two columns in nodes
+
+UPDATE METADATA SET mvalue = '5' WHERE mkey = 'version';
+INSERT INTO metadata(mkey,mvalue) VALUES ('updated',to_char(now(),'yyyy-MM-DD HH:mm:ss TZ') );
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/marmotta/blob/0fcaf95f/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 a738d90..5593985 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
@@ -39,7 +39,6 @@ load.literal_by_iv = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,tzoffset,bv
load.literal_by_dv = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,tzoffset,bvalue,lang,ltype,createdAt,ST_AsText(gvalue) FROM nodes WHERE dvalue = ? AND (lang IS NULL OR lang = '') AND ltype = ?
load.literal_by_tv = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,tzoffset,bvalue,lang,ltype,createdAt,ST_AsText(gvalue) FROM nodes WHERE tvalue = ? AND tzoffset = ? AND (lang IS NULL OR lang = '') AND ltype = ?
load.literal_by_bv = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,tzoffset,bvalue,lang,ltype,createdAt,ST_AsText(gvalue) FROM nodes WHERE bvalue = ? AND (lang IS NULL OR lang = '') AND ltype = ?
-
load.literal_by_gv = SELECT id,ntype,svalue,ivalue,dvalue,tvalue,tzoffset,bvalue,lang,ltype,createdAt,ST_AsText(gvalue) FROM nodes WHERE gvalue = ? AND ltype = ?
load.namespace_prefix = SELECT id,prefix,uri,createdAt FROM namespaces WHERE prefix = ?;
@@ -56,7 +55,6 @@ store.iliteral = INSERT INTO nodes (id,ntype,svalue,dvalue,ivalue,ltype,cr
store.dliteral = INSERT INTO nodes (id,ntype,svalue,dvalue,ltype,createdAt) VALUES (?,'double',?,?,?,?)
store.bliteral = INSERT INTO nodes (id,ntype,svalue,bvalue,ltype,createdAt) VALUES (?,'boolean',?,?,?,?)
store.tliteral = INSERT INTO nodes (id,ntype,svalue,tvalue,tzoffset,ltype,createdAt) VALUES (?,'date',?,?,?,?,?)
-
store.gliteral = INSERT INTO nodes (id,ntype,svalue,dvalue,ivalue,lang,ltype,createdAt,gvalue) VALUES (?,'geom',?,?,?,?,?,?,ST_GeomFromText(?,?))
store.namespace = INSERT INTO namespaces (id,prefix,uri,createdAt) VALUES (?,?,?,?)
[2/5] marmotta git commit: MARMOTTA-584: improve comment on
KiWiIONode.read() fallback
Posted by wi...@apache.org.
MARMOTTA-584: improve comment on KiWiIONode.read() fallback
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/996bad1d
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/996bad1d
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/996bad1d
Branch: refs/heads/MARMOTTA-584
Commit: 996bad1d73cab65f54f39fa6493372d027744035
Parents: 7f7c424
Author: Sergio Fern�ndez <wi...@apache.org>
Authored: Fri Jul 1 14:24:49 2016 +0200
Committer: Sergio Fern�ndez <wi...@apache.org>
Committed: Fri Jul 1 14:24:49 2016 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/marmotta/kiwi/io/KiWiIO.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/996bad1d/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/io/KiWiIO.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/io/KiWiIO.java b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/io/KiWiIO.java
index e87cfb6..2508427 100644
--- a/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/io/KiWiIO.java
+++ b/libraries/kiwi/kiwi-triplestore/src/main/java/org/apache/marmotta/kiwi/io/KiWiIO.java
@@ -234,7 +234,7 @@ public class KiWiIO {
}
}
- //should never arrive here, just to satisfy the static checks of the compiler
+ //should never arrive here...
throw new IllegalArgumentException("unknown KiWiNode type: " + type);
} else {
throw new IllegalArgumentException("unknown KiWiNode type: " + type);
[3/5] marmotta git commit: Revert "MARMOTTA-584: moved kiwi-geosparql
as a direct dependency of kiwi-sparql"
Posted by wi...@apache.org.
Revert "MARMOTTA-584: moved kiwi-geosparql as a direct dependency of kiwi-sparql"
This reverts commit 7f7c4246d088f460be66e65d44bb9b2ad60f217b.
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/772261f8
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/772261f8
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/772261f8
Branch: refs/heads/MARMOTTA-584
Commit: 772261f8537dae9d7857edb0ab073bd856cb9447
Parents: 996bad1
Author: Sergio Fern�ndez <wi...@apache.org>
Authored: Fri Jul 1 14:41:35 2016 +0200
Committer: Sergio Fern�ndez <wi...@apache.org>
Committed: Fri Jul 1 14:41:35 2016 +0200
----------------------------------------------------------------------
libraries/kiwi/kiwi-sparql/pom.xml | 4 ----
platform/marmotta-sparql/pom.xml | 4 ++++
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/772261f8/libraries/kiwi/kiwi-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/pom.xml b/libraries/kiwi/kiwi-sparql/pom.xml
index 6a04db1..3860d7a 100644
--- a/libraries/kiwi/kiwi-sparql/pom.xml
+++ b/libraries/kiwi/kiwi-sparql/pom.xml
@@ -55,10 +55,6 @@
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-triplestore</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>kiwi-geosparql</artifactId>
- </dependency>
<!-- Logging -->
<dependency>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/772261f8/platform/marmotta-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/pom.xml b/platform/marmotta-sparql/pom.xml
index 732c47d..edb5f7f 100644
--- a/platform/marmotta-sparql/pom.xml
+++ b/platform/marmotta-sparql/pom.xml
@@ -202,6 +202,10 @@
<artifactId>kiwi-sparql</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>kiwi-geosparql</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-query</artifactId>
</dependency>