Cleanup common

Author: pmenon

src/include/common/statement.h

@@ -6,7 +6,7 @@
 //
 // Identification: src/include/common/statement.h
 //
-// Copyright (c) 2015-16, Carnegie Mellon University Database Group
+// Copyright (c) 2015-2018, Carnegie Mellon University Database Group
 //
 //===----------------------------------------------------------------------===//
 
@@ -22,9 +22,10 @@
 #include "parser/sql_statement.h"
 
 namespace peloton {
+
 namespace planner {
 class AbstractPlan;
-}
+}  // namespace planner
 
 // Contains the value of a column in a tuple of the result set.
 // std::string since the result is sent to the client over the network.
@@ -38,55 +39,60 @@ typedef std::tuple<std::string, oid_t, size_t> FieldInfo;
 class Statement : public Printable {
  public:
   Statement() = delete;
-  Statement(const Statement&) = delete;
-  Statement& operator=(const Statement&) = delete;
-  Statement(Statement&&) = delete;
-  Statement& operator=(Statement&&) = delete;
+  Statement(const Statement &) = delete;
+  Statement &operator=(const Statement &) = delete;
+  Statement(Statement &&) = delete;
+  Statement &operator=(Statement &&) = delete;
 
-  Statement(const std::string& statement_name, const std::string& query_string);
-  Statement(const std::string& statement_name, QueryType query_type,
-            std::string query_string, std::unique_ptr<parser::SQLStatementList> sql_stmt_list);
+  Statement(const std::string &statement_name, const std::string &query_string);
+  Statement(const std::string &statement_name, QueryType query_type,
+            std::string query_string,
+            std::unique_ptr<parser::SQLStatementList> sql_stmt_list);
 
   ~Statement();
 
   std::vector<FieldInfo> GetTupleDescriptor() const;
 
-  void SetStatementName(const std::string& statement_name);
+  void SetStatementName(const std::string &statement_name);
 
   std::string GetStatementName() const;
 
-  void SetQueryString(const std::string& query_string);
+  void SetQueryString(const std::string &query_string);
 
   std::string GetQueryString() const;
 
   std::string GetQueryTypeString() const;
 
   QueryType GetQueryType() const;
 
-  void SetParamTypes(const std::vector<int32_t>& param_types);
+  void SetParamTypes(const std::vector<int32_t> &param_types);
 
   std::vector<int32_t> GetParamTypes() const;
 
-  void SetTupleDescriptor(const std::vector<FieldInfo>& tuple_descriptor);
+  void SetTupleDescriptor(const std::vector<FieldInfo> &tuple_descriptor);
 
   void SetReferencedTables(const std::set<oid_t> table_ids);
 
   const std::set<oid_t> GetReferencedTables() const;
 
   void SetPlanTree(std::shared_ptr<planner::AbstractPlan> plan_tree);
 
-  const std::shared_ptr<planner::AbstractPlan>& GetPlanTree() const;
+  const std::shared_ptr<planner::AbstractPlan> &GetPlanTree() const;
 
-  std::unique_ptr<parser::SQLStatementList>const& GetStmtParseTreeList() {return sql_stmt_list_;}
+  std::unique_ptr<parser::SQLStatementList> const &GetStmtParseTreeList() {
+    return sql_stmt_list_;
+  }
 
-  std::unique_ptr<parser::SQLStatementList> PassStmtParseTreeList() {return std::move(sql_stmt_list_);}
+  std::unique_ptr<parser::SQLStatementList> PassStmtParseTreeList() {
+    return std::move(sql_stmt_list_);
+  }
 
   inline bool GetNeedsReplan() const { return (needs_replan_); }
 
   inline void SetNeedsReplan(bool replan) { needs_replan_ = replan; }
 
   // Get a string representation for debugging
-  const std::string GetInfo() const;
+  const std::string GetInfo() const override;
 
  private:
   // logical name of statement
@@ -102,8 +108,8 @@ class Statement : public Printable {
   std::unique_ptr<parser::SQLStatementList> sql_stmt_list_;
 
   // first token in query
-  // Keep the string token of the query_type because it is returned 
-  // as responses after executing commands.
+  // Keep the string token of the query_type because it is returned as responses
+  // after executing commands.
   std::string query_type_string_;
 
   // format codes of the parameters
@@ -122,4 +128,5 @@ class Statement : public Printable {
   // If this flag is true, then somebody wants us to replan this query
   bool needs_replan_ = false;
 };
+
 }  // namespace peloton