[Bigdata-commit] SF.net SVN: bigdata:[4097] branches/QUADS_QUERY_BRANCH/bigdata/src/test/com /bigdata/bop/controller/TestSubqueryOp.java

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

Revision: 4097
          http://bigdata.svn.sourceforge.net/bigdata/?rev=4097&view=rev
Author:   thompsonbry
Date:     2011-01-14 14:47:56 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
Fixed unit test for SubqueryOp (the OPTIONAL annotation needs to be set explicitly for these unit tests now that the default for that annotation is false).

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

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/controller/TestSubqueryOp.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/controller/TestSubqueryOp.java	2011-01-14 14:26:21 UTC (rev 4096)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/controller/TestSubqueryOp.java	2011-01-14 14:47:56 UTC (rev 4097)
@@ -345,12 +345,12 @@
         final PipelineOp joinGroup1Op = new SubqueryOp(new BOp[]{join1Op}, 
                 new NV(Predicate.Annotations.BOP_ID, joinGroup1),//
 //                new NV(PipelineOp.Annotations.CONDITIONAL_GROUP, joinGroup1),//
-                new NV(SubqueryOp.Annotations.SUBQUERY, subQuery)//
+                new NV(SubqueryOp.Annotations.SUBQUERY, subQuery),//
 //                , new NV(BOp.Annotations.CONTROLLER,true)//
 //                new NV(BOp.Annotations.EVALUATION_CONTEXT,
 //                        BOpEvaluationContext.CONTROLLER)//
-//                // join is optional.
-//                new NV(PipelineJoin.Annotations.OPTIONAL, true),//
+                // join is optional.
+                new NV(SubqueryOp.Annotations.OPTIONAL, true)//
 //                // optional target is the same as the default target.
 //                new NV(PipelineOp.Annotations.ALT_SINK_REF, sliceId)
         );
@@ -610,12 +610,12 @@
         final PipelineOp joinGroup1Op = new SubqueryOp(new BOp[]{join1Op}, 
                 new NV(Predicate.Annotations.BOP_ID, joinGroup1),//
 //                new NV(PipelineOp.Annotations.CONDITIONAL_GROUP, joinGroup1),//
-                new NV(SubqueryOp.Annotations.SUBQUERY, subQuery)//
+                new NV(SubqueryOp.Annotations.SUBQUERY, subQuery),//
 //                new NV(BOp.Annotations.CONTROLLER,true)//
 //                new NV(BOp.Annotations.EVALUATION_CONTEXT,
 //                        BOpEvaluationContext.CONTROLLER)//
-//                // join is optional.
-//                new NV(PipelineJoin.Annotations.OPTIONAL, true),//
+                // join is optional.
+                new NV(SubqueryOp.Annotations.OPTIONAL, true)//
 //                // optional target is the same as the default target.
 //                new NV(PipelineOp.Annotations.ALT_SINK_REF, sliceId)
         );
@@ -871,12 +871,12 @@
         final PipelineOp joinGroup1Op = new SubqueryOp(new BOp[]{condOp}, 
                 new NV(Predicate.Annotations.BOP_ID, joinGroup1),//
 //                new NV(PipelineOp.Annotations.CONDITIONAL_GROUP, joinGroup1),//
-                new NV(SubqueryOp.Annotations.SUBQUERY, subQuery)//
+                new NV(SubqueryOp.Annotations.SUBQUERY, subQuery),//
 //                new NV(BOp.Annotations.CONTROLLER,true)//
 //                new NV(BOp.Annotations.EVALUATION_CONTEXT,
 //                        BOpEvaluationContext.CONTROLLER)//
-//                // join is optional.
-//                new NV(PipelineJoin.Annotations.OPTIONAL, true),//
+                // join is optional.
+                new NV(SubqueryOp.Annotations.OPTIONAL, true)//
 //                // optional target is the same as the default target.
 //                new NV(PipelineOp.Annotations.ALT_SINK_REF, sliceId)
         );


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