You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@quickstep.apache.org by ch...@apache.org on 2016/07/28 02:57:28 UTC
[11/15] incubator-quickstep git commit: Minor bug fix in QueryManager
base.
Minor bug fix in QueryManager base.
- Modified the order in which we check the completion of query and
completion of an operator in the queryStatus function.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/59fdd9ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/59fdd9ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/59fdd9ae
Branch: refs/heads/types-readme
Commit: 59fdd9ae6bb0a990c697adb77b5810e11456c99c
Parents: 120de6d
Author: Harshad Deshmukh <hb...@apache.org>
Authored: Mon Jul 25 12:23:34 2016 -0500
Committer: Craig Chasseur <sp...@gmail.com>
Committed: Wed Jul 27 19:56:58 2016 -0700
----------------------------------------------------------------------
query_execution/QueryManagerBase.cpp | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/59fdd9ae/query_execution/QueryManagerBase.cpp
----------------------------------------------------------------------
diff --git a/query_execution/QueryManagerBase.cpp b/query_execution/QueryManagerBase.cpp
index 37beb02..d2a3341 100644
--- a/query_execution/QueryManagerBase.cpp
+++ b/query_execution/QueryManagerBase.cpp
@@ -71,15 +71,16 @@ QueryManagerBase::QueryManagerBase(QueryHandle *query_handle)
QueryManagerBase::QueryStatusCode QueryManagerBase::queryStatus(
const dag_node_index op_index) {
- if (query_exec_state_->hasExecutionFinished(op_index)) {
- return QueryStatusCode::kOperatorExecuted;
- }
-
- // As kQueryExecuted takes precedence over kOperatorExecuted, we check again.
+ // As kQueryExecuted takes precedence over kOperatorExecuted, we first check
+ // whether the query has finished its execution.
if (query_exec_state_->hasQueryExecutionFinished()) {
return QueryStatusCode::kQueryExecuted;
}
+ if (query_exec_state_->hasExecutionFinished(op_index)) {
+ return QueryStatusCode::kOperatorExecuted;
+ }
+
return QueryStatusCode::kNone;
}