bigdata-commit

[Bigdata-commit] SF.net SVN: bigdata:[7549] branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/ com/bigdata/bop/engine/AbstractRunningQuery.java

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

Revision: 7549
          http://bigdata.svn.sourceforge.net/bigdata/?rev=7549&view=rev
Author:   thompsonbry
Date:     2013-11-13 21:53:56 +0000 (Wed, 13 Nov 2013)
Log Message:
-----------
made checkDeadline() public

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/engine/AbstractRunningQuery.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/engine/AbstractRunningQuery.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/engine/AbstractRunningQuery.java	2013-11-13 21:50:23 UTC (rev 7548)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/engine/AbstractRunningQuery.java	2013-11-13 21:53:56 UTC (rev 7549)
@@ -349,7 +349,7 @@
      * @see <a href="https://sourceforge.net/apps/trac/bigdata/ticket/772">
      *      Query timeout only checked at operator start/stop. </a>
      */
-    final protected void checkDeadline() {
+    final public void checkDeadline() {
 
         try {
         

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

[Bigdata-commit] SF.net SVN: bigdata:[7723] branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/ com/bigdata/bop/engine/AbstractRunningQuery.java

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

Revision: 7723
          http://bigdata.svn.sourceforge.net/bigdata/?rev=7723&view=rev
Author:   thompsonbry
Date:     2014-01-04 21:07:51 +0000 (Sat, 04 Jan 2014)
Log Message:
-----------
@Override

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/engine/AbstractRunningQuery.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/engine/AbstractRunningQuery.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/engine/AbstractRunningQuery.java	2014-01-04 20:53:51 UTC (rev 7722)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/engine/AbstractRunningQuery.java	2014-01-04 21:07:51 UTC (rev 7723)
@@ -493,6 +493,7 @@
         
     }
     
+    @Override
     final public Map<Integer, BOp> getBOpIndex() {
 
         return bopIndex;

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

[Bigdata-commit] SF.net SVN: bigdata:[7758] branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/ com/bigdata/bop/engine/AbstractRunningQuery.java

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

Revision: 7758
          http://bigdata.svn.sourceforge.net/bigdata/?rev=7758&view=rev
Author:   thompsonbry
Date:     2014-01-10 15:14:32 +0000 (Fri, 10 Jan 2014)
Log Message:
-----------
Modified AbstractRunningQuery.getChildren() to be recursive since we were missing any sub-queries that were executed from within a named subquery. This showed up in the explain view of govtrack/queries/query0011.rq.

See #64 (RTO).

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/engine/AbstractRunningQuery.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/engine/AbstractRunningQuery.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/engine/AbstractRunningQuery.java	2014-01-10 13:17:37 UTC (rev 7757)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/engine/AbstractRunningQuery.java	2014-01-10 15:14:32 UTC (rev 7758)
@@ -29,9 +29,12 @@
 
 import java.nio.ByteBuffer;
 import java.nio.channels.ClosedByInterruptException;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
@@ -1642,7 +1645,8 @@
 
     /**
      * Report a snapshot of the known (declared) child {@link IRunningQuery}s
-     * for this {@link IRunningQuery}.
+     * for this {@link IRunningQuery} and (recursively) for any children of this
+     * {@link IRunningQuery}.
      * 
      * @return An array providing a snapshot of the known child
      *         {@link IRunningQuery}s and never <code>null</code>.
@@ -1651,13 +1655,35 @@
 
         synchronized (children) {
 
-            return children.values()
-                    .toArray(new IRunningQuery[children.size()]);
+            if (children.isEmpty()) {
 
+                // Fast path if no children.
+                return EMPTY_ARRAY;
+
+            }
+
+            // Add in all direct child queries.
+            final List<IRunningQuery> tmp = new LinkedList<IRunningQuery>(
+                    children.values());
+
+            // Note: Do not iterator over [tmp] to avoid concurrent modification.
+            for (IRunningQuery c : children.values()) {
+
+                // Recursive for each child.
+                tmp.addAll(Arrays.asList(((AbstractRunningQuery) c)
+                        .getChildren()));
+
+            }
+
+            // Convert to array.
+            return tmp.toArray(new IRunningQuery[tmp.size()]);
+
         }
-        
+
     }
-    
+
+    private static final IRunningQuery[] EMPTY_ARRAY = new IRunningQuery[0];
+
     /**
      * Attach a child query.
      * <p>

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

[Bigdata-commit] SF.net SVN: bigdata:[8547] branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/ com/bigdata/bop/engine/AbstractRunningQuery.java

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

Revision: 8547
          http://sourceforge.net/p/bigdata/code/8547
Author:   thompsonbry
Date:     2014-07-14 20:22:02 +0000 (Mon, 14 Jul 2014)
Log Message:
-----------
Removed old deadline field and replace it in toString() with the runState.getDeadline(). This was missed when adding support for robust deadline termination for queries.

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/engine/AbstractRunningQuery.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/engine/AbstractRunningQuery.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/engine/AbstractRunningQuery.java	2014-07-14 20:08:31 UTC (rev 8546)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/engine/AbstractRunningQuery.java	2014-07-14 20:22:02 UTC (rev 8547)
@@ -146,13 +146,13 @@
     /** The unique identifier for this query. */
     final private UUID queryId;
 
-    /**
-     * The query deadline. The value is the system clock time in milliseconds
-     * when the query is due and {@link Long#MAX_VALUE} if there is no deadline.
-     * In order to have a guarantee of a consistent clock, the deadline is
-     * interpreted by the query controller.
-     */
-    final private AtomicLong deadline = new AtomicLong(Long.MAX_VALUE);
+//    /**
+//     * The query deadline. The value is the system clock time in milliseconds
+//     * when the query is due and {@link Long#MAX_VALUE} if there is no deadline.
+//     * In order to have a guarantee of a consistent clock, the deadline is
+//     * interpreted by the query controller.
+//     */
+//    final private AtomicLong deadline = new AtomicLong(Long.MAX_VALUE);
 
     /**
      * The timestamp (ms) when the query begins to execute.
@@ -1744,7 +1744,7 @@
         lock.lock();
         try {
             sb.append(",elapsed=" + getElapsed());
-            sb.append(",deadline=" + deadline.get());
+            sb.append(",deadline=" + runState.getDeadline());
             sb.append(",isDone=" + isDone());
             sb.append(",isCancelled=" + isCancelled());
             sb.append(",runState=" + runState);

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