quickstep-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jianq...@apache.org
Subject incubator-quickstep git commit: Updats
Date Sat, 04 Feb 2017 21:37:01 GMT
Repository: incubator-quickstep
Updated Branches:
  refs/heads/collision-free-agg dee650f64 -> 61caa035f


Updats


Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/61caa035
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/61caa035
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/61caa035

Branch: refs/heads/collision-free-agg
Commit: 61caa035f190ac65ebf1c68bcd74c37bb49b8174
Parents: dee650f
Author: Jianqiao Zhu <jianqiao@cs.wisc.edu>
Authored: Sat Feb 4 15:36:52 2017 -0600
Committer: Jianqiao Zhu <jianqiao@cs.wisc.edu>
Committed: Sat Feb 4 15:36:52 2017 -0600

----------------------------------------------------------------------
 query_optimizer/ExecutionGenerator.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/61caa035/query_optimizer/ExecutionGenerator.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/ExecutionGenerator.cpp b/query_optimizer/ExecutionGenerator.cpp
index a512e6f..bed43d0 100644
--- a/query_optimizer/ExecutionGenerator.cpp
+++ b/query_optimizer/ExecutionGenerator.cpp
@@ -1609,27 +1609,21 @@ void ExecutionGenerator::convertAggregate(
     const std::size_t estimated_num_groups =
         cost_model_for_aggregation_->estimateNumGroupsForAggregate(physical_plan);
 
-    std::size_t exact_num_groups;
+    std::size_t max_num_groups;
     const bool can_use_collision_free_aggregation =
         canUseCollisionFreeAggregation(physical_plan,
                                        estimated_num_groups,
-                                       &exact_num_groups);
+                                       &max_num_groups);
 
     if (can_use_collision_free_aggregation) {
       aggr_state_proto->set_hash_table_impl_type(
           serialization::HashTableImplType::COLLISION_FREE_VECTOR);
-      std::cout << "Use collision free aggregation!\n"
-                << "Size = " << exact_num_groups << "\n";
-
-      aggr_state_proto->set_estimated_num_entries(exact_num_groups);
+      aggr_state_proto->set_estimated_num_entries(max_num_groups);
       use_parallel_initialization = true;
     } else {
       // Otherwise, use SeparateChaining.
       aggr_state_proto->set_hash_table_impl_type(
           serialization::HashTableImplType::SEPARATE_CHAINING);
-      std::cout << "Use normal aggregation\n"
-                << "Size = " << estimated_num_groups << "\n";
-
       aggr_state_proto->set_estimated_num_entries(std::max(16uL, estimated_num_groups));
     }
   } else {


Mime
View raw message