Merge branch 'master' into join-reordering

Author: linmagit

src/common/init.cpp

@@ -15,8 +15,8 @@
 #include <gflags/gflags.h>
 #include <google/protobuf/stubs/common.h>
 
-#include "brain/index_tuner.h"
-#include "brain/layout_tuner.h"
+#include "tuning/index_tuner.h"
+#include "tuning/layout_tuner.h"
 #include "catalog/catalog.h"
 #include "common/statement_cache_manager.h"
 #include "common/thread_pool.h"
@@ -43,7 +43,7 @@ void PelotonInit::Initialize() {
   // start worker pool
   threadpool::MonoQueuePool::GetInstance().Startup();
 
-  // start brain thread pool
+  // start indextuner thread pool
   if (settings::SettingsManager::GetBool(settings::SettingId::brain)) {
     threadpool::MonoQueuePool::GetBrainInstance().Startup();
   }
@@ -62,13 +62,13 @@ void PelotonInit::Initialize() {
   if (settings::SettingsManager::GetBool(settings::SettingId::index_tuner)) {
     // Set the default visibility flag for all indexes to false
     index::IndexMetadata::SetDefaultVisibleFlag(false);
-    auto &index_tuner = brain::IndexTuner::GetInstance();
+    auto &index_tuner = tuning::IndexTuner::GetInstance();
     index_tuner.Start();
   }
 
   // start layout tuner
   if (settings::SettingsManager::GetBool(settings::SettingId::layout_tuner)) {
-    auto &layout_tuner = brain::LayoutTuner::GetInstance();
+    auto &layout_tuner = tuning::LayoutTuner::GetInstance();
     layout_tuner.Start();
   }
 
@@ -94,13 +94,13 @@ void PelotonInit::Initialize() {
 void PelotonInit::Shutdown() {
   // shut down index tuner
   if (settings::SettingsManager::GetBool(settings::SettingId::index_tuner)) {
-    auto &index_tuner = brain::IndexTuner::GetInstance();
+    auto &index_tuner = tuning::IndexTuner::GetInstance();
     index_tuner.Stop();
   }
 
   // shut down layout tuner
   if (settings::SettingsManager::GetBool(settings::SettingId::layout_tuner)) {
-    auto &layout_tuner = brain::LayoutTuner::GetInstance();
+    auto &layout_tuner = tuning::LayoutTuner::GetInstance();
     layout_tuner.Stop();
   }
 
@@ -113,7 +113,7 @@ void PelotonInit::Shutdown() {
   // stop worker pool
   threadpool::MonoQueuePool::GetInstance().Shutdown();
 
-  // stop brain thread pool
+  // stop indextuner thread pool
   if (settings::SettingsManager::GetBool(settings::SettingId::brain)) {
     threadpool::MonoQueuePool::GetBrainInstance().Shutdown();
   }

src/include/concurrency/transaction_context.h

@@ -186,7 +186,7 @@ class TransactionContext : public Printable {
   eid_t epoch_id_;
 
   // vector of strings to log at the end of the transaction
-  // populated only if the brain is running
+  // populated only if the indextuner is running
   std::vector<std::string> query_strings_;
 
   // timestamp when the transaction began

src/include/storage/data_table.h

@@ -33,9 +33,9 @@ extern std::vector<peloton::oid_t> sdbench_column_ids;
 
 namespace peloton {
 
-namespace brain {
+namespace tuning {
 class Sample;
-}  // namespace brain
+}  // namespace indextuner
 
 namespace catalog {
 class ForeignKey;
@@ -241,9 +241,9 @@ class DataTable : public AbstractTable {
   // LAYOUT TUNER
   //===--------------------------------------------------------------------===//
 
-  void RecordLayoutSample(const brain::Sample &sample);
+  void RecordLayoutSample(const tuning::Sample &sample);
 
-  std::vector<brain::Sample> GetLayoutSamples();
+  std::vector<tuning::Sample> GetLayoutSamples();
 
   void ClearLayoutSamples();
 
@@ -255,9 +255,9 @@ class DataTable : public AbstractTable {
   // INDEX TUNER
   //===--------------------------------------------------------------------===//
 
-  void RecordIndexSample(const brain::Sample &sample);
+  void RecordIndexSample(const tuning::Sample &sample);
 
-  std::vector<brain::Sample> GetIndexSamples();
+  std::vector<tuning::Sample> GetIndexSamples();
 
   void ClearIndexSamples();
 
@@ -418,13 +418,13 @@ class DataTable : public AbstractTable {
   column_map_type default_partition_;
 
   // samples for layout tuning
-  std::vector<brain::Sample> layout_samples_;
+  std::vector<tuning::Sample> layout_samples_;
 
   // layout samples mutex
   std::mutex layout_samples_mutex_;
 
   // samples for layout tuning
-  std::vector<brain::Sample> index_samples_;
+  std::vector<tuning::Sample> index_samples_;
 
   // index samples mutex
   std::mutex index_samples_mutex_;

src/include/storage/tile_group_header.h

@@ -304,7 +304,7 @@ class TileGroupHeader : public Printable {
 
   common::synchronization::SpinLatch tile_header_lock;
 
-  // Immmutable Flag. Should be set by the brain to be true.
+  // Immmutable Flag. Should be set by the indextuner to be true.
   // By default it will be set to false.
   bool immutable;
 };

src/include/brain/brain_util.h renamed to src/include/tuning/brain_util.h

@@ -4,7 +4,7 @@
 //
 // brain_util.h
 //
-// Identification: /peloton/src/include/brain/brain_util.h
+// Identification: /peloton/src/include/tuning/brain_util.h
 //
 // Copyright (c) 2015-2017, Carnegie Mellon University Database Group
 //
@@ -19,10 +19,10 @@
 #include <vector>
 #include <algorithm>
 
-#include "brain/sample.h"
+#include "sample.h"
 
 namespace peloton {
-namespace brain {
+namespace tuning {
 
 /**
  * Brain Utility Functions
@@ -34,9 +34,9 @@ class BrainUtil {
    * It's a vector because there could be more multiple samples per table.
    * TableName -> Sample
    */
-  static std::unordered_map<std::string, std::vector<brain::Sample>> LoadSamplesFile(
+  static std::unordered_map<std::string, std::vector<tuning::Sample>> LoadSamplesFile(
       const std::string file_path) {
-    std::unordered_map<std::string, std::vector<brain::Sample>> samples;
+    std::unordered_map<std::string, std::vector<tuning::Sample>> samples;
 
     // Parse the input file line-by-line
     std::ifstream infile(file_path);
@@ -60,7 +60,7 @@ class BrainUtil {
       }
       std::transform(name.begin(), name.end(), name.begin(), ::tolower);
 
-      brain::Sample sample(columns, weight, brain::SampleType::ACCESS);
+      tuning::Sample sample(columns, weight, tuning::SampleType::ACCESS);
       samples[name].push_back(sample);
 
     }  // WHILE

src/include/brain/clusterer.h renamed to src/include/tuning/clusterer.h

@@ -4,7 +4,7 @@
 //
 // clusterer.h
 //
-// Identification: src/include/brain/clusterer.h
+// Identification: src/include/tuning/clusterer.h
 //
 // Copyright (c) 2015-16, Carnegie Mellon University Database Group
 //
@@ -17,12 +17,12 @@
 #include <map>
 
 #include "common/printable.h"
-#include "brain/sample.h"
+#include "sample.h"
 #include "common/printable.h"
 #include "common/internal_types.h"
 
 namespace peloton {
-namespace brain {
+namespace tuning {
 
 #define NEW_SAMPLE_WEIGHT 0.01
 
@@ -123,5 +123,5 @@ class Clusterer : public Printable {
   oid_t sample_column_count_;
 };
 
-}  // namespace brain
+}  // namespace indextuner
 }  // namespace peloton

src/include/brain/index_tuner.h renamed to src/include/tuning/index_tuner.h

@@ -2,9 +2,9 @@
 //
 //                         Peloton
 //
-// index_tuner.h
+// indextuner.h
 //
-// Identification: src/include/brain/index_tuner.h
+// Identification: src/include/tuning/indextuner.h
 //
 // Copyright (c) 2015-16, Carnegie Mellon University Database Group
 //
@@ -29,7 +29,7 @@ namespace storage {
 class DataTable;
 }
 
-namespace brain {
+namespace tuning {
 
 /**
  * Load statistics for Index Tuner from a file
@@ -224,7 +224,7 @@ class IndexTuner {
    *
    * @return     The workload write ratio.
    */
-  double ComputeWorkloadWriteRatio(const std::vector<brain::Sample> &samples);
+  double ComputeWorkloadWriteRatio(const std::vector<tuning::Sample> &samples);
 
   void DropIndexes(storage::DataTable *table);
 
@@ -293,5 +293,5 @@ class IndexTuner {
   bool visibility_mode_ = false;
 };
 
-}  // namespace brain
+}  // namespace indextuner
 }  // namespace peloton

src/include/brain/layout_tuner.h renamed to src/include/tuning/layout_tuner.h

@@ -4,7 +4,7 @@
 //
 // layout_tuner.h
 //
-// Identification: src/include/brain/layout_tuner.h
+// Identification: src/include/tuning/layout_tuner.h
 //
 // Copyright (c) 2015-16, Carnegie Mellon University Database Group
 //
@@ -17,7 +17,7 @@
 #include <thread>
 #include <vector>
 
-#include "brain/clusterer.h"
+#include "clusterer.h"
 #include "common/internal_types.h"
 #include "common/timer.h"
 
@@ -27,7 +27,7 @@ namespace storage {
 class DataTable;
 }
 
-namespace brain {
+namespace tuning {
 
 //===--------------------------------------------------------------------===//
 // Layout Tuner
@@ -144,5 +144,5 @@ class LayoutTuner {
 
 };
 
-}  // namespace brain
+}  // namespace indextuner
 }  // namespace peloton

src/include/brain/sample.h renamed to src/include/tuning/sample.h

@@ -4,7 +4,7 @@
 //
 // sample.h
 //
-// Identification: src/include/brain/sample.h
+// Identification: src/include/tuning/sample.h
 //
 // Copyright (c) 2015-16, Carnegie Mellon University Database Group
 //
@@ -19,7 +19,7 @@
 #include "common/internal_types.h"
 
 namespace peloton {
-namespace brain {
+namespace tuning {
 
 #define DEFAULT_SAMPLE_WEIGHT 1.0
 #define DEFAULT_COLUMN_VALUE 0.5
@@ -170,14 +170,14 @@ class Sample : public Printable {
 
 };
 
-}  // namespace brain
+}  // namespace indextuner
 }  // namespace peloton
 
 namespace std {
 
 template <>
-struct hash<peloton::brain::Sample> {
-  size_t operator()(const peloton::brain::Sample &sample) const {
+struct hash<peloton::tuning::Sample> {
+  size_t operator()(const peloton::tuning::Sample &sample) const {
     // Compute individual hash values using XOR and bit shifting:
     long hash = 31;
     auto columns = sample.GetColumnsAccessed();

src/main/peloton/peloton.cpp

@@ -22,6 +22,7 @@
 DECLARE_bool(help);
 
 int main(int argc, char *argv[]) {
+
   // Parse the command line flags
   ::google::ParseCommandLineNonHelpFlags(&argc, &argv, true);