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 2013/01/24 16:06:51 UTC
svn commit: r1438037 - in /jena/trunk/jena-arq:
src/main/java/org/apache/jena/riot/system/StreamRDFLib.java
testing/ARQ/Sort/data-3.ttl testing/ARQ/Sort/sort-result-2.ttl
testing/ARQ/Sort/sort-result-3.ttl
Author: andy
Date: Thu Jan 24 15:06:50 2013
New Revision: 1438037
URL: http://svn.apache.org/viewvc?rev=1438037&view=rev
Log:
Remove non-determinism in tests (sorting in the presence of >1 bnode)
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java
jena/trunk/jena-arq/testing/ARQ/Sort/data-3.ttl
jena/trunk/jena-arq/testing/ARQ/Sort/sort-result-2.ttl
jena/trunk/jena-arq/testing/ARQ/Sort/sort-result-3.ttl
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java?rev=1438037&r1=1438036&r2=1438037&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFLib.java Thu Jan 24 15:06:50 2013
@@ -21,8 +21,6 @@ package org.apache.jena.riot.system;
import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.atlas.lib.Tuple ;
import org.apache.jena.riot.lang.RDFParserOutputCounting ;
-import org.apache.jena.riot.lang.RDFParserOutputIterator;
-import org.apache.jena.riot.lang.StreamedTriplesIterator;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
@@ -68,18 +66,6 @@ public class StreamRDFLib
public static RDFParserOutputCounting count(StreamRDF other)
{ return new ParserOutputCountingBase(other) ; }
-// private static class ParserOutputSink implements StreamRDF
-// {
-// public ParserOutputSink () {}
-// @Override public void start() {}
-// @Override public void triple(Triple triple) {}
-// @Override public void quad(Quad quad) {}
-// @Override public void tuple(Tuple<Node> tuple) {}
-// @Override public void base(String base) {}
-// @Override public void prefix(String prefix, String iri) {}
-// @Override public void finish() {}
-// }
-
private static class ParserOutputSinkTriplesToQuads extends StreamRDFWrapper
{
private final Node gn ;
@@ -89,7 +75,6 @@ public class StreamRDFLib
@Override public void triple(Triple triple)
{ sink.quad(new Quad(gn, triple)) ; }
}
-
private static class ParserOutputSinkTriples extends StreamRDFBase
{
Modified: jena/trunk/jena-arq/testing/ARQ/Sort/data-3.ttl
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/testing/ARQ/Sort/data-3.ttl?rev=1438037&r1=1438036&r2=1438037&view=diff
==============================================================================
--- jena/trunk/jena-arq/testing/ARQ/Sort/data-3.ttl (original)
+++ jena/trunk/jena-arq/testing/ARQ/Sort/data-3.ttl Thu Jan 24 15:06:50 2013
@@ -18,8 +18,7 @@
:y4 :q "abc"^^xsd:string .
:y5 :q "abc"^^xsd:integer .
:y6 :q "abc"^^:unknown .
-:y7 :q _:abc .
-:y8 :q :abc .
+:y7 :q :abc .
:z1 :r 1 .
:z2 :r 01 .
Modified: jena/trunk/jena-arq/testing/ARQ/Sort/sort-result-2.ttl
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/testing/ARQ/Sort/sort-result-2.ttl?rev=1438037&r1=1438036&r2=1438037&view=diff
==============================================================================
--- jena/trunk/jena-arq/testing/ARQ/Sort/sort-result-2.ttl (original)
+++ jena/trunk/jena-arq/testing/ARQ/Sort/sort-result-2.ttl Thu Jan 24 15:06:50 2013
@@ -12,7 +12,7 @@
rs:binding [ rs:value :y2 ;
rs:variable "x"
] ;
- rs:index 10
+ rs:index 9
] ;
rs:solution [ rs:binding [ rs:value "xyz"^^xsd:string ;
rs:variable "v"
@@ -20,7 +20,7 @@
rs:binding [ rs:value :x6 ;
rs:variable "x"
] ;
- rs:index 21
+ rs:index 20
] ;
rs:solution [ rs:binding [ rs:value :x3 ;
rs:variable "x"
@@ -28,7 +28,7 @@
rs:binding [ rs:value "xyz"@FR ;
rs:variable "v"
] ;
- rs:index 17
+ rs:index 16
] ;
rs:solution [ rs:binding [ rs:value "xyz"^^xsd:integer ;
rs:variable "v"
@@ -36,7 +36,7 @@
rs:binding [ rs:value :x7 ;
rs:variable "x"
] ;
- rs:index 20
+ rs:index 19
] ;
rs:solution [ rs:binding [ rs:value :z3 ;
rs:variable "x"
@@ -44,7 +44,7 @@
rs:binding [ rs:value "1"^^xsd:decimal ;
rs:variable "v"
] ;
- rs:index 6
+ rs:index 5
] ;
rs:solution [ rs:binding [ rs:value "xyz"@en ;
rs:variable "v"
@@ -52,7 +52,7 @@
rs:binding [ rs:value :x2 ;
rs:variable "x"
] ;
- rs:index 16
+ rs:index 15
] ;
rs:solution [ rs:binding [ rs:value "xyz"^^:unknown ;
rs:variable "v"
@@ -60,7 +60,7 @@
rs:binding [ rs:value :x8 ;
rs:variable "x"
] ;
- rs:index 19
+ rs:index 18
] ;
rs:solution [ rs:binding [ rs:value :x4 ;
rs:variable "x"
@@ -68,24 +68,15 @@
rs:binding [ rs:value "xyz"@fr ;
rs:variable "v"
] ;
- rs:index 18
- ] ;
- rs:solution [ rs:binding [ rs:value [
- ] ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y7 ;
- rs:variable "x"
- ] ;
- rs:index 1
+ rs:index 17
] ;
- rs:solution [ rs:binding [ rs:value :y8 ;
+ rs:solution [ rs:binding [ rs:value :y7 ;
rs:variable "x"
] ;
rs:binding [ rs:value :abc ;
rs:variable "v"
] ;
- rs:index 3
+ rs:index 2
] ;
rs:solution [ rs:binding [ rs:value :x9 ;
rs:variable "x"
@@ -94,7 +85,7 @@
] ;
rs:variable "v"
] ;
- rs:index 2
+ rs:index 1
] ;
rs:solution [ rs:binding [ rs:value "abc"@EN ;
rs:variable "v"
@@ -102,7 +93,7 @@
rs:binding [ rs:value :y3 ;
rs:variable "x"
] ;
- rs:index 9
+ rs:index 8
] ;
rs:solution [ rs:binding [ rs:value "abc" ;
rs:variable "v"
@@ -110,7 +101,7 @@
rs:binding [ rs:value :y1 ;
rs:variable "x"
] ;
- rs:index 8
+ rs:index 7
] ;
rs:solution [ rs:binding [ rs:value "abc"^^xsd:string ;
rs:variable "v"
@@ -118,7 +109,7 @@
rs:binding [ rs:value :y4 ;
rs:variable "x"
] ;
- rs:index 13
+ rs:index 12
] ;
rs:solution [ rs:binding [ rs:value :z2 ;
rs:variable "x"
@@ -126,7 +117,7 @@
rs:binding [ rs:value 01 ;
rs:variable "v"
] ;
- rs:index 5
+ rs:index 4
] ;
rs:solution [ rs:binding [ rs:value "xyz"@EN ;
rs:variable "v"
@@ -134,7 +125,7 @@
rs:binding [ rs:value :x5 ;
rs:variable "x"
] ;
- rs:index 15
+ rs:index 14
] ;
rs:solution [ rs:binding [ rs:value 1 ;
rs:variable "v"
@@ -142,7 +133,7 @@
rs:binding [ rs:value :z1 ;
rs:variable "x"
] ;
- rs:index 7
+ rs:index 6
] ;
rs:solution [ rs:binding [ rs:value :xyz ;
rs:variable "v"
@@ -150,7 +141,7 @@
rs:binding [ rs:value :x10 ;
rs:variable "x"
] ;
- rs:index 4
+ rs:index 3
] ;
rs:solution [ rs:binding [ rs:value "abc"^^:unknown ;
rs:variable "v"
@@ -158,7 +149,7 @@
rs:binding [ rs:value :y6 ;
rs:variable "x"
] ;
- rs:index 11
+ rs:index 10
] ;
rs:solution [ rs:binding [ rs:value "xyz" ;
rs:variable "v"
@@ -166,7 +157,7 @@
rs:binding [ rs:value :x1 ;
rs:variable "x"
] ;
- rs:index 14
+ rs:index 13
] ;
rs:solution [ rs:binding [ rs:value "abc"^^xsd:integer ;
rs:variable "v"
@@ -174,5 +165,5 @@
rs:binding [ rs:value :y5 ;
rs:variable "x"
] ;
- rs:index 12
+ rs:index 11
] .
Modified: jena/trunk/jena-arq/testing/ARQ/Sort/sort-result-3.ttl
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/testing/ARQ/Sort/sort-result-3.ttl?rev=1438037&r1=1438036&r2=1438037&view=diff
==============================================================================
--- jena/trunk/jena-arq/testing/ARQ/Sort/sort-result-3.ttl (original)
+++ jena/trunk/jena-arq/testing/ARQ/Sort/sort-result-3.ttl Thu Jan 24 15:06:50 2013
@@ -14,15 +14,6 @@
] ;
rs:index 2
] ;
- rs:solution [ rs:binding [ rs:value [
- ] ;
- rs:variable "v"
- ] ;
- rs:binding [ rs:value :y7 ;
- rs:variable "x"
- ] ;
- rs:index 21
- ] ;
rs:solution [ rs:binding [ rs:value :x9 ;
rs:variable "x"
] ;
@@ -139,7 +130,7 @@
rs:solution [ rs:binding [ rs:value :abc ;
rs:variable "v"
] ;
- rs:binding [ rs:value :y8 ;
+ rs:binding [ rs:value :y7h ;
rs:variable "x"
] ;
rs:index 19