Accidently rollbacked previous commit

Author: GustavoAngulo

test/optimizer/selectivity_test.cpp

@@ -78,7 +78,9 @@ TEST_F(SelectivityTests, RangeSelectivityTest) {
   oid_t table_id = table->GetOid();
   std::string column_name = "test.id";  // first column
   auto stats_storage = StatsStorage::GetInstance();
-  auto table_stats = stats_storage->GetTableStats(db_id, table_id);
+  txn = txn_manager.BeginTransaction();
+  auto table_stats = stats_storage->GetTableStats(db_id, table_id, txn);
+  txn_manager.CommitTransaction(txn);
   type::Value value1 = type::ValueFactory::GetIntegerValue(nrow / 4);
   ValueCondition condition{column_name, ExpressionType::COMPARE_LESSTHAN,
                            value1};
@@ -91,7 +93,9 @@ TEST_F(SelectivityTests, RangeSelectivityTest) {
   TestingSQLUtil::ExecuteSQLQuery("ANALYZE test");
 
   // Get updated table stats and check new selectivity
-  table_stats = stats_storage->GetTableStats(db_id, table_id);
+  txn = txn_manager.BeginTransaction();
+  table_stats = stats_storage->GetTableStats(db_id, table_id, txn);
+  txn_manager.CommitTransaction(txn);
   double less_than_sel =
       Selectivity::ComputeSelectivity(table_stats, condition);
   ExpectSelectivityEqual(less_than_sel, 0.25);
@@ -134,8 +138,11 @@ TEST_F(SelectivityTests, LikeSelectivityTest) {
   oid_t table_id = data_table->GetOid();
 
   auto stats_storage = StatsStorage::GetInstance();
-  auto table_stats = stats_storage->GetTableStats(db_id, table_id);
-  table_stats->SetTupleSampler(std::make_shared<TupleSampler>(data_table.get()));
+  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()));
 
   type::Value value = type::ValueFactory::GetVarcharValue("%3");
   ValueCondition condition1{"test_table.COL_D", ExpressionType::COMPARE_LIKE,
@@ -179,7 +186,9 @@ TEST_F(SelectivityTests, EqualSelectivityTest) {
   oid_t table_id = table->GetOid();
   std::string column_name1 = "test.b";
   auto stats_storage = StatsStorage::GetInstance();
-  auto table_stats = stats_storage->GetTableStats(db_id, table_id);
+  txn = txn_manager.BeginTransaction();
+  auto table_stats = stats_storage->GetTableStats(db_id, table_id, txn);
+  txn_manager.CommitTransaction(txn);
 
   type::Value value1 = type::ValueFactory::GetDecimalValue(1.0);
 
@@ -191,7 +200,9 @@ TEST_F(SelectivityTests, EqualSelectivityTest) {
 
   // Run analyze
   TestingSQLUtil::ExecuteSQLQuery("ANALYZE test");
-  table_stats = stats_storage->GetTableStats(db_id, table_id);
+  txn = txn_manager.BeginTransaction();
+  table_stats = stats_storage->GetTableStats(db_id, table_id, txn);
+  txn_manager.CommitTransaction(txn);
 
   // Check selectivity
   // equal, in mcv
@@ -222,7 +233,9 @@ TEST_F(SelectivityTests, EqualSelectivityTest) {
 
   // Run analyze
   TestingSQLUtil::ExecuteSQLQuery("ANALYZE test");
-  table_stats = stats_storage->GetTableStats(db_id, table_id);
+  txn = txn_manager.BeginTransaction();
+  table_stats = stats_storage->GetTableStats(db_id, table_id, txn);
+  txn_manager.CommitTransaction(txn);
 
   // Check selectivity
   // equal, not in mcv
@@ -248,4 +261,4 @@ TEST_F(SelectivityTests, EqualSelectivityTest) {
 }
 
 }  // namespace test
-}  // namespace peloton
+}  // namespace peloton

test/optimizer/stats_storage_test.cpp

@@ -245,10 +245,12 @@ 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());
+      data_table->GetDatabaseOid(), data_table->GetOid(), txn);
+  txn_manager.CommitTransaction(txn);
   EXPECT_EQ(table_stats->num_rows, tuple_count);
 }
 
 }  // namespace test
-}  // namespace peloton
+}  // namespace peloton