Merge pull request #711 from uwescience/fix-708

QueryManager: fix method of detecting whether a query is finished
uwescience · Mar 5, 2015 · fc3e7e5 · fc3e7e5
2 parents e965374 + 7c65824
commit fc3e7e5
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/edu/washington/escience/myria/parallel/QueryManager.java b/src/edu/washington/escience/myria/parallel/QueryManager.java
@@ -25,6 +25,7 @@
 import edu.washington.escience.myria.RelationKey;
 import edu.washington.escience.myria.api.encoding.QueryEncoding;
 import edu.washington.escience.myria.api.encoding.QueryStatusEncoding;
+import edu.washington.escience.myria.api.encoding.QueryStatusEncoding.Status;
 import edu.washington.escience.myria.coordinator.catalog.CatalogException;
 import edu.washington.escience.myria.coordinator.catalog.MasterCatalog;
 import edu.washington.escience.myria.proto.ControlProto;
@@ -79,9 +80,10 @@ public QueryManager(final MasterCatalog catalog, final Server server) {
   /**
    * @return if a query is running.
    * @param queryId queryID.
+   * @throws CatalogException if there is an exception checking the query status
    */
-  public boolean queryCompleted(final long queryId) {
-    return !runningQueries.containsKey(queryId);
+  public boolean queryCompleted(final long queryId) throws CatalogException {
+    return Status.finished(getQueryStatus(queryId).status);
   }
 
   /**