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

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

Revision: 4072
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4072&view=rev
Author:   thompsonbry
Date:     2011-01-11 01:37:17 +0000 (Tue, 11 Jan 2011)

Log Message:
-----------
Removed the CONTROLLER annotation for the OptionalJoinGroup operator.  

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/controller/OptionalJoinGroup.java
    branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/controller/TestOptionalJoinGroup.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/controller/OptionalJoinGroup.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/controller/OptionalJoinGroup.java	2011-01-10 22:09:06 UTC (rev 4071)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/controller/OptionalJoinGroup.java	2011-01-11 01:37:17 UTC (rev 4072)
@@ -129,8 +129,8 @@
 
         getRequiredProperty(Annotations.SUBQUERY);
         
-        if (!getProperty(Annotations.CONTROLLER, Annotations.DEFAULT_CONTROLLER))
-            throw new IllegalArgumentException(Annotations.CONTROLLER);
+//        if (!getProperty(Annotations.CONTROLLER, Annotations.DEFAULT_CONTROLLER))
+//            throw new IllegalArgumentException(Annotations.CONTROLLER);
         
 //        // The id of this operator (if any).
 //        final Integer thisId = (Integer)getProperty(Annotations.BOP_ID);

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/controller/TestOptionalJoinGroup.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/controller/TestOptionalJoinGroup.java	2011-01-10 22:09:06 UTC (rev 4071)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/controller/TestOptionalJoinGroup.java	2011-01-11 01:37:17 UTC (rev 4072)
@@ -345,8 +345,8 @@
         final PipelineOp joinGroup1Op = new OptionalJoinGroup(new BOp[]{join1Op}, 
                 new NV(Predicate.Annotations.BOP_ID, joinGroup1),//
 //                new NV(PipelineOp.Annotations.CONDITIONAL_GROUP, joinGroup1),//
-                new NV(OptionalJoinGroup.Annotations.SUBQUERY, subQuery),//
-                new NV(BOp.Annotations.CONTROLLER,true)//
+                new NV(OptionalJoinGroup.Annotations.SUBQUERY, subQuery)//
+//                , new NV(BOp.Annotations.CONTROLLER,true)//
 //                new NV(BOp.Annotations.EVALUATION_CONTEXT,
 //                        BOpEvaluationContext.CONTROLLER)//
 //                // join is optional.
@@ -610,8 +610,8 @@
         final PipelineOp joinGroup1Op = new OptionalJoinGroup(new BOp[]{join1Op}, 
                 new NV(Predicate.Annotations.BOP_ID, joinGroup1),//
 //                new NV(PipelineOp.Annotations.CONDITIONAL_GROUP, joinGroup1),//
-                new NV(OptionalJoinGroup.Annotations.SUBQUERY, subQuery),//
-                new NV(BOp.Annotations.CONTROLLER,true)//
+                new NV(OptionalJoinGroup.Annotations.SUBQUERY, subQuery)//
+//                new NV(BOp.Annotations.CONTROLLER,true)//
 //                new NV(BOp.Annotations.EVALUATION_CONTEXT,
 //                        BOpEvaluationContext.CONTROLLER)//
 //                // join is optional.
@@ -871,8 +871,8 @@
         final PipelineOp joinGroup1Op = new OptionalJoinGroup(new BOp[]{condOp}, 
                 new NV(Predicate.Annotations.BOP_ID, joinGroup1),//
 //                new NV(PipelineOp.Annotations.CONDITIONAL_GROUP, joinGroup1),//
-                new NV(OptionalJoinGroup.Annotations.SUBQUERY, subQuery),//
-                new NV(BOp.Annotations.CONTROLLER,true)//
+                new NV(OptionalJoinGroup.Annotations.SUBQUERY, subQuery)//
+//                new NV(BOp.Annotations.CONTROLLER,true)//
 //                new NV(BOp.Annotations.EVALUATION_CONTEXT,
 //                        BOpEvaluationContext.CONTROLLER)//
 //                // join is optional.


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