Address code review comments.

Author: tli2

src/common/dedicated_thread_registry.cpp

@@ -0,0 +1,41 @@
+//===----------------------------------------------------------------------===//
+//
+//                         Peloton
+//
+// dedicated_thread_registry.cpp
+//
+// Identification: src/common/dedicated_thread_registry.cpp
+//
+// Copyright (c) 2015-2018, Carnegie Mellon University Database Group
+//
+//===----------------------------------------------------------------------===//
+
+#include "common/dedicated_thread_registry.h"
+
+namespace peloton {
+
+DedicatedThreadRegistry::~DedicatedThreadRegistry() {
+  // Note that if registry is shutting down, it doesn't matter whether
+  // owners are notified as this class should have the same life cycle
+  // as the entire peloton process.
+
+  for (auto &entry : thread_owners_table_) {
+    for (auto &task : entry.second) {
+      task->Terminate();
+      threads_table_[task.get()].join();
+    }
+  }
+}
+DedicatedThreadRegistry &DedicatedThreadRegistry::GetInstance() {
+  static DedicatedThreadRegistry registry;
+  return registry;
+}
+
+template<typename Task>
+void DedicatedThreadRegistry::RegisterDedicatedThread(DedicatedThreadOwner *requester,
+                                                      std::shared_ptr<Task> task) {
+  thread_owners_table_[requester].push_back(task);
+  requester->NotifyNewThread();
+  threads_table_.emplace(task.get(), std::thread([=] { task->RunTask(); }));
+}
+}

src/include/common/dedicated_thread_registry.h

@@ -14,11 +14,13 @@
 #include <memory>
 #include <unordered_map>
 #include <vector>
-#include "common/dedicated_thread_owner.h"
-#include "common/dedicated_thread_task.h"
+#include <thread>
 #include "common/macros.h"
+#include "common/dedicated_thread_task.h"
 
 namespace peloton {
+
+class DedicatedThreadOwner;
 /**
  * Singleton class responsible for maintaining and dispensing long running
  * (dedicated) threads to other system components. The class also serves
@@ -29,24 +31,10 @@ class DedicatedThreadRegistry {
  public:
   DedicatedThreadRegistry() = default;
 
-  ~DedicatedThreadRegistry() {
-    // Note that if registry is shutting down, it doesn't matter whether
-    // owners are notified as this class should have the same life cycle
-    // as the entire peloton process.
-
-    for (auto &entry : thread_owners_table_) {
-      for (auto &task : entry.second) {
-        task->Terminate();
-        threads_table_[task.get()].join();
-      }
-    }
-  }
+  ~DedicatedThreadRegistry();
 
   // TODO(tianyu): Remove when we remove singletons
-  static DedicatedThreadRegistry &GetInstance() {
-    static DedicatedThreadRegistry registry;
-    return registry;
-  }
+  static DedicatedThreadRegistry &GetInstance();
 
   /**
    *
@@ -58,11 +46,7 @@ class DedicatedThreadRegistry {
    */
   template <typename Task>
   void RegisterDedicatedThread(DedicatedThreadOwner *requester,
-                      std::shared_ptr<Task> task) {
-    thread_owners_table_[requester].push_back(task);
-    requester->NotifyNewThread();
-    threads_table_.emplace(task.get(), std::thread([=] { task->RunTask(); }));
-  }
+                      std::shared_ptr<Task> task);
 
   // TODO(tianyu): Add code for thread removal
 
@@ -76,4 +60,5 @@ class DedicatedThreadRegistry {
                      std::vector<std::shared_ptr<DedicatedThreadTask>>>
       thread_owners_table_;
 };
+
 }  // namespace peloton

src/include/threadpool/mono_queue_pool.h

@@ -61,6 +61,7 @@ class MonoQueuePool {
     return mono_queue_pool;
   }
 
+  // TODO(Tianyu): Rename to (Brain)QueryHistoryLog or something
   static MonoQueuePool &GetBrainInstance() {
     uint32_t task_queue_size = settings::SettingsManager::GetInt(
         settings::SettingId::brain_task_queue_size);

src/network/connection_handle.cpp

@@ -107,7 +107,8 @@ DEF_TRANSITION_GRAPH
   END_DEF
 
   DEFINE_STATE(GET_RESULT) 
-    ON(WAKEUP) SET_STATE_TO(GET_RESULT) AND_INVOKE(GetResult) 
+    ON(WAKEUP) SET_STATE_TO(GET_RESULT) AND_INVOKE(GetResult)
+    ON(NEED_DATA) SET_STATE_TO (GET_RESULT) AND_WAIT
     ON(PROCEED) SET_STATE_TO(WRITE) AND_INVOKE(ProcessWrite) 
   END_DEF
 END_DEF

src/network/postgres_protocol_handler.cpp

@@ -1,15 +1,3 @@
-//===----------------------------------------------------------------------===//
-//
-//                         Peloton
-//
-// postgres_protocol_handler.cpp
-//
-// Identification: src/network/postgres_protocol_handler.cpp
-//
-// Copyright (c) 2015-2017, Carnegie Mellon University Database Group
-//
-//===----------------------------------------------------------------------===//
-
 //===----------------------------------------------------------------------===//
 //
 //                         Peloton