Merge pull request #1215 from GustavoAngulo/master

Add access methods to optimizer tests

Author: pervazea

src/include/optimizer/memo.h

@@ -54,7 +54,7 @@ class Memo {
   GroupExpression* InsertExpression(std::shared_ptr<GroupExpression> gexpr,
                                     GroupID target_group, bool enforced);
 
-  const std::vector<std::unique_ptr<Group>>& Groups() const;
+  std::vector<std::unique_ptr<Group>>& Groups();
 
   Group* GetGroupByID(GroupID id);
 

src/include/optimizer/optimizer.h

@@ -6,7 +6,7 @@
 //
 // Identification: src/include/optimizer/optimizer.h
 //
-// Copyright (c) 2015-16, Carnegie Mellon University Database Group
+// Copyright (c) 2015-2018, Carnegie Mellon University Database Group
 //
 //===----------------------------------------------------------------------===//
 
@@ -81,6 +81,19 @@ class Optimizer : public AbstractOptimizer {
 
   void Reset() override;
 
+  OptimizerMetadata &GetMetadata() { return metadata_; }
+
+  /* For test purposes only */
+  std::shared_ptr<GroupExpression> TestInsertQueryTree(parser::SQLStatement *tree,
+  concurrency::TransactionContext *txn) {
+    return InsertQueryTree(tree, txn);
+  }
+  /* For test purposes only */
+  void TestExecuteTaskStack(OptimizerTaskStack &task_stack, int root_group_id,
+                        std::shared_ptr<OptimizeContext> root_context) {
+    return ExecuteTaskStack(task_stack, root_group_id, root_context);
+  }
+
  private:
   /* HandleDDLStatement - Check and handle DDL statment (currently only support
    *CREATE), set

src/include/optimizer/rule.h

@@ -6,7 +6,7 @@
 //
 // Identification: src/include/optimizer/rule.h
 //
-// Copyright (c) 2015-16, Carnegie Mellon University Database Group
+// Copyright (c) 2015-2018, Carnegie Mellon University Database Group
 //
 //===----------------------------------------------------------------------===//
 
@@ -146,6 +146,10 @@ class RuleSet {
     return rewrite_rules_map_[static_cast<uint32_t>(set)];
   }
 
+  std::unordered_map<uint32_t, std::vector<std::unique_ptr<Rule>>> &GetRewriteRulesMap() { return rewrite_rules_map_; }
+
+  std::vector<std::unique_ptr<Rule>> &GetPredicatePushDownRules() { return predicate_push_down_rules_; }
+
  private:
   std::vector<std::unique_ptr<Rule>> transformation_rules_;
   std::vector<std::unique_ptr<Rule>> implementation_rules_;

src/optimizer/memo.cpp

@@ -63,7 +63,7 @@ GroupExpression *Memo::InsertExpression(std::shared_ptr<GroupExpression> gexpr,
   }
 }
 
-const std::vector<std::unique_ptr<Group>> &Memo::Groups() const {
+std::vector<std::unique_ptr<Group>> &Memo::Groups() {
   return groups_;
 }
 

test/optimizer/column_stats_collector_test.cpp

@@ -6,7 +6,7 @@
 //
 // Identification: test/optimizer/column_stats_collector_test.cpp
 //
-// Copyright (c) 2015-16, Carnegie Mellon University Database Group
+// Copyright (c) 2015-2018, Carnegie Mellon University Database Group
 //
 //===----------------------------------------------------------------------===//
 
@@ -20,7 +20,6 @@
 #include "type/value.h"
 #include "type/value_factory.h"
 
-#define private public
 #define TEST_OID 0
 
 namespace peloton {

test/optimizer/cost_test.cpp

@@ -6,14 +6,12 @@
 //
 // Identification: test/optimizer/cost_test.cpp
 //
-// Copyright (c) 2015-16, Carnegie Mellon University Database Group
+// Copyright (c) 2015-2018, Carnegie Mellon University Database Group
 //
 //===----------------------------------------------------------------------===//
 
 #include "common/harness.h"
 
-#define private public
-
 #include <iostream>
 #include <sstream>
 #include <string>

test/optimizer/count_min_sketch_test.cpp

@@ -6,14 +6,12 @@
 //
 // Identification: test/optimizer/count_min_sketch_test.cpp
 //
-// Copyright (c) 2015-16, Carnegie Mellon University Database Group
+// Copyright (c) 2015-2018, Carnegie Mellon University Database Group
 //
 //===----------------------------------------------------------------------===//
 
 #include "common/harness.h"
 
-#define private public
-
 #include "optimizer/stats/count_min_sketch.h"
 #include "common/logger.h"
 #include "common/statement.h"

test/optimizer/histogram_test.cpp

@@ -6,14 +6,12 @@
 //
 // Identification: test/optimizer/histogram_test.cpp
 //
-// Copyright (c) 2015-16, Carnegie Mellon University Database Group
+// Copyright (c) 2015-2018, Carnegie Mellon University Database Group
 //
 //===----------------------------------------------------------------------===//
 
 #include "common/harness.h"
 
-#define private public
-
 #include <random>
 
 #include "optimizer/stats/histogram.h"

test/optimizer/hyperloglog_test.cpp

@@ -6,14 +6,12 @@
 //
 // Identification: test/optimizer/hyperloglog_test.cpp
 //
-// Copyright (c) 2015-16, Carnegie Mellon University Database Group
+// Copyright (c) 2015-2018, Carnegie Mellon University Database Group
 //
 //===----------------------------------------------------------------------===//
 
 #include "common/harness.h"
 
-#define private public
-
 #include "optimizer/stats/hyperloglog.h"
 
 #include "common/logger.h"

test/optimizer/old_optimizer_test.cpp

@@ -1,7 +1,16 @@
-#include "common/harness.h"
-
-#define private public
-
+//===----------------------------------------------------------------------===//
+//
+//                         Peloton
+//
+// old_optimizer_test.cpp
+//
+// Identification: test/optimizer/old_optimizer_test.cpp
+//
+// Copyright (c) 2015-2018, Carnegie Mellon University Database Group
+//
+//===----------------------------------------------------------------------===//
+
+#include <common/harness.h>
 #include "catalog/catalog.h"
 #include "common/statement.h"
 #include "concurrency/transaction_manager_factory.h"