You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@quickstep.apache.org by ha...@apache.org on 2016/08/03 06:54:34 UTC
incubator-quickstep git commit: Applied fixes.
Repository: incubator-quickstep
Updated Branches:
refs/heads/refactor-hashjoin-probe-build c36bbc92d -> 7c5bdf92e
Applied fixes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/7c5bdf92
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/7c5bdf92
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/7c5bdf92
Branch: refs/heads/refactor-hashjoin-probe-build
Commit: 7c5bdf92e578d0815100bac0fe258e36b8876eae
Parents: c36bbc9
Author: Hakan Memisoglu <ha...@gmail.com>
Authored: Wed Aug 3 01:54:09 2016 -0500
Committer: Hakan Memisoglu <ha...@gmail.com>
Committed: Wed Aug 3 01:54:09 2016 -0500
----------------------------------------------------------------------
query_optimizer/rules/BottomUpRule.hpp | 8 +++++++-
query_optimizer/rules/CollapseProject.cpp | 5 -----
query_optimizer/rules/CollapseProject.hpp | 1 -
query_optimizer/rules/SwapProbeBuild.cpp | 3 +--
query_optimizer/rules/SwapProbeBuild.hpp | 1 +
query_optimizer/rules/UnnestSubqueries.cpp | 4 ----
query_optimizer/rules/UnnestSubqueries.hpp | 1 -
query_optimizer/rules/UpdateExpression.cpp | 5 -----
query_optimizer/rules/UpdateExpression.hpp | 1 -
9 files changed, 9 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/7c5bdf92/query_optimizer/rules/BottomUpRule.hpp
----------------------------------------------------------------------
diff --git a/query_optimizer/rules/BottomUpRule.hpp b/query_optimizer/rules/BottomUpRule.hpp
index 5831fa0..251ad0c 100644
--- a/query_optimizer/rules/BottomUpRule.hpp
+++ b/query_optimizer/rules/BottomUpRule.hpp
@@ -81,7 +81,13 @@ class BottomUpRule : public Rule<TreeType> {
*/
virtual TreeNodePtr applyToNode(const TreeNodePtr &node) = 0;
- virtual void init(const TreeNodePtr &node) = 0;
+ /**
+ * @brief Initialization code to be used for each node.
+ *
+ * @param node The node to apply the initialization logic.
+ */
+ virtual void init(const TreeNodePtr &node) {
+ }
private:
DISALLOW_COPY_AND_ASSIGN(BottomUpRule);
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/7c5bdf92/query_optimizer/rules/CollapseProject.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/rules/CollapseProject.cpp b/query_optimizer/rules/CollapseProject.cpp
index 62567e8..6f2fa13 100644
--- a/query_optimizer/rules/CollapseProject.cpp
+++ b/query_optimizer/rules/CollapseProject.cpp
@@ -54,10 +54,5 @@ L::LogicalPtr CollapseProject::applyToNode(const L::LogicalPtr &input) {
return input;
}
-void CollapseProject::init(const L::LogicalPtr &input) {
- // Do nothing.
- return;
-}
-
} // namespace optimizer
} // namespace quickstep
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/7c5bdf92/query_optimizer/rules/CollapseProject.hpp
----------------------------------------------------------------------
diff --git a/query_optimizer/rules/CollapseProject.hpp b/query_optimizer/rules/CollapseProject.hpp
index 528e3c7..db45864 100644
--- a/query_optimizer/rules/CollapseProject.hpp
+++ b/query_optimizer/rules/CollapseProject.hpp
@@ -43,7 +43,6 @@ class CollapseProject : public BottomUpRule<logical::Logical> {
protected:
logical::LogicalPtr applyToNode(const logical::LogicalPtr &input) override;
- void init(const logical::LogicalPtr &input) override;
private:
DISALLOW_COPY_AND_ASSIGN(CollapseProject);
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/7c5bdf92/query_optimizer/rules/SwapProbeBuild.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/rules/SwapProbeBuild.cpp b/query_optimizer/rules/SwapProbeBuild.cpp
index 86c6424..5e4ae11 100644
--- a/query_optimizer/rules/SwapProbeBuild.cpp
+++ b/query_optimizer/rules/SwapProbeBuild.cpp
@@ -1,6 +1,7 @@
#include "query_optimizer/rules/SwapProbeBuild.hpp"
#include <cstddef>
+#include <memory>
#include <vector>
#include "query_optimizer/cost_model/StarSchemaSimpleCostModel.hpp"
@@ -23,8 +24,6 @@ P::PhysicalPtr SwapProbeBuild::applyToNode(const P::PhysicalPtr &input) {
P::PhysicalPtr left = hash_join->left();
P::PhysicalPtr right = hash_join->right();
-
-
std::size_t left_cardinality = cost_model_->estimateCardinality(left);
std::size_t right_cardinality = cost_model_->estimateCardinality(right);
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/7c5bdf92/query_optimizer/rules/SwapProbeBuild.hpp
----------------------------------------------------------------------
diff --git a/query_optimizer/rules/SwapProbeBuild.hpp b/query_optimizer/rules/SwapProbeBuild.hpp
index 4f7fe38..da8fdf9 100644
--- a/query_optimizer/rules/SwapProbeBuild.hpp
+++ b/query_optimizer/rules/SwapProbeBuild.hpp
@@ -1,6 +1,7 @@
#ifndef QUICKSTEP_QUERY_OPTIMIZER_RULES_SWAP_PROBE_BUILD_HPP_
#define QUICKSTEP_QUERY_OPTIMIZER_RULES_SWAP_PROBE_BUILD_HPP_
+#include <memory>
#include <string>
#include "query_optimizer/physical/Physical.hpp"
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/7c5bdf92/query_optimizer/rules/UnnestSubqueries.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/rules/UnnestSubqueries.cpp b/query_optimizer/rules/UnnestSubqueries.cpp
index 015e959..d22ab8e 100644
--- a/query_optimizer/rules/UnnestSubqueries.cpp
+++ b/query_optimizer/rules/UnnestSubqueries.cpp
@@ -790,9 +790,5 @@ E::ExpressionPtr DeOuterAttributeReference::applyToNode(const E::ExpressionPtr &
return input;
}
-void DeOuterAttributeReference::init(const E::ExpressionPtr &input) {
- return;
-}
-
} // namespace optimizer
} // namespace quickstep
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/7c5bdf92/query_optimizer/rules/UnnestSubqueries.hpp
----------------------------------------------------------------------
diff --git a/query_optimizer/rules/UnnestSubqueries.hpp b/query_optimizer/rules/UnnestSubqueries.hpp
index 83c30b3..d51dfd5 100644
--- a/query_optimizer/rules/UnnestSubqueries.hpp
+++ b/query_optimizer/rules/UnnestSubqueries.hpp
@@ -219,7 +219,6 @@ class DeOuterAttributeReference : public BottomUpRule<expressions::Expression> {
protected:
expressions::ExpressionPtr applyToNode(const expressions::ExpressionPtr &input) override;
- void init(const expressions::ExpressionPtr &input) override;
private:
const bool allow_outer_reference_;
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/7c5bdf92/query_optimizer/rules/UpdateExpression.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/rules/UpdateExpression.cpp b/query_optimizer/rules/UpdateExpression.cpp
index 25d86cf..b99178c 100644
--- a/query_optimizer/rules/UpdateExpression.cpp
+++ b/query_optimizer/rules/UpdateExpression.cpp
@@ -48,10 +48,5 @@ E::ExpressionPtr UpdateExpression::applyToNode(const E::ExpressionPtr &input) {
return input;
}
-void UpdateExpression::init(const E::ExpressionPtr &input) {
- // Do nothing.
- return;
-}
-
} // namespace optimizer
} // namespace quickstep
http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/7c5bdf92/query_optimizer/rules/UpdateExpression.hpp
----------------------------------------------------------------------
diff --git a/query_optimizer/rules/UpdateExpression.hpp b/query_optimizer/rules/UpdateExpression.hpp
index e12c24e..0c9fe5a 100644
--- a/query_optimizer/rules/UpdateExpression.hpp
+++ b/query_optimizer/rules/UpdateExpression.hpp
@@ -53,7 +53,6 @@ class UpdateExpression : public BottomUpRule<expressions::Expression> {
protected:
expressions::ExpressionPtr applyToNode(const expressions::ExpressionPtr &input) override;
- void init(const expressions::ExpressionPtr &input) override;
private:
const std::unordered_map<expressions::ExprId, expressions::ExpressionPtr> &substitution_map_;