Repository: incubator-quickstep
Updated Branches:
  refs/heads/reorder-partitioned-hash-join 29cfa41e6 -> 6afdbbf76 (forced 
update)


Minor improved the scheduling algorithm in the distributed version.


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

Branch: refs/heads/reorder-partitioned-hash-join
Commit: ab46d78de70b7490dc1ce25aad51a5165848ae95
Parents: fead6f8
Author: Zuyu Zhang <zu...@apache.org>
Authored: Fri Feb 10 20:37:23 2017 -0800
Committer: Zuyu Zhang <zu...@apache.org>
Committed: Fri Feb 10 20:37:23 2017 -0800

----------------------------------------------------------------------
 query_execution/ForemanDistributed.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/ab46d78d/query_execution/ForemanDistributed.cpp
----------------------------------------------------------------------
diff --git a/query_execution/ForemanDistributed.cpp 
b/query_execution/ForemanDistributed.cpp
index 8c20e65..389d6ab 100644
--- a/query_execution/ForemanDistributed.cpp
+++ b/query_execution/ForemanDistributed.cpp
@@ -378,7 +378,8 @@ void ForemanDistributed::dispatchWorkOrderMessages(const 
vector<unique_ptr<S::Wo
     sendWorkOrderMessage(shiftboss_index_for_particular_work_order_type, 
proto);
     
shiftboss_directory_.incrementNumQueuedWorkOrders(shiftboss_index_for_particular_work_order_type);
 
-    if (shiftboss_index == shiftboss_index_for_particular_work_order_type) {
+    if (shiftboss_index == shiftboss_index_for_particular_work_order_type &&
+        shiftboss_directory_.hasReachedCapacity(shiftboss_index)) {
       shiftboss_index = (shiftboss_index + 1) % shiftboss_directory_.size();
     } else {
       // NOTE(zuyu): This is not the exact round-robin scheduling, as in this 
case,

Reply via email to