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/08/22 18:56:25 UTC
[16/22] incubator-quickstep git commit: minor updates
minor 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/0e0c1c0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/0e0c1c0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/0e0c1c0b
Branch: refs/heads/LIP-for-tpch-merged
Commit: 0e0c1c0b9f7f22e1c73a4a757f1092251818d960
Parents: 677ac5a
Author: Jianqiao Zhu <ji...@cs.wisc.edu>
Authored: Fri Aug 12 01:19:18 2016 -0500
Committer: Jianqiao Zhu <ji...@cs.wisc.edu>
Committed: Mon Aug 22 13:47:34 2016 -0500
----------------------------------------------------------------------
query_optimizer/ExecutionGenerator.cpp | 5 +++--
utility/PlanVisualizer.cpp | 18 +++++++++---------
2 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/0e0c1c0b/query_optimizer/ExecutionGenerator.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/ExecutionGenerator.cpp b/query_optimizer/ExecutionGenerator.cpp
index 11c9cfa..9a0043a 100644
--- a/query_optimizer/ExecutionGenerator.cpp
+++ b/query_optimizer/ExecutionGenerator.cpp
@@ -1439,8 +1439,9 @@ void ExecutionGenerator::convertAggregate(
}
// aggr_state_proto->set_estimated_num_entries(cost_model_->estimateCardinality(physical_plan));
- aggr_state_proto->set_estimated_num_entries(
- star_schema_cost_model_->estimateCardinality(physical_plan) * 10);
+// aggr_state_proto->set_estimated_num_entries(
+// star_schema_cost_model_->estimateCardinality(physical_plan) * 10);
+ aggr_state_proto->set_estimated_num_entries(64u);
const QueryPlan::DAGNodeIndex aggregation_operator_index =
execution_plan_->addRelationalOperator(
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/0e0c1c0b/utility/PlanVisualizer.cpp
----------------------------------------------------------------------
diff --git a/utility/PlanVisualizer.cpp b/utility/PlanVisualizer.cpp
index 2039a69..e4df69c 100644
--- a/utility/PlanVisualizer.cpp
+++ b/utility/PlanVisualizer.cpp
@@ -142,15 +142,15 @@ void PlanVisualizer::visit(const P::PhysicalPtr &input) {
attr_info.append(std::to_string(static_cast<std::size_t>(
stat->getNumDistinctValues(attr_id) * cost_model_->estimateSelectivity(child))));
}
- const Type& attr_type = attr->getValueType();
- if (stat->hasMinValue(attr_id)) {
- attr_info.append(", min = ");
- attr_info.append(attr_type.printValueToString(stat->getMinValue(attr_id)));
- }
- if (stat->hasMaxValue(attr_id)) {
- attr_info.append(", max = ");
- attr_info.append(attr_type.printValueToString(stat->getMaxValue(attr_id)));
- }
+// const Type& attr_type = attr->getValueType();
+// if (stat->hasMinValue(attr_id)) {
+// attr_info.append(", min = ");
+// attr_info.append(attr_type.printValueToString(stat->getMinValue(attr_id)));
+// }
+// if (stat->hasMaxValue(attr_id)) {
+// attr_info.append(", max = ");
+// attr_info.append(attr_type.printValueToString(stat->getMaxValue(attr_id)));
+// }
}
edge_info.labels.emplace_back(attr_info);
}