bigdata-commit

[Bigdata-commit] SF.net SVN: bigdata:[4089] branches/QUADS_QUERY_BRANCH/bigdata-sails/src/ java/com/bigdata/rdf/sail/sop/SOp2BOpUtility.java

[<mrp...@us...>]

Revision: 4089
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4089&view=rev
Author:   mrpersonick
Date:     2011-01-13 20:53:37 +0000 (Thu, 13 Jan 2011)

Log Message:
-----------
added a slice op

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/sop/SOp2BOpUtility.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/sop/SOp2BOpUtility.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/sop/SOp2BOpUtility.java	2011-01-13 20:47:44 UTC (rev 4088)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/sop/SOp2BOpUtility.java	2011-01-13 20:53:37 UTC (rev 4089)
@@ -50,6 +50,7 @@
 import com.bigdata.bop.controller.SubqueryOp;
 import com.bigdata.bop.controller.Union;
 import com.bigdata.bop.engine.QueryEngine;
+import com.bigdata.bop.solutions.SliceOp;
 import com.bigdata.rdf.sail.Rule2BOpUtility;
 import com.bigdata.rdf.sail.sop.SOpTree.SOpGroup;
 import com.bigdata.rdf.sail.sop.SOpTree.SOpGroups;
@@ -165,14 +166,26 @@
     	
     	final IRule rule = rule(join, conditionals);
     	
-    	final PipelineOp joinGroup = Rule2BOpUtility.convert(
+    	PipelineOp left = Rule2BOpUtility.convert(
     			rule, conditionals, idFactory, db, queryEngine, queryHints);
     	
+        if (!left.getEvaluationContext().equals(
+                BOpEvaluationContext.CONTROLLER)) {
+            /*
+             * Wrap with an operator which will be evaluated on the query
+             * controller.
+             */
+            left = new SliceOp(new BOp[] { left }, NV.asMap(//
+                    new NV(BOp.Annotations.BOP_ID, idFactory
+                            .incrementAndGet()), //
+                    new NV(BOp.Annotations.EVALUATION_CONTEXT,
+                            BOpEvaluationContext.CONTROLLER)));
+        }
+    	
     	/*
     	 * Start with left=<this join group> and add a SubqueryOp for each
     	 * sub group.
     	 */
-    	PipelineOp left = joinGroup;
     	
     	final SOpGroups children = join.getChildren();
     	if (children != null) {


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

[Bigdata-commit] SF.net SVN: bigdata:[4091] branches/QUADS_QUERY_BRANCH/bigdata-sails/src/ java/com/bigdata/rdf/sail/sop/SOp2BOpUtility.java

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

Revision: 4091
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4091&view=rev
Author:   thompsonbry
Date:     2011-01-13 20:58:04 +0000 (Thu, 13 Jan 2011)

Log Message:
-----------
javadoc

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/sop/SOp2BOpUtility.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/sop/SOp2BOpUtility.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/sop/SOp2BOpUtility.java	2011-01-13 20:54:09 UTC (rev 4090)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/sop/SOp2BOpUtility.java	2011-01-13 20:58:04 UTC (rev 4091)
@@ -173,7 +173,8 @@
                 BOpEvaluationContext.CONTROLLER)) {
             /*
              * Wrap with an operator which will be evaluated on the query
-             * controller.
+             * controller so the results will be streamed back to the query
+             * controller in scale-out.
              */
             left = new SliceOp(new BOp[] { left }, NV.asMap(//
                     new NV(BOp.Annotations.BOP_ID, idFactory


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

[Bigdata-commit] SF.net SVN: bigdata:[4367] branches/QUADS_QUERY_BRANCH/bigdata-sails/src/ java/com/bigdata/rdf/sail/sop/SOp2BOpUtility.java

[<mrp...@us...>]

Revision: 4367
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4367&view=rev
Author:   mrpersonick
Date:     2011-04-01 22:03:23 +0000 (Fri, 01 Apr 2011)

Log Message:
-----------
added a slice op for the subquery for the hash join op

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/sop/SOp2BOpUtility.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/sop/SOp2BOpUtility.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/sop/SOp2BOpUtility.java	2011-04-01 21:36:59 UTC (rev 4366)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/sop/SOp2BOpUtility.java	2011-04-01 22:03:23 UTC (rev 4367)
@@ -619,6 +619,13 @@
 					final PipelineOp subquery = convert(hashGroup, constraints, 
 							null/*left*/, knownBound, 
 							idFactory, db, queryEngine, queryHints);
+		            final PipelineOp slice = new SliceOp(new BOp[] { subquery }, NV.asMap(//
+							new NV(BOp.Annotations.BOP_ID, idFactory.incrementAndGet()), //
+							new NV(BOp.Annotations.EVALUATION_CONTEXT,
+									BOpEvaluationContext.CONTROLLER),//
+							new NV(PipelineOp.Annotations.SHARED_STATE, true)//
+					));
+					
 					final IVariable<?>[] joinVarsArray = 
 							joinVars.toArray(new IVariable[joinVars.size()]);
 					
@@ -630,7 +637,7 @@
 					left = new SubqueryHashJoinOp(new BOp[]{left},
 	                	new NV(Predicate.Annotations.BOP_ID, idFactory.incrementAndGet()),//
 	                	new NV(SubqueryHashJoinOp.Annotations.PIPELINED, false),//
-	                	new NV(SubqueryHashJoinOp.Annotations.SUBQUERY, subquery),//
+	                	new NV(SubqueryHashJoinOp.Annotations.SUBQUERY, slice),//
 	                	new NV(SubqueryHashJoinOp.Annotations.JOIN_VARS, joinVarsArray));
 	                	
 				}


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

[Bigdata-commit] SF.net SVN: bigdata:[4368] branches/QUADS_QUERY_BRANCH/bigdata-sails/src/ java/com/bigdata/rdf/sail/sop/SOp2BOpUtility.java

[<mrp...@us...>]

Revision: 4368
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4368&view=rev
Author:   mrpersonick
Date:     2011-04-01 22:48:06 +0000 (Fri, 01 Apr 2011)

Log Message:
-----------
slice

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/sop/SOp2BOpUtility.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/sop/SOp2BOpUtility.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/sop/SOp2BOpUtility.java	2011-04-01 22:03:23 UTC (rev 4367)
+++ branches/QUADS_QUERY_BRANCH/bigdata-sails/src/java/com/bigdata/rdf/sail/sop/SOp2BOpUtility.java	2011-04-01 22:48:06 UTC (rev 4368)
@@ -293,8 +293,8 @@
 	    }
     	
 		if (!left.getEvaluationContext()
-				.equals(BOpEvaluationContext.CONTROLLER)
-				&& !(left instanceof SubqueryOp)) {
+				.equals(BOpEvaluationContext.CONTROLLER)) {
+//				&& !(left instanceof SubqueryOp)) {
 			/*
 			 * Wrap with an operator which will be evaluated on the query
 			 * controller so the results will be streamed back to the query


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