reformat source code

according to code styles, 'AccessModifierOffset' should be -2.

Author: gm

.clang-format

@@ -2,7 +2,7 @@
 Language: Cpp
 # BasedOnStyle:	LLVM
 SortIncludes: false
-AccessModifierOffset: -4
+AccessModifierOffset: -2
 AlignAfterOpenBracket: DontAlign
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false

deps/easy/src/packet/easy_tbnet.h

@@ -43,7 +43,7 @@ static uint64_t addrv_to_server_id(easy_addr_t addr)
 class IServerAdapter;
 class Transport;
 class DataBuffer {
-  public:
+public:
   DataBuffer(easy_buf_t* pb)
   {
     b = pb;
@@ -180,22 +180,22 @@ class DataBuffer {
     return true;
   }
 
-  private:
+private:
   easy_pool_t* pool;
   easy_list_t* l;
   easy_buf_t* b;
   int wl;
 };
 
 class PacketHeader {
-  public:
+public:
   uint32_t _chid;
   int _pcode;
   int _dataLen;
 };
 
 class Packet {
-  public:
+public:
   Packet()
   {
     memset(&_packetHeader, 0, sizeof(PacketHeader));
@@ -241,13 +241,13 @@ class Packet {
   virtual bool encode(DataBuffer* output) = 0;
   virtual bool decode(DataBuffer* input, PacketHeader* header) = 0;
 
-  public:
+public:
   PacketHeader _packetHeader;
   easy_request_t* r;
 };
 
 class ControlPacket : public Packet {
-  public:
+public:
   enum { CMD_BAD_PACKET = 1, CMD_TIMEOUT_PACKET, CMD_DISCONN_PACKET };
   ControlPacket(int c) : _command(c)
   {}
@@ -268,12 +268,12 @@ class ControlPacket : public Packet {
     return false;
   }
 
-  private:
+private:
   int _command;
 };
 
 class IOComponent {
-  public:
+public:
   IOComponent()
   {}
   ~IOComponent()
@@ -283,12 +283,12 @@ class IOComponent {
     this->l = l;
   }
 
-  private:
+private:
   easy_listen_t* l;
 };
 
 class IPacketFactory {
-  public:
+public:
   IPacketFactory()
   {
     flag = 0x416e4574;
@@ -304,7 +304,7 @@ class IPacketFactory {
 
 class IPacketStreamer {
 
-  public:
+public:
   IPacketStreamer()
   {
     _factory = NULL;
@@ -410,12 +410,12 @@ class IPacketStreamer {
     return EASY_OK;
   }
 
-  protected:
+protected:
   IPacketFactory* _factory;
 };
 
 class IPacketHandler {
-  public:
+public:
   enum HPRetCode {
     KEEP_CHANNEL = 0,    // easy_ok
     CLOSE_CHANNEL = -1,  // easy_error
@@ -482,13 +482,13 @@ class IPacketHandler {
   {}
   virtual HPRetCode handlePacket(Packet* packet, void* args) = 0;
 
-  protected:
+protected:
   IPacketStreamer* client_streamer;
   easy_io_handler_pt client_handler;
 };
 
 class PacketQueue {
-  public:
+public:
   PacketQueue(easy_message_t* pm)
   {
     m = pm;
@@ -502,7 +502,7 @@ class PacketQueue {
 
 class Connection {
 
-  public:
+public:
   Connection()
   {}
   Connection(easy_connection_t* c, easy_request_t* r)
@@ -565,14 +565,14 @@ class Connection {
     return htons(((addr.addr >> 32) & 0xffff));
   }
 
-  protected:
+protected:
   easy_addr_t addr;
   easy_connection_t* c;
   easy_request_t* r;
 };
 
 class IServerAdapter {
-  public:
+public:
   IServerAdapter()
   {
     memset(&server_handler, 0, sizeof(easy_io_handler_pt));
@@ -646,14 +646,14 @@ class IServerAdapter {
     return false;
   }
 
-  protected:
+protected:
   IPacketStreamer* server_streamer;
   easy_io_handler_pt server_handler;
 };
 
 class DefaultPacketStreamer : public IPacketStreamer {
 
-  public:
+public:
   DefaultPacketStreamer()
   {}
 
@@ -673,7 +673,7 @@ class DefaultPacketStreamer : public IPacketStreamer {
 
 class Transport {
 
-  public:
+public:
   Transport()
   {
     _eio = easy_eio_create(NULL, 1);
@@ -742,19 +742,19 @@ class Transport {
     return _eio;
   }
 
-  private:
+private:
   easy_io_t* _eio;
 };
 
 class IPacketQueueHandler {
-  public:
+public:
   virtual ~IPacketQueueHandler()
   {}
   virtual bool handlePacketQueue(Packet* packet, void* args) = 0;
 };
 
 class PacketQueueThread {
-  public:
+public:
   PacketQueueThread()
   {
     _threadPool = NULL;
@@ -794,13 +794,13 @@ class PacketQueueThread {
     return easy_thread_pool_push_message(_threadPool, queue.m, (int64_t)(long)queue.m);
   }
 
-  private:
+private:
   IPacketQueueHandler* _handler;
   easy_thread_pool_t* _threadPool;
 };
 
 class ConnectionManager {
-  public:
+public:
   ConnectionManager(Transport* transport, IPacketStreamer* streamer, IPacketHandler* packetHandler)
   {
     _transport = transport;
@@ -871,7 +871,7 @@ class ConnectionManager {
     return true;
   }
 
-  private:
+private:
   Transport* _transport;
   IPacketHandler* _packetHandler;
   easy_client_t* _cl;

deps/oblib/src/common/cell/ob_cell_reader.h

@@ -18,7 +18,7 @@
 namespace oceanbase {
 namespace common {
 class ObCellReader {
-  public:
+public:
   ObCellReader();
   virtual ~ObCellReader()
   {}
@@ -38,7 +38,7 @@ class ObCellReader {
   }
   int read_cell(common::ObObj& obj);
 
-  private:
+private:
   inline int read_oracle_timestamp(
       const ObObjType obj_type, const uint8_t meta_attr, const ObOTimestampMetaAttrType otmat, ObObj& obj);
   int read_interval_ds(ObObj& obj);
@@ -49,7 +49,7 @@ class ObCellReader {
   int read(const T*& ptr);
   inline int is_es_end_object(const common::ObObj& obj, bool& is_end_obj);
 
-  private:
+private:
   const char* buf_;
   int64_t buf_size_;
   int64_t pos_;

deps/oblib/src/common/cell/ob_cell_writer.h

@@ -36,7 +36,7 @@ enum ObCompactStoreType {
 const uint8_t TEXT_CELL_META_VERSION = 1;
 
 class ObCellWriter {
-  public:
+public:
   struct CellMeta {
     static const uint64_t SF_BIT_TYPE = 6;
     static const uint64_t SF_BIT_ATTR = 2;
@@ -66,7 +66,7 @@ class ObCellWriter {
     EV_LOCK_ROW = 5
   };
 
-  public:
+public:
   ObCellWriter();
   virtual ~ObCellWriter()
   {}
@@ -111,7 +111,7 @@ class ObCellWriter {
     return true;
   }
 
-  private:
+private:
   template <class T>
   int append(const T& value);
   inline int write_int(const ObObj& obj, const enum common::ObObjType meta_type, const int64_t value);
@@ -133,7 +133,7 @@ class ObCellWriter {
     return old_text_format_;
   }
 
-  private:
+private:
   char* buf_;
   int64_t buf_size_;
   int64_t pos_;

deps/oblib/src/common/data_buffer.h

@@ -21,7 +21,7 @@
 namespace oceanbase {
 namespace common {
 class ObDataBuffer : public ObIAllocator {
-  public:
+public:
   ObDataBuffer() : data_(NULL), capacity_(0), position_(0), limit_(0)
   {}
 
@@ -138,7 +138,7 @@ class ObDataBuffer : public ObIAllocator {
 
   OB_UNIS_VERSION(1);
 
-  protected:
+protected:
   char* data_;
   int64_t capacity_;
   int64_t position_;

deps/oblib/src/common/log/ob_direct_log_reader.h

@@ -18,7 +18,7 @@
 namespace oceanbase {
 namespace common {
 class ObDirectLogReader : public ObSingleLogReader {
-  public:
+public:
   ObDirectLogReader();
   virtual ~ObDirectLogReader();
 

deps/oblib/src/common/log/ob_log_cursor.h

@@ -44,15 +44,15 @@ struct ObLogCursor {
 
 ObLogCursor& set_cursor(ObLogCursor& cursor, const int64_t file_id, const int64_t log_id, const int64_t offset);
 class ObAtomicLogCursor {
-  public:
+public:
   ObAtomicLogCursor()
   {}
   ~ObAtomicLogCursor()
   {}
   int get_cursor(ObLogCursor& cursor) const;
   int set_cursor(ObLogCursor& cursor);
 
-  private:
+private:
   ObLogCursor log_cursor_;
   mutable common::SpinRWLock cursor_lock_;
 };

deps/oblib/src/common/log/ob_log_data_writer.h

@@ -22,7 +22,7 @@ namespace common {
 int myfallocate(int fd, int mode, off_t offset, off_t len);
 
 class MinAvailFileIdGetter {
-  public:
+public:
   MinAvailFileIdGetter()
   {}
   virtual ~MinAvailFileIdGetter()
@@ -31,27 +31,27 @@ class MinAvailFileIdGetter {
 };
 
 class ObLogDataWriter {
-  public:
+public:
   static const int OPEN_FLAG = O_WRONLY | O_DIRECT;
   static const int OPEN_MODE = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
   static const int CREATE_FLAG = OPEN_FLAG | O_CREAT;
   class AppendBuffer {
-    public:
+  public:
     static const int64_t DEFAULT_BUF_SIZE = 1 << 22;
     AppendBuffer();
     ~AppendBuffer();
     int write(const char* buf, int64_t len, int64_t pos);
     int flush(int fd);
     void destroy();
 
-    private:
+  private:
     int64_t file_pos_;
     char* buf_;
     int64_t buf_end_;
     int64_t buf_limit_;
   };
 
-  public:
+public:
   ObLogDataWriter();
   ~ObLogDataWriter();
   int init(const char* log_dir, const int64_t file_size, const int64_t du_percent, const int64_t log_sync_type,
@@ -67,13 +67,13 @@ class ObLogDataWriter {
   }
   int64_t to_string(char* buf, const int64_t len) const;
 
-  protected:
+protected:
   int check_eof_after_log_cursor(const ObLogCursor& cursor);
   int prepare_fd(const int64_t file_id);
   int reuse(const char* pool_file, const char* fname);
   const char* select_pool_file(char* fname, const int64_t limit);
 
-  private:
+private:
   AppendBuffer write_buffer_;
   const char* log_dir_;
   int64_t file_size_;