[Bigdata-commit] SF.net SVN: bigdata:[7788] branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/ com/bigdata/bop

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

Revision: 7788
          http://bigdata.svn.sourceforge.net/bigdata/?rev=7788&view=rev
Author:   thompsonbry
Date:     2014-01-14 00:31:41 +0000 (Tue, 14 Jan 2014)
Log Message:
-----------
I missed some tests where the SliceOp constructor was invoked in the last commit.  This should bring the build back to normal.

See #64 (RTO)
See #798 (Solution order not always preserved)

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/bop/controller/TestSubqueryOp.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/bop/controller/TestUnion.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/bop/fed/TestFederatedQueryEngine.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/bop/controller/TestSubqueryOp.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/bop/controller/TestSubqueryOp.java	2014-01-13 21:55:30 UTC (rev 7787)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/bop/controller/TestSubqueryOp.java	2014-01-14 00:31:41 UTC (rev 7788)
@@ -633,6 +633,7 @@
                         new NV(BOp.Annotations.EVALUATION_CONTEXT,
                                 BOpEvaluationContext.CONTROLLER),//
                         new NV(PipelineOp.Annotations.SHARED_STATE,true),//
+                        new NV(PipelineOp.Annotations.REORDER_SOLUTIONS,false)//
                         }));
 
         final PipelineOp query = sliceOp;
@@ -900,6 +901,7 @@
                         new NV(BOp.Annotations.EVALUATION_CONTEXT,
                                 BOpEvaluationContext.CONTROLLER),//
                         new NV(PipelineOp.Annotations.SHARED_STATE,true),//
+                        new NV(PipelineOp.Annotations.REORDER_SOLUTIONS,false)//
                         }));
 
         final PipelineOp query = sliceOp;
@@ -1163,6 +1165,7 @@
                         new NV(BOp.Annotations.EVALUATION_CONTEXT,
                                 BOpEvaluationContext.CONTROLLER),//
                         new NV(PipelineOp.Annotations.SHARED_STATE,true),//
+                        new NV(PipelineOp.Annotations.REORDER_SOLUTIONS,false)//
                         }));
 
         final PipelineOp query = sliceOp;

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/bop/controller/TestUnion.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/bop/controller/TestUnion.java	2014-01-13 21:55:30 UTC (rev 7787)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/bop/controller/TestUnion.java	2014-01-14 00:31:41 UTC (rev 7788)
@@ -309,7 +309,8 @@
                 new NV(Union.Annotations.BOP_ID, sliceId),//
                 new NV(Union.Annotations.EVALUATION_CONTEXT,
                         BOpEvaluationContext.CONTROLLER),//
-                new NV(PipelineOp.Annotations.SHARED_STATE,true)//
+                new NV(PipelineOp.Annotations.SHARED_STATE,true),//
+                new NV(PipelineOp.Annotations.REORDER_SOLUTIONS,false)//
                 ));
         
         final BOp query = sliceOp;

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/bop/fed/TestFederatedQueryEngine.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/bop/fed/TestFederatedQueryEngine.java	2014-01-13 21:55:30 UTC (rev 7787)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/bop/fed/TestFederatedQueryEngine.java	2014-01-14 00:31:41 UTC (rev 7788)
@@ -337,6 +337,7 @@
                         new NV(SliceOp.Annotations.EVALUATION_CONTEXT,
                                 BOpEvaluationContext.CONTROLLER),//
                         new NV(PipelineOp.Annotations.SHARED_STATE,true),//
+                        new NV(PipelineOp.Annotations.REORDER_SOLUTIONS,false),//
                         new NV(FederatedQueryEngine.Annotations.CHUNK_HANDLER,
                                 FederationChunkHandler.TEST_INSTANCE),//
                         })//
@@ -455,6 +456,7 @@
                         new NV(SliceOp.Annotations.EVALUATION_CONTEXT,
                                 BOpEvaluationContext.CONTROLLER),//
                         new NV(PipelineOp.Annotations.SHARED_STATE,true),//
+                        new NV(PipelineOp.Annotations.REORDER_SOLUTIONS,false),//
                         new NV(FederatedQueryEngine.Annotations.CHUNK_HANDLER,
                                 FederationChunkHandler.TEST_INSTANCE),//
                         })//
@@ -624,6 +626,7 @@
                         new NV(SliceOp.Annotations.EVALUATION_CONTEXT,
                                 BOpEvaluationContext.CONTROLLER),//
                         new NV(PipelineOp.Annotations.SHARED_STATE,true),//
+                        new NV(PipelineOp.Annotations.REORDER_SOLUTIONS,false),//
                         new NV(FederatedQueryEngine.Annotations.CHUNK_HANDLER,
                                 FederationChunkHandler.TEST_INSTANCE),//
                         })//
@@ -770,6 +773,7 @@
                         new NV(SliceOp.Annotations.EVALUATION_CONTEXT,
                                 BOpEvaluationContext.CONTROLLER),//
                         new NV(PipelineOp.Annotations.SHARED_STATE,true),//
+                        new NV(PipelineOp.Annotations.REORDER_SOLUTIONS,false),//
                         new NV(FederatedQueryEngine.Annotations.CHUNK_HANDLER,
                                 FederationChunkHandler.TEST_INSTANCE),//
                         })//
@@ -916,6 +920,7 @@
                         new NV(SliceOp.Annotations.EVALUATION_CONTEXT,
                                 BOpEvaluationContext.CONTROLLER),//
                         new NV(PipelineOp.Annotations.SHARED_STATE,true),//
+                        new NV(PipelineOp.Annotations.REORDER_SOLUTIONS,false),//
                         new NV(FederatedQueryEngine.Annotations.CHUNK_HANDLER,
                                 FederationChunkHandler.TEST_INSTANCE),//
                         }));
@@ -1125,6 +1130,7 @@
                         new NV(BOp.Annotations.EVALUATION_CONTEXT,
                                 BOpEvaluationContext.CONTROLLER),//
                         new NV(PipelineOp.Annotations.SHARED_STATE,true),//
+                        new NV(PipelineOp.Annotations.REORDER_SOLUTIONS,false),//
                         new NV(FederatedQueryEngine.Annotations.CHUNK_HANDLER,
                                 FederationChunkHandler.TEST_INSTANCE),//
                         }));

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