make the changes suggested in review

Author: pbollimp

src/include/catalog/query_history_catalog.h

@@ -23,7 +23,6 @@
 #pragma once
 
 #include "catalog/abstract_catalog.h"
-#include "statistics/query_metric.h"
 
 #define QUERY_HISTORY_CATALOG_NAME "pg_query_history"
 

src/include/parser/pg_list.h

@@ -73,7 +73,6 @@ struct ListCell {
  * if supported by the compiler, or as regular functions otherwise.
  * See STATIC_IF_INLINE in c.h.
  */
-
 #ifndef PG_USE_INLINE
 extern ListCell *list_head(const List *l);
 extern ListCell *list_tail(List *l);

test/brain/query_logger_test.cpp

@@ -10,15 +10,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <memory>
-
-#include "catalog/catalog.h"
 #include "common/harness.h"
-#include "concurrency/transaction_manager_factory.h"
 #include "sql/testing_sql_util.h"
 #include "settings/settings_manager.h"
 #include "parser/pg_query.h"
-#include "threadpool/brain_thread_pool.h"
 
 using std::vector;
 using std::string;
@@ -33,11 +28,11 @@ class QueryLoggerTests : public PelotonTest {
     PelotonInit::Initialize();
 
     // query to check that logging is done
-    select_query =
+    select_query_ =
         "SELECT query_string, fingerprint FROM pg_catalog.pg_query_history;";
-    select_query_fingerprint =
-        pg_query_fingerprint(select_query.c_str()).hexdigest;
-    wait_time = 2;
+    select_query_fingerprint_ =
+        pg_query_fingerprint(select_query_.c_str()).hexdigest;
+    wait_time_ = 2;
   }
 
   virtual void TearDown() override { PelotonInit::Shutdown(); }
@@ -52,13 +47,13 @@ class QueryLoggerTests : public PelotonTest {
     TestingSQLUtil::ExecuteSQLQuery(test_query.c_str());
 
     // give some time to actually log this query
-    sleep(wait_time);
+    sleep(wait_time_);
 
-    TestingSQLUtil::ExecuteSQLQueryAndCheckResult(select_query.c_str(),
+    TestingSQLUtil::ExecuteSQLQueryAndCheckResult(select_query_.c_str(),
                                                   expected_result, true);
 
     // the select query we used will also be logged for next time
-    expected_result.push_back(select_query + "|" + select_query_fingerprint);
+    expected_result.push_back(select_query_ + "|" + select_query_fingerprint_);
   }
 
   // Executes the given query and then checks if the queries that are executed
@@ -75,37 +70,40 @@ class QueryLoggerTests : public PelotonTest {
     TestingSQLUtil::ExecuteSQLQuery(test_query.c_str());
 
     // give some time to actually log this query
-    sleep(wait_time);
+    sleep(wait_time_);
 
     // only check once the the transaction has committed
     if (committed) {
-      // accounting for the select_query that happened before this txn
-      expected_result.push_back(select_query + "|" + select_query_fingerprint);
+      // accounting for the select_query_ that happened before this txn
+      expected_result.push_back(select_query_ + "|" +
+                                select_query_fingerprint_);
 
       expected_result.insert(expected_result.end(),
                              temporary_expected_result.begin(),
                              temporary_expected_result.end());
       temporary_expected_result.clear();
-      TestingSQLUtil::ExecuteSQLQueryAndCheckResult(select_query.c_str(),
+      TestingSQLUtil::ExecuteSQLQueryAndCheckResult(select_query_.c_str(),
                                                     expected_result, true);
 
       // the select query we used will also be logged for next time
-      expected_result.push_back(select_query + "|" + select_query_fingerprint);
+      expected_result.push_back(select_query_ + "|" +
+                                select_query_fingerprint_);
 
     } else {
       // verify that the logging does not happen before the txn commit
-      TestingSQLUtil::ExecuteSQLQueryAndCheckResult(select_query.c_str(),
+      TestingSQLUtil::ExecuteSQLQueryAndCheckResult(select_query_.c_str(),
                                                     expected_result, true);
       // the select query we used will also be logged for next time
-      temporary_expected_result.push_back(select_query + "|" +
-                                          select_query_fingerprint);
+      temporary_expected_result.push_back(select_query_ + "|" +
+                                          select_query_fingerprint_);
     }
   }
 
  protected:
-  string select_query;  // fixed query to check the queries logged in the table
-  string select_query_fingerprint;  // fingerprint for the fixed query
-  int wait_time;  // time to wait in seconds for the query to log into the table
+  string select_query_;  // fixed query to check the queries logged in the table
+  string select_query_fingerprint_;  // fingerprint for the fixed query
+  int wait_time_;  // time to wait in seconds for the query to log into the
+                   // table
 };
 
 // Testing the functionality of query logging
@@ -117,16 +115,17 @@ TEST_F(QueryLoggerTests, QueriesTest) {
   TestSimpleUtil("INSERT INTO test VALUES (1);", expected_result);
   TestSimpleUtil("INSERT INTO test VALUES (2);", expected_result);
 
-  expected_result.pop_back();  // the select_query done at the end of above test
-                               // won't be logged till the txn below commits
+  expected_result
+      .pop_back();  // the select_query_ done at the end of above test
+                    // won't be logged till the txn below commits
 
   // check if the queries are logged only when the transaction actually commits
   TestTransactionUtil("BEGIN;", expected_result, false);
   TestTransactionUtil("INSERT INTO test VALUES (1);", expected_result, false);
   TestTransactionUtil("COMMIT;", expected_result, true);
 
   // final check to see if everything is ok
-  TestSimpleUtil(select_query, expected_result);
+  TestSimpleUtil(select_query_, expected_result);
 }
 
 }  // namespace test

third_party/libpg_query/src/postgres/include/nodes/pg_list.h

@@ -78,7 +78,6 @@ struct ListCell
  * if supported by the compiler, or as regular functions otherwise.
  * See STATIC_IF_INLINE in c.h.
  */
-
 #ifndef PG_USE_INLINE
 extern ListCell *list_head(const List *l);
 extern ListCell *list_tail(List *l);