Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[8081] branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/ test/com/bigdata/rdf/sparql/ast/eval
|
From: <tho...@us...> - 2014-04-07 22:52:37
|
Revision: 8081
http://sourceforge.net/p/bigdata/code/8081
Author: thompsonbry
Date: 2014-04-07 22:52:33 +0000 (Mon, 07 Apr 2014)
Log Message:
-----------
Added regression test suite for #831 and #874.
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestUnions.java
Added Paths:
-----------
branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_831.rq
branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_831.srx
branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_831.ttl
branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874.rq
branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874.srx
branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874.ttl
branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874b.rq
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestUnions.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestUnions.java 2014-04-07 22:34:42 UTC (rev 8080)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestUnions.java 2014-04-07 22:52:33 UTC (rev 8081)
@@ -209,4 +209,54 @@
).runTest();
}
+
+ /**
+ *
+ * @see <a href="http://trac.bigdata.com/ticket/831">Union with FILTER
+ * issue</a>
+ */
+ public void test_union_ticket_831() throws Exception {
+
+ new TestHelper(
+ "ticket_831", // testURI,
+ "ticket_831.rq",// queryFileURL
+ "ticket_831.ttl",// dataFileURL
+ "ticket_831.srx"// resultFileURL
+ ).runTest();
+
+ }
+
+ /**
+ * The original query.
+ * @see <a href="http://trac.bigdata.com/ticket/874">FILTER not applied when
+ * there is UNION in the same join group</a>
+ */
+ public void test_union_ticket_874() throws Exception {
+
+ new TestHelper(
+ "ticket_874", // testURI,
+ "ticket_874.rq",// queryFileURL
+ "ticket_874.ttl",// dataFileURL
+ "ticket_874.srx"// resultFileURL
+ ).runTest();
+
+ }
+
+ /**
+ * A rewrite of the original query that works.
+ *
+ * @see <a href="http://trac.bigdata.com/ticket/874">FILTER not applied when
+ * there is UNION in the same join group</a>
+ */
+ public void test_union_ticket_874b() throws Exception {
+
+ new TestHelper(
+ "ticket_874b", // testURI,
+ "ticket_874b.rq",// queryFileURL
+ "ticket_874.ttl",// dataFileURL
+ "ticket_874.srx"// resultFileURL
+ ).runTest();
+
+ }
+
}
Added: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_831.rq
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_831.rq (rev 0)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_831.rq 2014-04-07 22:52:33 UTC (rev 8081)
@@ -0,0 +1,20 @@
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
+
+select ?s ?p ?o
+
+where {
+
+ {
+ ?s ?p ?o.
+ filter(?s = <http://example.org/data/person1>)
+ }
+ UNION
+ {
+ ?s ?p ?o.
+ filter(?s = <http://example.org/data/person2>)
+
+ }
+
+}
\ No newline at end of file
Added: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_831.srx
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_831.srx (rev 0)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_831.srx 2014-04-07 22:52:33 UTC (rev 8081)
@@ -0,0 +1,88 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
+ <head>
+ <variable name='s'/>
+ <variable name='p'/>
+ <variable name='o'/>
+ </head>
+ <results>
+<!--
+:person1
+ a :Person ;
+ :age 21;
+ :name "Person 1".
+-->
+ <result>
+ <binding name='s'>
+ <uri>http://example.org/data/person1</uri>
+ </binding>
+ <binding name='p'>
+ <uri>http://www.w3.org/1999/02/22-rdf-syntax-ns#type</uri>
+ </binding>
+ <binding name='o'>
+ <uri>http://example.org/data/Person</uri>
+ </binding>
+ </result>
+ <result>
+ <binding name='s'>
+ <uri>http://example.org/data/person1</uri>
+ </binding>
+ <binding name='p'>
+ <uri>http://example.org/data/age</uri>
+ </binding>
+ <binding name='o'>
+ <literal datatype="http://www.w3.org/2001/XMLSchema#integer">21</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name='s'>
+ <uri>http://example.org/data/person1</uri>
+ </binding>
+ <binding name='p'>
+ <uri>http://example.org/data/name</uri>
+ </binding>
+ <binding name='o'>
+ <literal>Person 1</literal>
+ </binding>
+ </result>
+<!--
+:person2
+ a :Person ;
+ :age 11;
+ :name "Person 2".
+ -->
+ <result>
+ <binding name='s'>
+ <uri>http://example.org/data/person2</uri>
+ </binding>
+ <binding name='p'>
+ <uri>http://www.w3.org/1999/02/22-rdf-syntax-ns#type</uri>
+ </binding>
+ <binding name='o'>
+ <uri>http://example.org/data/Person</uri>
+ </binding>
+ </result>
+ <result>
+ <binding name='s'>
+ <uri>http://example.org/data/person2</uri>
+ </binding>
+ <binding name='p'>
+ <uri>http://example.org/data/age</uri>
+ </binding>
+ <binding name='o'>
+ <literal datatype="http://www.w3.org/2001/XMLSchema#integer">11</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name='s'>
+ <uri>http://example.org/data/person2</uri>
+ </binding>
+ <binding name='p'>
+ <uri>http://example.org/data/name</uri>
+ </binding>
+ <binding name='o'>
+ <literal>Person 2</literal>
+ </binding>
+ </result>
+ </results>
+</sparql>
Added: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_831.ttl
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_831.ttl (rev 0)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_831.ttl 2014-04-07 22:52:33 UTC (rev 8081)
@@ -0,0 +1,11 @@
+@prefix : <http://example.org/data/> .
+
+:person1
+ a :Person ;
+ :age 21;
+ :name "Person 1".
+
+:person2
+ a :Person ;
+ :age 11;
+ :name "Person 2".
\ No newline at end of file
Added: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874.rq
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874.rq (rev 0)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874.rq 2014-04-07 22:52:33 UTC (rev 8081)
@@ -0,0 +1,9 @@
+prefix xsd: <http://www.w3.org/2001/XMLSchema#>
+SELECT *
+where {
+ ?s ?p ?o .
+ FILTER strStarts(str(?s), "http://arvados.org/schema/modified") .
+ { ?user <http://arvados.org/schema/user_is_admin> "true"^^xsd:boolean }
+ union { ?user <http://arvados.org/schema/permission/can_read> ?s }
+ ?user <http://arvados.org/schema/api_token> <token:ckedd>
+}
\ No newline at end of file
Added: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874.srx
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874.srx (rev 0)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874.srx 2014-04-07 22:52:33 UTC (rev 8081)
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
+ <head>
+ <variable name='s'/>
+ <variable name='p'/>
+ <variable name='o'/>
+ <variable name='user'/>
+ </head>
+ <results>
+ <result>
+ <binding name='s'>
+ <uri>http://arvados.org/schema/modified_at</uri>
+ </binding>
+ <binding name='p'>
+ <uri>http://www.w3.org/1999/02/22-rdf-syntax-ns#type</uri>
+ </binding>
+ <binding name='o'>
+ <uri>http://www.w3.org/2000/01/rdf-schema#Property</uri>
+ </binding>
+ <binding name='user'>
+ <uri>http://qr1hi/user/12345</uri>
+ </binding>
+ </result>
+ </results>
+</sparql>
Added: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874.ttl
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874.ttl (rev 0)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874.ttl 2014-04-07 22:52:33 UTC (rev 8081)
@@ -0,0 +1,4 @@
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+<http://qr1hi/user/12345> <http://arvados.org/schema/api_token> <token:ckedd> .
+<http://qr1hi/user/12345> <http://arvados.org/schema/user_is_admin> "true"^^xsd:boolean .
+<http://arvados.org/schema/modified_at> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Property> .
\ No newline at end of file
Added: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874b.rq
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874b.rq (rev 0)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874b.rq 2014-04-07 22:52:33 UTC (rev 8081)
@@ -0,0 +1,17 @@
+prefix xsd: <http://www.w3.org/2001/XMLSchema#>
+SELECT *
+where {
+?user <http://arvados.org/schema/api_token> <token:ckedd> .
+{
+ ?user <http://arvados.org/schema/user_is_admin> true .
+ ?s ?p ?o .
+ FILTER strStarts(str(?s), "http://arvados.org/schema/modified") .
+}
+union
+{
+ ?user <http://arvados.org/schema/user_is_admin> false .
+ ?user <http://arvados.org/schema/permission/can_read> ?s .
+ ?s ?p ?o .
+ FILTER strStarts(str(?s), "http://arvados.org/schema/modified") .
+}
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
