Refactor utils, add silent option for basic db

Author: ls4154

core/acknowledged_counter_generator.cc

@@ -6,7 +6,7 @@
 //
 
 #include "acknowledged_counter_generator.h"
-#include "utils.h"
+#include "utils/utils.h"
 
 namespace ycsbc {
 void AcknowledgedCounterGenerator::Acknowledge(uint64_t value) {

core/basic_db.cc

@@ -9,29 +9,37 @@
 #include "basic_db.h"
 #include "core/db_factory.h"
 
-using std::cout;
-using std::endl;
+namespace {
+  const std::string PROP_SILENT = "basic.silent";
+  const std::string PROP_SILENT_DEFAULT = "false";
+}
 
 namespace ycsbc {
 
 std::mutex BasicDB:: mutex_;
 
 void BasicDB::Init() {
   std::lock_guard<std::mutex> lock(mutex_);
+  if (props_->GetProperty(PROP_SILENT, PROP_SILENT_DEFAULT) == "true") {
+    out_ = new std::ofstream;
+    out_->setstate(std::ios_base::badbit);
+  } else {
+    out_ = &std::cout;
+  }
 }
 
 DB::Status BasicDB::Read(const std::string &table, const std::string &key,
                          const std::vector<std::string> *fields, std::vector<Field> &result) {
   std::lock_guard<std::mutex> lock(mutex_);
-  cout << "READ " << table << ' ' << key;
+  *out_ << "READ " << table << ' ' << key;
   if (fields) {
-    cout << " [ ";
+    *out_ << " [ ";
     for (auto f : *fields) {
-      cout << f << ' ';
+      *out_ << f << ' ';
     }
-    cout << ']' << endl;
+    *out_ << ']' << std::endl;
   } else {
-    cout  << " < all fields >" << endl;
+    *out_  << " < all fields >" << std::endl;
   }
   return kOK;
 }
@@ -40,44 +48,44 @@ DB::Status BasicDB::Scan(const std::string &table, const std::string &key, int l
                          const std::vector<std::string> *fields,
                          std::vector<std::vector<Field>> &result) {
   std::lock_guard<std::mutex> lock(mutex_);
-  cout << "SCAN " << table << ' ' << key << " " << len;
+  *out_ << "SCAN " << table << ' ' << key << " " << len;
   if (fields) {
-    cout << " [ ";
+    *out_ << " [ ";
     for (auto f : *fields) {
-      cout << f << ' ';
+      *out_ << f << ' ';
     }
-    cout << ']' << endl;
+    *out_ << ']' << std::endl;
   } else {
-    cout  << " < all fields >" << endl;
+    *out_  << " < all fields >" << std::endl;
   }
   return kOK;
 }
 
 DB::Status BasicDB::Update(const std::string &table, const std::string &key,
                            std::vector<Field> &values) {
   std::lock_guard<std::mutex> lock(mutex_);
-  cout << "UPDATE " << table << ' ' << key << " [ ";
+  *out_ << "UPDATE " << table << ' ' << key << " [ ";
   for (auto v : values) {
-    cout << v.name << '=' << v.value << ' ';
+    *out_ << v.name << '=' << v.value << ' ';
   }
-  cout << ']' << endl;
+  *out_ << ']' << std::endl;
   return kOK;
 }
 
 DB::Status BasicDB::Insert(const std::string &table, const std::string &key,
                            std::vector<Field> &values) {
   std::lock_guard<std::mutex> lock(mutex_);
-  cout << "INSERT " << table << ' ' << key << " [ ";
+  *out_ << "INSERT " << table << ' ' << key << " [ ";
   for (auto v : values) {
-    cout << v.name << '=' << v.value << ' ';
+    *out_ << v.name << '=' << v.value << ' ';
   }
-  cout << ']' << endl;
+  *out_ << ']' << std::endl;
   return kOK;
 }
 
 DB::Status BasicDB::Delete(const std::string &table, const std::string &key) {
   std::lock_guard<std::mutex> lock(mutex_);
-  cout << "DELETE " << table << ' ' << key << endl;
+  *out_ << "DELETE " << table << ' ' << key << std::endl;
   return kOK;
 }
 

core/basic_db.h

@@ -10,7 +10,7 @@
 #define YCSB_C_BASIC_DB_H_
 
 #include "db.h"
-#include "properties.h"
+#include "utils/properties.h"
 
 #include <iostream>
 #include <string>
@@ -20,6 +20,8 @@ namespace ycsbc {
 
 class BasicDB : public DB {
  public:
+  BasicDB() : out_(nullptr) {}
+
   void Init();
 
   Status Read(const std::string &table, const std::string &key,
@@ -36,6 +38,8 @@ class BasicDB : public DB {
 
  private:
   static std::mutex mutex_;
+
+  std::ostream *out_;
 };
 
 DB *NewBasicDB();

core/client.h

@@ -9,11 +9,13 @@
 #ifndef YCSB_C_CLIENT_H_
 #define YCSB_C_CLIENT_H_
 
+#include <iostream>
 #include <string>
+
 #include "db.h"
 #include "core_workload.h"
-#include "utils.h"
-#include "countdown_latch.h"
+#include "utils/countdown_latch.h"
+#include "utils/utils.h"
 
 namespace ycsbc {
 

core/core_workload.cc

@@ -7,14 +7,14 @@
 //  Modifications Copyright 2023 Chengye YU <yuchengye2013 AT outlook.com>.
 //
 
-#include "utils.h"
 #include "uniform_generator.h"
 #include "zipfian_generator.h"
 #include "scrambled_zipfian_generator.h"
 #include "skewed_latest_generator.h"
 #include "const_generator.h"
 #include "core_workload.h"
 #include "random_byte_generator.h"
+#include "utils/utils.h"
 
 #include <algorithm>
 #include <random>

core/core_workload.h

@@ -13,12 +13,12 @@
 #include <vector>
 #include <string>
 #include "db.h"
-#include "properties.h"
 #include "generator.h"
 #include "discrete_generator.h"
 #include "counter_generator.h"
 #include "acknowledged_counter_generator.h"
-#include "utils.h"
+#include "utils/properties.h"
+#include "utils/utils.h"
 
 namespace ycsbc {
 

core/db.h

@@ -9,7 +9,7 @@
 #ifndef YCSB_C_DB_H_
 #define YCSB_C_DB_H_
 
-#include "properties.h"
+#include "utils/properties.h"
 
 #include <vector>
 #include <string>

core/db_factory.h

@@ -11,7 +11,7 @@
 
 #include "db.h"
 #include "measurements.h"
-#include "properties.h"
+#include "utils/properties.h"
 
 #include <string>
 #include <map>

core/db_wrapper.h

@@ -13,8 +13,8 @@
 
 #include "db.h"
 #include "measurements.h"
-#include "timer.h"
-#include "utils.h"
+#include "utils/timer.h"
+#include "utils/utils.h"
 
 namespace ycsbc {
 

core/discrete_generator.h

@@ -14,7 +14,7 @@
 #include <atomic>
 #include <cassert>
 #include <vector>
-#include "utils.h"
+#include "utils/utils.h"
 
 namespace ycsbc {