Thread: [Bigdata-commit] SF.net SVN: bigdata:[7703] branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/ java/c

Fast, scalable, robust graph database platform

Brought to you by: beebs, hyandell, mrpersonick, thompsonbry

bigdata-commit

[Bigdata-commit] SF.net SVN: bigdata:[7703] branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/ java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java

From: <tho...@us...> - 2013-12-30 19:07:53

Revision: 7703
          http://bigdata.svn.sourceforge.net/bigdata/?rev=7703&view=rev
Author:   thompsonbry
Date:     2013-12-30 19:07:46 +0000 (Mon, 30 Dec 2013)
Log Message:
-----------
Explicitly disable the RTO for QUADS mode query.

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java	2013-12-30 16:25:31 UTC (rev 7702)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java	2013-12-30 19:07:46 UTC (rev 7703)
@@ -101,6 +101,13 @@
             final JoinGroupNode joinGroup, final Set<IVariable<?>> doneSet,
             final AST2BOpContext ctx, final AtomicInteger start) {
 
+        if (ctx.isQuads()) {
+
+            // FIXME The RTO does not handle quads yet.
+            return left;
+
+        }
+        
         final int arity = joinGroup.arity();
 
         // The predicates for the RTO join group.

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

[Bigdata-commit] SF.net SVN: bigdata:[7763] branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/ java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java

From: <tho...@us...> - 2014-01-10 21:51:44

Revision: 7763
          http://bigdata.svn.sourceforge.net/bigdata/?rev=7763&view=rev
Author:   thompsonbry
Date:     2014-01-10 21:51:38 +0000 (Fri, 10 Jan 2014)
Log Message:
-----------
javadoc

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java	2014-01-10 21:48:09 UTC (rev 7762)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java	2014-01-10 21:51:38 UTC (rev 7763)
@@ -61,6 +61,7 @@
 import com.bigdata.bop.Var;
 import com.bigdata.bop.ap.Predicate;
 import com.bigdata.bop.ap.SampleIndex.SampleType;
+import com.bigdata.bop.bset.ConditionalRoutingOp;
 import com.bigdata.bop.engine.IRunningQuery;
 import com.bigdata.bop.engine.QueryEngine;
 import com.bigdata.bop.join.JoinAnnotations;
@@ -218,6 +219,15 @@
      * estimated cardinality of the join since we can not compute the join hit
      * ratio without knowing the #of solutions in required to produce a given
      * #of solutions out.
+     * 
+     * FIXME Make this <code>true</code>. There is a known problem where a
+     * {@link ConditionalRoutingOp} can cause out of order evaluation if some
+     * solutions flow along the default sink and some along the alt sink. I
+     * think that the fix for this is to make the materialization step
+     * non-conditional when performing cutoff evaluation of the join. I need to
+     * run this past MikeP, so this allows out-of-order evaluation for the
+     * moment. See BSBM Q5 for a query that currently fails if out of order
+     * evaluation is disallowed.
      */
     static final private boolean failOutOfOrderEvaluation = false;
     

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

[Bigdata-commit] SF.net SVN: bigdata:[7765] branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/ java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java

From: <tho...@us...> - 2014-01-10 22:19:47

Revision: 7765
          http://bigdata.svn.sourceforge.net/bigdata/?rev=7765&view=rev
Author:   thompsonbry
Date:     2014-01-10 22:19:40 +0000 (Fri, 10 Jan 2014)
Log Message:
-----------
inline comment.

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java	2014-01-10 22:16:31 UTC (rev 7764)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java	2014-01-10 22:19:40 UTC (rev 7765)
@@ -265,7 +265,10 @@
 
             /*
              * FIXME At least an OPTIONAL join group causes a "No stats"
-             * assertion error during query evaluation.
+             * assertion error during query evaluation. When this is fixed, take
+             * out this code block.
+             * 
+             * See TestRTO_BSBM.test_BSBM_Q7b_pc100().
              */
             return left;
             

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

[Bigdata-commit] SF.net SVN: bigdata:[7784] branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/ java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java

From: <tho...@us...> - 2014-01-13 16:29:10

Revision: 7784
          http://bigdata.svn.sourceforge.net/bigdata/?rev=7784&view=rev
Author:   thompsonbry
Date:     2014-01-13 16:29:03 +0000 (Mon, 13 Jan 2014)
Log Message:
-----------
inline doc.

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java	2014-01-13 16:27:44 UTC (rev 7783)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java	2014-01-13 16:29:03 UTC (rev 7784)
@@ -236,7 +236,7 @@
      * will be checked to verify that the query plans do not permit reordering
      * of solutions.
      */
-    static final private boolean checkQueryPlans = false;
+    static final private boolean checkQueryPlans = false; // Note: Make [false] in committed code!
     
     /**
      * Inspect the remainder of the join group. If we can isolate a join graph

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

[Bigdata-commit] SF.net SVN: bigdata:[7785] branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/ java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java

From: <tho...@us...> - 2014-01-13 16:32:32

Revision: 7785
          http://bigdata.svn.sourceforge.net/bigdata/?rev=7785&view=rev
Author:   thompsonbry
Date:     2014-01-13 16:32:25 +0000 (Mon, 13 Jan 2014)
Log Message:
-----------
javadoc

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java	2014-01-13 16:29:03 UTC (rev 7784)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java	2014-01-13 16:32:25 UTC (rev 7785)
@@ -458,7 +458,8 @@
      *         {@link JoinGraph.Annotations#JOIN_GROUP} into the ordering
      *         specified in the {@link Path} and make sure that
      *         convertJoinGroup() did not attempt to recursively reapply the
-     *         RTO.
+     *         RTO. This will get rid of one of the few remaining uses of
+     *         {@link PartitionedJoinGroup}.
      */
     public static PipelineOp compileJoinGraph(final QueryEngine queryEngine,
             final JoinGraph joinGraph, final Path path) {
@@ -502,10 +503,6 @@
 
         /*
          * Figure out which constraints are attached to which predicates.
-         * 
-         * TODO Can we reconcile this code with the filter assignment code in
-         * AST2BOpFilter? If so, then we can get rid of the
-         * PartitionedJoinGroup.
          */
         final IConstraint[][] constraintAttachmentArray = PartitionedJoinGroup
                 .getJoinGraphConstraints(predicates, constraints,

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

[Bigdata-commit] SF.net SVN: bigdata:[7856] branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/ java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java

From: <tho...@us...> - 2014-02-20 12:02:57

Revision: 7856
          http://sourceforge.net/p/bigdata/code/7856
Author:   thompsonbry
Date:     2014-02-20 12:02:54 +0000 (Thu, 20 Feb 2014)
Log Message:
-----------
Removed junit import. This has also been removed in the RDR branch.

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java	2014-02-20 00:08:03 UTC (rev 7855)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java	2014-02-20 12:02:54 UTC (rev 7856)
@@ -40,8 +40,6 @@
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import junit.framework.AssertionFailedError;
-
 import org.apache.log4j.Logger;
 
 import com.bigdata.bop.BOp;
@@ -1055,7 +1053,7 @@
         // The cutoff limit. This annotation MUST exist on the JOIN.
         if (limit != ((Long) joinOp.getRequiredProperty(JoinAnnotations.LIMIT))
                 .intValue())
-            throw new AssertionFailedError();
+            throw new AssertionError();
         
         final int joinId = joinOp.getId();
                 

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