p4: misc fixes for tests (#659)

* p4: misc fixes for tests

Signed-off-by: Alex Chi <[email protected]>

* fix lint

Signed-off-by: Alex Chi <[email protected]>

---------

Signed-off-by: Alex Chi <[email protected]>

Author: skyzh

src/common/bustub_instance.cpp

@@ -45,7 +45,7 @@ auto BustubInstance::MakeExecutorContext(Transaction *txn, bool is_modify) -> st
                                            lock_manager_.get(), is_modify);
 }
 
-BustubInstance::BustubInstance(const std::string &db_file_name) {
+BustubInstance::BustubInstance(const std::string &db_file_name, size_t bpm_size) {
   enable_logging = false;
 
   // Storage related.
@@ -60,7 +60,7 @@ BustubInstance::BustubInstance(const std::string &db_file_name) {
   // buffer pool size specified in `config.h`.
   try {
     buffer_pool_manager_ =
-        std::make_unique<BufferPoolManager>(128, disk_manager_.get(), LRUK_REPLACER_K, log_manager_.get());
+        std::make_unique<BufferPoolManager>(bpm_size, disk_manager_.get(), LRUK_REPLACER_K, log_manager_.get());
   } catch (NotImplementedException &e) {
     std::cerr << "BufferPoolManager is not implemented, only mock tables are supported." << std::endl;
     buffer_pool_manager_ = nullptr;
@@ -98,7 +98,7 @@ BustubInstance::BustubInstance(const std::string &db_file_name) {
   execution_engine_ = std::make_unique<ExecutionEngine>(buffer_pool_manager_.get(), txn_manager_.get(), catalog_.get());
 }
 
-BustubInstance::BustubInstance() {
+BustubInstance::BustubInstance(size_t bpm_size) {
   enable_logging = false;
 
   // Storage related.
@@ -113,7 +113,7 @@ BustubInstance::BustubInstance() {
   // buffer pool size specified in `config.h`.
   try {
     buffer_pool_manager_ =
-        std::make_unique<BufferPoolManager>(128, disk_manager_.get(), LRUK_REPLACER_K, log_manager_.get());
+        std::make_unique<BufferPoolManager>(bpm_size, disk_manager_.get(), LRUK_REPLACER_K, log_manager_.get());
   } catch (NotImplementedException &e) {
     std::cerr << "BufferPoolManager is not implemented, only mock tables are supported." << std::endl;
     buffer_pool_manager_ = nullptr;

src/include/common/bustub_instance.h

@@ -241,9 +241,9 @@ class BustubInstance {
   auto MakeExecutorContext(Transaction *txn, bool is_modify) -> std::unique_ptr<ExecutorContext>;
 
  public:
-  explicit BustubInstance(const std::string &db_file_name);
+  explicit BustubInstance(const std::string &db_file_name, size_t bpm_size = 128);
 
-  BustubInstance();
+  explicit BustubInstance(size_t bpm_size = 128);
 
   ~BustubInstance();
 

src/include/concurrency/transaction.h

@@ -158,6 +158,13 @@ class Transaction {
     return undo_logs_.size();
   }
 
+  /** Use this function in leaderboard benchmarks for online garbage collection. For stop-the-world GC, simply remove
+   * the txn from the txn_map. */
+  inline auto ClearUndoLog() -> size_t {
+    std::scoped_lock<std::mutex> lck(latch_);
+    return undo_logs_.size();
+  }
+
   void SetTainted();
 
  private:

test/CMakeLists.txt

@@ -31,7 +31,6 @@ foreach (bustub_test_source ${BUSTUB_TEST_SOURCES})
 
     gtest_discover_tests(${bustub_test_name}
             EXTRA_ARGS
-            --gtest_color=auto
             --gtest_output=xml:${CMAKE_BINARY_DIR}/test/${bustub_test_name}.xml
             --gtest_catch_exceptions=0
             DISCOVERY_TIMEOUT 120

test/txn/txn_common.h

@@ -87,7 +87,7 @@ TEST(TxnIndexTest, DISABLED_IndexConcurrentInsertTest) {  // NOLINT
     auto query_txn = BeginTxn(*bustub, "query_txn");
     WithTxn(query_txn, QueryShowResult(*bustub, _var, _txn, "SELECT * FROM maintable", expected_rows));
     auto entry = TableHeapEntry(*bustub, bustub->catalog_->GetTable("maintable"));
-    fmt::println("{} entries in the table heap", entry);
+    fmt::println(stderr, "{} entries in the table heap", entry);
     if (n == trials - 1) {
       SimpleStreamWriter writer(std::cerr);
       fmt::println(stderr, "--- the following data might be manually inspected by TAs ---");

test/txn/txn_index_concurrent_test.cpp

@@ -152,7 +152,7 @@ TEST(TxnIndexTest, DISABLED_UpdateTest) {  // NOLINT
   };
 
   {
-    fmt::println("---- UpdateTest1: insert, update, and commit ----");
+    fmt::println(stderr, "---- UpdateTest1: insert, update, and commit ----");
     auto bustub = std::make_unique<BustubInstance>();
     EnsureIndexScan(*bustub);
     Execute(*bustub, "CREATE TABLE maintable(col1 int primary key, col2 int)");

test/txn/txn_index_test.cpp

@@ -142,7 +142,7 @@ void Bench1TaskTransfer(const int thread_id, const int terrier_num, const uint64
   std::uniform_int_distribution<int> terrier_uniform_dist(0, terrier_num - 1);
   std::uniform_int_distribution<int> money_transfer_dist(5, max_transfer_amount);
 
-  TerrierMetrics metrics(fmt::format("Xfr {}", thread_id), duration_ms);
+  TerrierMetrics metrics(fmt::format("Xfr  {}", thread_id), duration_ms);
   metrics.Begin();
 
   while (!metrics.ShouldFinish()) {
@@ -201,7 +201,7 @@ void Bench2TaskTransfer(const int thread_id, const int terrier_num, const uint64
   std::uniform_int_distribution<int> money_transfer_dist(5, max_transfer_amount);
   int adjustment = 0;
 
-  TerrierMetrics metrics(fmt::format("Xfr {}", thread_id), duration_ms);
+  TerrierMetrics metrics(fmt::format("Xfr  {}", thread_id), duration_ms);
   metrics.Begin();
 
   while (!metrics.ShouldFinish()) {
@@ -467,6 +467,7 @@ auto main(int argc, char **argv) -> int {
 
   size_t bustub_terrier_num = 10;
   size_t bustub_thread_cnt = 2;
+  const size_t bpm_size = 4096; // ensure benchmark does not hit BPM
 
   try {
     program.parse_args(argc, argv);
@@ -475,7 +476,7 @@ auto main(int argc, char **argv) -> int {
     return 1;
   }
 
-  auto bustub = std::make_unique<bustub::BustubInstance>();
+  auto bustub = std::make_unique<bustub::BustubInstance>(bpm_size);
   auto writer = bustub::SimpleStreamWriter(std::cerr);
 
   if (program.present("--terriers")) {