header file follow the google cpp coding style (OpenAtomFoundation#474)

luowei0603 · May 15, 2019 · 98f495c · 98f495c
1 parent e954c9d
commit 98f495c
Show file tree

Hide file tree

Showing 59 changed files with 192 additions and 265 deletions.
diff --git a/include/pika_admin.h b/include/pika_admin.h
@@ -12,10 +12,8 @@
 #include <iomanip>
 
 #include "blackwidow/blackwidow.h"
-#include "slash/include/slash_string.h"
 
 #include "include/pika_command.h"
-#include "include/pika_client_conn.h"
 
 /*
  * Admin

diff --git a/include/pika_binlog.h b/include/pika_binlog.h
@@ -6,28 +6,46 @@
 #ifndef PIKA_BINLOG_H_
 #define PIKA_BINLOG_H_
 
-#include <cstdio>
-#include <list>
-#include <string>
-#include <deque>
-#include <pthread.h>
-
-#ifndef __STDC_FORMAT_MACROS
-# define __STDC_FORMAT_MACROS
-# include <inttypes.h>
-#endif 
-
-#include "slash/include/slash_status.h"
-#include "slash/include/slash_mutex.h"
 #include "slash/include/env.h"
+#include "slash/include/slash_mutex.h"
+#include "slash/include/slash_status.h"
+
 #include "include/pika_define.h"
 
 using slash::Status;
 using slash::Slice;
 
 std::string NewFileName(const std::string name, const uint32_t current);
 
-class Version;
+class Version {
+ public:
+  Version(slash::RWFile *save);
+  ~Version();
+
+  Status Init();
+
+  // RWLock should be held when access members.
+  Status StableSave();
+
+  uint32_t pro_num_;
+  uint64_t pro_offset_;
+  uint64_t logic_id_;
+
+  pthread_rwlock_t rwlock_;
+
+  void debug() {
+    slash::RWLock(&rwlock_, false);
+    printf ("Current pro_num %u pro_offset %lu\n", pro_num_, pro_offset_);
+  }
+
+ private:
+
+  slash::RWFile *save_;
+
+  // No copying allowed;
+  Version(const Version&);
+  void operator=(const Version&);
+};
 
 class Binlog {
  public:
@@ -94,34 +112,4 @@ class Binlog {
   void operator=(const Binlog&);
 };
 
-class Version {
- public:
-  Version(slash::RWFile *save);
-  ~Version();
-
-  Status Init();
-
-  // RWLock should be held when access members.
-  Status StableSave();
-
-  uint32_t pro_num_;
-  uint64_t pro_offset_;
-  uint64_t logic_id_;
-
-  pthread_rwlock_t rwlock_;
-
-  void debug() {
-    slash::RWLock(&rwlock_, false);
-    printf ("Current pro_num %u pro_offset %lu\n", pro_num_, pro_offset_);
-  }
-
- private:
-
-  slash::RWFile *save_;
-
-  // No copying allowed;
-  Version(const Version&);
-  void operator=(const Version&);
-};
-
 #endif
diff --git a/include/pika_binlog_bgworker.h b/include/pika_binlog_bgworker.h
@@ -5,9 +5,12 @@
 
 #ifndef PIKA_BINLOG_BGWORKER_H_
 #define PIKA_BINLOG_BGWORKER_H_
-#include "include/pika_command.h"
+
 #include "pink/include/bg_thread.h"
 
+#include "include/pika_command.h"
+#include "include/pika_binlog_transverter.h"
+
 class BinlogBGWorker {
  public:
   BinlogBGWorker(int full)

diff --git a/include/pika_binlog_parser.h b/include/pika_binlog_parser.h
@@ -7,7 +7,8 @@
 #define PIKA_BINLOG_PARSER_H_
 
 #include "pink/include/pink_conn.h"
-#include "include/pika_command.h"
+
+#include "include/pika_binlog_transverter.h"
 
 enum BinlogParserStatus {
   kBinlogParserNone = 0,

diff --git a/include/pika_binlog_receiver_conn.h b/include/pika_binlog_receiver_conn.h
@@ -7,9 +7,8 @@
 #define PIKA_BINLOG_RECEIVER_CONN_H_
 
 #include "pink/include/pink_conn.h"
-#include "include/pika_command.h"
 #include "pink/include/redis_parser.h"
-#include "include/pika_binlog_transverter.h"
+
 #include "include/pika_binlog_parser.h"
 
 class PikaBinlogReceiverThread;

diff --git a/include/pika_binlog_receiver_thread.h b/include/pika_binlog_receiver_thread.h
@@ -6,18 +6,10 @@
 #ifndef PIKA_BINLOG_RECEIVER_THREAD_H_
 #define PIKA_BINLOG_RECEIVER_THREAD_H_
 
-#include <queue>
-#include <set>
+#include <glog/logging.h>
 
-#include "pink/include/server_thread.h"
-#include "slash/include/slash_mutex.h"
-#include "slash/include/env.h"
-#include "include/pika_define.h"
-#include "include/pika_binlog_receiver_conn.h"
 #include "include/pika_command.h"
-#include "include/pika_conf.h"
-
-extern PikaConf* g_pika_conf;
+#include "include/pika_binlog_receiver_conn.h"
 
 class PikaBinlogReceiverThread {
  public:

diff --git a/include/pika_binlog_sender_thread.h b/include/pika_binlog_sender_thread.h
@@ -6,12 +6,11 @@
 #ifndef PIKA_BINLOG_SENDER_THREAD_H_
 #define PIKA_BINLOG_SENDER_THREAD_H_
 
-#include "pink/include/pink_thread.h"
 #include "pink/include/pink_cli.h"
+#include "pink/include/pink_thread.h"
+#include "slash/include/env.h"
 #include "slash/include/slash_slice.h"
 #include "slash/include/slash_status.h"
-#include "slash/include/env.h"
-#include "slash/include/slash_mutex.h"
 
 using slash::Status;
 using slash::Slice;

diff --git a/include/pika_binlog_transverter.h b/include/pika_binlog_transverter.h
@@ -6,12 +6,9 @@
 #ifndef PIKA_BINLOG_TRANSVERTER_H_
 #define PIKA_BINLOG_TRANSVERTER_H_
 
-#include <iostream>
 #include <vector>
-#include <glog/logging.h>
-
-#include "slash/include/slash_coding.h"
-
+#include <stdint.h>
+#include <iostream>
 
 /*
  * **************Header**************

diff --git a/include/pika_bit.h b/include/pika_bit.h
@@ -11,7 +11,6 @@
 #include "include/pika_command.h"
 #include "include/pika_partition.h"
 
-
 /*
  * bitoperation
  */

diff --git a/include/pika_client_conn.h b/include/pika_client_conn.h
@@ -6,14 +6,8 @@
 #ifndef PIKA_CLIENT_CONN_H_
 #define PIKA_CLIENT_CONN_H_
 
-#include <glog/logging.h>
-#include <atomic>
-
-#include "pink/include/pink_thread.h"
 #include "include/pika_command.h"
 
-class PikaWorkerSpecificData;
-
 class PikaClientConn: public pink::RedisConn {
  public:
   struct BgTaskArg {

diff --git a/include/pika_cmd_table_manager.h b/include/pika_cmd_table_manager.h
@@ -5,15 +5,9 @@
 
 #ifndef PIKA_CMD_TABLE_MANAGER_H_
 #define PIKA_CMD_TABLE_MANAGER_H_
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/syscall.h>
 
-#include "slash/include/slash_mutex.h"
 #include "include/pika_command.h"
 
-#define gettid() syscall(__NR_gettid)
-
 class PikaCmdTableManager {
  public:
   PikaCmdTableManager();

diff --git a/include/pika_command.h b/include/pika_command.h
@@ -6,17 +6,12 @@
 #ifndef PIKA_COMMAND_H_
 #define PIKA_COMMAND_H_
 
-#include <deque>
-#include <string>
-#include <memory>
 #include <unordered_map>
 
-#include "slash/include/slash_string.h"
 #include "pink/include/redis_conn.h"
+#include "slash/include/slash_string.h"
 
-#include "include/pika_binlog_transverter.h"
-
-class Partition;
+#include "include/pika_partition.h"
 
 //Constant for command name
 //Admin

diff --git a/include/pika_conf.h b/include/pika_conf.h
@@ -5,17 +5,13 @@
 
 #ifndef PIKA_CONF_H_
 #define PIKA_CONF_H_
-#include <pthread.h>
-#include <stdlib.h>
-#include <string>
-#include <vector>
+
+#include <map>
 #include <unordered_set>
 
 #include "slash/include/base_conf.h"
 #include "slash/include/slash_mutex.h"
 #include "slash/include/slash_string.h"
-#include "slash/include/xdebug.h"
-#include "include/pika_define.h"
 
 typedef slash::RWLock RWLock;
 

diff --git a/include/pika_define.h b/include/pika_define.h
@@ -6,7 +6,7 @@
 #ifndef PIKA_DEFINE_H_
 #define PIKA_DEFINE_H_
 
-#include "include/pika_command.h"
+#include "pink/include/redis_cli.h"
 
 #define PIKA_MAX_WORKER_THREAD_NUM 24
 

diff --git a/include/pika_dispatch_thread.h b/include/pika_dispatch_thread.h
@@ -6,8 +6,8 @@
 #ifndef PIKA_DISPATCH_THREAD_H_
 #define PIKA_DISPATCH_THREAD_H_
 
-#include "slash/include/env.h"
 #include "pink/include/server_thread.h"
+
 #include "include/pika_client_conn.h"
 
 class PikaDispatchThread {

diff --git a/include/pika_geo.h b/include/pika_geo.h
@@ -5,32 +5,32 @@
 
 #ifndef PIKA_GEO_H_
 #define PIKA_GEO_H_
+
 #include "include/pika_command.h"
 #include "include/pika_partition.h"
 
 /*
  * zset
  */
- enum Sort
-{
+enum Sort {
   Unsort,	//default
   Asc,
   Desc
 };
 
- struct GeoPoint {
+struct GeoPoint {
   std::string member;
   double longitude;
   double latitude;
 };
 
- struct NeighborPoint{
-   std::string member;
-   double score;
-   double distance;
- };
+struct NeighborPoint {
+  std::string member;
+  double score;
+  double distance;
+};
 
- struct GeoRange {
+struct GeoRange {
   std::string member;
   double longitude;
   double latitude;
@@ -46,7 +46,7 @@
   bool storedist;
   std::string storekey;
   Sort sort;
- };
+};
 
 class GeoAddCmd : public Cmd {
  public:

diff --git a/include/pika_hash.h b/include/pika_hash.h
@@ -14,7 +14,6 @@
 /*
  * hash
  */
-
 class HDelCmd : public Cmd {
  public:
   HDelCmd(const std::string& name, int arity, uint16_t flag)

diff --git a/include/pika_heartbeat_conn.h b/include/pika_heartbeat_conn.h
@@ -6,13 +6,9 @@
 #ifndef PIKA_HEARTBEAT_CONN_H_
 #define PIKA_HEARTBEAT_CONN_H_
 
-#include <glog/logging.h>
-
-#include "include/pika_command.h"
 #include "pink/include/redis_conn.h"
-#include "pink/include/pink_thread.h"
 
-class PikaHeartbeatThread;
+#include "include/pika_command.h"
 
 class PikaHeartbeatConn: public pink::RedisConn {
  public:

diff --git a/include/pika_heartbeat_thread.h b/include/pika_heartbeat_thread.h
@@ -7,9 +7,7 @@
 #define PIKA_HEARTBEAT_THREAD_H_
 
 #include <set>
-#include <string>
 
-#include "pink/include/server_thread.h"
 #include "pika_heartbeat_conn.h"
 
 class PikaHeartbeatThread {

diff --git a/include/pika_list.h b/include/pika_list.h
@@ -11,7 +11,6 @@
 #include "include/pika_command.h"
 #include "include/pika_partition.h"
 
-
 /*
  * list
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,6 @@ @@
     #include "include/pika_command.h"
     #include "include/pika_partition.h"
     /*
      * bitoperation
      */
@@ Expand Down @@