Merge branch 'master' into ssl_test

Author: pervazea

test/optimizer/optimizer_rule_test.cpp

@@ -162,6 +162,7 @@ TEST_F(OptimizerRuleTests, SimpleAssociativeRuleTest) {
   auto child_join_op = output_join->Children()[1]->Op().As<LogicalInnerJoin>();
   EXPECT_EQ(2, parent_join_op->join_predicates.size());
   EXPECT_EQ(0, child_join_op->join_predicates.size());
+  delete root_context;
 }
 
 TEST_F(OptimizerRuleTests, SimpleAssociativeRuleTest2) {
@@ -256,6 +257,7 @@ TEST_F(OptimizerRuleTests, SimpleAssociativeRuleTest2) {
   auto child_join_op = output_join->Children()[1]->Op().As<LogicalInnerJoin>();
   EXPECT_EQ(1, parent_join_op->join_predicates.size());
   EXPECT_EQ(1, child_join_op->join_predicates.size());
+  delete root_context;
 }
 
 }  // namespace test

test/planner/plan_util_test.cpp

@@ -163,6 +163,7 @@ TEST_F(PlanUtilTests, GetAffectedIndexesTest) {
 
   // no indexes are affected
   EXPECT_EQ(0, static_cast<int>(affected_indexes.size()));
+  txn_manager.CommitTransaction(txn);  
 }
 
 }  // namespace test

test/sql/insert_sql_test.cpp

@@ -598,6 +598,7 @@ TEST_F(InsertSQLTests, BadTypes) {
   query = "INSERT INTO foo(id5) VALUES('h');";
   EXPECT_THROW(TestingSQLUtil::GeneratePlanWithOptimizer(optimizer, query, txn),
                peloton::Exception);
+  txn_manager.CommitTransaction(txn);
 
   // free the database just created
   txn = txn_manager.BeginTransaction();
@@ -618,6 +619,7 @@ TEST_F(InsertSQLTests, NonExistentTable) {
   txn = txn_manager.BeginTransaction();
   EXPECT_THROW(TestingSQLUtil::GeneratePlanWithOptimizer(optimizer, query, txn),
                peloton::CatalogException);
+  txn_manager.CommitTransaction(txn);
 }
 
 }  // namespace test