[*] Fixed all trailing spaces plus retab

Author: vozbu

Logging.h

@@ -18,9 +18,9 @@
 
 #include <iostream>
 
-#define LOG_TRACE(LOG, S) 
-#define LOG_DEBUG(LOG, S) 
-#define LOG_INFO(LOG, S) 
+#define LOG_TRACE(LOG, S)
+#define LOG_DEBUG(LOG, S)
+#define LOG_INFO(LOG, S)
 #define LOG_WARNING(LOG, S) std::cerr << S << std::endl;
 #define LOG_ERROR(LOG, S) std::cerr << S << std::endl;
 

Slave.cpp

@@ -99,7 +99,7 @@ void Slave::createTable(RelayLogInfo& rli,
     LOG_TRACE(log, "enter: createTable " << db_name << " " << tbl_name);
 
     nanomysql::Connection::result_t res;
-    
+
     conn.query("SHOW FULL COLUMNS FROM " + tbl_name + " IN " + db_name);
     conn.store(res);
 
@@ -360,7 +360,7 @@ void Slave::get_remote_binlog( const boost::function< bool() >& _interruptFlag)
 
         stats::setMasterInfoFile(m_master_info.master_info_file);
 
-        stats::readMasterInfoFile(m_master_info.master_log_name, 
+        stats::readMasterInfoFile(m_master_info.master_log_name,
                                   m_master_info.master_log_pos);
     }
 
@@ -460,7 +460,7 @@ void Slave::get_remote_binlog( const boost::function< bool() >& _interruptFlag)
             slave::Basic_event_info event;
 
             if (!slave::read_log_event((const char*) mysql.net.read_pos + 1,
-                                       len - 1, 
+                                       len - 1,
                                        event)) {
 
                 LOG_TRACE(log, "Skipping unknown event.");
@@ -522,20 +522,20 @@ void Slave::get_remote_binlog( const boost::function< bool() >& _interruptFlag)
 
                 stats::setMasterLogPos(m_master_info.master_log_pos);
                 stats::setMasterLogName(rei.new_log_ident);
-    
+
                 m_master_info.master_log_name = rei.new_log_ident;
                 m_master_info.master_log_pos = rei.pos; //всегда равно 4
 
                 LOG_TRACE(log, "ROTATE_EVENT processed OK.");
             }
 
-            
+
             if (process_event(event, m_rli, m_master_info.master_log_pos)) {
 
                 LOG_TRACE(log, "Error in processing event.");
             }
 
-            
+
 
         } catch (const std::exception& _ex ) {
 
@@ -576,7 +576,7 @@ std::map<std::string,std::string> Slave::getRowType(const std::string& db_name,
             LOG_ERROR(log, "WARNING: Broken SHOW TABLE STATUS FROM " << db_name);
             continue;
         }
-        
+
         //row[0] - содержит имя таблицы
         //row[3] - содержит row_format
 
@@ -697,7 +697,7 @@ void Slave::check_master_version() {
                 break;
             }
 
-            if (*e == '\0' || e == v) 
+            if (*e == '\0' || e == v)
                 break;
 
             v = e+1;
@@ -758,7 +758,7 @@ static bool checkAlterQuery(const std::string& str)
     //RegularExpression regexp("^\\s*ALTER\\s+TABLE)", RegularExpression::RE_CASELESS);
 
     enum {
-        SP0, _A0, _L0, _T0, _E0, _R, SP1, _T1, _A1, _B, _L1, _E1 
+        SP0, _A0, _L0, _T0, _E0, _R, SP1, _T1, _A1, _B, _L1, _E1
     } state = SP0;
 
 
@@ -785,7 +785,7 @@ static bool checkAlterQuery(const std::string& str)
             state = SP1;
 
         } else if (state == SP1 && (*i == ' ' || *i == '\t' || *i == '\r' || *i == '\n')) {
-            
+
         } else if (state == SP1 && (*i == 't' || *i == 'T')) {
             state = _T1;
 
@@ -873,7 +873,7 @@ int Slave::process_event(const slave::Basic_event_info& bei, RelayLogInfo &m_rli
 
         break;
     }
-   
+
     default:
         break;
     }
@@ -954,7 +954,7 @@ void Slave::generateSlaveId()
         //row[0] - содержит имя server_id
 
         std::map<std::string,nanomysql::Connection::field>::const_iterator z = i->find("Server_id");
-        
+
         if (z == i->end())
             throw std::runtime_error("Slave::create_table(): SHOW SLAVE HOSTS query did not return 'Server_id'");
 
@@ -998,14 +998,14 @@ std::pair<std::string,unsigned int> Slave::getLastBinlog()
     if (res.size() == 1 && res[0].size() == 4) {
 
         std::map<std::string,nanomysql::Connection::field>::const_iterator z = res[0].find("File");
-        
+
         if (z == res[0].end())
             throw std::runtime_error("Slave::create_table(): SHOW SLAVE HOSTS query did not return 'File'");
 
         std::string file = z->second.data;
 
         z = res[0].find("Position");
-        
+
         if (z == res[0].end())
             throw std::runtime_error("Slave::create_table(): SHOW SLAVE HOSTS query did not return 'Position'");
 

Slave.h

@@ -13,9 +13,9 @@
 */
 
 /*
- * 
+ *
  * Гарантируется работа с MySQL5.1.23
- * 
+ *
  */
 
 #ifndef __SLAVE_SLAVE_H_
@@ -63,7 +63,7 @@ struct MasterInfo {
     std::string master_log_name;
     unsigned long master_log_pos;
     unsigned int connect_retry;
-	
+
     std::string master_info_file;
 
     MasterInfo() : port(3306), master_log_pos(0), connect_retry(10) {}
@@ -84,14 +84,14 @@ class Slave
 
     MYSQL mysql;
 
-    int m_server_id;	
+    int m_server_id;
 
     MasterInfo m_master_info;
 
     table_order_t m_table_order;
     callbacks_t m_callbacks;
 
-    typedef boost::function<void (unsigned int)> xid_callback_t; 
+    typedef boost::function<void (unsigned int)> xid_callback_t;
     xid_callback_t m_xid_callback;
 
     RelayLogInfo m_rli;
@@ -100,7 +100,7 @@ class Slave
     void createDatabaseStructure_(table_order_t& tabs, RelayLogInfo& rli) const;
 
 public:
-	
+
     Slave() {}
 
     Slave(MasterInfo& _master_info) : m_master_info(_master_info) {}
@@ -116,9 +116,9 @@ class Slave
     void setXidCallback(xid_callback_t _callback) {
         m_xid_callback = _callback;
     }
-		
+
     void get_remote_binlog( const boost::function< bool() >& _interruptFlag = &Slave::falseFunction );
-	
+
     void createDatabaseStructure() {
 
         m_rli.clear();
@@ -136,10 +136,10 @@ class Slave
 
     table_order_t getTableOrder() const {
         return m_table_order;
-    }	
+    }
 
     void init();
-	
+
     int getServerOid() const { return m_server_id; }
 
     // Closes connection, opened in get_remotee_binlog. Should be called if your have get_remote_binlog
@@ -148,41 +148,41 @@ class Slave
     void close_connection();
 
 protected:
-	
-		
+
+
     int connect_to_master(int reconnect = 0);
-		
+
     int safe_reconnect();
-		
+
     int safe_connect();
-		
+
     void check_master_version();
 
     void check_master_binlog_format();
-		
+
     int process_event(const slave::Basic_event_info& bei, RelayLogInfo &rli, unsigned long long pos);
-		
+
     void request_dump(const std::string& logname, unsigned long start_position, MYSQL* mysql);
-		
+
     ulong read_event(MYSQL* mysql);
-		
-    std::map<std::string,std::string> getRowType(const std::string& db_name, 
+
+    std::map<std::string,std::string> getRowType(const std::string& db_name,
                                                  const std::set<std::string>& tbl_names) const;
 
     std::pair<std::string,unsigned int> getLastBinlog();
-		
+
     void createTable(RelayLogInfo& rli,
                      const std::string& db_name, const std::string& tbl_name,
                      const collate_map_t& collate_map, nanomysql::Connection& conn) const;
-		
+
     void register_slave_on_master(const bool m_register, MYSQL* mysql);
-		
+
     void generateSlaveId();
-	
+
 };
 
 
 
 }
 
-#endif 
+#endif

SlaveStats.h

@@ -37,8 +37,8 @@ namespace stats {
 
 class SlaveStats {
 public:
-			
-    std::string connection_host;	
+
+    std::string connection_host;
     std::string master_log_name;
     unsigned long master_log_pos;
     unsigned int reconnect_count;
@@ -51,7 +51,7 @@ class SlaveStats {
     std::map<std::string,size_t> table_counts;
 
     std::string master_info_file;
-	
+
     SlaveStats() :
         master_log_pos(0),
         reconnect_count(0),
@@ -66,7 +66,7 @@ class SlaveStats {
 
         std::ofstream f(master_info_file.c_str(), std::ios::out | std::ios::trunc);
 
-        if (!f) 
+        if (!f)
             throw std::runtime_error("slave::writeMasterInfoFile(): Could not open file: " + master_info_file);
 
         f << master_log_pos << '\n' << master_log_name << '\n';
@@ -99,9 +99,9 @@ class SlaveStats {
 
 };
 
-/// 
+///
 
-inline SlaveStats& stats() { 
+inline SlaveStats& stats() {
     static SlaveStats _stats;
     return _stats;
 }
@@ -120,9 +120,9 @@ inline void setMasterLogPos(unsigned int p) { stats().master_log_pos = p; }
 
 inline void setReconnectCount() { stats().reconnect_count++; }
 
-inline void setLastEventTime(time_t d) { 
-    stats().last_event_time = d; 
-    stats().last_update = ::time(NULL); 
+inline void setLastEventTime(time_t d) {
+    stats().last_event_time = d;
+    stats().last_update = ::time(NULL);
 }
 
 inline void setStateProcessing(bool p) { stats().state_processing = p; }
@@ -140,4 +140,4 @@ inline void incTableCount(const std::string& t) { stats().table_counts[t]++; }
 }
 
 
-#endif 
+#endif