[Bigdata-commit] SF.net SVN: bigdata:[3864] branches/QUADS_QUERY_BRANCH/bigdata/src/test/com /bigdata/bop/engine/TestQueryEngine.java

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

Revision: 3864
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3864&view=rev
Author:   thompsonbry
Date:     2010-11-02 12:42:22 +0000 (Tue, 02 Nov 2010)

Log Message:
-----------
Additional edit to TestQueryEngine to work around the fact that a Slice can interrupt an operator before its BOpStats have been reported/aggregated.  In this case, the race appeared with the StartOp.

Modified Paths:
--------------
    branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/engine/TestQueryEngine.java

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/engine/TestQueryEngine.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/engine/TestQueryEngine.java	2010-11-02 12:11:41 UTC (rev 3863)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/test/com/bigdata/bop/engine/TestQueryEngine.java	2010-11-02 12:42:22 UTC (rev 3864)
@@ -911,20 +911,28 @@
                 log.info(statsMap.toString());
         }
 
-        // validate the stats for the start operator.
-        {
-            final BOpStats stats = statsMap.get(startId);
-            assertNotNull(stats);
-            if (log.isInfoEnabled())
-                log.info("start: " + stats.toString());
+        /*
+         * Note: SliceOp can cause the Start operator to be interrupted. If this
+         * occurs, the BOpStats for the join are not reported and aggregated
+         * reliably (there is a race between the completion of the Start and its
+         * interrupt by the slice). Since this unit test has a slice which will
+         * interrupt the running query, we can not test the stats on the Start
+         * reliably for this unit test.
+         */
+//        // validate the stats for the start operator.
+//        {
+//            final BOpStats stats = statsMap.get(startId);
+//            assertNotNull(stats);
+//            if (log.isInfoEnabled())
+//                log.info("start: " + stats.toString());
+//
+//            // verify query solution stats details.
+//            assertEquals(1L, stats.chunksIn.get());
+//            assertEquals(1L, stats.unitsIn.get());
+//            assertEquals(1L, stats.unitsOut.get());
+//            assertEquals(1L, stats.chunksOut.get());
+//        }
 
-            // verify query solution stats details.
-            assertEquals(1L, stats.chunksIn.get());
-            assertEquals(1L, stats.unitsIn.get());
-            assertEquals(1L, stats.unitsOut.get());
-            assertEquals(1L, stats.chunksOut.get());
-        }
-
         /*
          * Note: SliceOp can cause the Join operator to be interrupted. If this
          * occurs, the BOpStats for the join are not reported and aggregated


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