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 2016/10/09 22:48:18 UTC
incubator-quickstep git commit: IWYU fixes for QueryExecutionUtil.
Repository: incubator-quickstep
Updated Branches:
refs/heads/iwyu_fix [created] b5dcb6d29
IWYU fixes for QueryExecutionUtil.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/b5dcb6d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/b5dcb6d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/b5dcb6d2
Branch: refs/heads/iwyu_fix
Commit: b5dcb6d29805dce944c11d5ad0720a3267ad57cf
Parents: 2e02333
Author: Zuyu Zhang <zu...@apache.org>
Authored: Sun Oct 9 15:48:03 2016 -0700
Committer: Zuyu Zhang <zu...@apache.org>
Committed: Sun Oct 9 15:48:03 2016 -0700
----------------------------------------------------------------------
query_execution/CMakeLists.txt | 1 -
query_execution/QueryExecutionUtil.hpp | 34 ++++++++++++++++-------------
2 files changed, 19 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b5dcb6d2/query_execution/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/query_execution/CMakeLists.txt b/query_execution/CMakeLists.txt
index 1b27194..6a84be1 100644
--- a/query_execution/CMakeLists.txt
+++ b/query_execution/CMakeLists.txt
@@ -217,7 +217,6 @@ target_link_libraries(quickstep_queryexecution_QueryExecutionTypedefs
target_link_libraries(quickstep_queryexecution_QueryExecutionUtil
quickstep_queryexecution_AdmitRequestMessage
quickstep_queryexecution_QueryExecutionTypedefs
- quickstep_queryexecution_WorkerMessage
quickstep_utility_Macros
tmb)
target_link_libraries(quickstep_queryexecution_QueryManagerBase
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/b5dcb6d2/query_execution/QueryExecutionUtil.hpp
----------------------------------------------------------------------
diff --git a/query_execution/QueryExecutionUtil.hpp b/query_execution/QueryExecutionUtil.hpp
index feb4cc0..7a3a3b3 100644
--- a/query_execution/QueryExecutionUtil.hpp
+++ b/query_execution/QueryExecutionUtil.hpp
@@ -20,26 +20,30 @@
#ifndef QUICKSTEP_QUERY_EXECUTION_QUERY_EXECUTION_UTIL_HPP_
#define QUICKSTEP_QUERY_EXECUTION_QUERY_EXECUTION_UTIL_HPP_
+#include <cstddef>
#include <memory>
#include <utility>
#include "query_execution/AdmitRequestMessage.hpp"
#include "query_execution/QueryExecutionTypedefs.hpp"
-#include "query_execution/WorkerMessage.hpp"
#include "utility/Macros.hpp"
#include "glog/logging.h"
#include "tmb/address.h"
#include "tmb/id_typedefs.h"
-#include "tmb/message_style.h"
#include "tmb/message_bus.h"
+#include "tmb/message_style.h"
#include "tmb/tagged_message.h"
namespace quickstep {
class QueryHandle;
+/** \addtogroup QueryExecution
+ * @{
+ */
+
/**
* @brief A static class for reusable methods in query_execution module.
**/
@@ -57,14 +61,14 @@ class QueryExecutionUtil {
* The caller should ensure that the status is SendStatus::kOK.
**/
static tmb::MessageBus::SendStatus SendTMBMessage(
- MessageBus *bus,
- client_id sender_id,
- client_id receiver_id,
- TaggedMessage &&tagged_message) { // NOLINT(whitespace/operators)
- Address receiver_address;
+ tmb::MessageBus *bus,
+ tmb::client_id sender_id,
+ tmb::client_id receiver_id,
+ tmb::TaggedMessage &&tagged_message) { // NOLINT(whitespace/operators)
+ tmb::Address receiver_address;
receiver_address.AddRecipient(receiver_id);
- MessageStyle single_receiver_style;
+ tmb::MessageStyle single_receiver_style;
return bus->Send(sender_id,
receiver_address,
single_receiver_style,
@@ -88,11 +92,11 @@ class QueryExecutionUtil {
const tmb::client_id sender_id,
const tmb::client_id receiver_id,
QueryHandle *query_handle,
- MessageBus *bus) {
+ tmb::MessageBus *bus) {
std::unique_ptr<AdmitRequestMessage> request_message(
new AdmitRequestMessage(query_handle));
const std::size_t size_of_request_msg = sizeof(*request_message);
- TaggedMessage admit_tagged_message(
+ tmb::TaggedMessage admit_tagged_message(
request_message.release(), size_of_request_msg, kAdmitRequestMessage);
return QueryExecutionUtil::SendTMBMessage(
@@ -111,9 +115,9 @@ class QueryExecutionUtil {
**/
static void ReceiveQueryCompletionMessage(const tmb::client_id receiver_id,
tmb::MessageBus *bus) {
- const AnnotatedMessage annotated_msg =
+ const tmb::AnnotatedMessage annotated_msg =
bus->Receive(receiver_id, 0, true);
- const TaggedMessage &tagged_message = annotated_msg.tagged_message;
+ const tmb::TaggedMessage &tagged_message = annotated_msg.tagged_message;
DCHECK_EQ(kWorkloadCompletionMessage, tagged_message.message_type());
}
@@ -122,11 +126,11 @@ class QueryExecutionUtil {
// The sender thread broadcasts poison message to the workers and foreman.
// Each worker dies after receiving poison message. The order of workers'
// death is irrelavant.
- MessageStyle style;
+ tmb::MessageStyle style;
style.Broadcast(true);
- Address address;
+ tmb::Address address;
address.All(true);
- TaggedMessage poison_tagged_message(kPoisonMessage);
+ tmb::TaggedMessage poison_tagged_message(kPoisonMessage);
DLOG(INFO) << "TMB client ID " << sender_id
<< " broadcast PoisonMessage (typed '" << kPoisonMessage << "') to all";