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/02/11 14:42:45 UTC
[1/5] marmotta git commit: MARMOTTA-627: applied patch by @orinciog
from github, closes #17
Repository: marmotta
Updated Branches:
refs/heads/develop 83be62b49 -> 808403d16
MARMOTTA-627: applied patch by @orinciog from github, closes #17
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/cfdf9e60
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/cfdf9e60
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/cfdf9e60
Branch: refs/heads/develop
Commit: cfdf9e604352382ede3f05dac39004c929981ebe
Parents: ea28ddb
Author: Sergio Fernández <wi...@apache.org>
Authored: Thu Feb 11 14:27:43 2016 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Thu Feb 11 14:27:43 2016 +0100
----------------------------------------------------------------------
.../kiwi/sparql/builder/eval/ValueExpressionEvaluator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/cfdf9e60/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/eval/ValueExpressionEvaluator.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/eval/ValueExpressionEvaluator.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/eval/ValueExpressionEvaluator.java
index dee6841..2d41ff9 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/eval/ValueExpressionEvaluator.java
+++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/eval/ValueExpressionEvaluator.java
@@ -733,7 +733,7 @@ public class ValueExpressionEvaluator extends QueryModelVisitorBase<RuntimeExcep
case PLUS: return " + ";
case MINUS: return " - ";
case DIVIDE: return " / ";
- case MULTIPLY: return " / ";
+ case MULTIPLY: return " * ";
}
throw new IllegalArgumentException("unsupported operator type for math expression: "+op);
}
[5/5] marmotta git commit: Merge branch 'MARMOTTA-627' into develop
Posted by wi...@apache.org.
Merge branch 'MARMOTTA-627' into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/808403d1
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/808403d1
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/808403d1
Branch: refs/heads/develop
Commit: 808403d163079271dbc1db0dbf22e6faf0f1b924
Parents: 83be62b 6eb0973
Author: Sergio Fernández <wi...@apache.org>
Authored: Thu Feb 11 14:41:24 2016 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Thu Feb 11 14:41:24 2016 +0100
----------------------------------------------------------------------
.../builder/eval/ValueExpressionEvaluator.java | 2 +-
.../kiwi/sparql/test/KiWiSparqlTest.java | 55 +++++++++++++++++++-
2 files changed, 55 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[3/5] marmotta git commit: MARMOTTA-627: temporally disabled test
that detected MARMOTTA-628
Posted by wi...@apache.org.
MARMOTTA-627: temporally disabled test that detected MARMOTTA-628
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/1eb00653
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/1eb00653
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/1eb00653
Branch: refs/heads/develop
Commit: 1eb006530f6070fdce26c970fd77b22f69a960c9
Parents: 1413bb8
Author: Sergio Fernández <wi...@apache.org>
Authored: Thu Feb 11 14:40:18 2016 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Thu Feb 11 14:40:18 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/1eb00653/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
index 510e504..4a615bc 100644
--- a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
+++ b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
@@ -297,10 +297,13 @@ public class KiWiSparqlTest {
}
}
+ /*
+ see https://issues.apache.org/jira/browse/MARMOTTA-628
@Test
public void testMarmotta627_1() throws Exception {
testMarmotta627("SELECT ( (4.5-4.4)*0.1 as ?c ) WHERE {}", 0.01);
}
+ */
@Test
public void testMarmotta627_2() throws Exception {
[2/5] marmotta git commit: MARMOTTA-627: added some tests
Posted by wi...@apache.org.
MARMOTTA-627: added some tests
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/1413bb85
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/1413bb85
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/1413bb85
Branch: refs/heads/develop
Commit: 1413bb858b24c61600cd82ba80ff1de784d3056a
Parents: cfdf9e6
Author: Sergio Fernández <wi...@apache.org>
Authored: Thu Feb 11 14:32:49 2016 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Thu Feb 11 14:32:49 2016 +0100
----------------------------------------------------------------------
.../kiwi/sparql/test/KiWiSparqlTest.java | 51 ++++++++++++++++++++
1 file changed, 51 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/1413bb85/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
index c3a2868..510e504 100644
--- a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
+++ b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
@@ -23,6 +23,7 @@ import info.aduna.iteration.Iterations;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.io.IOUtils;
import org.apache.marmotta.kiwi.config.KiWiConfiguration;
+import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect;
import org.apache.marmotta.kiwi.sail.KiWiStore;
import org.apache.marmotta.kiwi.sparql.sail.KiWiSparqlSail;
import org.apache.marmotta.kiwi.test.junit.KiWiDatabaseRunner;
@@ -54,6 +55,7 @@ import java.util.Set;
* @author Sergio Fernámdez
*/
@RunWith(KiWiDatabaseRunner.class)
+@KiWiDatabaseRunner.ForDialects(PostgreSQLDialect.class)
public class KiWiSparqlTest {
final Logger log = LoggerFactory.getLogger(this.getClass());
@@ -272,4 +274,53 @@ public class KiWiSparqlTest {
}
}
+ private void testMarmotta627(String queryString, double expected) throws RepositoryException, MalformedQueryException, QueryEvaluationException {
+ RepositoryConnection conn = repository.getConnection();
+ try {
+ conn.begin();
+ final TupleQuery query = conn.prepareTupleQuery(QueryLanguage.SPARQL, queryString);
+ final TupleQueryResult results = query.evaluate();
+ try {
+ Assert.assertTrue(results.hasNext());
+ final BindingSet bindingSet = results.next();
+ Assert.assertNotNull(bindingSet);
+ Assert.assertTrue(bindingSet.getValue("c") instanceof Literal);
+ final Literal c = (Literal) bindingSet.getValue("c");
+ Assert.assertEquals("http://www.w3.org/2001/XMLSchema#decimal", c.getDatatype().stringValue());
+ Assert.assertEquals(expected, c.doubleValue(), 0);
+ Assert.assertFalse(results.hasNext());
+ } finally {
+ results.close();
+ }
+ } finally {
+ conn.close();
+ }
+ }
+
+ @Test
+ public void testMarmotta627_1() throws Exception {
+ testMarmotta627("SELECT ( (4.5-4.4)*0.1 as ?c ) WHERE {}", 0.01);
+ }
+
+ @Test
+ public void testMarmotta627_2() throws Exception {
+ testMarmotta627("SELECT ( 0.1*0.1 as ?c ) WHERE {}", 0.01);
+ }
+
+ @Test
+ public void testMarmotta627_3() throws Exception {
+ testMarmotta627("SELECT ( 0.10*0.01 as ?c ) WHERE {}", 0.001);
+ }
+
+ @Test
+ public void testMarmotta627_4() throws Exception {
+ testMarmotta627("SELECT ( 1.00*3.10 as ?c ) WHERE {}", 3.10);
+ }
+
+ @Test
+ public void testMarmotta627_5() throws Exception {
+ testMarmotta627("SELECT ( 2.00*4.00 as ?c ) WHERE {}", 8.00);
+ }
+
+
}
[4/5] marmotta git commit: MARMOTTA-627: recovered all dialects
Posted by wi...@apache.org.
MARMOTTA-627: recovered all dialects
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/6eb09733
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/6eb09733
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/6eb09733
Branch: refs/heads/develop
Commit: 6eb09733b31eeb935d0f8c003b75f4d110cdb063
Parents: 1eb0065
Author: Sergio Fernández <wi...@apache.org>
Authored: Thu Feb 11 14:41:04 2016 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Thu Feb 11 14:41:04 2016 +0100
----------------------------------------------------------------------
.../org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/6eb09733/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
index 4a615bc..1246845 100644
--- a/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
+++ b/libraries/kiwi/kiwi-sparql/src/test/java/org/apache/marmotta/kiwi/sparql/test/KiWiSparqlTest.java
@@ -23,7 +23,6 @@ import info.aduna.iteration.Iterations;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.io.IOUtils;
import org.apache.marmotta.kiwi.config.KiWiConfiguration;
-import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect;
import org.apache.marmotta.kiwi.sail.KiWiStore;
import org.apache.marmotta.kiwi.sparql.sail.KiWiSparqlSail;
import org.apache.marmotta.kiwi.test.junit.KiWiDatabaseRunner;
@@ -31,7 +30,8 @@ import org.junit.*;
import org.junit.rules.TestWatcher;
import org.junit.runner.Description;
import org.junit.runner.RunWith;
-import org.openrdf.model.*;
+import org.openrdf.model.BNode;
+import org.openrdf.model.Literal;
import org.openrdf.query.*;
import org.openrdf.repository.Repository;
import org.openrdf.repository.RepositoryConnection;
@@ -55,7 +55,6 @@ import java.util.Set;
* @author Sergio Fernámdez
*/
@RunWith(KiWiDatabaseRunner.class)
-@KiWiDatabaseRunner.ForDialects(PostgreSQLDialect.class)
public class KiWiSparqlTest {
final Logger log = LoggerFactory.getLogger(this.getClass());