|
From: <tho...@us...> - 2010-10-07 20:04:28
|
Revision: 3748
http://bigdata.svn.sourceforge.net/bigdata/?rev=3748&view=rev
Author: thompsonbry
Date: 2010-10-07 20:04:21 +0000 (Thu, 07 Oct 2010)
Log Message:
-----------
Another code reorganization.
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 20:00:16 UTC (rev 3747)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/engine/RunningQuery.java 2010-10-07 20:04:21 UTC (rev 3748)
@@ -166,7 +166,7 @@
*
* @see RunState
*/
- private final ReentrantLock lock;
+ private final ReentrantLock lock = new ReentrantLock();
/**
* The run state of this query and <code>null</code> unless this is the
@@ -357,10 +357,6 @@
this.query = query;
- this.lock = new ReentrantLock();
-
- this.runState = controller ? new RunState(this) : null;
-
this.bopIndex = BOpUtility.getIndex(query);
/*
@@ -368,6 +364,8 @@
*/
if (controller) {
+ runState = new RunState(this);
+
statsMap = new ConcurrentHashMap<Integer, BOpStats>();
for (Map.Entry<Integer, BOp> e : bopIndex.entrySet()) {
@@ -409,20 +407,13 @@
} else {
- statsMap = null;
+ runState = null; // Note: only on the query controller.
+ statsMap = null; // Note: only on the query controller.
+ queryBuffer = null; // Note: only on the query controller.
+ queryIterator = null; // Note: only when queryBuffer is defined.
- // Note: only exists on the query controller.
- queryBuffer = null;
- queryIterator = null;
-
}
- // System.err
- // .println("new RunningQuery:: queryId=" + queryId
- // + ", isController=" + controller + ", queryController="
- // + clientProxy + ", queryEngine="
- // + queryEngine.getServiceUUID());
-
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|