commit c72aaf0aefdf88a6d956b337fa19f6919c08cc9f
author Zuyu Zhang <zuyuz@apache.org> Sun Mar 05 02:52:34 2017 -0800
committer Zuyu Zhang <zuyuz@apache.org> Sun Mar 05 02:52:34 2017 -0800
tree 53510a6e1162910782783f197b4ac7cbbc03bf27
parent d81ca08691bb2f07da1d52bdc756e3830753569d

Minor refactored the debug logs.

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 @@
   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: {

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 @@
     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()));

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 @@
     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 @@
   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()));