Thread: [Bigdata-commit] SF.net SVN: bigdata:[7877] branches/RDR/bigdata-rdf/src

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7877
          http://sourceforge.net/p/bigdata/code/7877
Author:   thompsonbry
Date:     2014-02-23 23:24:57 +0000 (Sun, 23 Feb 2014)
Log Message:
-----------
Bug fix for #816 (static analysis of SERVICE ignores variables declared in the SERVICE's graph pattern).

Modified Paths:
--------------
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StaticAnalysis.java
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StaticAnalysisBase.java
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/TestStaticAnalysis.java

Modified: branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StaticAnalysis.java
===================================================================

--- branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StaticAnalysis.java	2014-02-23 12:15:58 UTC (rev 7876)
+++ branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StaticAnalysis.java	2014-02-23 23:24:57 UTC (rev 7877)
@@ -1547,7 +1547,11 @@
     /**
      * Report "MUST" bound bindings projected by the SERVICE. This involves
      * checking the graph pattern reported by
-     * {@link ServiceNode#getGraphPattern()} .
+     * {@link ServiceNode#getGraphPattern()}.
+     * <p>
+     * Note: If the SERVICE URI is a variable, then it can only become bound
+     * through some other operation. If the SERVICE variable never becomes
+     * bound, then the SERVICE call can not run.
      */
     // MUST : ServiceNode
     public Set<IVariable<?>> getDefinitelyProducedBindings(

Modified: branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StaticAnalysisBase.java
===================================================================
--- branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StaticAnalysisBase.java	2014-02-23 12:15:58 UTC (rev 7876)
+++ branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StaticAnalysisBase.java	2014-02-23 23:24:57 UTC (rev 7877)
@@ -38,8 +38,8 @@
 import com.bigdata.bop.IConstant;
 import com.bigdata.bop.IVariable;
 import com.bigdata.rdf.sparql.ast.eval.IEvaluationContext;
+import com.bigdata.rdf.sparql.ast.service.ServiceNode;
 import com.bigdata.rdf.sparql.ast.ssets.ISolutionSetManager;
-import com.bigdata.rdf.store.ITripleStore;
 
 /**
  * Base class for static analysis.
@@ -171,7 +171,26 @@
         	
         	// do not recurse
         	return varSet;
-        	
+
+        } else if (op instanceof ServiceNode) {
+
+            // @see http://trac.bigdata.com/ticket/816
+            final ServiceNode serviceNode = (ServiceNode) op;
+            
+            // Look for the SERVICE URI, it might be a variable as well.
+            final TermNode uriRef = serviceNode.getServiceRef();
+
+            if (uriRef instanceof VarNode) {
+
+                varSet.add(((VarNode) uriRef).getValueExpression());
+
+            }
+
+            // pick up anything in the group graph pattern.
+            getSpannedVariables(serviceNode.getGraphPattern(), filters, varSet);
+
+            // fall through - look for attached filters.
+
         } else if (op instanceof FilterNode && !filters) {
 
             // DO NOT RECURSE INTO THE FILTER!

Modified: branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/TestStaticAnalysis.java
===================================================================
--- branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/TestStaticAnalysis.java	2014-02-23 12:15:58 UTC (rev 7876)
+++ branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/TestStaticAnalysis.java	2014-02-23 23:24:57 UTC (rev 7877)
@@ -270,6 +270,70 @@
     }
 
     /**
+     * Unit test of static analysis for a SERVICE call.
+     * 
+     * @see <a href="http://trac.bigdata.com/ticket/816" > Wildcard projection
+     *      ignores variables inside a SERVICE call </a>
+     */
+    public void test_static_analysis05()
+            throws MalformedQueryException {
+
+        final String queryStr = "" +
+                "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"+
+                "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"+
+                "PREFIX foaf: <http://xmlns.com/foaf/0.1/> \n"+
+                "select ?x (12 as ?y)\n" +
+                " where {\n" +
+                "    service ?uri {\n" +
+                "      ?x rdf:type foaf:Person .\n" +
+                "      ?x rdfs:label ?z .\n" +
+                "    }\n" +
+                "}";
+
+        final QueryRoot queryRoot = new Bigdata2ASTSPARQLParser(store)
+                .parseQuery2(queryStr, baseURI).getOriginalAST();
+        
+        final StaticAnalysis sa = new StaticAnalysis(queryRoot);
+        
+        final Set<IVariable<?>> expectedProjected = new LinkedHashSet<IVariable<?>>();
+        
+        expectedProjected.add(Var.var("x"));
+        expectedProjected.add(Var.var("y"));
+        
+        assertEquals(expectedProjected, sa.getDefinitelyProducedBindings(queryRoot));
+
+        // The spanned variables includes the SERVICE URI (if it is a variable).
+        {
+
+            final Set<IVariable<?>> expectedWhereClause = new LinkedHashSet<IVariable<?>>();
+
+            expectedWhereClause.add(Var.var("uri"));
+            expectedWhereClause.add(Var.var("x"));
+            expectedWhereClause.add(Var.var("z"));
+
+            assertEquals(expectedWhereClause, sa.getSpannedVariables(
+                    queryRoot.getWhereClause(),
+                    new LinkedHashSet<IVariable<?>>()));
+        }
+
+        // The definitely bound variables does NOT include the SERVICE URI. When
+        // that is a variable it needs to become bound through other means.
+        {
+
+            final Set<IVariable<?>> expectedWhereClause = new LinkedHashSet<IVariable<?>>();
+
+            expectedWhereClause.add(Var.var("x"));
+            expectedWhereClause.add(Var.var("z"));
+
+            assertEquals(expectedWhereClause, sa.getDefinitelyProducedBindings(
+                    queryRoot.getWhereClause(),
+                    new LinkedHashSet<IVariable<?>>(), true/* recursive */));
+
+        }
+
+    }
+
+    /**
      * Unit test for computing the join variables for a named subquery based on
      * the analysis of the bindings which MUST be produced by the subquery and
      * those which MUST be bound on entry into the group in which the subquery

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [Bigdata-commit] SF.net SVN: bigdata:[7877] branches/RDR/bigdata-rdf/src

Fast, scalable, robust graph database platform

bigdata-commit