You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@quickstep.apache.org by zu...@apache.org on 2017/03/13 20:55:57 UTC

[48/60] [abbrv] incubator-quickstep git commit: Minor refactored in PolicyEnforcerDistributed::getWorkOrderProtoMessages.

Minor refactored in PolicyEnforcerDistributed::getWorkOrderProtoMessages.


Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/64316f85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/64316f85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/64316f85

Branch: refs/heads/dist-patch
Commit: 64316f8588c7665fad527ffa0560bc327cec0187
Parents: f8cf7fb
Author: Zuyu Zhang <zu...@apache.org>
Authored: Fri Mar 10 00:13:52 2017 -0800
Committer: Zuyu Zhang <zu...@apache.org>
Committed: Fri Mar 10 00:13:52 2017 -0800

----------------------------------------------------------------------
 query_execution/PolicyEnforcerDistributed.cpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/64316f85/query_execution/PolicyEnforcerDistributed.cpp
----------------------------------------------------------------------
diff --git a/query_execution/PolicyEnforcerDistributed.cpp b/query_execution/PolicyEnforcerDistributed.cpp
index 5cd4341..857d9aa 100644
--- a/query_execution/PolicyEnforcerDistributed.cpp
+++ b/query_execution/PolicyEnforcerDistributed.cpp
@@ -87,14 +87,12 @@ void PolicyEnforcerDistributed::getWorkOrderProtoMessages(
   // works well when multiple queries are getting executed.
   if (admitted_queries_.empty()) {
     if (waiting_queries_.empty()) {
-      LOG(WARNING) << "Requesting WorkOrderProtoMessages when no query is running";
       return;
-    } else {
-      // Admit the earliest waiting query.
-      QueryHandle *new_query = waiting_queries_.front();
-      waiting_queries_.pop();
-      admitQuery(new_query);
-    }
+
+    // Admit the earliest waiting query.
+    QueryHandle *new_query = waiting_queries_.front();
+    waiting_queries_.pop();
+    admitQuery(new_query);
   }
 
   const std::size_t per_query_share =