Minor refactored the debug logs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/c72aaf0a Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/c72aaf0a Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/c72aaf0a Branch: refs/heads/reorder-partitioned-hash-join Commit: c72aaf0aefdf88a6d956b337fa19f6919c08cc9f Parents: d81ca08 Author: Zuyu Zhang <zu...@apache.org> Authored: Sun Mar 5 02:52:34 2017 -0800 Committer: Zuyu Zhang <zu...@apache.org> Committed: Sun Mar 5 02:52:34 2017 -0800 ---------------------------------------------------------------------- query_execution/Shiftboss.cpp | 4 ++-- query_execution/tests/BlockLocator_unittest.cpp | 4 ++-- storage/StorageManager.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/c72aaf0a/query_execution/Shiftboss.cpp ---------------------------------------------------------------------- diff --git a/query_execution/Shiftboss.cpp b/query_execution/Shiftboss.cpp index d023d84..e227385 100644 --- a/query_execution/Shiftboss.cpp +++ b/query_execution/Shiftboss.cpp @@ -159,8 +159,8 @@ void Shiftboss::run() { for (;;) { if (bus_global_->ReceiveIfAvailable(shiftboss_client_id_global_, &annotated_message, 0, true)) { message_type = annotated_message.tagged_message.message_type(); - DLOG(INFO) << "Shiftboss " << shiftboss_index_ << " (id '" << shiftboss_client_id_global_ - << "') received " << QueryExecutionUtil::MessageTypeToString(message_type) + DLOG(INFO) << "Shiftboss " << shiftboss_index_ << " with Client " << shiftboss_client_id_global_ + << " received " << QueryExecutionUtil::MessageTypeToString(message_type) << " from Foreman with Client " << annotated_message.sender; switch (message_type) { case kQueryInitiateMessage: { http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/c72aaf0a/query_execution/tests/BlockLocator_unittest.cpp ---------------------------------------------------------------------- diff --git a/query_execution/tests/BlockLocator_unittest.cpp b/query_execution/tests/BlockLocator_unittest.cpp index 426a2c9..b73c2f7 100644 --- a/query_execution/tests/BlockLocator_unittest.cpp +++ b/query_execution/tests/BlockLocator_unittest.cpp @@ -129,8 +129,8 @@ class BlockLocatorTest : public ::testing::Test { const AnnotatedMessage annotated_message(bus_.Receive(worker_client_id_, 0, true)); const TaggedMessage &tagged_message = annotated_message.tagged_message; CHECK_EQ(kLocateBlockResponseMessage, tagged_message.message_type()); - LOG(INFO) << "Worker (id '" << worker_client_id_ - << "') received LocateBlockResponseMessage from BlockLocator"; + LOG(INFO) << "Worker with Client " << worker_client_id_ + << " received LocateBlockResponseMessage from BlockLocator"; serialization::LocateBlockResponseMessage response_proto; CHECK(response_proto.ParseFromArray(tagged_message.message(), tagged_message.message_bytes())); http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/c72aaf0a/storage/StorageManager.cpp ---------------------------------------------------------------------- diff --git a/storage/StorageManager.cpp b/storage/StorageManager.cpp index 4410385..c70eafa 100644 --- a/storage/StorageManager.cpp +++ b/storage/StorageManager.cpp @@ -233,8 +233,8 @@ StorageManager::StorageManager( bus_->RegisterClientAsSender(storage_manager_client_id_, kDeleteBlockLocationMessage); bus_->RegisterClientAsSender(storage_manager_client_id_, kBlockDomainUnregistrationMessage); - LOG(INFO) << "StorageManager (id '" << storage_manager_client_id_ - << "') starts with Domain " << block_domain; + LOG(INFO) << "StorageManager with Client " << storage_manager_client_id_ + << " starts with Domain " << block_domain; } #endif @@ -605,8 +605,8 @@ vector<string> StorageManager::getPeerDomainNetworkAddresses(const block_id bloc const TaggedMessage &tagged_message = annotated_message.tagged_message; CHECK_EQ(block_locator_client_id_, annotated_message.sender); CHECK_EQ(kGetPeerDomainNetworkAddressesResponseMessage, tagged_message.message_type()); - DLOG(INFO) << "StorageManager (id '" << storage_manager_client_id_ - << "') received GetPeerDomainNetworkAddressesResponseMessage from BlockLocator"; + DLOG(INFO) << "StorageManager with Client " << storage_manager_client_id_ + << " received GetPeerDomainNetworkAddressesResponseMessage from BlockLocator"; serialization::GetPeerDomainNetworkAddressesResponseMessage response_proto; CHECK(response_proto.ParseFromArray(tagged_message.message(), tagged_message.message_bytes()));