[Bigdata-commit] SF.net SVN: bigdata:[4131] branches/QUADS_QUERY_BRANCH/bigdata

[<tho...@us...>]

Revision: 4131
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4131&view=rev
Author:   thompsonbry
Date:     2011-01-19 21:21:03 +0000 (Wed, 19 Jan 2011)

Log Message:
-----------
Turned off backchain() for the named and default graph expanders since inference is not compatible with quads and those expanders were only ever used in quads mode.  

Backchain access path support has not made it into the new query engine yet.  I've filed an issue [1] for this and also added some javadoc notes on IAccessPathExpander and RDFJoinNexus concerning 

[1] https://sourceforge.net/apps/trac/bigdata/ticket/231

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/relation/rule/IAccessPathExpander.java
    branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/rules/RDFJoinNexus.java
    branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/DefaultGraphSolutionExpander.java
    branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/NamedGraphSolutionExpander.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/relation/rule/IAccessPathExpander.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/relation/rule/IAccessPathExpander.java	2011-01-19 18:34:43 UTC (rev 4130)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/relation/rule/IAccessPathExpander.java	2011-01-19 21:21:03 UTC (rev 4131)
@@ -54,19 +54,24 @@
      *         onto or otherwise override the given {@link IAccessPath}.
      */
     IAccessPath<E> getAccessPath(IAccessPath<E> accessPath);
-    
+
     /**
      * Add the backchainer on top of the expander.
      * 
      * @return true if the backchainer should run
+     * 
+     * @deprecated Never <code>true</code>. The backchainer is only run for
+     *             normal predicates in triples mode at this time. If it is to
+     *             be layer, it should be layered as an annotation.  See
+     *             https://sourceforge.net/apps/trac/bigdata/ticket/231.
      */
     boolean backchain();
-    
+
     /**
      * If true, the predicate for this expander will be given priority in the
      * join order.
      * 
-     *  @return true if the predicate should be run first
+     * @return true if the predicate should be run first
      */
     boolean runFirst();
     

Modified: branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/rules/RDFJoinNexus.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/rules/RDFJoinNexus.java	2011-01-19 18:34:43 UTC (rev 4130)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/rules/RDFJoinNexus.java	2011-01-19 21:21:03 UTC (rev 4131)
@@ -391,6 +391,7 @@
 //        }
 
         // @todo raise into SPORelation#getAccessPath/3?
+        // @see https://sourceforge.net/apps/trac/bigdata/ticket/231
         if(backchain && relation instanceof SPORelation) {
 
             if (expander == null || expander.backchain()) {

Modified: branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/DefaultGraphSolutionExpander.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/DefaultGraphSolutionExpander.java	2011-01-19 18:34:43 UTC (rev 4130)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/DefaultGraphSolutionExpander.java	2011-01-19 21:21:03 UTC (rev 4131)
@@ -247,7 +247,7 @@
     
     public boolean backchain() {
         
-        return true;
+        return false;
         
     }
 

Modified: branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/NamedGraphSolutionExpander.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/NamedGraphSolutionExpander.java	2011-01-19 18:34:43 UTC (rev 4130)
+++ branches/QUADS_QUERY_BRANCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/NamedGraphSolutionExpander.java	2011-01-19 21:21:03 UTC (rev 4131)
@@ -180,7 +180,7 @@
     
     public boolean backchain() {
         
-        return true;
+        return false;
         
     }
 


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