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 2012/03/26 12:39:26 UTC
svn commit: r1305300 - in
/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main:
OpExecutor.java iterator/QueryIterGraph.java
Author: andy
Date: Mon Mar 26 10:39:25 2012
New Revision: 1305300
URL: http://svn.apache.org/viewvc?rev=1305300&view=rev
Log:
Fix execution of paths inside GRAPH when using a triples/quad store.
Modified:
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/iterator/QueryIterGraph.java
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java?rev=1305300&r1=1305299&r2=1305300&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/OpExecutor.java Mon Mar 26 10:39:25 2012
@@ -305,17 +305,17 @@ public class OpExecutor
private QueryIterator specialcase(Node gn, Op subOp, QueryIterator input)
{
- // This is a placeholder fro code to specially handle explicitly named
+ // This is a placeholder for code to specially handle explicitly named
// default graph and union graph.
- if ( true ) return null ;
-
- if ( gn == Quad.defaultGraphIRI || gn == Quad.defaultGraphNodeGenerated )
+ if ( Quad.isDefaultGraph(gn) )
{
ExecutionContext cxt2 = new ExecutionContext(execCxt, execCxt.getDataset().getDefaultGraph()) ;
return execute(subOp, cxt2) ;
}
+ if ( true ) return null ;
+
if ( gn == Quad.unionGraph )
{}
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/iterator/QueryIterGraph.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/iterator/QueryIterGraph.java?rev=1305300&r1=1305299&r2=1305300&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/iterator/QueryIterGraph.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/com/hp/hpl/jena/sparql/engine/main/iterator/QueryIterGraph.java Mon Mar 26 10:39:25 2012
@@ -179,7 +179,7 @@ public class QueryIterGraph extends Quer
// We can't just use DatasetGraph.getGraph because it may "auto-create" graphs.
// Use the containsGraph function.
- boolean syntheticGraph = ( Quad.isDefaultGraphExplicit(graphNode) || Quad.isUnionGraph(graphNode) ) ;
+ boolean syntheticGraph = ( Quad.isDefaultGraph(graphNode) || Quad.isUnionGraph(graphNode) ) ;
if ( ! syntheticGraph && ! outerCxt.getDataset().containsGraph(graphNode) )
return null ;