[29/38] incubator-quickstep git commit: Refactored the debug logs in the query execution.
Refactored the debug logs in the query execution.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/686bbb58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/686bbb58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/686bbb58
Branch: refs/heads/reorder-partitioned-hash-join
Commit: 686bbb587035b4980503373461c7df4466115023
Parents: 8643add
Author: Zuyu Zhang
Authored: Sun Mar 5 01:54:45 2017 -0800
Committer: Zuyu Zhang
Committed: Sun Mar 5 02:03:57 2017 -0800
--
cli/distributed/Cli.cpp | 22
cli/distributed/Conductor.cpp | 21
cli/distributed/QuickstepDistributedCli.cpp | 2 +
.../DistributedCommandExecutorTestRunner.cpp| 11 +---
query_execution/BlockLocator.cpp| 24 -
query_execution/BlockLocatorUtil.cpp| 11 ++--
query_execution/ForemanDistributed.cpp | 15 +++---
query_execution/ForemanSingleNode.cpp | 7 ++-
query_execution/PolicyEnforcerDistributed.cpp | 17 ++
query_execution/QueryExecutionUtil.hpp | 48 -
query_execution/QueryManagerDistributed.cpp | 3 +-
query_execution/Shiftboss.cpp | 56 +---
query_execution/Worker.cpp | 7 +--
query_execution/tests/BlockLocator_unittest.cpp | 9 ++--
relational_operators/DeleteOperator.cpp | 3 +-
relational_operators/RebuildWorkOrder.hpp | 3 +-
relational_operators/UpdateOperator.cpp | 3 +-
relational_operators/WorkOrder.hpp | 3 +-
storage/InsertDestination.cpp | 15 +++---
storage/InsertDestination.hpp | 3 +-
storage/StorageManager.cpp | 21
storage/tests/DataExchange_unittest.cpp | 5 +-
22 files changed, 151 insertions(+), 158 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/686bbb58/cli/distributed/Cli.cpp
--
diff --git a/cli/distributed/Cli.cpp b/cli/distributed/Cli.cpp
index 14880a7..9f48ecc 100644
--- a/cli/distributed/Cli.cpp
+++ b/cli/distributed/Cli.cpp
@@ -88,9 +88,7 @@ void Cli::init() {
bus_.RegisterClientAsSender(cli_id_, kDistributedCliRegistrationMessage);
bus_.RegisterClientAsReceiver(cli_id_,
kDistributedCliRegistrationResponseMessage);
- DLOG(INFO) << "DistributedCli sent DistributedCliRegistrationMessage (typed
'"
- << kDistributedCliRegistrationMessage
- << "') to all";
+ DLOG(INFO) << "DistributedCli sent DistributedCliRegistrationMessage to all";
tmb::Address all_addresses;
all_addresses.All(true);
@@ -103,12 +101,12 @@ void Cli::init() {
// Wait for Conductor to response.
const AnnotatedMessage cli_reg_response_message(bus_.Receive(cli_id_, 0,
true));
- CHECK_EQ(kDistributedCliRegistrationResponseMessage,
- cli_reg_response_message.tagged_message.message_type());
+ DCHECK_EQ(kDistributedCliRegistrationResponseMessage,
+cli_reg_response_message.tagged_message.message_type());
conductor_client_id_ = cli_reg_response_message.sender;
- DLOG(INFO) << "DistributedCli received typed '" <<
kDistributedCliRegistrationResponseMessage
- << "' message from Conductor (id'" << conductor_client_id_ <<
"').";
+ DLOG(INFO) << "DistributedCli received
DistributedCliRegistrationResponseMessage from Conductor with Client "
+ << conductor_client_id_;
// Setup StorageManager.
bus_.RegisterClientAsSender(cli_id_, kBlockDomainRegistrationMessage);
@@ -179,8 +177,7 @@ void Cli::run() {
}
}
-DLOG(INFO) << "DistributedCli sent SqlQueryMessage (typed '" <<
kSqlQueryMessage
- << "') to Conductor";
+DLOG(INFO) << "DistributedCli sent SqlQueryMessage to Conductor";
S::SqlQueryMessage proto;
proto.set_sql_query(*command_string);
@@ -197,9 +194,10 @@ void Cli::run() {
const AnnotatedMessage annotated_message(bus_.Receive(cli_id_, 0,
true));
const TaggedMessage &tagged_message = annotated_message.tagged_message;
-DLOG(INFO) << "DistributedCli received typed '" <<
tagged_message.message_type()
- << "' message from client " << annotated_message.sender;
-switch (tagged_message.message_type()) {
+const tmb::message_type_id message_type =
tagged_message.message_type();
+DLOG(INFO) << "DistributedCli received " <<
QueryExecutionUtil::MessageTypeToString(message_type)
+ << " from Client " << annotated_message.sender;
+switch (message_type) {
case kCommandResponseMessage
incubator-quickstep git commit: Refactored the debug logs in the query execution.
Repository: incubator-quickstep
Updated Branches:
refs/heads/master 8643add3f -> 686bbb587
Refactored the debug logs in the query execution.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/686bbb58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/686bbb58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/686bbb58
Branch: refs/heads/master
Commit: 686bbb587035b4980503373461c7df4466115023
Parents: 8643add
Author: Zuyu Zhang
Authored: Sun Mar 5 01:54:45 2017 -0800
Committer: Zuyu Zhang
Committed: Sun Mar 5 02:03:57 2017 -0800
--
cli/distributed/Cli.cpp | 22
cli/distributed/Conductor.cpp | 21
cli/distributed/QuickstepDistributedCli.cpp | 2 +
.../DistributedCommandExecutorTestRunner.cpp| 11 +---
query_execution/BlockLocator.cpp| 24 -
query_execution/BlockLocatorUtil.cpp| 11 ++--
query_execution/ForemanDistributed.cpp | 15 +++---
query_execution/ForemanSingleNode.cpp | 7 ++-
query_execution/PolicyEnforcerDistributed.cpp | 17 ++
query_execution/QueryExecutionUtil.hpp | 48 -
query_execution/QueryManagerDistributed.cpp | 3 +-
query_execution/Shiftboss.cpp | 56 +---
query_execution/Worker.cpp | 7 +--
query_execution/tests/BlockLocator_unittest.cpp | 9 ++--
relational_operators/DeleteOperator.cpp | 3 +-
relational_operators/RebuildWorkOrder.hpp | 3 +-
relational_operators/UpdateOperator.cpp | 3 +-
relational_operators/WorkOrder.hpp | 3 +-
storage/InsertDestination.cpp | 15 +++---
storage/InsertDestination.hpp | 3 +-
storage/StorageManager.cpp | 21
storage/tests/DataExchange_unittest.cpp | 5 +-
22 files changed, 151 insertions(+), 158 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/686bbb58/cli/distributed/Cli.cpp
--
diff --git a/cli/distributed/Cli.cpp b/cli/distributed/Cli.cpp
index 14880a7..9f48ecc 100644
--- a/cli/distributed/Cli.cpp
+++ b/cli/distributed/Cli.cpp
@@ -88,9 +88,7 @@ void Cli::init() {
bus_.RegisterClientAsSender(cli_id_, kDistributedCliRegistrationMessage);
bus_.RegisterClientAsReceiver(cli_id_,
kDistributedCliRegistrationResponseMessage);
- DLOG(INFO) << "DistributedCli sent DistributedCliRegistrationMessage (typed
'"
- << kDistributedCliRegistrationMessage
- << "') to all";
+ DLOG(INFO) << "DistributedCli sent DistributedCliRegistrationMessage to all";
tmb::Address all_addresses;
all_addresses.All(true);
@@ -103,12 +101,12 @@ void Cli::init() {
// Wait for Conductor to response.
const AnnotatedMessage cli_reg_response_message(bus_.Receive(cli_id_, 0,
true));
- CHECK_EQ(kDistributedCliRegistrationResponseMessage,
- cli_reg_response_message.tagged_message.message_type());
+ DCHECK_EQ(kDistributedCliRegistrationResponseMessage,
+cli_reg_response_message.tagged_message.message_type());
conductor_client_id_ = cli_reg_response_message.sender;
- DLOG(INFO) << "DistributedCli received typed '" <<
kDistributedCliRegistrationResponseMessage
- << "' message from Conductor (id'" << conductor_client_id_ <<
"').";
+ DLOG(INFO) << "DistributedCli received
DistributedCliRegistrationResponseMessage from Conductor with Client "
+ << conductor_client_id_;
// Setup StorageManager.
bus_.RegisterClientAsSender(cli_id_, kBlockDomainRegistrationMessage);
@@ -179,8 +177,7 @@ void Cli::run() {
}
}
-DLOG(INFO) << "DistributedCli sent SqlQueryMessage (typed '" <<
kSqlQueryMessage
- << "') to Conductor";
+DLOG(INFO) << "DistributedCli sent SqlQueryMessage to Conductor";
S::SqlQueryMessage proto;
proto.set_sql_query(*command_string);
@@ -197,9 +194,10 @@ void Cli::run() {
const AnnotatedMessage annotated_message(bus_.Receive(cli_id_, 0,
true));
const TaggedMessage &tagged_message = annotated_message.tagged_message;
-DLOG(INFO) << "DistributedCli received typed '" <<
tagged_message.message_type()
- << "' message from client " << annotated_message.sender;
-switch (tagged_message.message_type()) {
+const tmb::message_type_id message_type =
tagged_message.message_type();
+DLOG(INFO) << "DistributedCli received " <<
QueryExecutionUtil::MessageTypeToString(message_type)
+ << " from Client " << annotated_message.sender;
