Fix the problem with CrossReferenceCoalesceAggregate.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/f4f5ca08 Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/f4f5ca08 Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/f4f5ca08 Branch: refs/heads/dist-patch Commit: f4f5ca08600001e92502a3ad9e597e93e994d068 Parents: b88625d Author: Jianqiao Zhu <jianq...@cs.wisc.edu> Authored: Fri Feb 24 10:46:06 2017 -0600 Committer: Zuyu Zhang <zu...@apache.org> Committed: Fri Feb 24 12:51:51 2017 -0800 ---------------------------------------------------------------------- relational_operators/BuildAggregationExistenceMapOperator.cpp | 2 +- relational_operators/BuildAggregationExistenceMapOperator.hpp | 6 +++--- relational_operators/WorkOrderFactory.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/f4f5ca08/relational_operators/BuildAggregationExistenceMapOperator.cpp ---------------------------------------------------------------------- diff --git a/relational_operators/BuildAggregationExistenceMapOperator.cpp b/relational_operators/BuildAggregationExistenceMapOperator.cpp index 648e291..ff65265 100644 --- a/relational_operators/BuildAggregationExistenceMapOperator.cpp +++ b/relational_operators/BuildAggregationExistenceMapOperator.cpp @@ -144,7 +144,7 @@ bool BuildAggregationExistenceMapOperator serialization::WorkOrder* BuildAggregationExistenceMapOperator ::createWorkOrderProto(const block_id block) { serialization::WorkOrder *proto = new serialization::WorkOrder; - proto->set_work_order_type(serialization::BUILD_LIP_FILTER); + proto->set_work_order_type(serialization::BUILD_AGGREGATION_EXISTENCE_MAP); proto->set_query_id(query_id_); proto->SetExtension(serialization::BuildAggregationExistenceMapWorkOrder::relation_id, http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/f4f5ca08/relational_operators/BuildAggregationExistenceMapOperator.hpp ---------------------------------------------------------------------- diff --git a/relational_operators/BuildAggregationExistenceMapOperator.hpp b/relational_operators/BuildAggregationExistenceMapOperator.hpp index e2928a8..dde39d8 100644 --- a/relational_operators/BuildAggregationExistenceMapOperator.hpp +++ b/relational_operators/BuildAggregationExistenceMapOperator.hpp @@ -80,9 +80,9 @@ class BuildAggregationExistenceMapOperator : public RelationalOperator { input_relation_(input_relation), build_attribute_(build_attribute), input_relation_is_stored_(input_relation_is_stored), + aggr_state_index_(aggr_state_index), input_relation_block_ids_(input_relation_is_stored ? input_relation.getBlocksSnapshot() : std::vector<block_id>()), - aggr_state_index_(aggr_state_index), num_workorders_generated_(0), started_(false) {} @@ -118,9 +118,9 @@ class BuildAggregationExistenceMapOperator : public RelationalOperator { const CatalogRelation &input_relation_; const attribute_id build_attribute_; const bool input_relation_is_stored_; - std::vector<block_id> input_relation_block_ids_; const QueryContext::aggregation_state_id aggr_state_index_; + std::vector<block_id> input_relation_block_ids_; std::vector<block_id>::size_type num_workorders_generated_; bool started_; @@ -163,8 +163,8 @@ class BuildAggregationExistenceMapWorkOrder : public WorkOrder { const CatalogRelationSchema &input_relation_; const block_id build_block_id_; const attribute_id build_attribute_; - AggregationOperationState *state_; + AggregationOperationState *state_; StorageManager *storage_manager_; DISALLOW_COPY_AND_ASSIGN(BuildAggregationExistenceMapWorkOrder); http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/f4f5ca08/relational_operators/WorkOrderFactory.cpp ---------------------------------------------------------------------- diff --git a/relational_operators/WorkOrderFactory.cpp b/relational_operators/WorkOrderFactory.cpp index cf0ee74..ae57e6f 100644 --- a/relational_operators/WorkOrderFactory.cpp +++ b/relational_operators/WorkOrderFactory.cpp @@ -103,7 +103,7 @@ WorkOrder* WorkOrderFactory::ReconstructFromProto(const serialization::WorkOrder proto.GetExtension(serialization::BuildAggregationExistenceMapWorkOrder::build_block_id), proto.GetExtension(serialization::BuildAggregationExistenceMapWorkOrder::build_attribute), query_context->getAggregationState( - proto.GetExtension(serialization::AggregationWorkOrder::aggr_state_index)), + proto.GetExtension(serialization::BuildAggregationExistenceMapWorkOrder::aggr_state_index)), storage_manager); } case serialization::BUILD_LIP_FILTER: {
