[Bigdata-commit] SF.net SVN: bigdata:[3747] branches/QUADS_QUERY_BRANCH/bigdata/src/java/com /bigdata/bop/engine/RunningQuery.java

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

Revision: 3747
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3747&view=rev
Author:   thompsonbry
Date:     2010-10-07 20:00:16 +0000 (Thu, 07 Oct 2010)

Log Message:
-----------
Reorganized the code in an attempt to get around a weird CI problem.

compile:
    [javac] /var/lib/hudson/jobs/Bigdata Quads Query Branch/workspace/QUADS_QUERY_BRANCH/build.xml:76: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds
    [javac] Compiling 1398 source files to /var/lib/hudson/jobs/Bigdata Quads Query Branch/workspace/QUADS_QUERY_BRANCH/ant-build/classes
    [javac] javac 1.6.0_17
    [javac] /var/lib/hudson/jobs/Bigdata Quads Query Branch/workspace/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/engine/RunningQuery.java:379: variable lock might already have been assigned
    [javac]         lock = new ReentrantLock();
    [javac]         ^
    [javac] /var/lib/hudson/jobs/Bigdata Quads Query Branch/workspace/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/engine/RunningQuery.java:381: variable runState might already have been assigned
    [javac]         runState = controller ? new RunState(this) : null;
    [javac]         ^
    [javac] /var/lib/hudson/jobs/Bigdata Quads Query Branch/workspace/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/engine/RunningQuery.java:392: variable queryBuffer might already have been assigned
    [javac]                 queryBuffer = query.newBuffer(queryStats);
    [javac]                 ^
    [javac] /var/lib/hudson/jobs/Bigdata Quads Query Branch/workspace/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/engine/RunningQuery.java:397: variable queryBuffer might already have been assigned
    [javac]                 queryBuffer = null;
    [javac]                 ^
    [javac] /var/lib/hudson/jobs/Bigdata Quads Query Branch/workspace/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/engine/RunningQuery.java:404: variable queryBuffer might already have been assigned
    [javac]             queryBuffer = null;
    [javac]             ^
    [javac] /var/lib/hudson/jobs/Bigdata Quads Query Branch/workspace/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/engine/RunningQuery.java:410: variable queryIterator might already have been assigned
    [javac]             queryIterator = null;
    [javac]             ^
    [javac] /var/lib/hudson/jobs/Bigdata Quads Query Branch/workspace/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/engine/RunningQuery.java:414: variable queryIterator might already have been assigned
    [javac]             queryIterator = new QueryResultIterator<IBindingSet[]>(this,
    [javac]             ^
    [javac] Note: Some input files use or override a deprecated API.
    [javac] Note: Recompile with -Xlint:deprecation for details.
    [javac] Note: Some input files use unchecked or unsafe operations.
    [javac] Note: Recompile with -Xlint:unchecked for details.
    [javac] 7 errors

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

Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/engine/RunningQuery.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/engine/RunningQuery.java	2010-10-07 19:52:35 UTC (rev 3746)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/engine/RunningQuery.java	2010-10-07 20:00:16 UTC (rev 3747)
@@ -357,63 +357,64 @@
 
         this.query = query;
 
-        bopIndex = BOpUtility.getIndex(query);
+        this.lock = new ReentrantLock();
 
+        this.runState = controller ? new RunState(this) : null;
+
+        this.bopIndex = BOpUtility.getIndex(query);
+
         /*
          * Setup the BOpStats object for each pipeline operator in the query.
          */
         if (controller) {
+            
             statsMap = new ConcurrentHashMap<Integer, BOpStats>();
+            
             for (Map.Entry<Integer, BOp> e : bopIndex.entrySet()) {
+            
                 final int bopId = e.getKey();
+                
                 final BOp tmp = e.getValue();
+                
                 if ((tmp instanceof PipelineOp)) {
+                    
                     final PipelineOp bop = (PipelineOp) tmp;
+                
                     statsMap.put(bopId, bop.newStats());
+                    
                 }
             }
-        } else {
-            statsMap = null;
-        }
 
-        lock = new ReentrantLock();
+//            final BOpStats queryStats = query.newStats();
+//
+//            statsMap.put((Integer) query
+//                    .getRequiredProperty(BOp.Annotations.BOP_ID), queryStats);
 
-        runState = controller ? new RunState(this) : null;
+            if (!query.isMutation()) {
 
-        if (controller) {
+                final BOpStats queryStats = statsMap.get(query.getId());
 
-            final BOpStats queryStats = query.newStats();
+                queryBuffer = query.newBuffer(queryStats);
 
-            statsMap.put((Integer) query
-                    .getRequiredProperty(BOp.Annotations.BOP_ID), queryStats);
+                queryIterator = new QueryResultIterator<IBindingSet[]>(this,
+                        queryBuffer.iterator());
 
-            if (!query.isMutation()) {
-
-                queryBuffer = query.newBuffer(queryStats);
-
             } else {
 
                 // Note: Not used for mutation queries.
                 queryBuffer = null;
+                queryIterator = null;
 
             }
 
         } else {
 
+            statsMap = null;
+            
             // Note: only exists on the query controller.
             queryBuffer = null;
-
-        }
-
-        if (queryBuffer == null) {
-
             queryIterator = null;
-
-        } else {
-
-            queryIterator = new QueryResultIterator<IBindingSet[]>(this,
-                    queryBuffer.iterator());
-
+            
         }
 
         // System.err


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