quickstep-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jianq...@apache.org
Subject [51/62] [abbrv] incubator-quickstep git commit: Minor refactored the registration process between Foreman and Shiftboss.
Date Wed, 15 Mar 2017 19:01:10 GMT
Minor refactored the registration process between Foreman and Shiftboss.


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

Branch: refs/heads/LIP-time-decomposition
Commit: a5c68dd088cf45bb210b0257dfe291669712e7ba
Parents: c9be13b
Author: Zuyu Zhang <zuyuz@apache.org>
Authored: Fri Mar 10 04:21:15 2017 -0800
Committer: Zuyu Zhang <zuyuz@apache.org>
Committed: Fri Mar 10 04:21:15 2017 -0800

----------------------------------------------------------------------
 query_execution/Shiftboss.cpp                                    | 4 ++--
 .../tests/DistributedExecutionGeneratorTestRunner.cpp            | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/a5c68dd0/query_execution/Shiftboss.cpp
----------------------------------------------------------------------
diff --git a/query_execution/Shiftboss.cpp b/query_execution/Shiftboss.cpp
index 01c81b2..905464f 100644
--- a/query_execution/Shiftboss.cpp
+++ b/query_execution/Shiftboss.cpp
@@ -158,8 +158,6 @@ void Shiftboss::run() {
     ThreadUtil::BindToCPU(cpu_id_);
   }
 
-  processShiftbossRegistrationResponseMessage();
-
   AnnotatedMessage annotated_message;
   tmb::message_type_id message_type;
   for (;;) {
@@ -322,6 +320,8 @@ void Shiftboss::registerWithForeman() {
   tmb::MessageBus::SendStatus send_status =
       bus_global_->Send(shiftboss_client_id_global_, all_addresses, style, move(message));
   DCHECK(send_status == tmb::MessageBus::SendStatus::kOK);
+
+  processShiftbossRegistrationResponseMessage();
 }
 
 void Shiftboss::processShiftbossRegistrationResponseMessage() {

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/a5c68dd0/query_optimizer/tests/DistributedExecutionGeneratorTestRunner.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/tests/DistributedExecutionGeneratorTestRunner.cpp b/query_optimizer/tests/DistributedExecutionGeneratorTestRunner.cpp
index 0eeb83f..be04c50 100644
--- a/query_optimizer/tests/DistributedExecutionGeneratorTestRunner.cpp
+++ b/query_optimizer/tests/DistributedExecutionGeneratorTestRunner.cpp
@@ -110,6 +110,7 @@ DistributedExecutionGeneratorTestRunner::DistributedExecutionGeneratorTestRunner
   // could receive a registration message from the latter.
   foreman_ = make_unique<ForemanDistributed>(*block_locator_, &bus_, test_database_loader_->catalog_database(),
                                              nullptr /* query_processor */);
+  foreman_->start();
 
   // We don't use the NUMA aware version of worker code.
   const vector<numa_node_id> numa_nodes(1 /* Number of worker threads per instance
*/,
@@ -140,8 +141,6 @@ DistributedExecutionGeneratorTestRunner::DistributedExecutionGeneratorTestRunner
     storage_managers_.push_back(move(storage_manager));
   }
 
-  foreman_->start();
-
   for (int i = 0; i < kNumInstances; ++i) {
     data_exchangers_[i].start();
     shiftbosses_[i]->start();


Mime
View raw message