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 2017/05/17 05:48:26 UTC
incubator-quickstep git commit: Print the partition id in WorkOrder
Reconstruction.
Repository: incubator-quickstep
Updated Branches:
refs/heads/master 97650fb85 -> e4dd66ea2
Print the partition id in WorkOrder Reconstruction.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/e4dd66ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/e4dd66ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/e4dd66ea
Branch: refs/heads/master
Commit: e4dd66ea2501c475aeea07a551a4c5c11800bc3c
Parents: 97650fb
Author: Zuyu Zhang <zu...@apache.org>
Authored: Sat May 13 22:45:15 2017 -0700
Committer: Zuyu Zhang <zu...@apache.org>
Committed: Tue May 16 22:46:59 2017 -0700
----------------------------------------------------------------------
relational_operators/WorkOrderFactory.cpp | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/e4dd66ea/relational_operators/WorkOrderFactory.cpp
----------------------------------------------------------------------
diff --git a/relational_operators/WorkOrderFactory.cpp b/relational_operators/WorkOrderFactory.cpp
index d63bb62..bb71ec4 100644
--- a/relational_operators/WorkOrderFactory.cpp
+++ b/relational_operators/WorkOrderFactory.cpp
@@ -128,16 +128,17 @@ WorkOrder* WorkOrderFactory::ReconstructFromProto(const serialization::WorkOrder
CreateLIPFilterBuilderHelper(lip_deployment_index, query_context));
}
case serialization::BUILD_HASH: {
- LOG(INFO) << "Creating BuildHashWorkOrder for Query " << proto.query_id() << " in Shiftboss " << shiftboss_index;
+ const partition_id part_id =
+ proto.GetExtension(serialization::BuildHashWorkOrder::partition_id);
+
+ LOG(INFO) << "Creating BuildHashWorkOrder (Partition " << part_id << ") for Query " << proto.query_id()
+ << " in Shiftboss " << shiftboss_index;
vector<attribute_id> join_key_attributes;
for (int i = 0; i < proto.ExtensionSize(serialization::BuildHashWorkOrder::join_key_attributes); ++i) {
join_key_attributes.push_back(
proto.GetExtension(serialization::BuildHashWorkOrder::join_key_attributes, i));
}
- const partition_id part_id =
- proto.GetExtension(serialization::BuildHashWorkOrder::partition_id);
-
return new BuildHashWorkOrder(
proto.query_id(),
catalog_database->getRelationSchemaById(
@@ -176,14 +177,16 @@ WorkOrder* WorkOrderFactory::ReconstructFromProto(const serialization::WorkOrder
query_context);
}
case serialization::DESTROY_HASH: {
- LOG(INFO) << "Creating DestroyHashWorkOrder for Query " << proto.query_id()
+ const partition_id part_id =
+ proto.GetExtension(serialization::DestroyHashWorkOrder::partition_id);
+
+ LOG(INFO) << "Creating DestroyHashWorkOrder (Partition " << part_id << ") for Query " << proto.query_id()
<< " in Shiftboss " << shiftboss_index;
return new DestroyHashWorkOrder(
proto.query_id(),
proto.GetExtension(
serialization::DestroyHashWorkOrder::join_hash_table_index),
- proto.GetExtension(
- serialization::DestroyHashWorkOrder::partition_id),
+ part_id,
query_context);
}
case serialization::DROP_TABLE: {
@@ -265,7 +268,7 @@ WorkOrder* WorkOrderFactory::ReconstructFromProto(const serialization::WorkOrder
switch (hash_join_work_order_type) {
case serialization::HashJoinWorkOrder::HASH_ANTI_JOIN: {
- LOG(INFO) << "Creating HashAntiJoinWorkOrder for Query " << proto.query_id()
+ LOG(INFO) << "Creating HashAntiJoinWorkOrder (Partition " << part_id << ") for Query " << proto.query_id()
<< " in Shiftboss " << shiftboss_index;
return new HashAntiJoinWorkOrder(
proto.query_id(),
@@ -283,7 +286,7 @@ WorkOrder* WorkOrderFactory::ReconstructFromProto(const serialization::WorkOrder
lip_filter_adaptive_prober);
}
case serialization::HashJoinWorkOrder::HASH_INNER_JOIN: {
- LOG(INFO) << "Creating HashInnerJoinWorkOrder for Query " << proto.query_id()
+ LOG(INFO) << "Creating HashInnerJoinWorkOrder (Partition " << part_id << ") for Query " << proto.query_id()
<< " in Shiftboss " << shiftboss_index;
return new HashInnerJoinWorkOrder(
proto.query_id(),
@@ -309,7 +312,7 @@ WorkOrder* WorkOrderFactory::ReconstructFromProto(const serialization::WorkOrder
proto.GetExtension(serialization::HashJoinWorkOrder::is_selection_on_build, i));
}
- LOG(INFO) << "Creating HashOuterJoinWorkOrder for Query " << proto.query_id()
+ LOG(INFO) << "Creating HashOuterJoinWorkOrder (Partition " << part_id << ") for Query " << proto.query_id()
<< " in Shiftboss " << shiftboss_index;
return new HashOuterJoinWorkOrder(
proto.query_id(),
@@ -327,7 +330,7 @@ WorkOrder* WorkOrderFactory::ReconstructFromProto(const serialization::WorkOrder
lip_filter_adaptive_prober);
}
case serialization::HashJoinWorkOrder::HASH_SEMI_JOIN: {
- LOG(INFO) << "Creating HashSemiJoinWorkOrder for Query " << proto.query_id()
+ LOG(INFO) << "Creating HashSemiJoinWorkOrder (Partition " << part_id << ") for Query " << proto.query_id()
<< " in Shiftboss " << shiftboss_index;
return new HashSemiJoinWorkOrder(
proto.query_id(),