incubator-quickstep git commit: Removed namespace definitions in a hpp file.

[zu...@apache.org]

Repository: incubator-quickstep
Updated Branches:
  refs/heads/namespace-hpp [created] 45e691e67


Removed namespace definitions in a hpp file.


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

Branch: refs/heads/namespace-hpp
Commit: 45e691e6787effaf1da4400919deb93d195d8285
Parents: a0b9734
Author: Zuyu Zhang <zu...@apache.org>
Authored: Sun May 21 15:01:36 2017 -0700
Committer: Zuyu Zhang <zu...@apache.org>
Committed: Sun May 21 15:01:36 2017 -0700

----------------------------------------------------------------------
 query_optimizer/rules/SwapProbeBuild.cpp |  4 ++++
 query_optimizer/rules/SwapProbeBuild.hpp | 12 ++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/45e691e6/query_optimizer/rules/SwapProbeBuild.cpp
----------------------------------------------------------------------
diff --git a/query_optimizer/rules/SwapProbeBuild.cpp b/query_optimizer/rules/SwapProbeBuild.cpp
index cc3f1e2..d707e01 100644
--- a/query_optimizer/rules/SwapProbeBuild.cpp
+++ b/query_optimizer/rules/SwapProbeBuild.cpp
@@ -34,6 +34,10 @@
 namespace quickstep {
 namespace optimizer {
 
+namespace C = cost;
+namespace E = expressions;
+namespace P = physical;
+
 P::PhysicalPtr SwapProbeBuild::applyToNode(const P::PhysicalPtr &input) {
   P::HashJoinPtr hash_join;
 

http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/45e691e6/query_optimizer/rules/SwapProbeBuild.hpp
----------------------------------------------------------------------
diff --git a/query_optimizer/rules/SwapProbeBuild.hpp b/query_optimizer/rules/SwapProbeBuild.hpp
index ad756fb..9e0dae3 100644
--- a/query_optimizer/rules/SwapProbeBuild.hpp
+++ b/query_optimizer/rules/SwapProbeBuild.hpp
@@ -36,15 +36,11 @@ namespace optimizer {
  *  @{
  */
 
-namespace P = ::quickstep::optimizer::physical;
-namespace E = ::quickstep::optimizer::expressions;
-namespace C = ::quickstep::optimizer::cost;
-
 /**
  * @brief Rule that applies to a physical plan to arrange probe and
  *        build side based on the cardinalities.
  */
-class SwapProbeBuild : public BottomUpRule<P::Physical> {
+class SwapProbeBuild : public BottomUpRule<physical::Physical> {
  public:
   SwapProbeBuild() {
   }
@@ -52,11 +48,11 @@ class SwapProbeBuild : public BottomUpRule<P::Physical> {
   std::string getName() const override { return "SwapProbeBuild"; }
 
  protected:
-  P::PhysicalPtr applyToNode(const P::PhysicalPtr &input) override;
-  void init(const P::PhysicalPtr &input) override;
+  physical::PhysicalPtr applyToNode(const physical::PhysicalPtr &input) override;
+  void init(const physical::PhysicalPtr &input) override;
 
  private:
-  std::unique_ptr<C::SimpleCostModel> cost_model_;
+  std::unique_ptr<cost::SimpleCostModel> cost_model_;
 
   DISALLOW_COPY_AND_ASSIGN(SwapProbeBuild);
 };