You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@quickstep.apache.org by ji...@apache.org on 2016/07/11 08:20:25 UTC
[2/2] incubator-quickstep git commit: updates
updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/870c494c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/870c494c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/870c494c
Branch: refs/heads/adaptive-bloom-filters
Commit: 870c494c0a1c12c79f0deef93f614cf34b57ee24
Parents: 520a0fd
Author: Jianqiao Zhu <ji...@cs.wisc.edu>
Authored: Mon Jul 11 03:20:08 2016 -0500
Committer: Jianqiao Zhu <ji...@cs.wisc.edu>
Committed: Mon Jul 11 03:20:08 2016 -0500
----------------------------------------------------------------------
query_optimizer/ExecutionGenerator.cpp | 1 +
query_optimizer/ExecutionGenerator.hpp | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/870c494c/query_optimizer/ExecutionGenerator.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/ExecutionGenerator.cpp b/query_optimizer/ExecutionGenerator.cpp
index cd29552..f84c371 100644
--- a/query_optimizer/ExecutionGenerator.cpp
+++ b/query_optimizer/ExecutionGenerator.cpp
@@ -865,6 +865,7 @@ void ExecutionGenerator::convertHashJoin(const P::HashJoinPtr &physical_plan) {
std::move(probe_original_attribute_ids),
join_hash_table_index,
star_schema_cost_model_->estimateCardinality(build_physical));
+ }
}
void ExecutionGenerator::convertNestedLoopsJoin(
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/870c494c/query_optimizer/ExecutionGenerator.hpp
----------------------------------------------------------------------
diff --git a/query_optimizer/ExecutionGenerator.hpp b/query_optimizer/ExecutionGenerator.hpp
index ee8451c..14939ff 100644
--- a/query_optimizer/ExecutionGenerator.hpp
+++ b/query_optimizer/ExecutionGenerator.hpp
@@ -422,7 +422,7 @@ class ExecutionGenerator {
* @brief The cost model to use for creating the execution plan.
*/
std::unique_ptr<cost::CostModel> cost_model_;
- std::unique_ptr<cost::CostModel> start_schema_cost_model_;
+ std::unique_ptr<cost::CostModel> star_schema_cost_model_;
physical::TopLevelPlanPtr top_level_physical_plan_;