Repository: incubator-quickstep Updated Branches: refs/heads/fix-fuse-agg-hash [created] 7f7afa908
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/7f7afa90 Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/7f7afa90 Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/7f7afa90 Branch: refs/heads/fix-fuse-agg-hash Commit: 7f7afa90802124e592c027e073b92d3aec3ce89a Parents: 4be8e91 Author: Jianqiao Zhu <jianq...@cs.wisc.edu> Authored: Fri Feb 24 10:46:06 2017 -0600 Committer: Jianqiao Zhu <jianq...@cs.wisc.edu> Committed: Fri Feb 24 10:46:21 2017 -0600 ---------------------------------------------------------------------- relational_operators/BuildAggregationExistenceMapOperator.cpp | 2 +- relational_operators/BuildAggregationExistenceMapOperator.hpp | 4 ++-- relational_operators/WorkOrderFactory.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/7f7afa90/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/7f7afa90/relational_operators/BuildAggregationExistenceMapOperator.hpp ---------------------------------------------------------------------- diff --git a/relational_operators/BuildAggregationExistenceMapOperator.hpp b/relational_operators/BuildAggregationExistenceMapOperator.hpp index e2928a8..d53d7d4 100644 --- a/relational_operators/BuildAggregationExistenceMapOperator.hpp +++ b/relational_operators/BuildAggregationExistenceMapOperator.hpp @@ -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/7f7afa90/relational_operators/WorkOrderFactory.cpp ---------------------------------------------------------------------- diff --git a/relational_operators/WorkOrderFactory.cpp b/relational_operators/WorkOrderFactory.cpp index d2c8251..4d9eb41 100644 --- a/relational_operators/WorkOrderFactory.cpp +++ b/relational_operators/WorkOrderFactory.cpp @@ -102,7 +102,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: {
