You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@quickstep.apache.org by hb...@apache.org on 2016/06/08 20:49:12 UTC
[13/16] incubator-quickstep git commit: Reordered query ID in
aggregation operator
Reordered query ID in aggregation operator
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/15a2114a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/15a2114a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/15a2114a
Branch: refs/heads/query-manager-used-in-foreman
Commit: 15a2114a2c64c05f8a1b23831496fcf606a38d5d
Parents: eb3e73f
Author: Harshad Deshmukh <hb...@apache.org>
Authored: Wed Jun 8 09:14:20 2016 -0500
Committer: Harshad Deshmukh <hb...@apache.org>
Committed: Wed Jun 8 09:14:20 2016 -0500
----------------------------------------------------------------------
query_optimizer/ExecutionGenerator.cpp | 5 +++--
relational_operators/AggregationOperator.cpp | 4 ++--
relational_operators/AggregationOperator.hpp | 14 +++++++-------
.../tests/AggregationOperator_unittest.cpp | 4 ++--
4 files changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/15a2114a/query_optimizer/ExecutionGenerator.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/ExecutionGenerator.cpp b/query_optimizer/ExecutionGenerator.cpp
index 30dfa8e..56625fd 100644
--- a/query_optimizer/ExecutionGenerator.cpp
+++ b/query_optimizer/ExecutionGenerator.cpp
@@ -1429,10 +1429,11 @@ void ExecutionGenerator::convertAggregate(
const QueryPlan::DAGNodeIndex aggregation_operator_index =
execution_plan_->addRelationalOperator(
new AggregationOperator(
+ query_handle_->query_id(),
*input_relation_info->relation,
input_relation_info->isStoredRelation(),
- aggr_state_index,
- query_handle_->query_id()));
+ aggr_state_index));
+
if (!input_relation_info->isStoredRelation()) {
execution_plan_->addDirectDependency(aggregation_operator_index,
input_relation_info->producer_operator_index,
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/15a2114a/relational_operators/AggregationOperator.cpp
----------------------------------------------------------------------
diff --git a/relational_operators/AggregationOperator.cpp b/relational_operators/AggregationOperator.cpp
index 94ba901..7252541 100644
--- a/relational_operators/AggregationOperator.cpp
+++ b/relational_operators/AggregationOperator.cpp
@@ -39,8 +39,8 @@ bool AggregationOperator::getAllWorkOrders(
for (const block_id input_block_id : input_relation_block_ids_) {
container->addNormalWorkOrder(
new AggregationWorkOrder(
- input_block_id,
query_id_,
+ input_block_id,
query_context->getAggregationState(aggr_state_index_)),
op_index_);
}
@@ -51,8 +51,8 @@ bool AggregationOperator::getAllWorkOrders(
while (num_workorders_generated_ < input_relation_block_ids_.size()) {
container->addNormalWorkOrder(
new AggregationWorkOrder(
- input_relation_block_ids_[num_workorders_generated_],
query_id_,
+ input_relation_block_ids_[num_workorders_generated_],
query_context->getAggregationState(aggr_state_index_)),
op_index_);
++num_workorders_generated_;
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/15a2114a/relational_operators/AggregationOperator.hpp
----------------------------------------------------------------------
diff --git a/relational_operators/AggregationOperator.hpp b/relational_operators/AggregationOperator.hpp
index 0fbc381..f340d4e 100644
--- a/relational_operators/AggregationOperator.hpp
+++ b/relational_operators/AggregationOperator.hpp
@@ -53,17 +53,17 @@ class AggregationOperator : public RelationalOperator {
* @brief Constructor for aggregating with arbitrary expressions in projection
* list.
*
+ * @param query_id The ID of this query.
* @param input_relation The relation to perform aggregation over.
* @param input_relation_is_stored If input_relation is a stored relation and
* is fully available to the operator before it can start generating
* workorders.
* @param aggr_state_index The index of the AggregationState in QueryContext.
- * @param query_id The ID of this query.
**/
- AggregationOperator(const CatalogRelation &input_relation,
+ AggregationOperator(const std::size_t query_id,
+ const CatalogRelation &input_relation,
bool input_relation_is_stored,
- const QueryContext::aggregation_state_id aggr_state_index,
- const std::size_t query_id)
+ const QueryContext::aggregation_state_id aggr_state_index)
: RelationalOperator(query_id),
input_relation_is_stored_(input_relation_is_stored),
input_relation_block_ids_(input_relation_is_stored ? input_relation.getBlocksSnapshot()
@@ -109,12 +109,12 @@ class AggregationWorkOrder : public WorkOrder {
/**
* @brief Constructor
*
- * @param input_block_id The block id.
* @param query_id The ID of this query.
+ * @param input_block_id The block id.
* @param state The AggregationState to use.
**/
- AggregationWorkOrder(const block_id input_block_id,
- const std::size_t query_id,
+ AggregationWorkOrder(const std::size_t query_id,
+ const block_id input_block_id,
AggregationOperationState *state)
: WorkOrder(query_id),
input_block_id_(input_block_id),
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/15a2114a/relational_operators/tests/AggregationOperator_unittest.cpp
----------------------------------------------------------------------
diff --git a/relational_operators/tests/AggregationOperator_unittest.cpp b/relational_operators/tests/AggregationOperator_unittest.cpp
index ace7951..5f3a434 100644
--- a/relational_operators/tests/AggregationOperator_unittest.cpp
+++ b/relational_operators/tests/AggregationOperator_unittest.cpp
@@ -270,7 +270,7 @@ class AggregationOperatorTest : public ::testing::Test {
aggr_state_proto->set_estimated_num_entries(estimated_entries);
// Create Operators.
- op_.reset(new AggregationOperator(*table_, true, aggr_state_index, 0));
+ op_.reset(new AggregationOperator(0, *table_, true, aggr_state_index));
// Setup the InsertDestination proto in the query context proto.
const QueryContext::insert_destination_id insert_destination_index =
@@ -354,7 +354,7 @@ class AggregationOperatorTest : public ::testing::Test {
serialization::HashTableImplType::LINEAR_OPEN_ADDRESSING);
// Create Operators.
- op_.reset(new AggregationOperator(*table_, true, aggr_state_index, 0));
+ op_.reset(new AggregationOperator(0, *table_, true, aggr_state_index));
// Setup the InsertDestination proto in the query context proto.
const QueryContext::insert_destination_id insert_destination_index =