quickstep-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jianq...@apache.org
Subject [1/2] incubator-quickstep git commit: minor updates
Date Fri, 12 Aug 2016 08:46:00 GMT
Repository: incubator-quickstep
Updated Branches:
  refs/heads/LIP-for-tpch 39f574999 -> 82e7efd93


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/50c650b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/50c650b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/50c650b5

Branch: refs/heads/LIP-for-tpch
Commit: 50c650b5ac3ec8b5d3586deb456bd53a6233b044
Parents: 39f5749
Author: Jianqiao Zhu <jianqiao@cs.wisc.edu>
Authored: Fri Aug 12 01:19:18 2016 -0500
Committer: Jianqiao Zhu <jianqiao@cs.wisc.edu>
Committed: Fri Aug 12 01:19:18 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/50c650b5/query_optimizer/ExecutionGenerator.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/ExecutionGenerator.cpp b/query_optimizer/ExecutionGenerator.cpp
index 02deb3a..f8559ec 100644
--- a/query_optimizer/ExecutionGenerator.cpp
+++ b/query_optimizer/ExecutionGenerator.cpp
@@ -1440,8 +1440,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/50c650b5/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);
       }


Mime
View raw message