Removed pound defined

GustavoAngulo · GustavoAngulo · commit 1782a703a50a · 2018-03-22T01:00:58.000-04:00
diff --git a/test/optimizer/column_stats_collector_test.cpp b/test/optimizer/column_stats_collector_test.cpp
@@ -20,7 +20,6 @@
 #include "type/value.h"
 #include "type/value_factory.h"
 
-#define private public
 #define TEST_OID 0
 
 namespace peloton {
diff --git a/test/optimizer/cost_test.cpp b/test/optimizer/cost_test.cpp
@@ -12,8 +12,6 @@
 
 #include "common/harness.h"
 
-#define private public
-
 #include <iostream>
 #include <sstream>
 #include <string>
diff --git a/test/optimizer/count_min_sketch_test.cpp b/test/optimizer/count_min_sketch_test.cpp
@@ -12,8 +12,6 @@
 
 #include "common/harness.h"
 
-#define private public
-
 #include "optimizer/stats/count_min_sketch.h"
 #include "common/logger.h"
 #include "common/statement.h"
diff --git a/test/optimizer/histogram_test.cpp b/test/optimizer/histogram_test.cpp
@@ -12,8 +12,6 @@
 
 #include "common/harness.h"
 
-#define private public
-
 #include <random>
 
 #include "optimizer/stats/histogram.h"
diff --git a/test/optimizer/hyperloglog_test.cpp b/test/optimizer/hyperloglog_test.cpp
@@ -12,8 +12,6 @@
 
 #include "common/harness.h"
 
-#define private public
-
 #include "optimizer/stats/hyperloglog.h"
 
 #include "common/logger.h"
diff --git a/test/optimizer/old_optimizer_test.cpp b/test/optimizer/old_optimizer_test.cpp
@@ -1,7 +1,5 @@
 #include "common/harness.h"
 
-#define private public
-
 #include "catalog/catalog.h"
 #include "common/statement.h"
 #include "concurrency/transaction_manager_factory.h"
diff --git a/test/optimizer/operator_test.cpp b/test/optimizer/operator_test.cpp
@@ -1,8 +1,6 @@
 #include <algorithm>
 #include "common/harness.h"
 
-#define private public
-
 #include "optimizer/operators.h"
 #include "expression/comparison_expression.h"
 #include "expression/tuple_value_expression.h"
diff --git a/test/optimizer/operator_transformer_test.cpp b/test/optimizer/operator_transformer_test.cpp
@@ -1,7 +1,5 @@
 #include <algorithm>
 #include "common/harness.h"
-
-#define private public
 #include "parser/postgresparser.h"
 #include "parser/sql_statement.h"
 #include "binder/bind_node_visitor.h"
diff --git a/test/optimizer/optimizer_rule_test.cpp b/test/optimizer/optimizer_rule_test.cpp
@@ -10,8 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#define private public
-
 #include "binder/bind_node_visitor.h"
 #include "catalog/catalog.h"
 #include "common/harness.h"
@@ -89,12 +87,12 @@ TEST_F(OptimizerRuleTests, SimpleAssociativeRuleTest) {
   auto right_get = std::make_shared<OperatorExpression>(
       LogicalGet::make(2, {}, nullptr, "test3"));
 
-  auto left_get_group = optimizer.metadata_.memo.InsertExpression(
-      optimizer.metadata_.MakeGroupExpression(left_get), false);
-  auto middle_get_group = optimizer.metadata_.memo.InsertExpression(
-      optimizer.metadata_.MakeGroupExpression(middle_get), false);
-  auto right_get_group = optimizer.metadata_.memo.InsertExpression(
-      optimizer.metadata_.MakeGroupExpression(right_get), false);
+  auto left_get_group = optimizer.GetMetadata().memo.InsertExpression(
+      optimizer.GetMetadata().MakeGroupExpression(left_get), false);
+  auto middle_get_group = optimizer.GetMetadata().memo.InsertExpression(
+      optimizer.GetMetadata().MakeGroupExpression(middle_get), false);
+  auto right_get_group = optimizer.GetMetadata().memo.InsertExpression(
+      optimizer.GetMetadata().MakeGroupExpression(right_get), false);
 
   auto left_leaf = std::make_shared<OperatorExpression>(
       LeafOperator::make(left_get_group->GetGroupID()));
@@ -117,8 +115,8 @@ TEST_F(OptimizerRuleTests, SimpleAssociativeRuleTest) {
       LogicalInnerJoin::make(child_join_predicates));
   child_join->PushChild(left_leaf);
   child_join->PushChild(middle_leaf);
-  optimizer.metadata_.memo.InsertExpression(
-      optimizer.metadata_.MakeGroupExpression(child_join), true);
+  optimizer.GetMetadata().memo.InsertExpression(
+      optimizer.GetMetadata().MakeGroupExpression(child_join), true);
 
   // Make Parent join
   std::vector<AnnotatedExpression> parent_join_predicates;
@@ -131,10 +129,10 @@ TEST_F(OptimizerRuleTests, SimpleAssociativeRuleTest) {
   parent_join->PushChild(child_join);
   parent_join->PushChild(right_leaf);
 
-  optimizer.metadata_.memo.InsertExpression(
-      optimizer.metadata_.MakeGroupExpression(parent_join), true);
+  optimizer.GetMetadata().memo.InsertExpression(
+      optimizer.GetMetadata().MakeGroupExpression(parent_join), true);
   OptimizeContext *root_context =
-      new OptimizeContext(&(optimizer.metadata_), nullptr);
+      new OptimizeContext(&(optimizer.GetMetadata()), nullptr);
 
   EXPECT_EQ(left_leaf, parent_join->Children()[0]->Children()[0]);
   EXPECT_EQ(middle_leaf, parent_join->Children()[0]->Children()[1]);
@@ -175,7 +173,7 @@ TEST_F(OptimizerRuleTests, SimpleAssociativeRuleTest2) {
 
   // Setup Memo
   Optimizer optimizer;
-  auto &memo = optimizer.metadata_.memo;
+  auto &memo = optimizer.GetMetadata().memo;
 
   auto left_get = std::make_shared<OperatorExpression>(
       LogicalGet::make(0, {}, nullptr, "test1"));
@@ -186,11 +184,11 @@ TEST_F(OptimizerRuleTests, SimpleAssociativeRuleTest2) {
 
   // Create Groups for Get Operators
   auto left_get_group = memo.InsertExpression(
-      optimizer.metadata_.MakeGroupExpression(left_get), false);
+      optimizer.GetMetadata().MakeGroupExpression(left_get), false);
   auto middle_get_group = memo.InsertExpression(
-      optimizer.metadata_.MakeGroupExpression(middle_get), false);
+      optimizer.GetMetadata().MakeGroupExpression(middle_get), false);
   auto right_get_group = memo.InsertExpression(
-      optimizer.metadata_.MakeGroupExpression(right_get), false);
+      optimizer.GetMetadata().MakeGroupExpression(right_get), false);
 
   auto left_leaf = std::make_shared<OperatorExpression>(
       LeafOperator::make(left_get_group->GetGroupID()));
@@ -204,8 +202,8 @@ TEST_F(OptimizerRuleTests, SimpleAssociativeRuleTest2) {
       std::make_shared<OperatorExpression>(LogicalInnerJoin::make());
   child_join->PushChild(left_leaf);
   child_join->PushChild(middle_leaf);
-  optimizer.metadata_.memo.InsertExpression(
-      optimizer.metadata_.MakeGroupExpression(child_join), true);
+  optimizer.GetMetadata().memo.InsertExpression(
+      optimizer.GetMetadata().MakeGroupExpression(child_join), true);
 
   // Make Parent join
   std::vector<AnnotatedExpression> parent_join_predicates;
@@ -225,10 +223,10 @@ TEST_F(OptimizerRuleTests, SimpleAssociativeRuleTest2) {
   parent_join->PushChild(child_join);
   parent_join->PushChild(right_leaf);
 
-  optimizer.metadata_.memo.InsertExpression(
-      optimizer.metadata_.MakeGroupExpression(parent_join), true);
+  optimizer.GetMetadata().memo.InsertExpression(
+      optimizer.GetMetadata().MakeGroupExpression(parent_join), true);
   OptimizeContext *root_context =
-      new OptimizeContext(&(optimizer.metadata_), nullptr);
+      new OptimizeContext(&(optimizer.GetMetadata()), nullptr);
 
   EXPECT_EQ(left_leaf, parent_join->Children()[0]->Children()[0]);
   EXPECT_EQ(middle_leaf, parent_join->Children()[0]->Children()[1]);
diff --git a/test/optimizer/optimizer_test.cpp b/test/optimizer/optimizer_test.cpp
@@ -1,7 +1,5 @@
 #include "common/harness.h"
 
-#define private public
-
 #include "catalog/catalog.h"
 #include "common/logger.h"
 #include "common/statement.h"
@@ -40,8 +38,8 @@ class OptimizerTests : public PelotonTest {
   GroupExpression *GetSingleGroupExpression(Memo &memo, GroupExpression *expr,
                                             int child_group_idx) {
     auto group = memo.GetGroupByID(expr->GetChildGroupId(child_group_idx));
-    EXPECT_EQ(1, group->logical_expressions_.size());
-    return group->logical_expressions_[0].get();
+    EXPECT_EQ(1, group->GetLogicalExpressions().size());
+    return group->GetLogicalExpressions()[0].get();
   }
 
   virtual void TearDown() override {
@@ -305,8 +303,8 @@ TEST_F(OptimizerTests, PushFilterThroughJoinTest) {
 
   optimizer::Optimizer optimizer;
   // Only include PushFilterThroughJoin rewrite rule
-  optimizer.metadata_.rule_set.rewrite_rules_map_.clear();
-  optimizer.metadata_.rule_set.AddRewriteRule(
+  optimizer.GetMetadata().rule_set.GetRewriteRulesMap().clear();
+  optimizer.GetMetadata().rule_set.AddRewriteRule(
       RewriteRuleSetName::PREDICATE_PUSH_DOWN, new PushFilterThroughJoin());
   txn = txn_manager.BeginTransaction();
 
@@ -315,17 +313,17 @@ TEST_F(OptimizerTests, PushFilterThroughJoinTest) {
   bind_node_visitor->BindNameToNode(parse_tree);
 
   std::shared_ptr<GroupExpression> gexpr =
-      optimizer.InsertQueryTree(parse_tree, txn);
+      optimizer.TestInsertQueryTree(parse_tree, txn);
   std::vector<GroupID> child_groups = {gexpr->GetGroupID()};
 
   std::shared_ptr<GroupExpression> head_gexpr =
       std::make_shared<GroupExpression>(Operator(), child_groups);
 
   std::shared_ptr<OptimizeContext> root_context =
-      std::make_shared<OptimizeContext>(&(optimizer.metadata_), nullptr);
+      std::make_shared<OptimizeContext>(&(optimizer.GetMetadata()), nullptr);
   auto task_stack =
       std::unique_ptr<OptimizerTaskStack>(new OptimizerTaskStack());
-  optimizer.metadata_.SetTaskPool(task_stack.get());
+  optimizer.GetMetadata().SetTaskPool(task_stack.get());
   task_stack->Push(new TopDownRewrite(gexpr->GetGroupID(), root_context,
                                       RewriteRuleSetName::PREDICATE_PUSH_DOWN));
 
@@ -334,7 +332,7 @@ TEST_F(OptimizerTests, PushFilterThroughJoinTest) {
     task->execute();
   }
 
-  auto &memo = optimizer.metadata_.memo;
+  auto &memo = optimizer.GetMetadata().memo;
 
   // Check join in the root
   auto group_expr = GetSingleGroupExpression(memo, head_gexpr.get(), 0);
@@ -387,12 +385,12 @@ TEST_F(OptimizerTests, PredicatePushDownRewriteTest) {
 
   optimizer::Optimizer optimizer;
   // Only include PushFilterThroughJoin rewrite rule
-  optimizer.metadata_.rule_set.predicate_push_down_rules_.clear();
-  optimizer.metadata_.rule_set.predicate_push_down_rules_.emplace_back(
+  optimizer.GetMetadata().rule_set.GetPredicatePushDownRules().clear();
+  optimizer.GetMetadata().rule_set.GetPredicatePushDownRules().emplace_back(
       new PushFilterThroughJoin());
-  optimizer.metadata_.rule_set.predicate_push_down_rules_.emplace_back(
+  optimizer.GetMetadata().rule_set.GetPredicatePushDownRules().emplace_back(
       new CombineConsecutiveFilter());
-  optimizer.metadata_.rule_set.predicate_push_down_rules_.emplace_back(
+  optimizer.GetMetadata().rule_set.GetPredicatePushDownRules().emplace_back(
       new EmbedFilterIntoGet());
 
   txn = txn_manager.BeginTransaction();
@@ -402,17 +400,17 @@ TEST_F(OptimizerTests, PredicatePushDownRewriteTest) {
   bind_node_visitor->BindNameToNode(parse_tree);
 
   std::shared_ptr<GroupExpression> gexpr =
-      optimizer.InsertQueryTree(parse_tree, txn);
+      optimizer.TestInsertQueryTree(parse_tree, txn);
   std::vector<GroupID> child_groups = {gexpr->GetGroupID()};
 
   std::shared_ptr<GroupExpression> head_gexpr =
       std::make_shared<GroupExpression>(Operator(), child_groups);
 
   std::shared_ptr<OptimizeContext> root_context =
-      std::make_shared<OptimizeContext>(&(optimizer.metadata_), nullptr);
+      std::make_shared<OptimizeContext>(&(optimizer.GetMetadata()), nullptr);
   auto task_stack =
       std::unique_ptr<OptimizerTaskStack>(new OptimizerTaskStack());
-  optimizer.metadata_.SetTaskPool(task_stack.get());
+  optimizer.GetMetadata().SetTaskPool(task_stack.get());
   task_stack->Push(new TopDownRewrite(gexpr->GetGroupID(), root_context,
                                       RewriteRuleSetName::PREDICATE_PUSH_DOWN));
 
@@ -421,7 +419,7 @@ TEST_F(OptimizerTests, PredicatePushDownRewriteTest) {
     task->execute();
   }
 
-  auto &memo = optimizer.metadata_.memo;
+  auto &memo = optimizer.GetMetadata().memo;
 
   // Check join in the root
   auto group_expr = GetSingleGroupExpression(memo, head_gexpr.get(), 0);
diff --git a/test/optimizer/selectivity_test.cpp b/test/optimizer/selectivity_test.cpp
@@ -28,8 +28,6 @@
 #include "type/value.h"
 #include "type/value_factory.h"
 
-#define private public
-
 namespace peloton {
 namespace test {
 
@@ -80,9 +78,7 @@ TEST_F(SelectivityTests, RangeSelectivityTest) {
   oid_t table_id = table->GetOid();
   std::string column_name = "test.id";  // first column
   auto stats_storage = StatsStorage::GetInstance();
-  txn = txn_manager.BeginTransaction();
-  auto table_stats = stats_storage->GetTableStats(db_id, table_id, txn);
-  txn_manager.CommitTransaction(txn);
+  auto table_stats = stats_storage->GetTableStats(db_id, table_id);
   type::Value value1 = type::ValueFactory::GetIntegerValue(nrow / 4);
   ValueCondition condition{column_name, ExpressionType::COMPARE_LESSTHAN,
                            value1};
@@ -95,9 +91,7 @@ TEST_F(SelectivityTests, RangeSelectivityTest) {
   TestingSQLUtil::ExecuteSQLQuery("ANALYZE test");
 
   // Get updated table stats and check new selectivity
-  txn = txn_manager.BeginTransaction();
-  table_stats = stats_storage->GetTableStats(db_id, table_id, txn);
-  txn_manager.CommitTransaction(txn);
+  table_stats = stats_storage->GetTableStats(db_id, table_id);
   double less_than_sel =
       Selectivity::ComputeSelectivity(table_stats, condition);
   ExpectSelectivityEqual(less_than_sel, 0.25);
@@ -140,11 +134,8 @@ TEST_F(SelectivityTests, LikeSelectivityTest) {
   oid_t table_id = data_table->GetOid();
 
   auto stats_storage = StatsStorage::GetInstance();
-  txn = txn_manager.BeginTransaction();
-  auto table_stats = stats_storage->GetTableStats(db_id, table_id, txn);
-  txn_manager.CommitTransaction(txn);
-  table_stats->SetTupleSampler(
-      std::make_shared<TupleSampler>(data_table.get()));
+  auto table_stats = stats_storage->GetTableStats(db_id, table_id);
+  table_stats->SetTupleSampler(std::make_shared<TupleSampler>(data_table.get()));
 
   type::Value value = type::ValueFactory::GetVarcharValue("%3");
   ValueCondition condition1{"test_table.COL_D", ExpressionType::COMPARE_LIKE,
@@ -188,9 +179,7 @@ TEST_F(SelectivityTests, EqualSelectivityTest) {
   oid_t table_id = table->GetOid();
   std::string column_name1 = "test.b";
   auto stats_storage = StatsStorage::GetInstance();
-  txn = txn_manager.BeginTransaction();
-  auto table_stats = stats_storage->GetTableStats(db_id, table_id, txn);
-  txn_manager.CommitTransaction(txn);
+  auto table_stats = stats_storage->GetTableStats(db_id, table_id);
 
   type::Value value1 = type::ValueFactory::GetDecimalValue(1.0);
 
@@ -202,9 +191,7 @@ TEST_F(SelectivityTests, EqualSelectivityTest) {
 
   // Run analyze
   TestingSQLUtil::ExecuteSQLQuery("ANALYZE test");
-  txn = txn_manager.BeginTransaction();
-  table_stats = stats_storage->GetTableStats(db_id, table_id, txn);
-  txn_manager.CommitTransaction(txn);
+  table_stats = stats_storage->GetTableStats(db_id, table_id);
 
   // Check selectivity
   // equal, in mcv
@@ -235,9 +222,7 @@ TEST_F(SelectivityTests, EqualSelectivityTest) {
 
   // Run analyze
   TestingSQLUtil::ExecuteSQLQuery("ANALYZE test");
-  txn = txn_manager.BeginTransaction();
-  table_stats = stats_storage->GetTableStats(db_id, table_id, txn);
-  txn_manager.CommitTransaction(txn);
+  table_stats = stats_storage->GetTableStats(db_id, table_id);
 
   // Check selectivity
   // equal, not in mcv
diff --git a/test/optimizer/stats_storage_test.cpp b/test/optimizer/stats_storage_test.cpp
@@ -12,9 +12,6 @@
 
 #include "common/harness.h"
 
-#define private public
-#define protected public
-
 #include "optimizer/stats/stats_storage.h"
 #include "optimizer/stats/column_stats.h"
 #include "optimizer/stats/table_stats.h"
@@ -248,10 +245,8 @@ TEST_F(StatsStorageTests, GetTableStatsTest) {
   stats_storage->AnalyzeStatsForAllTables(txn);
   txn_manager.CommitTransaction(txn);
 
-  txn = txn_manager.BeginTransaction();
   std::shared_ptr<TableStats> table_stats = stats_storage->GetTableStats(
-      data_table->GetDatabaseOid(), data_table->GetOid(), txn);
-  txn_manager.CommitTransaction(txn);
+      data_table->GetDatabaseOid(), data_table->GetOid());
   EXPECT_EQ(table_stats->num_rows, tuple_count);
 }
 
diff --git a/test/optimizer/table_stats_collector_test.cpp b/test/optimizer/table_stats_collector_test.cpp
@@ -27,8 +27,6 @@
 #include "type/type.h"
 #include "type/value.h"
 
-#define private public
-
 namespace peloton {
 namespace test {
 
diff --git a/test/optimizer/table_stats_test.cpp b/test/optimizer/table_stats_test.cpp
@@ -15,9 +15,6 @@
 #include "optimizer/stats/table_stats.h"
 #include "optimizer/stats/column_stats.h"
 
-#define private public
-#define protected public
-
 namespace peloton {
 namespace test {
 
diff --git a/test/optimizer/top_k_elements_test.cpp b/test/optimizer/top_k_elements_test.cpp
diff --git a/test/optimizer/tuple_samples_storage_test.cpp b/test/optimizer/tuple_samples_storage_test.cpp
