jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1174709 - /incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/
Date Fri, 23 Sep 2011 12:36:02 GMT
Author: andy
Date: Fri Sep 23 12:36:01 2011
New Revision: 1174709

URL: http://svn.apache.org/viewvc?rev=1174709&view=rev
Log:
Tests for group - strict SPARQL where possible.

Added:
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/avg-01.rq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-02.rq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-03.rq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-04.rq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-05.rq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-06.rq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-07.rq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-07.srx
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-10.rq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-11.rq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-12.rq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-13.rq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-01.rq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-02.rq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-03.rq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-04.rq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-10.rq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-11.rq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-20.rq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/having-1.rq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/max-01.rq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/min-01.rq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/sum-01.rq
Removed:
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/avg-01.arq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-02.arq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-03.arq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-04.arq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-05.arq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-06.arq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-10.arq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-11.arq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-12.arq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-13.arq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-01.arq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-02.arq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-03.arq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-04.arq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-10.arq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-11.arq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-20.arq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/having-1.arq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/max-01.arq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/min-01.arq
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/sum-01.arq
Modified:
    incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/manifest.ttl

Added: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/avg-01.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/avg-01.rq?rev=1174709&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/avg-01.rq (added)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/avg-01.rq Fri Sep 23 12:36:01 2011
@@ -0,0 +1,7 @@
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT (avg(?v) AS ?V)
+{
+    ?x :p ?v
+}

Added: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-02.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-02.rq?rev=1174709&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-02.rq (added)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-02.rq Fri Sep 23 12:36:01 2011
@@ -0,0 +1,7 @@
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT (count(*) AS ?count)
+{
+    ?x rdf:type :X .
+}

Added: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-03.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-03.rq?rev=1174709&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-03.rq (added)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-03.rq Fri Sep 23 12:36:01 2011
@@ -0,0 +1,9 @@
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT ?p (count(*) AS ?count)
+{
+    ?x rdf:type :X .
+    ?x :p ?p .
+}
+GROUP BY ?p

Added: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-04.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-04.rq?rev=1174709&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-04.rq (added)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-04.rq Fri Sep 23 12:36:01 2011
@@ -0,0 +1,10 @@
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT ?p (count(*) AS ?count)
+{
+    ?x rdf:type :X .
+    ?x :p ?p .
+    ?x :n ?n .
+}
+GROUP BY ?p

Added: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-05.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-05.rq?rev=1174709&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-05.rq (added)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-05.rq Fri Sep 23 12:36:01 2011
@@ -0,0 +1,12 @@
+PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX  :       <http://example/>
+PREFIX  dc:     <http://purl.org/dc/elements/1.1/>
+
+SELECT ?p (count(*) AS ?c) (count(distinct *) AS ?cd) 
+{
+    # UNION is asymmetric in what it generates
+    { ?x rdf:type :X . } UNION { ?x rdf:type :X . FILTER (?x != :x2 )}
+    # and :x2 :p 2 with ":p 2" occuring twice.
+    ?x :p ?p .
+}
+GROUP BY ?p

Added: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-06.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-06.rq?rev=1174709&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-06.rq (added)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-06.rq Fri Sep 23 12:36:01 2011
@@ -0,0 +1,13 @@
+PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX  :       <http://example/>
+PREFIX  dc:     <http://purl.org/dc/elements/1.1/>
+
+SELECT ?p (count(?n) AS ?num) (count(distinct ?n) AS ?numD)
+{
+    # UNION is asymmetric in what it generates
+    { ?x rdf:type :X . } UNION { ?x rdf:type :X . FILTER (?x != :x2 )}
+    # and :x2 :p 2 with ":p 2" occuring twice.
+    OPTIONAL { ?x :p ?p . }
+    OPTIONAL { ?x :n ?n . }
+}
+GROUP BY ?p

Added: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-07.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-07.rq?rev=1174709&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-07.rq (added)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-07.rq Fri Sep 23 12:36:01 2011
@@ -0,0 +1,7 @@
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT (count(*) AS ?c1) (count(*) AS ?c2) 
+{
+    ?x rdf:type :X .
+}

Added: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-07.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-07.srx?rev=1174709&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-07.srx (added)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-07.srx Fri Sep 23 12:36:01 2011
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<sparql
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
+    xmlns="http://www.w3.org/2005/sparql-results#" >
+  <head>
+    <variable name="c1"/>
+    <variable name="c2"/>
+  </head>
+  <results>
+    <result>
+      <binding name="c1">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">5</literal>
+      </binding>
+      <binding name="c2">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">5</literal>
+      </binding>
+    </result>
+  </results>
+</sparql>

Added: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-10.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-10.rq?rev=1174709&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-10.rq (added)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-10.rq Fri Sep 23 12:36:01 2011
@@ -0,0 +1,7 @@
+PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX  :       <http://example/>
+
+SELECT (count(*) AS ?c)
+{
+    :xx :noMatch ?z .
+}

Added: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-11.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-11.rq?rev=1174709&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-11.rq (added)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-11.rq Fri Sep 23 12:36:01 2011
@@ -0,0 +1,8 @@
+PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX  :       <http://example/>
+
+SELECT (count(distinct *) AS ?c)
+{
+    :xx :noMatch ?z .
+}
+GROUP BY ?z

Added: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-12.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-12.rq?rev=1174709&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-12.rq (added)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-12.rq Fri Sep 23 12:36:01 2011
@@ -0,0 +1,7 @@
+PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX  :       <http://example/>
+
+SELECT (count(?z) AS ?c)
+{
+    :xx :noMatch ?z .
+}

Added: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-13.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-13.rq?rev=1174709&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-13.rq (added)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/count-13.rq Fri Sep 23 12:36:01 2011
@@ -0,0 +1,8 @@
+PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX  :       <http://example/>
+
+SELECT (count(distinct ?a) AS ?c)
+{
+    :xx :noMatch ?z .
+}
+GROUP BY ?a

Added: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-01.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-01.rq?rev=1174709&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-01.rq (added)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-01.rq Fri Sep 23 12:36:01 2011
@@ -0,0 +1,10 @@
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT ?p
+{
+    ?x rdf:type :X .
+    ?x :p ?p .
+    ?x :n ?n .
+}
+GROUP BY ?p

Added: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-02.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-02.rq?rev=1174709&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-02.rq (added)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-02.rq Fri Sep 23 12:36:01 2011
@@ -0,0 +1,11 @@
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT ?p ?q
+{
+    ?x rdf:type :X .
+    ?x :p ?p .
+    ?x :q ?q .
+    ?x :n ?n .
+}
+GROUP BY ?p ?q

Added: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-03.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-03.rq?rev=1174709&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-03.rq (added)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-03.rq Fri Sep 23 12:36:01 2011
@@ -0,0 +1,11 @@
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT ?z
+{
+    ?x rdf:type :X .
+    ?x :p ?p .
+    ?x :q ?q .
+    ?x :n ?n .
+}
+GROUP BY ?z

Added: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-04.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-04.rq?rev=1174709&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-04.rq (added)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-04.rq Fri Sep 23 12:36:01 2011
@@ -0,0 +1,11 @@
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT ?p
+{
+    ?x rdf:type :X .
+    ?x :p ?p .
+    ?x :q ?q .
+    ?x :n ?n .
+}
+GROUP BY ?p (?q = "a" && ?n = 2)

Added: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-10.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-10.rq?rev=1174709&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-10.rq (added)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-10.rq Fri Sep 23 12:36:01 2011
@@ -0,0 +1,9 @@
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT ?p
+{
+    { ?x rdf:type :X . } UNION { ?x rdf:type :X . FILTER (?x != :x2 )}
+    OPTIONAL { ?x :p ?p . }
+}
+GROUP BY ?p

Added: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-11.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-11.rq?rev=1174709&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-11.rq (added)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-11.rq Fri Sep 23 12:36:01 2011
@@ -0,0 +1,9 @@
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT (1 AS ?p)
+{
+    ?x rdf:type :X .
+    OPTIONAL { ?x :noSuch ?z }
+}
+GROUP BY ?z

Added: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-20.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-20.rq?rev=1174709&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-20.rq (added)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/group-20.rq Fri Sep 23 12:36:01 2011
@@ -0,0 +1,8 @@
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT ?p
+{
+    :x :noMatch "123" .
+}
+GROUP BY ?p
\ No newline at end of file

Added: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/having-1.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/having-1.rq?rev=1174709&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/having-1.rq (added)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/having-1.rq Fri Sep 23 12:36:01 2011
@@ -0,0 +1,10 @@
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT ?p (count(*) AS ?count)
+{
+    ?x rdf:type :X .
+    ?x :p ?p .
+}
+GROUP BY ?p
+HAVING (count(*) = 1)

Modified: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/manifest.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/manifest.ttl?rev=1174709&r1=1174708&r2=1174709&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/manifest.ttl (original)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/manifest.ttl Fri Sep 23 12:36:01 2011
@@ -12,7 +12,7 @@
       [  mf:name    "Group By - 1" ;
          rdf:type   mfx:TestQuery ; 
          mf:action
-            [ qt:query  <group-01.arq> ;
+            [ qt:query  <group-01.rq> ;
               qt:data   <data-1.ttl> ] ;
         mf:result  <group-01.srx>
       ]
@@ -20,7 +20,7 @@
       [  mf:name    "Group By - 2" ;
          rdf:type   mfx:TestQuery ; 
          mf:action
-            [ qt:query  <group-02.arq> ;
+            [ qt:query  <group-02.rq> ;
               qt:data   <data-1.ttl> ] ;
         mf:result  <group-02.srx>
       ]
@@ -28,7 +28,7 @@
       [  mf:name    "Group By - 3 (Group var does not occur)" ;
          rdf:type   mfx:TestQuery ; 
          mf:action
-            [ qt:query  <group-03.arq> ;
+            [ qt:query  <group-03.rq> ;
               qt:data   <data-1.ttl> ] ;
         mf:result  <group-03.srx>
       ]
@@ -36,7 +36,7 @@
       [  mf:name    "Group By - 4 (Group expression)" ;
          rdf:type   mfx:TestQuery ; 
          mf:action
-            [ qt:query  <group-04.arq> ;
+            [ qt:query  <group-04.rq> ;
               qt:data   <data-1.ttl> ] ;
         mf:result  <group-04.srx>
       ]
@@ -57,11 +57,11 @@
         mf:result  <group-06.srx>
       ]
 
-    ## Partial data
+          ## Partial data
       [  mf:name    "Group By - 10" ;
          rdf:type   mfx:TestQuery ; 
          mf:action
-            [ qt:query  <group-10.arq> ;
+            [ qt:query  <group-10.rq> ;
               qt:data   <data-2.ttl> ] ;
         mf:result  <group-10.srx>
       ]
@@ -69,7 +69,7 @@
       [  mf:name    "Group By - 11" ;
          rdf:type   mfx:TestQuery ; 
          mf:action
-            [ qt:query  <group-11.arq> ;
+            [ qt:query  <group-11.rq> ;
               qt:data   <data-2.ttl> ] ;
         mf:result  <group-11.srx>
       ]
@@ -87,7 +87,7 @@
      [  mf:name    "Group By - 20 / Zero data" ;
          rdf:type   mfx:TestQuery ; 
          mf:action
-            [ qt:query  <group-20.arq> ;
+            [ qt:query  <group-20.rq> ;
               qt:data   <data-0.ttl> ] ;
         mf:result  <group-20.srx>
       ]
@@ -105,7 +105,7 @@
       [  mf:name    "Count - 2 - No Group" ;
          rdf:type   mfx:TestQuery ; 
          mf:action
-            [ qt:query  <count-02.arq> ;
+            [ qt:query  <count-02.rq> ;
               qt:data   <data-1.ttl> ] ;
         mf:result  <count-02.srx>
       ]
@@ -113,7 +113,7 @@
       [  mf:name    "Count - 3" ;
          rdf:type   mfx:TestQuery ; 
          mf:action
-            [ qt:query  <count-03.arq> ;
+            [ qt:query  <count-03.rq> ;
               qt:data   <data-1.ttl> ] ;
         mf:result  <count-03.srx>
       ]
@@ -121,15 +121,15 @@
       [  mf:name    "Count - 4" ;
          rdf:type   mfx:TestQuery ; 
          mf:action
-            [ qt:query  <count-04.arq> ;
+            [ qt:query  <count-04.rq> ;
               qt:data   <data-1.ttl> ] ;
         mf:result  <count-04.srx>
       ]
 
-      [  mf:name    "Count - 5 - count(distinct)" ;
+      [  mf:name    "Count - 5 - count(*) / count(distinct *)" ;
          rdf:type   mfx:TestQuery ; 
          mf:action
-            [ qt:query  <count-05.arq> ;
+            [ qt:query  <count-05.rq> ;
               qt:data   <data-1.ttl> ] ;
         mf:result  <count-05.srx>
       ]
@@ -137,16 +137,25 @@
       [  mf:name    "Count - 6 - count(?var) / count(distinct ?var)" ;
          rdf:type   mfx:TestQuery ; 
          mf:action
-            [ qt:query  <count-06.arq> ;
+            [ qt:query  <count-06.rq> ;
               qt:data   <data-1.ttl> ] ;
         mf:result  <count-06.srx>
       ]
 
+      [  mf:name    "Count - 7 - count(*) / count(*)" ;
+         rdf:type   mfx:TestQuery ; 
+         mf:action
+            [ qt:query  <count-07.rq> ;
+              qt:data   <data-1.ttl> ] ;
+        mf:result  <count-07.srx>
+      ]
+      
+
     ##  Empty pattern
       [  mf:name    "Count - 10 - count(*) / no matches" ;
          rdf:type   mfx:TestQuery ; 
          mf:action
-            [ qt:query  <count-10.arq> ;
+            [ qt:query  <count-10.rq> ;
               qt:data   <data-0.ttl> ] ;
         mf:result  <count-10.srx>
       ]
@@ -154,14 +163,14 @@
       [  mf:name    "Count - 11 - count(distinct *) / group / no matches" ;
          rdf:type   mfx:TestQuery ; 
          mf:action
-            [ qt:query  <count-11.arq> ;
+            [ qt:query  <count-11.rq> ;
               qt:data   <data-0.ttl> ] ;
         mf:result  <count-11.srx>
       ]
       [  mf:name    "Count - 12 - count(?z) / no matches" ;
          rdf:type   mfx:TestQuery ; 
          mf:action
-            [ qt:query  <count-12.arq> ;
+            [ qt:query  <count-12.rq> ;
               qt:data   <data-0.ttl> ] ;
         mf:result  <count-12.srx>
       ]
@@ -169,7 +178,7 @@
       [  mf:name    "Count - 13 - count(distinct ?z) / group / no matches" ;
          rdf:type   mfx:TestQuery ; 
          mf:action
-            [ qt:query  <count-13.arq> ;
+            [ qt:query  <count-13.rq> ;
               qt:data   <data-0.ttl> ] ;
         mf:result  <count-13.srx>
       ]
@@ -212,7 +221,7 @@
       [  mf:name    "Sum - 1 - sum(?v)" ;
          rdf:type   mfx:TestQuery ; 
          mf:action
-            [ qt:query  <sum-01.arq> ;
+            [ qt:query  <sum-01.rq> ;
               qt:data   <data-1.ttl> ] ;
         mf:result  <sum-01.srj>
       ]
@@ -220,7 +229,7 @@
       [  mf:name    "Min - 1 - min(?v)" ;
          rdf:type   mfx:TestQuery ; 
          mf:action
-            [ qt:query  <min-01.arq> ;
+            [ qt:query  <min-01.rq> ;
               qt:data   <data-1.ttl> ] ;
         mf:result  <min-01.srj>
       ]
@@ -228,7 +237,7 @@
       [  mf:name    "Max - 1 - max(?v)" ;
          rdf:type   mfx:TestQuery ; 
          mf:action
-            [ qt:query  <max-01.arq> ;
+            [ qt:query  <max-01.rq> ;
               qt:data   <data-1.ttl> ] ;
         mf:result  <max-01.srj>
       ]
@@ -236,7 +245,7 @@
       [  mf:name    "Avg - 1 - avg(?v)" ;
          rdf:type   mfx:TestQuery ; 
          mf:action
-            [ qt:query  <avg-01.arq> ;
+            [ qt:query  <avg-01.rq> ;
               qt:data   <data-1.ttl> ] ;
         mf:result  <avg-01.srj>
       ]
@@ -246,7 +255,7 @@
       [  mf:name    "Having - 1" ;
          rdf:type   mfx:TestQuery ; 
          mf:action
-            [ qt:query  <having-1.arq> ;
+            [ qt:query  <having-1.rq> ;
               qt:data   <data-1.ttl> ] ;
         mf:result  <having-1.srx>
       ]

Added: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/max-01.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/max-01.rq?rev=1174709&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/max-01.rq (added)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/max-01.rq Fri Sep 23 12:36:01 2011
@@ -0,0 +1,7 @@
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT (max(?v) AS ?V)
+{
+    ?x :p ?v
+}

Added: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/min-01.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/min-01.rq?rev=1174709&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/min-01.rq (added)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/min-01.rq Fri Sep 23 12:36:01 2011
@@ -0,0 +1,7 @@
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT (min(?v) AS ?V)
+{
+    ?x :p ?v
+}

Added: incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/sum-01.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/sum-01.rq?rev=1174709&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/sum-01.rq (added)
+++ incubator/jena/Jena2/ARQ/trunk/testing/ARQ/GroupBy/sum-01.rq Fri Sep 23 12:36:01 2011
@@ -0,0 +1,7 @@
+PREFIX : <http://example/>
+PREFIX rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+
+SELECT (sum(?v) AS ?V)
+{
+    ?x :p ?v
+}



Mime
View raw message