You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2014/12/21 21:07:39 UTC
[1/6] jena git commit: Short forms for arguments.
Repository: jena
Updated Branches:
refs/heads/master bc14bb549 -> 95b1c7c20
Short forms for arguments.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b8200ec0
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b8200ec0
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b8200ec0
Branch: refs/heads/master
Commit: b8200ec0b56058a96b614653d0dc1debd4e0f7ac
Parents: bc14bb5
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Dec 20 21:49:11 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Dec 20 21:49:11 2014 +0000
----------------------------------------------------------------------
jena-arq/src/main/java/arq/cmdline/ModLangOutput.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b8200ec0/jena-arq/src/main/java/arq/cmdline/ModLangOutput.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/ModLangOutput.java b/jena-arq/src/main/java/arq/cmdline/ModLangOutput.java
index 78edad6..c27c6c6 100644
--- a/jena-arq/src/main/java/arq/cmdline/ModLangOutput.java
+++ b/jena-arq/src/main/java/arq/cmdline/ModLangOutput.java
@@ -32,7 +32,7 @@ import arq.cmd.CmdException ;
public class ModLangOutput implements ArgModuleGeneral
{
protected ArgDecl argOutput = new ArgDecl(ArgDecl.HasValue, "out", "output") ;
- protected ArgDecl argPretty = new ArgDecl(ArgDecl.HasValue, "formatted", "pretty") ;
+ protected ArgDecl argPretty = new ArgDecl(ArgDecl.HasValue, "formatted", "pretty", "fmt") ;
protected ArgDecl argStream = new ArgDecl(ArgDecl.HasValue, "stream") ;
private RDFFormat streamOutput = null ;
private RDFFormat formattedOutput = null ;
[4/6] jena git commit: Stablize test across RDF 1.0 and RDF 1.1
Posted by an...@apache.org.
Stablize test across RDF 1.0 and RDF 1.1
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/046d1951
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/046d1951
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/046d1951
Branch: refs/heads/master
Commit: 046d1951a0c24af54fc3ea9402f82dfbd20e4237
Parents: ef33e52
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Dec 21 20:03:43 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Dec 21 20:04:46 2014 +0000
----------------------------------------------------------------------
jena-arq/testing/ARQ/Sort/sort-2.rq | 2 +-
jena-arq/testing/ARQ/Sort/sort-3.rq | 2 +-
jena-arq/testing/ARQ/Sort/sort-result-2.ttl | 336 +++++++++----------
.../testing/ARQ/Sort/sort-result-2_RDF_10.ttl | 169 ++++++++++
.../testing/ARQ/Sort/sort-result-2_RDF_11.ttl | 169 ++++++++++
jena-arq/testing/ARQ/Sort/sort-result-3.ttl | 336 +++++++++----------
.../testing/ARQ/Sort/sort-result-3_RDF_10.ttl | 169 ++++++++++
.../testing/ARQ/Sort/sort-result-3_RDF_11.ttl | 169 ++++++++++
8 files changed, 1014 insertions(+), 338 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/046d1951/jena-arq/testing/ARQ/Sort/sort-2.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Sort/sort-2.rq b/jena-arq/testing/ARQ/Sort/sort-2.rq
index ccf9ea6..a86deaa 100644
--- a/jena-arq/testing/ARQ/Sort/sort-2.rq
+++ b/jena-arq/testing/ARQ/Sort/sort-2.rq
@@ -5,4 +5,4 @@ SELECT ?x ?v
{
?x ?p ?v
}
-ORDER BY ?v
+ORDER BY ?v ?x
http://git-wip-us.apache.org/repos/asf/jena/blob/046d1951/jena-arq/testing/ARQ/Sort/sort-3.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Sort/sort-3.rq b/jena-arq/testing/ARQ/Sort/sort-3.rq
index 986909e..057c3e6 100644
--- a/jena-arq/testing/ARQ/Sort/sort-3.rq
+++ b/jena-arq/testing/ARQ/Sort/sort-3.rq
@@ -5,4 +5,4 @@ SELECT ?x ?v
{
?x ?p ?v
}
-ORDER BY desc(?v)
+ORDER BY desc(?v) ?x
http://git-wip-us.apache.org/repos/asf/jena/blob/046d1951/jena-arq/testing/ARQ/Sort/sort-result-2.ttl
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Sort/sort-result-2.ttl b/jena-arq/testing/ARQ/Sort/sort-result-2.ttl
index f9edeb1..1ea6049 100644
--- a/jena-arq/testing/ARQ/Sort/sort-result-2.ttl
+++ b/jena-arq/testing/ARQ/Sort/sort-result-2.ttl
@@ -1,169 +1,169 @@
-@prefix : <http://example/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rs: <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix : <http://example/> .
+@prefix rs: <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-[] rdf:type rs:ResultSet ;
- rs:resultVariable "v" ;
- rs:resultVariable "x" ;
- rs:solution [ rs:binding [ rs:value "abc"@en ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y2 ;
- rs:variable "x"
- ] ;
- rs:index 9
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz"^^xsd:string ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x6 ;
- rs:variable "x"
- ] ;
- rs:index 20
- ] ;
- rs:solution [ rs:binding [ rs:value :x3 ;
- rs:variable "x"
- ] ;
- rs:binding [ rs:value "xyz"@FR ;
- rs:variable "v"
- ] ;
- rs:index 16
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz"^^xsd:integer ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x7 ;
- rs:variable "x"
- ] ;
- rs:index 19
- ] ;
- rs:solution [ rs:binding [ rs:value :z3 ;
- rs:variable "x"
- ] ;
- rs:binding [ rs:value "1"^^xsd:decimal ;
- rs:variable "v"
- ] ;
- rs:index 5
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz"@en ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x2 ;
- rs:variable "x"
- ] ;
- rs:index 15
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz"^^:unknown ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x8 ;
- rs:variable "x"
- ] ;
- rs:index 18
- ] ;
- rs:solution [ rs:binding [ rs:value :x4 ;
- rs:variable "x"
- ] ;
- rs:binding [ rs:value "xyz"@fr ;
- rs:variable "v"
- ] ;
- rs:index 17
- ] ;
- rs:solution [ rs:binding [ rs:value :y7 ;
- rs:variable "x"
- ] ;
- rs:binding [ rs:value :abc ;
- rs:variable "v"
- ] ;
- rs:index 2
- ] ;
- rs:solution [ rs:binding [ rs:value :x9 ;
- rs:variable "x"
- ] ;
- rs:binding [ rs:value [
- ] ;
- rs:variable "v"
- ] ;
- rs:index 1
- ] ;
- rs:solution [ rs:binding [ rs:value "abc"@EN ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y3 ;
- rs:variable "x"
- ] ;
- rs:index 8
- ] ;
- rs:solution [ rs:binding [ rs:value "abc" ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y1 ;
- rs:variable "x"
- ] ;
- rs:index 7
- ] ;
- rs:solution [ rs:binding [ rs:value "abc"^^xsd:string ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y4 ;
- rs:variable "x"
- ] ;
- rs:index 12
- ] ;
- rs:solution [ rs:binding [ rs:value :z2 ;
- rs:variable "x"
- ] ;
- rs:binding [ rs:value 01 ;
- rs:variable "v"
- ] ;
- rs:index 4
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz"@EN ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x5 ;
- rs:variable "x"
- ] ;
- rs:index 14
- ] ;
- rs:solution [ rs:binding [ rs:value 1 ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :z1 ;
- rs:variable "x"
- ] ;
- rs:index 6
- ] ;
- rs:solution [ rs:binding [ rs:value :xyz ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x10 ;
- rs:variable "x"
- ] ;
- rs:index 3
- ] ;
- rs:solution [ rs:binding [ rs:value "abc"^^:unknown ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y6 ;
- rs:variable "x"
- ] ;
- rs:index 10
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz" ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x1 ;
- rs:variable "x"
- ] ;
- rs:index 13
- ] ;
- rs:solution [ rs:binding [ rs:value "abc"^^xsd:integer ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y5 ;
- rs:variable "x"
- ] ;
- rs:index 11
- ] .
+[ a rs:ResultSet ;
+ rs:resultVariable "x" , "v" ;
+ rs:size "20"^^xsd:int ;
+ rs:solution [ rs:binding [ rs:value "1"^^xsd:decimal ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :z3 ;
+ rs:variable "x"
+ ] ;
+ rs:index 5
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz" ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x1 ;
+ rs:variable "x"
+ ] ;
+ rs:index 13
+ ] ;
+ rs:solution [ rs:binding [ rs:value 1 ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :z1 ;
+ rs:variable "x"
+ ] ;
+ rs:index 6
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"@FR ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x3 ;
+ rs:variable "x"
+ ] ;
+ rs:index 17
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"@en ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y2 ;
+ rs:variable "x"
+ ] ;
+ rs:index 10
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz" ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x6 ;
+ rs:variable "x"
+ ] ;
+ rs:index 14
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc" ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y4 ;
+ rs:variable "x"
+ ] ;
+ rs:index 8
+ ] ;
+ rs:solution [ rs:binding [ rs:value [] ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x9 ;
+ rs:variable "x"
+ ] ;
+ rs:index 1
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"@en ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x2 ;
+ rs:variable "x"
+ ] ;
+ rs:index 16
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"^^:unknown ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y6 ;
+ rs:variable "x"
+ ] ;
+ rs:index 11
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc" ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y1 ;
+ rs:variable "x"
+ ] ;
+ rs:index 7
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"^^xsd:integer ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x7 ;
+ rs:variable "x"
+ ] ;
+ rs:index 20
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"@EN ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y3 ;
+ rs:variable "x"
+ ] ;
+ rs:index 9
+ ] ;
+ rs:solution [ rs:binding [ rs:value :abc ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y7 ;
+ rs:variable "x"
+ ] ;
+ rs:index 2
+ ] ;
+ rs:solution [ rs:binding [ rs:value 01 ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :z2 ;
+ rs:variable "x"
+ ] ;
+ rs:index 4
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"@EN ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x5 ;
+ rs:variable "x"
+ ] ;
+ rs:index 15
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"^^:unknown ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x8 ;
+ rs:variable "x"
+ ] ;
+ rs:index 19
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"@fr ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x4 ;
+ rs:variable "x"
+ ] ;
+ rs:index 18
+ ] ;
+ rs:solution [ rs:binding [ rs:value :xyz ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x10 ;
+ rs:variable "x"
+ ] ;
+ rs:index 3
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"^^xsd:integer ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y5 ;
+ rs:variable "x"
+ ] ;
+ rs:index 12
+ ]
+] .
http://git-wip-us.apache.org/repos/asf/jena/blob/046d1951/jena-arq/testing/ARQ/Sort/sort-result-2_RDF_10.ttl
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Sort/sort-result-2_RDF_10.ttl b/jena-arq/testing/ARQ/Sort/sort-result-2_RDF_10.ttl
new file mode 100644
index 0000000..f9edeb1
--- /dev/null
+++ b/jena-arq/testing/ARQ/Sort/sort-result-2_RDF_10.ttl
@@ -0,0 +1,169 @@
+@prefix : <http://example/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rs: <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+
+[] rdf:type rs:ResultSet ;
+ rs:resultVariable "v" ;
+ rs:resultVariable "x" ;
+ rs:solution [ rs:binding [ rs:value "abc"@en ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y2 ;
+ rs:variable "x"
+ ] ;
+ rs:index 9
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"^^xsd:string ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x6 ;
+ rs:variable "x"
+ ] ;
+ rs:index 20
+ ] ;
+ rs:solution [ rs:binding [ rs:value :x3 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "xyz"@FR ;
+ rs:variable "v"
+ ] ;
+ rs:index 16
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"^^xsd:integer ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x7 ;
+ rs:variable "x"
+ ] ;
+ rs:index 19
+ ] ;
+ rs:solution [ rs:binding [ rs:value :z3 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "1"^^xsd:decimal ;
+ rs:variable "v"
+ ] ;
+ rs:index 5
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"@en ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x2 ;
+ rs:variable "x"
+ ] ;
+ rs:index 15
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"^^:unknown ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x8 ;
+ rs:variable "x"
+ ] ;
+ rs:index 18
+ ] ;
+ rs:solution [ rs:binding [ rs:value :x4 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "xyz"@fr ;
+ rs:variable "v"
+ ] ;
+ rs:index 17
+ ] ;
+ rs:solution [ rs:binding [ rs:value :y7 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value :abc ;
+ rs:variable "v"
+ ] ;
+ rs:index 2
+ ] ;
+ rs:solution [ rs:binding [ rs:value :x9 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value [
+ ] ;
+ rs:variable "v"
+ ] ;
+ rs:index 1
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"@EN ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y3 ;
+ rs:variable "x"
+ ] ;
+ rs:index 8
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc" ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y1 ;
+ rs:variable "x"
+ ] ;
+ rs:index 7
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"^^xsd:string ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y4 ;
+ rs:variable "x"
+ ] ;
+ rs:index 12
+ ] ;
+ rs:solution [ rs:binding [ rs:value :z2 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value 01 ;
+ rs:variable "v"
+ ] ;
+ rs:index 4
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"@EN ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x5 ;
+ rs:variable "x"
+ ] ;
+ rs:index 14
+ ] ;
+ rs:solution [ rs:binding [ rs:value 1 ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :z1 ;
+ rs:variable "x"
+ ] ;
+ rs:index 6
+ ] ;
+ rs:solution [ rs:binding [ rs:value :xyz ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x10 ;
+ rs:variable "x"
+ ] ;
+ rs:index 3
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"^^:unknown ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y6 ;
+ rs:variable "x"
+ ] ;
+ rs:index 10
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz" ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x1 ;
+ rs:variable "x"
+ ] ;
+ rs:index 13
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"^^xsd:integer ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y5 ;
+ rs:variable "x"
+ ] ;
+ rs:index 11
+ ] .
http://git-wip-us.apache.org/repos/asf/jena/blob/046d1951/jena-arq/testing/ARQ/Sort/sort-result-2_RDF_11.ttl
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Sort/sort-result-2_RDF_11.ttl b/jena-arq/testing/ARQ/Sort/sort-result-2_RDF_11.ttl
new file mode 100644
index 0000000..1ea6049
--- /dev/null
+++ b/jena-arq/testing/ARQ/Sort/sort-result-2_RDF_11.ttl
@@ -0,0 +1,169 @@
+@prefix : <http://example/> .
+@prefix rs: <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+[ a rs:ResultSet ;
+ rs:resultVariable "x" , "v" ;
+ rs:size "20"^^xsd:int ;
+ rs:solution [ rs:binding [ rs:value "1"^^xsd:decimal ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :z3 ;
+ rs:variable "x"
+ ] ;
+ rs:index 5
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz" ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x1 ;
+ rs:variable "x"
+ ] ;
+ rs:index 13
+ ] ;
+ rs:solution [ rs:binding [ rs:value 1 ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :z1 ;
+ rs:variable "x"
+ ] ;
+ rs:index 6
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"@FR ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x3 ;
+ rs:variable "x"
+ ] ;
+ rs:index 17
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"@en ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y2 ;
+ rs:variable "x"
+ ] ;
+ rs:index 10
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz" ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x6 ;
+ rs:variable "x"
+ ] ;
+ rs:index 14
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc" ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y4 ;
+ rs:variable "x"
+ ] ;
+ rs:index 8
+ ] ;
+ rs:solution [ rs:binding [ rs:value [] ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x9 ;
+ rs:variable "x"
+ ] ;
+ rs:index 1
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"@en ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x2 ;
+ rs:variable "x"
+ ] ;
+ rs:index 16
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"^^:unknown ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y6 ;
+ rs:variable "x"
+ ] ;
+ rs:index 11
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc" ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y1 ;
+ rs:variable "x"
+ ] ;
+ rs:index 7
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"^^xsd:integer ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x7 ;
+ rs:variable "x"
+ ] ;
+ rs:index 20
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"@EN ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y3 ;
+ rs:variable "x"
+ ] ;
+ rs:index 9
+ ] ;
+ rs:solution [ rs:binding [ rs:value :abc ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y7 ;
+ rs:variable "x"
+ ] ;
+ rs:index 2
+ ] ;
+ rs:solution [ rs:binding [ rs:value 01 ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :z2 ;
+ rs:variable "x"
+ ] ;
+ rs:index 4
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"@EN ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x5 ;
+ rs:variable "x"
+ ] ;
+ rs:index 15
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"^^:unknown ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x8 ;
+ rs:variable "x"
+ ] ;
+ rs:index 19
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"@fr ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x4 ;
+ rs:variable "x"
+ ] ;
+ rs:index 18
+ ] ;
+ rs:solution [ rs:binding [ rs:value :xyz ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x10 ;
+ rs:variable "x"
+ ] ;
+ rs:index 3
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"^^xsd:integer ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y5 ;
+ rs:variable "x"
+ ] ;
+ rs:index 12
+ ]
+] .
http://git-wip-us.apache.org/repos/asf/jena/blob/046d1951/jena-arq/testing/ARQ/Sort/sort-result-3.ttl
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Sort/sort-result-3.ttl b/jena-arq/testing/ARQ/Sort/sort-result-3.ttl
index d4d7536..006290e 100644
--- a/jena-arq/testing/ARQ/Sort/sort-result-3.ttl
+++ b/jena-arq/testing/ARQ/Sort/sort-result-3.ttl
@@ -1,169 +1,169 @@
-@prefix : <http://example/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix rs: <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix : <http://example/> .
+@prefix rs: <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-[] rdf:type rs:ResultSet ;
- rs:resultVariable "v" ;
- rs:resultVariable "x" ;
- rs:solution [ rs:binding [ rs:value :x7 ;
- rs:variable "x"
- ] ;
- rs:binding [ rs:value "xyz"^^xsd:integer ;
- rs:variable "v"
- ] ;
- rs:index 2
- ] ;
- rs:solution [ rs:binding [ rs:value :x9 ;
- rs:variable "x"
- ] ;
- rs:binding [ rs:value [
- ] ;
- rs:variable "v"
- ] ;
- rs:index 20
- ] ;
- rs:solution [ rs:binding [ rs:value :y6 ;
- rs:variable "x"
- ] ;
- rs:binding [ rs:value "abc"^^:unknown ;
- rs:variable "v"
- ] ;
- rs:index 11
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz"^^:unknown ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x8 ;
- rs:variable "x"
- ] ;
- rs:index 3
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz"^^xsd:string ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x6 ;
- rs:variable "x"
- ] ;
- rs:index 1
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz"@EN ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x5 ;
- rs:variable "x"
- ] ;
- rs:index 7
- ] ;
- rs:solution [ rs:binding [ rs:value :z3 ;
- rs:variable "x"
- ] ;
- rs:binding [ rs:value "1"^^xsd:decimal ;
- rs:variable "v"
- ] ;
- rs:index 16
- ] ;
- rs:solution [ rs:binding [ rs:value :x4 ;
- rs:variable "x"
- ] ;
- rs:binding [ rs:value "xyz"@fr ;
- rs:variable "v"
- ] ;
- rs:index 4
- ] ;
- rs:solution [ rs:binding [ rs:value :y1 ;
- rs:variable "x"
- ] ;
- rs:binding [ rs:value "abc" ;
- rs:variable "v"
- ] ;
- rs:index 14
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz" ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x1 ;
- rs:variable "x"
- ] ;
- rs:index 8
- ] ;
- rs:solution [ rs:binding [ rs:value "abc"^^xsd:string ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y4 ;
- rs:variable "x"
- ] ;
- rs:index 9
- ] ;
- rs:solution [ rs:binding [ rs:value "abc"^^xsd:integer ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y5 ;
- rs:variable "x"
- ] ;
- rs:index 10
- ] ;
- rs:solution [ rs:binding [ rs:value :x3 ;
- rs:variable "x"
- ] ;
- rs:binding [ rs:value "xyz"@FR ;
- rs:variable "v"
- ] ;
- rs:index 5
- ] ;
- rs:solution [ rs:binding [ rs:value :x10 ;
- rs:variable "x"
- ] ;
- rs:binding [ rs:value :xyz ;
- rs:variable "v"
- ] ;
- rs:index 18
- ] ;
- rs:solution [ rs:binding [ rs:value :x2 ;
- rs:variable "x"
- ] ;
- rs:binding [ rs:value "xyz"@en ;
- rs:variable "v"
- ] ;
- rs:index 6
- ] ;
- rs:solution [ rs:binding [ rs:value :abc ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y7 ;
- rs:variable "x"
- ] ;
- rs:index 19
- ] ;
- rs:solution [ rs:binding [ rs:value :z1 ;
- rs:variable "x"
- ] ;
- rs:binding [ rs:value 1 ;
- rs:variable "v"
- ] ;
- rs:index 15
- ] ;
- rs:solution [ rs:binding [ rs:value :y3 ;
- rs:variable "x"
- ] ;
- rs:binding [ rs:value "abc"@EN ;
- rs:variable "v"
- ] ;
- rs:index 13
- ] ;
- rs:solution [ rs:binding [ rs:value :z2 ;
- rs:variable "x"
- ] ;
- rs:binding [ rs:value 01 ;
- rs:variable "v"
- ] ;
- rs:index 17
- ] ;
- rs:solution [ rs:binding [ rs:value :y2 ;
- rs:variable "x"
- ] ;
- rs:binding [ rs:value "abc"@en ;
- rs:variable "v"
- ] ;
- rs:index 12
- ] .
+[ a rs:ResultSet ;
+ rs:resultVariable "x" , "v" ;
+ rs:size "20"^^xsd:int ;
+ rs:solution [ rs:binding [ rs:value "abc"^^:unknown ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y6 ;
+ rs:variable "x"
+ ] ;
+ rs:index 10
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"@fr ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x4 ;
+ rs:variable "x"
+ ] ;
+ rs:index 3
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"@EN ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y3 ;
+ rs:variable "x"
+ ] ;
+ rs:index 12
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc" ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y4 ;
+ rs:variable "x"
+ ] ;
+ rs:index 14
+ ] ;
+ rs:solution [ rs:binding [ rs:value [] ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x9 ;
+ rs:variable "x"
+ ] ;
+ rs:index 20
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz" ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x1 ;
+ rs:variable "x"
+ ] ;
+ rs:index 7
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"@en ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x2 ;
+ rs:variable "x"
+ ] ;
+ rs:index 5
+ ] ;
+ rs:solution [ rs:binding [ rs:value :abc ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y7 ;
+ rs:variable "x"
+ ] ;
+ rs:index 19
+ ] ;
+ rs:solution [ rs:binding [ rs:value "1"^^xsd:decimal ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :z3 ;
+ rs:variable "x"
+ ] ;
+ rs:index 16
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"@FR ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x3 ;
+ rs:variable "x"
+ ] ;
+ rs:index 4
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"^^:unknown ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x8 ;
+ rs:variable "x"
+ ] ;
+ rs:index 2
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"^^xsd:integer ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y5 ;
+ rs:variable "x"
+ ] ;
+ rs:index 9
+ ] ;
+ rs:solution [ rs:binding [ rs:value :xyz ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x10 ;
+ rs:variable "x"
+ ] ;
+ rs:index 18
+ ] ;
+ rs:solution [ rs:binding [ rs:value 01 ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :z2 ;
+ rs:variable "x"
+ ] ;
+ rs:index 17
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc" ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y1 ;
+ rs:variable "x"
+ ] ;
+ rs:index 13
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"^^xsd:integer ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x7 ;
+ rs:variable "x"
+ ] ;
+ rs:index 1
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"@en ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y2 ;
+ rs:variable "x"
+ ] ;
+ rs:index 11
+ ] ;
+ rs:solution [ rs:binding [ rs:value 1 ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :z1 ;
+ rs:variable "x"
+ ] ;
+ rs:index 15
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz" ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x6 ;
+ rs:variable "x"
+ ] ;
+ rs:index 8
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"@EN ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x5 ;
+ rs:variable "x"
+ ] ;
+ rs:index 6
+ ]
+] .
http://git-wip-us.apache.org/repos/asf/jena/blob/046d1951/jena-arq/testing/ARQ/Sort/sort-result-3_RDF_10.ttl
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Sort/sort-result-3_RDF_10.ttl b/jena-arq/testing/ARQ/Sort/sort-result-3_RDF_10.ttl
new file mode 100644
index 0000000..d4d7536
--- /dev/null
+++ b/jena-arq/testing/ARQ/Sort/sort-result-3_RDF_10.ttl
@@ -0,0 +1,169 @@
+@prefix : <http://example/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rs: <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+
+[] rdf:type rs:ResultSet ;
+ rs:resultVariable "v" ;
+ rs:resultVariable "x" ;
+ rs:solution [ rs:binding [ rs:value :x7 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "xyz"^^xsd:integer ;
+ rs:variable "v"
+ ] ;
+ rs:index 2
+ ] ;
+ rs:solution [ rs:binding [ rs:value :x9 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value [
+ ] ;
+ rs:variable "v"
+ ] ;
+ rs:index 20
+ ] ;
+ rs:solution [ rs:binding [ rs:value :y6 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "abc"^^:unknown ;
+ rs:variable "v"
+ ] ;
+ rs:index 11
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"^^:unknown ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x8 ;
+ rs:variable "x"
+ ] ;
+ rs:index 3
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"^^xsd:string ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x6 ;
+ rs:variable "x"
+ ] ;
+ rs:index 1
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"@EN ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x5 ;
+ rs:variable "x"
+ ] ;
+ rs:index 7
+ ] ;
+ rs:solution [ rs:binding [ rs:value :z3 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "1"^^xsd:decimal ;
+ rs:variable "v"
+ ] ;
+ rs:index 16
+ ] ;
+ rs:solution [ rs:binding [ rs:value :x4 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "xyz"@fr ;
+ rs:variable "v"
+ ] ;
+ rs:index 4
+ ] ;
+ rs:solution [ rs:binding [ rs:value :y1 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "abc" ;
+ rs:variable "v"
+ ] ;
+ rs:index 14
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz" ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x1 ;
+ rs:variable "x"
+ ] ;
+ rs:index 8
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"^^xsd:string ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y4 ;
+ rs:variable "x"
+ ] ;
+ rs:index 9
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"^^xsd:integer ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y5 ;
+ rs:variable "x"
+ ] ;
+ rs:index 10
+ ] ;
+ rs:solution [ rs:binding [ rs:value :x3 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "xyz"@FR ;
+ rs:variable "v"
+ ] ;
+ rs:index 5
+ ] ;
+ rs:solution [ rs:binding [ rs:value :x10 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value :xyz ;
+ rs:variable "v"
+ ] ;
+ rs:index 18
+ ] ;
+ rs:solution [ rs:binding [ rs:value :x2 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "xyz"@en ;
+ rs:variable "v"
+ ] ;
+ rs:index 6
+ ] ;
+ rs:solution [ rs:binding [ rs:value :abc ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y7 ;
+ rs:variable "x"
+ ] ;
+ rs:index 19
+ ] ;
+ rs:solution [ rs:binding [ rs:value :z1 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value 1 ;
+ rs:variable "v"
+ ] ;
+ rs:index 15
+ ] ;
+ rs:solution [ rs:binding [ rs:value :y3 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "abc"@EN ;
+ rs:variable "v"
+ ] ;
+ rs:index 13
+ ] ;
+ rs:solution [ rs:binding [ rs:value :z2 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value 01 ;
+ rs:variable "v"
+ ] ;
+ rs:index 17
+ ] ;
+ rs:solution [ rs:binding [ rs:value :y2 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "abc"@en ;
+ rs:variable "v"
+ ] ;
+ rs:index 12
+ ] .
http://git-wip-us.apache.org/repos/asf/jena/blob/046d1951/jena-arq/testing/ARQ/Sort/sort-result-3_RDF_11.ttl
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Sort/sort-result-3_RDF_11.ttl b/jena-arq/testing/ARQ/Sort/sort-result-3_RDF_11.ttl
new file mode 100644
index 0000000..006290e
--- /dev/null
+++ b/jena-arq/testing/ARQ/Sort/sort-result-3_RDF_11.ttl
@@ -0,0 +1,169 @@
+@prefix : <http://example/> .
+@prefix rs: <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+
+[ a rs:ResultSet ;
+ rs:resultVariable "x" , "v" ;
+ rs:size "20"^^xsd:int ;
+ rs:solution [ rs:binding [ rs:value "abc"^^:unknown ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y6 ;
+ rs:variable "x"
+ ] ;
+ rs:index 10
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"@fr ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x4 ;
+ rs:variable "x"
+ ] ;
+ rs:index 3
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"@EN ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y3 ;
+ rs:variable "x"
+ ] ;
+ rs:index 12
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc" ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y4 ;
+ rs:variable "x"
+ ] ;
+ rs:index 14
+ ] ;
+ rs:solution [ rs:binding [ rs:value [] ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x9 ;
+ rs:variable "x"
+ ] ;
+ rs:index 20
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz" ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x1 ;
+ rs:variable "x"
+ ] ;
+ rs:index 7
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"@en ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x2 ;
+ rs:variable "x"
+ ] ;
+ rs:index 5
+ ] ;
+ rs:solution [ rs:binding [ rs:value :abc ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y7 ;
+ rs:variable "x"
+ ] ;
+ rs:index 19
+ ] ;
+ rs:solution [ rs:binding [ rs:value "1"^^xsd:decimal ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :z3 ;
+ rs:variable "x"
+ ] ;
+ rs:index 16
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"@FR ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x3 ;
+ rs:variable "x"
+ ] ;
+ rs:index 4
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"^^:unknown ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x8 ;
+ rs:variable "x"
+ ] ;
+ rs:index 2
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"^^xsd:integer ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y5 ;
+ rs:variable "x"
+ ] ;
+ rs:index 9
+ ] ;
+ rs:solution [ rs:binding [ rs:value :xyz ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x10 ;
+ rs:variable "x"
+ ] ;
+ rs:index 18
+ ] ;
+ rs:solution [ rs:binding [ rs:value 01 ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :z2 ;
+ rs:variable "x"
+ ] ;
+ rs:index 17
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc" ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y1 ;
+ rs:variable "x"
+ ] ;
+ rs:index 13
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"^^xsd:integer ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x7 ;
+ rs:variable "x"
+ ] ;
+ rs:index 1
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"@en ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y2 ;
+ rs:variable "x"
+ ] ;
+ rs:index 11
+ ] ;
+ rs:solution [ rs:binding [ rs:value 1 ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :z1 ;
+ rs:variable "x"
+ ] ;
+ rs:index 15
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz" ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x6 ;
+ rs:variable "x"
+ ] ;
+ rs:index 8
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"@EN ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x5 ;
+ rs:variable "x"
+ ] ;
+ rs:index 6
+ ]
+] .
[6/6] jena git commit: RDF 1.0 and 1.1 results
Posted by an...@apache.org.
RDF 1.0 and 1.1 results
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/95b1c7c2
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/95b1c7c2
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/95b1c7c2
Branch: refs/heads/master
Commit: 95b1c7c20b0255715434b820b7c37c667d58a68f
Parents: 6d304fc
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Dec 21 20:07:05 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Dec 21 20:07:05 2014 +0000
----------------------------------------------------------------------
jena-arq/testing/ARQ/Sort/sort-result-2.ttl | 336 +++++++++++------------
jena-arq/testing/ARQ/Sort/sort-result-3.ttl | 336 +++++++++++------------
2 files changed, 336 insertions(+), 336 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/95b1c7c2/jena-arq/testing/ARQ/Sort/sort-result-2.ttl
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Sort/sort-result-2.ttl b/jena-arq/testing/ARQ/Sort/sort-result-2.ttl
index 1ea6049..f9edeb1 100644
--- a/jena-arq/testing/ARQ/Sort/sort-result-2.ttl
+++ b/jena-arq/testing/ARQ/Sort/sort-result-2.ttl
@@ -1,169 +1,169 @@
-@prefix : <http://example/> .
-@prefix rs: <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix : <http://example/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rs: <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-[ a rs:ResultSet ;
- rs:resultVariable "x" , "v" ;
- rs:size "20"^^xsd:int ;
- rs:solution [ rs:binding [ rs:value "1"^^xsd:decimal ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :z3 ;
- rs:variable "x"
- ] ;
- rs:index 5
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz" ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x1 ;
- rs:variable "x"
- ] ;
- rs:index 13
- ] ;
- rs:solution [ rs:binding [ rs:value 1 ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :z1 ;
- rs:variable "x"
- ] ;
- rs:index 6
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz"@FR ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x3 ;
- rs:variable "x"
- ] ;
- rs:index 17
- ] ;
- rs:solution [ rs:binding [ rs:value "abc"@en ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y2 ;
- rs:variable "x"
- ] ;
- rs:index 10
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz" ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x6 ;
- rs:variable "x"
- ] ;
- rs:index 14
- ] ;
- rs:solution [ rs:binding [ rs:value "abc" ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y4 ;
- rs:variable "x"
- ] ;
- rs:index 8
- ] ;
- rs:solution [ rs:binding [ rs:value [] ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x9 ;
- rs:variable "x"
- ] ;
- rs:index 1
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz"@en ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x2 ;
- rs:variable "x"
- ] ;
- rs:index 16
- ] ;
- rs:solution [ rs:binding [ rs:value "abc"^^:unknown ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y6 ;
- rs:variable "x"
- ] ;
- rs:index 11
- ] ;
- rs:solution [ rs:binding [ rs:value "abc" ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y1 ;
- rs:variable "x"
- ] ;
- rs:index 7
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz"^^xsd:integer ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x7 ;
- rs:variable "x"
- ] ;
- rs:index 20
- ] ;
- rs:solution [ rs:binding [ rs:value "abc"@EN ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y3 ;
- rs:variable "x"
- ] ;
- rs:index 9
- ] ;
- rs:solution [ rs:binding [ rs:value :abc ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y7 ;
- rs:variable "x"
- ] ;
- rs:index 2
- ] ;
- rs:solution [ rs:binding [ rs:value 01 ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :z2 ;
- rs:variable "x"
- ] ;
- rs:index 4
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz"@EN ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x5 ;
- rs:variable "x"
- ] ;
- rs:index 15
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz"^^:unknown ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x8 ;
- rs:variable "x"
- ] ;
- rs:index 19
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz"@fr ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x4 ;
- rs:variable "x"
- ] ;
- rs:index 18
- ] ;
- rs:solution [ rs:binding [ rs:value :xyz ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x10 ;
- rs:variable "x"
- ] ;
- rs:index 3
- ] ;
- rs:solution [ rs:binding [ rs:value "abc"^^xsd:integer ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y5 ;
- rs:variable "x"
- ] ;
- rs:index 12
- ]
-] .
+[] rdf:type rs:ResultSet ;
+ rs:resultVariable "v" ;
+ rs:resultVariable "x" ;
+ rs:solution [ rs:binding [ rs:value "abc"@en ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y2 ;
+ rs:variable "x"
+ ] ;
+ rs:index 9
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"^^xsd:string ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x6 ;
+ rs:variable "x"
+ ] ;
+ rs:index 20
+ ] ;
+ rs:solution [ rs:binding [ rs:value :x3 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "xyz"@FR ;
+ rs:variable "v"
+ ] ;
+ rs:index 16
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"^^xsd:integer ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x7 ;
+ rs:variable "x"
+ ] ;
+ rs:index 19
+ ] ;
+ rs:solution [ rs:binding [ rs:value :z3 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "1"^^xsd:decimal ;
+ rs:variable "v"
+ ] ;
+ rs:index 5
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"@en ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x2 ;
+ rs:variable "x"
+ ] ;
+ rs:index 15
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"^^:unknown ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x8 ;
+ rs:variable "x"
+ ] ;
+ rs:index 18
+ ] ;
+ rs:solution [ rs:binding [ rs:value :x4 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "xyz"@fr ;
+ rs:variable "v"
+ ] ;
+ rs:index 17
+ ] ;
+ rs:solution [ rs:binding [ rs:value :y7 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value :abc ;
+ rs:variable "v"
+ ] ;
+ rs:index 2
+ ] ;
+ rs:solution [ rs:binding [ rs:value :x9 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value [
+ ] ;
+ rs:variable "v"
+ ] ;
+ rs:index 1
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"@EN ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y3 ;
+ rs:variable "x"
+ ] ;
+ rs:index 8
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc" ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y1 ;
+ rs:variable "x"
+ ] ;
+ rs:index 7
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"^^xsd:string ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y4 ;
+ rs:variable "x"
+ ] ;
+ rs:index 12
+ ] ;
+ rs:solution [ rs:binding [ rs:value :z2 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value 01 ;
+ rs:variable "v"
+ ] ;
+ rs:index 4
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"@EN ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x5 ;
+ rs:variable "x"
+ ] ;
+ rs:index 14
+ ] ;
+ rs:solution [ rs:binding [ rs:value 1 ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :z1 ;
+ rs:variable "x"
+ ] ;
+ rs:index 6
+ ] ;
+ rs:solution [ rs:binding [ rs:value :xyz ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x10 ;
+ rs:variable "x"
+ ] ;
+ rs:index 3
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"^^:unknown ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y6 ;
+ rs:variable "x"
+ ] ;
+ rs:index 10
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz" ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x1 ;
+ rs:variable "x"
+ ] ;
+ rs:index 13
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"^^xsd:integer ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y5 ;
+ rs:variable "x"
+ ] ;
+ rs:index 11
+ ] .
http://git-wip-us.apache.org/repos/asf/jena/blob/95b1c7c2/jena-arq/testing/ARQ/Sort/sort-result-3.ttl
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Sort/sort-result-3.ttl b/jena-arq/testing/ARQ/Sort/sort-result-3.ttl
index 006290e..d4d7536 100644
--- a/jena-arq/testing/ARQ/Sort/sort-result-3.ttl
+++ b/jena-arq/testing/ARQ/Sort/sort-result-3.ttl
@@ -1,169 +1,169 @@
-@prefix : <http://example/> .
-@prefix rs: <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix : <http://example/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rs: <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-[ a rs:ResultSet ;
- rs:resultVariable "x" , "v" ;
- rs:size "20"^^xsd:int ;
- rs:solution [ rs:binding [ rs:value "abc"^^:unknown ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y6 ;
- rs:variable "x"
- ] ;
- rs:index 10
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz"@fr ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x4 ;
- rs:variable "x"
- ] ;
- rs:index 3
- ] ;
- rs:solution [ rs:binding [ rs:value "abc"@EN ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y3 ;
- rs:variable "x"
- ] ;
- rs:index 12
- ] ;
- rs:solution [ rs:binding [ rs:value "abc" ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y4 ;
- rs:variable "x"
- ] ;
- rs:index 14
- ] ;
- rs:solution [ rs:binding [ rs:value [] ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x9 ;
- rs:variable "x"
- ] ;
- rs:index 20
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz" ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x1 ;
- rs:variable "x"
- ] ;
- rs:index 7
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz"@en ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x2 ;
- rs:variable "x"
- ] ;
- rs:index 5
- ] ;
- rs:solution [ rs:binding [ rs:value :abc ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y7 ;
- rs:variable "x"
- ] ;
- rs:index 19
- ] ;
- rs:solution [ rs:binding [ rs:value "1"^^xsd:decimal ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :z3 ;
- rs:variable "x"
- ] ;
- rs:index 16
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz"@FR ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x3 ;
- rs:variable "x"
- ] ;
- rs:index 4
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz"^^:unknown ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x8 ;
- rs:variable "x"
- ] ;
- rs:index 2
- ] ;
- rs:solution [ rs:binding [ rs:value "abc"^^xsd:integer ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y5 ;
- rs:variable "x"
- ] ;
- rs:index 9
- ] ;
- rs:solution [ rs:binding [ rs:value :xyz ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x10 ;
- rs:variable "x"
- ] ;
- rs:index 18
- ] ;
- rs:solution [ rs:binding [ rs:value 01 ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :z2 ;
- rs:variable "x"
- ] ;
- rs:index 17
- ] ;
- rs:solution [ rs:binding [ rs:value "abc" ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y1 ;
- rs:variable "x"
- ] ;
- rs:index 13
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz"^^xsd:integer ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x7 ;
- rs:variable "x"
- ] ;
- rs:index 1
- ] ;
- rs:solution [ rs:binding [ rs:value "abc"@en ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y2 ;
- rs:variable "x"
- ] ;
- rs:index 11
- ] ;
- rs:solution [ rs:binding [ rs:value 1 ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :z1 ;
- rs:variable "x"
- ] ;
- rs:index 15
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz" ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x6 ;
- rs:variable "x"
- ] ;
- rs:index 8
- ] ;
- rs:solution [ rs:binding [ rs:value "xyz"@EN ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :x5 ;
- rs:variable "x"
- ] ;
- rs:index 6
- ]
-] .
+[] rdf:type rs:ResultSet ;
+ rs:resultVariable "v" ;
+ rs:resultVariable "x" ;
+ rs:solution [ rs:binding [ rs:value :x7 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "xyz"^^xsd:integer ;
+ rs:variable "v"
+ ] ;
+ rs:index 2
+ ] ;
+ rs:solution [ rs:binding [ rs:value :x9 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value [
+ ] ;
+ rs:variable "v"
+ ] ;
+ rs:index 20
+ ] ;
+ rs:solution [ rs:binding [ rs:value :y6 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "abc"^^:unknown ;
+ rs:variable "v"
+ ] ;
+ rs:index 11
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"^^:unknown ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x8 ;
+ rs:variable "x"
+ ] ;
+ rs:index 3
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"^^xsd:string ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x6 ;
+ rs:variable "x"
+ ] ;
+ rs:index 1
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz"@EN ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x5 ;
+ rs:variable "x"
+ ] ;
+ rs:index 7
+ ] ;
+ rs:solution [ rs:binding [ rs:value :z3 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "1"^^xsd:decimal ;
+ rs:variable "v"
+ ] ;
+ rs:index 16
+ ] ;
+ rs:solution [ rs:binding [ rs:value :x4 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "xyz"@fr ;
+ rs:variable "v"
+ ] ;
+ rs:index 4
+ ] ;
+ rs:solution [ rs:binding [ rs:value :y1 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "abc" ;
+ rs:variable "v"
+ ] ;
+ rs:index 14
+ ] ;
+ rs:solution [ rs:binding [ rs:value "xyz" ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :x1 ;
+ rs:variable "x"
+ ] ;
+ rs:index 8
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"^^xsd:string ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y4 ;
+ rs:variable "x"
+ ] ;
+ rs:index 9
+ ] ;
+ rs:solution [ rs:binding [ rs:value "abc"^^xsd:integer ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y5 ;
+ rs:variable "x"
+ ] ;
+ rs:index 10
+ ] ;
+ rs:solution [ rs:binding [ rs:value :x3 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "xyz"@FR ;
+ rs:variable "v"
+ ] ;
+ rs:index 5
+ ] ;
+ rs:solution [ rs:binding [ rs:value :x10 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value :xyz ;
+ rs:variable "v"
+ ] ;
+ rs:index 18
+ ] ;
+ rs:solution [ rs:binding [ rs:value :x2 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "xyz"@en ;
+ rs:variable "v"
+ ] ;
+ rs:index 6
+ ] ;
+ rs:solution [ rs:binding [ rs:value :abc ;
+ rs:variable "v"
+ ] ;
+ rs:binding [ rs:value :y7 ;
+ rs:variable "x"
+ ] ;
+ rs:index 19
+ ] ;
+ rs:solution [ rs:binding [ rs:value :z1 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value 1 ;
+ rs:variable "v"
+ ] ;
+ rs:index 15
+ ] ;
+ rs:solution [ rs:binding [ rs:value :y3 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "abc"@EN ;
+ rs:variable "v"
+ ] ;
+ rs:index 13
+ ] ;
+ rs:solution [ rs:binding [ rs:value :z2 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value 01 ;
+ rs:variable "v"
+ ] ;
+ rs:index 17
+ ] ;
+ rs:solution [ rs:binding [ rs:value :y2 ;
+ rs:variable "x"
+ ] ;
+ rs:binding [ rs:value "abc"@en ;
+ rs:variable "v"
+ ] ;
+ rs:index 12
+ ] .
[5/6] jena git commit: RDF 1.0 and 1.1 results
Posted by an...@apache.org.
RDF 1.0 and 1.1 results
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6d304fc2
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6d304fc2
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6d304fc2
Branch: refs/heads/master
Commit: 6d304fc28177129ba3657cc35b270dbc6585783a
Parents: 046d195
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Dec 21 20:04:14 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Dec 21 20:05:03 2014 +0000
----------------------------------------------------------------------
.../ARQ/BasicPatterns/result-B-01-RDF_10.n3 | 19 ++++
.../ARQ/BasicPatterns/result-B-01-RDF_11.n3 | 24 ++++
.../ARQ/Distinct/distinct-all_RDF_10.srx | 111 +++++++++++++++++++
.../ARQ/Distinct/distinct-all_RDF_11.srx | 93 ++++++++++++++++
.../ARQ/Distinct/distinct-str_RDF_10.srx | 56 ++++++++++
.../ARQ/Distinct/distinct-str_RDF_11.srx | 38 +++++++
jena-arq/testing/ARQ/SPARQL11_RDF11.txt | 24 ++++
jena-arq/testing/DAWG-Final/SPARQL11_RDF11.txt | 15 +++
.../DAWG-Final/distinct/distinct-all_RDF_10.srx | 111 +++++++++++++++++++
.../DAWG-Final/distinct/distinct-all_RDF_11.srx | 93 ++++++++++++++++
.../DAWG-Final/distinct/distinct-str_RDF_10.srx | 56 ++++++++++
.../DAWG-Final/distinct/distinct-str_RDF_11.srx | 38 +++++++
12 files changed, 678 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/ARQ/BasicPatterns/result-B-01-RDF_10.n3
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-01-RDF_10.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-01-RDF_10.n3
new file mode 100644
index 0000000..cadd099
--- /dev/null
+++ b/jena-arq/testing/ARQ/BasicPatterns/result-B-01-RDF_10.n3
@@ -0,0 +1,19 @@
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rs: <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
+
+[] rdf:type rs:ResultSet ;
+ rs:resultVariable "x" ;
+ rs:resultVariable "y" ;
+ rs:size "0" ;
+
+## Exact graph match - "string" != "string"^^xsd:string
+
+## rs:size "1" ;
+## rs:solution
+## [ rdf:type rs:ResultSolution ;
+## rs:binding [ rdf:type rs:ResultBinding ;
+## rs:variable "x" ; rs:value <http://rdf.hp.com/r> ] ;
+## rs:binding [ rdf:type rs:ResultBinding ;
+## rs:variable "y" ; rs:value <http://rdf.hp.com/p1> ] ;
+## ] ;
+ .
http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/ARQ/BasicPatterns/result-B-01-RDF_11.n3
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-01-RDF_11.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-01-RDF_11.n3
new file mode 100644
index 0000000..df95b9e
--- /dev/null
+++ b/jena-arq/testing/ARQ/BasicPatterns/result-B-01-RDF_11.n3
@@ -0,0 +1,24 @@
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rs: <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
+
+## RDF 1.-0 results.
+## [] rdf:type rs:ResultSet ;
+## rs:resultVariable "x" ;
+## rs:resultVariable "y" ;
+## rs:size "0" ;
+
+## Exact graph match - "string" != "string"^^xsd:string
+
+## RDF 1.1
+[] rdf:type rs:ResultSet ;
+ rs:resultVariable "x" ;
+ rs:resultVariable "y" ;
+ rs:size "1" ;
+ rs:solution
+ [ rdf:type rs:ResultSolution ;
+ rs:binding [ rdf:type rs:ResultBinding ;
+ rs:variable "x" ; rs:value <http://rdf.hp.com/r> ] ;
+ rs:binding [ rdf:type rs:ResultBinding ;
+ rs:variable "y" ; rs:value <http://rdf.hp.com/p1> ] ;
+ ] ;
+ .
http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/ARQ/Distinct/distinct-all_RDF_10.srx
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Distinct/distinct-all_RDF_10.srx b/jena-arq/testing/ARQ/Distinct/distinct-all_RDF_10.srx
new file mode 100644
index 0000000..963d208
--- /dev/null
+++ b/jena-arq/testing/ARQ/Distinct/distinct-all_RDF_10.srx
@@ -0,0 +1,111 @@
+<?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="v"/>
+ </head>
+ <results>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#float">1.3e0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en">ABC</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#integer">+1</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">01.0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal>ABC</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#integer">01</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">+1.0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en">abc</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en"></literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">1.0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <bnode>b0</bnode>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <uri>http://example/z1</uri>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal>abc</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal></literal>
+ </binding>
+ </result>
+ </results>
+</sparql>
http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/ARQ/Distinct/distinct-all_RDF_11.srx
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Distinct/distinct-all_RDF_11.srx b/jena-arq/testing/ARQ/Distinct/distinct-all_RDF_11.srx
new file mode 100644
index 0000000..aff9f9d
--- /dev/null
+++ b/jena-arq/testing/ARQ/Distinct/distinct-all_RDF_11.srx
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<sparql xmlns="http://www.w3.org/2005/sparql-results#">
+ <head>
+ <variable name="v"/>
+ </head>
+ <results>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#integer">+1</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString">ABC</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">01.0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString">abc</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">1.0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#float">1.3e0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#integer">01</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"></literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">+1.0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <bnode>b0</bnode>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <uri>http://example/z1</uri>
+ </binding>
+ </result>
+ </results>
+</sparql>
http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/ARQ/Distinct/distinct-str_RDF_10.srx
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Distinct/distinct-str_RDF_10.srx b/jena-arq/testing/ARQ/Distinct/distinct-str_RDF_10.srx
new file mode 100644
index 0000000..a836754
--- /dev/null
+++ b/jena-arq/testing/ARQ/Distinct/distinct-str_RDF_10.srx
@@ -0,0 +1,56 @@
+<?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="v"/>
+ </head>
+ <results>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en">ABC</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal>ABC</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en">abc</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en"></literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal>abc</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal></literal>
+ </binding>
+ </result>
+ </results>
+</sparql>
http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/ARQ/Distinct/distinct-str_RDF_11.srx
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Distinct/distinct-str_RDF_11.srx b/jena-arq/testing/ARQ/Distinct/distinct-str_RDF_11.srx
new file mode 100644
index 0000000..b4cb595
--- /dev/null
+++ b/jena-arq/testing/ARQ/Distinct/distinct-str_RDF_11.srx
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<sparql xmlns="http://www.w3.org/2005/sparql-results#">
+ <head>
+ <variable name="v"/>
+ </head>
+ <results>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString">ABC</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString">abc</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"></literal>
+ </binding>
+ </result>
+ </results>
+</sparql>
http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/ARQ/SPARQL11_RDF11.txt
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/SPARQL11_RDF11.txt b/jena-arq/testing/ARQ/SPARQL11_RDF11.txt
new file mode 100644
index 0000000..f48fdfa
--- /dev/null
+++ b/jena-arq/testing/ARQ/SPARQL11_RDF11.txt
@@ -0,0 +1,24 @@
+The following changes are needed for RDF 1.1 where xsd:strings and simple
+literals are the same term.
+
+In both case, the results are alterted. See the two results files
+("RDF_11", "RDF_10"); copy the right one to the base results file.
+the appropriate one to the on used by the
+
+1/ BasicPatterns/test-B-01
+
+2/ ARQ/Sort/sort-2.rq => sort-result-2.ttl
+3/ ARQ/Sort/sort-3.rq => sort-result-3.ttl
+
+query and results changed (data must be changed for stable results).
+
+
+4/ "Strings: Distinct"
+ARQ/Distinct/
+ distinct-1.rq + <data-str.ttl>
+ => distinct-str.srx
+
+5/ "All: Distinct"
+ARQ/Distinct/
+ distinct-1.rq + <data-num.ttl> , <data-str.ttl> , <data-node.ttl>
+ => <distinct-all.srx>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/DAWG-Final/SPARQL11_RDF11.txt
----------------------------------------------------------------------
diff --git a/jena-arq/testing/DAWG-Final/SPARQL11_RDF11.txt b/jena-arq/testing/DAWG-Final/SPARQL11_RDF11.txt
new file mode 100644
index 0000000..a491417
--- /dev/null
+++ b/jena-arq/testing/DAWG-Final/SPARQL11_RDF11.txt
@@ -0,0 +1,15 @@
+RDF 1.1 makes
+ simple literals and xsd:strings the same term.
+
+The following changes are needed to the DAWG test suite:
+
+
+
+Changes due to SPARQL 1.1
+SPARQL 1.1:
+ 18. => 18.0
+
+syntax-sparql1/syntax-lit-08.rq
+basic/term-6.rq
+basic/term-7.rq
+basic/data-4.ttl
http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/DAWG-Final/distinct/distinct-all_RDF_10.srx
----------------------------------------------------------------------
diff --git a/jena-arq/testing/DAWG-Final/distinct/distinct-all_RDF_10.srx b/jena-arq/testing/DAWG-Final/distinct/distinct-all_RDF_10.srx
new file mode 100644
index 0000000..963d208
--- /dev/null
+++ b/jena-arq/testing/DAWG-Final/distinct/distinct-all_RDF_10.srx
@@ -0,0 +1,111 @@
+<?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="v"/>
+ </head>
+ <results>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#float">1.3e0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en">ABC</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#integer">+1</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">01.0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal>ABC</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#integer">01</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">+1.0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en">abc</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en"></literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">1.0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <bnode>b0</bnode>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <uri>http://example/z1</uri>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal>abc</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal></literal>
+ </binding>
+ </result>
+ </results>
+</sparql>
http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/DAWG-Final/distinct/distinct-all_RDF_11.srx
----------------------------------------------------------------------
diff --git a/jena-arq/testing/DAWG-Final/distinct/distinct-all_RDF_11.srx b/jena-arq/testing/DAWG-Final/distinct/distinct-all_RDF_11.srx
new file mode 100644
index 0000000..aff9f9d
--- /dev/null
+++ b/jena-arq/testing/DAWG-Final/distinct/distinct-all_RDF_11.srx
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<sparql xmlns="http://www.w3.org/2005/sparql-results#">
+ <head>
+ <variable name="v"/>
+ </head>
+ <results>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#integer">+1</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString">ABC</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.3e0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">01.0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString">abc</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#double">1.0e0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">1.0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#float">1.3e0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#integer">01</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"></literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#decimal">+1.0</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <bnode>b0</bnode>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <uri>http://example/z1</uri>
+ </binding>
+ </result>
+ </results>
+</sparql>
http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/DAWG-Final/distinct/distinct-str_RDF_10.srx
----------------------------------------------------------------------
diff --git a/jena-arq/testing/DAWG-Final/distinct/distinct-str_RDF_10.srx b/jena-arq/testing/DAWG-Final/distinct/distinct-str_RDF_10.srx
new file mode 100644
index 0000000..a836754
--- /dev/null
+++ b/jena-arq/testing/DAWG-Final/distinct/distinct-str_RDF_10.srx
@@ -0,0 +1,56 @@
+<?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="v"/>
+ </head>
+ <results>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en">ABC</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal>ABC</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en">abc</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en"></literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal>abc</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal></literal>
+ </binding>
+ </result>
+ </results>
+</sparql>
http://git-wip-us.apache.org/repos/asf/jena/blob/6d304fc2/jena-arq/testing/DAWG-Final/distinct/distinct-str_RDF_11.srx
----------------------------------------------------------------------
diff --git a/jena-arq/testing/DAWG-Final/distinct/distinct-str_RDF_11.srx b/jena-arq/testing/DAWG-Final/distinct/distinct-str_RDF_11.srx
new file mode 100644
index 0000000..b4cb595
--- /dev/null
+++ b/jena-arq/testing/DAWG-Final/distinct/distinct-str_RDF_11.srx
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<sparql xmlns="http://www.w3.org/2005/sparql-results#">
+ <head>
+ <variable name="v"/>
+ </head>
+ <results>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString">ABC</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string"></literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString">abc</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string">abc</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal datatype="http://www.w3.org/2001/XMLSchema#string">ABC</literal>
+ </binding>
+ </result>
+ <result>
+ <binding name="v">
+ <literal xml:lang="en" datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"></literal>
+ </binding>
+ </result>
+ </results>
+</sparql>
[3/6] jena git commit: :index generation should be xsd:integer
Posted by an...@apache.org.
:index generation should be xsd:integer
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ef33e52e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ef33e52e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ef33e52e
Branch: refs/heads/master
Commit: ef33e52ed6247ba72aa68d2542ba36d8b5a05f7e
Parents: b94290f
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Dec 21 19:59:33 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Dec 21 19:59:33 2014 +0000
----------------------------------------------------------------------
.../main/java/com/hp/hpl/jena/sparql/resultset/RDFOutput.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ef33e52e/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/RDFOutput.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/RDFOutput.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/RDFOutput.java
index c0fa973..7759a9f 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/RDFOutput.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/RDFOutput.java
@@ -82,8 +82,10 @@ public class RDFOutput
if ( includeTypeProperties )
thisSolution.addProperty(RDF.type, ResultSetGraphVocab.ResultSolution) ;
results.addProperty(ResultSetGraphVocab.solution, thisSolution) ;
- if ( false )
- results.addLiteral(ResultSetGraphVocab.index, count) ;
+ if ( false ) { // IFF query was completely sorted
+ Literal x = model.createTypedLiteral(count+"",XSDDatatype.XSDinteger) ;
+ thisSolution.addLiteral(ResultSetGraphVocab.index, x) ;
+ }
Iterator<String> iter = getAllVars() ?
rBind.varNames() :
[2/6] jena git commit: Remove file
Posted by an...@apache.org.
Remove file
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b94290f2
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b94290f2
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b94290f2
Branch: refs/heads/master
Commit: b94290f2b5ffc55346e242e9b76e5ac20bcdcc54
Parents: b8200ec
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Dec 21 19:58:23 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Dec 21 19:58:23 2014 +0000
----------------------------------------------------------------------
jena-arq/testing/DAWG-Final/AFS.txt | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b94290f2/jena-arq/testing/DAWG-Final/AFS.txt
----------------------------------------------------------------------
diff --git a/jena-arq/testing/DAWG-Final/AFS.txt b/jena-arq/testing/DAWG-Final/AFS.txt
deleted file mode 100644
index bfe632f..0000000
--- a/jena-arq/testing/DAWG-Final/AFS.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Changes:
-SPARQL 1.1:
- 18. => 18.0
-
-syntax-sparql1/syntax-lit-08.rq
-basic/term-6.rq
-basic/term-7.rq
-basic/data-4.ttl