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/05/27 03:23:27 UTC
[36/50] [abbrv] incubator-quickstep git commit: Fixed a bug.
Fixed a bug.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/d527ef22
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/d527ef22
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/d527ef22
Branch: refs/heads/partition_aware_hashjoin_with_optimizer_support
Commit: d527ef22610093ba3e9063b74fa1ce043db1c132
Parents: 6c342a4
Author: Adalbert Gerald Soosai Raj <ge...@cs.wisc.edu>
Authored: Mon May 23 18:14:05 2016 -0500
Committer: Adalbert Gerald Soosai Raj <ge...@cs.wisc.edu>
Committed: Mon May 23 18:14:05 2016 -0500
----------------------------------------------------------------------
relational_operators/HashJoinOperator.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/d527ef22/relational_operators/HashJoinOperator.cpp
----------------------------------------------------------------------
diff --git a/relational_operators/HashJoinOperator.cpp b/relational_operators/HashJoinOperator.cpp
index 4acabde..7b3961c 100644
--- a/relational_operators/HashJoinOperator.cpp
+++ b/relational_operators/HashJoinOperator.cpp
@@ -314,7 +314,7 @@ void HashJoinOperator::addWorkOrdersUsingPartitionedInput(WorkOrdersContainer *c
}
} else {
for (std::size_t part_id = 0; part_id < num_partitions; ++part_id) {
- while (num_workorders_generated_ < probe_relation_block_ids_in_partition_[part_id].size()) {
+ while (num_workorders_generated_in_partition_[part_id] < probe_relation_block_ids_in_partition_[part_id].size()) {
container->addNormalWorkOrder(new JoinWorkOrderClass(build_relation_,
probe_relation_,
join_key_attributes_,
@@ -326,7 +326,7 @@ void HashJoinOperator::addWorkOrdersUsingPartitionedInput(WorkOrdersContainer *c
output_destination,
storage_manager),
op_index_);
- ++num_workorders_generated_;
+ ++num_workorders_generated_in_partition_[part_id];
} // end while
}
} // end else (probe_relation_is_stored_)