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: Updates
Date Fri, 21 Apr 2017 21:36:48 GMT
Repository: incubator-quickstep
Updated Branches:
  refs/heads/common-subexpression 9f48a4a70 -> bd78194e6


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

Branch: refs/heads/common-subexpression
Commit: bd78194e642fed44307d9fb90f0df036d9dadff5
Parents: 9f48a4a
Author: Jianqiao Zhu <jianqiao@cs.wisc.edu>
Authored: Fri Apr 21 16:36:44 2017 -0500
Committer: Jianqiao Zhu <jianqiao@cs.wisc.edu>
Committed: Fri Apr 21 16:36:44 2017 -0500

----------------------------------------------------------------------
 query_optimizer/rules/ExtractCommonSubexpression.cpp | 3 ++-
 query_optimizer/rules/ReuseAggregateExpressions.cpp  | 9 ++++++---
 utility/HashError.hpp                                | 1 +
 3 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/bd78194e/query_optimizer/rules/ExtractCommonSubexpression.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/rules/ExtractCommonSubexpression.cpp b/query_optimizer/rules/ExtractCommonSubexpression.cpp
index 6bbd902..25bab89 100644
--- a/query_optimizer/rules/ExtractCommonSubexpression.cpp
+++ b/query_optimizer/rules/ExtractCommonSubexpression.cpp
@@ -145,7 +145,8 @@ P::PhysicalPtr ExtractCommonSubexpression::applyInternal(
                 E::Alias::Create(expr->id(),
                                  new_func,
                                  expr->attribute_name(),
-                                 expr->attribute_alias()));
+                                 expr->attribute_alias(),
+                                 expr->relation_name()));
           }
         }
         return P::Aggregate::Create(aggregate->input(),

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/bd78194e/query_optimizer/rules/ReuseAggregateExpressions.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/rules/ReuseAggregateExpressions.cpp b/query_optimizer/rules/ReuseAggregateExpressions.cpp
index 7903605..dd54889 100644
--- a/query_optimizer/rules/ReuseAggregateExpressions.cpp
+++ b/query_optimizer/rules/ReuseAggregateExpressions.cpp
@@ -282,7 +282,8 @@ P::PhysicalPtr ReuseAggregateExpressions::applyToNode(
               E::Alias::Create(agg_expr->id(),
                                agg_attrs[agg_ref->first_ref],
                                agg_expr->attribute_name(),
-                               agg_expr->attribute_alias()));
+                               agg_expr->attribute_alias(),
+                               agg_expr->relation_name()));
           break;
         }
         // Case 2.2: this aggregate expression is an AVG.
@@ -305,7 +306,8 @@ P::PhysicalPtr ReuseAggregateExpressions::applyToNode(
                 E::Alias::Create(optimizer_context_->nextExprId(),
                                  sum_expr,
                                  agg_expr->attribute_name(),
-                                 agg_expr->attribute_alias()));
+                                 agg_expr->attribute_alias(),
+                                 agg_expr->relation_name()));
 
             sum_attr = E::ToRef(new_agg_exprs.back());
           } else {
@@ -325,7 +327,8 @@ P::PhysicalPtr ReuseAggregateExpressions::applyToNode(
               E::Alias::Create(agg_expr->id(),
                                avg_expr,
                                agg_expr->attribute_name(),
-                               agg_expr->attribute_alias()));
+                               agg_expr->attribute_alias(),
+                               agg_expr->relation_name()));
         }
       }
     }

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/bd78194e/utility/HashError.hpp
----------------------------------------------------------------------
diff --git a/utility/HashError.hpp b/utility/HashError.hpp
index fda54d7..0472345 100644
--- a/utility/HashError.hpp
+++ b/utility/HashError.hpp
@@ -21,6 +21,7 @@
 #define QUICKSTEP_UTILITY_HASH_ERROR_HPP_
 
 #include <exception>
+#include <string>
 
 namespace quickstep {
 


Mime
View raw message