You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-07-29 08:21:15 +03:00
Reformat all code to coding standard
This commit is contained in:
Andrew Hutchings
@ -81,73 +81,73 @@ typedef boost::shared_ptr<boost::mutex> SP_UM_MUTEX;
|
||||
//------------------------------------------------------------------------------
|
||||
class UmSocketSelector
|
||||
{
|
||||
public:
|
||||
typedef std::map<in_addr_t,unsigned int> IpAddressUmMap_t;
|
||||
public:
|
||||
typedef std::map<in_addr_t, unsigned int> IpAddressUmMap_t;
|
||||
|
||||
/** @brief Singleton accessor to UmSocketSelector instance.
|
||||
*
|
||||
* This method should be called once from the main thread to perform
|
||||
* initialization from a single threaded environment.
|
||||
*/
|
||||
static UmSocketSelector* instance();
|
||||
/** @brief Singleton accessor to UmSocketSelector instance.
|
||||
*
|
||||
* This method should be called once from the main thread to perform
|
||||
* initialization from a single threaded environment.
|
||||
*/
|
||||
static UmSocketSelector* instance();
|
||||
|
||||
/** @brief UmSocketSelector destructor
|
||||
*
|
||||
*/
|
||||
~UmSocketSelector()
|
||||
{ };
|
||||
/** @brief UmSocketSelector destructor
|
||||
*
|
||||
*/
|
||||
~UmSocketSelector()
|
||||
{ };
|
||||
|
||||
/** @brief Accessor to total number of UM IP's in Columnstore.xml.
|
||||
*
|
||||
* @return Number of UM IP addresses read from Columnstore.xml.
|
||||
*/
|
||||
uint32_t ipAddressCount() const;
|
||||
/** @brief Accessor to total number of UM IP's in Columnstore.xml.
|
||||
*
|
||||
* @return Number of UM IP addresses read from Columnstore.xml.
|
||||
*/
|
||||
uint32_t ipAddressCount() const;
|
||||
|
||||
/** @brief Add a socket/port connection to the connection list.
|
||||
*
|
||||
* @param ios (in) socket/port connection to be added.
|
||||
* @param writeLock (in) mutex to use when writing to ios.
|
||||
* @return boolean indicating if socket/port connection was added.
|
||||
*/
|
||||
bool addConnection( const SP_UM_IOSOCK& ios,
|
||||
const SP_UM_MUTEX& writeLock );
|
||||
/** @brief Add a socket/port connection to the connection list.
|
||||
*
|
||||
* @param ios (in) socket/port connection to be added.
|
||||
* @param writeLock (in) mutex to use when writing to ios.
|
||||
* @return boolean indicating if socket/port connection was added.
|
||||
*/
|
||||
bool addConnection( const SP_UM_IOSOCK& ios,
|
||||
const SP_UM_MUTEX& writeLock );
|
||||
|
||||
/** @brief Delete a socket/port connection from the connection list.
|
||||
*
|
||||
* @param ios (in) socket/port connection to be removed.
|
||||
*/
|
||||
void delConnection( const IOSocket& ios );
|
||||
/** @brief Delete a socket/port connection from the connection list.
|
||||
*
|
||||
* @param ios (in) socket/port connection to be removed.
|
||||
*/
|
||||
void delConnection( const IOSocket& ios );
|
||||
|
||||
/** @brief Get the next output IOSocket to use for the specified ios.
|
||||
*
|
||||
* @param ios (in) socket/port connection for the incoming message.
|
||||
* @param outIos (out) socket/port connection to use for the response.
|
||||
* @param writeLock (out) mutex to use when writing to outIos.
|
||||
* @return boolean indicating if operation was successful.
|
||||
*/
|
||||
bool nextIOSocket( const IOSocket& ios, SP_UM_IOSOCK& outIos,
|
||||
SP_UM_MUTEX& writeLock );
|
||||
/** @brief Get the next output IOSocket to use for the specified ios.
|
||||
*
|
||||
* @param ios (in) socket/port connection for the incoming message.
|
||||
* @param outIos (out) socket/port connection to use for the response.
|
||||
* @param writeLock (out) mutex to use when writing to outIos.
|
||||
* @return boolean indicating if operation was successful.
|
||||
*/
|
||||
bool nextIOSocket( const IOSocket& ios, SP_UM_IOSOCK& outIos,
|
||||
SP_UM_MUTEX& writeLock );
|
||||
|
||||
/** @brief toString method used in logging, debugging, etc.
|
||||
*
|
||||
*/
|
||||
const std::string toString() const;
|
||||
/** @brief toString method used in logging, debugging, etc.
|
||||
*
|
||||
*/
|
||||
const std::string toString() const;
|
||||
|
||||
private:
|
||||
//...Disable default copy constructor and assignment operator by
|
||||
// declaring but not defining
|
||||
UmSocketSelector (const UmSocketSelector& rhs);
|
||||
UmSocketSelector& operator=(const UmSocketSelector& rhs);
|
||||
private:
|
||||
//...Disable default copy constructor and assignment operator by
|
||||
// declaring but not defining
|
||||
UmSocketSelector (const UmSocketSelector& rhs);
|
||||
UmSocketSelector& operator=(const UmSocketSelector& rhs);
|
||||
|
||||
UmSocketSelector();
|
||||
void loadUMModuleInfo();
|
||||
unsigned int findOrAddUm( const std::string& moduleName );
|
||||
UmSocketSelector();
|
||||
void loadUMModuleInfo();
|
||||
unsigned int findOrAddUm( const std::string& moduleName );
|
||||
|
||||
static UmSocketSelector* fpUmSocketSelector;
|
||||
std::vector<SP_UM_MODIPS> fUmModuleIPs; // UM's and their sockets
|
||||
static UmSocketSelector* fpUmSocketSelector;
|
||||
std::vector<SP_UM_MODIPS> fUmModuleIPs; // UM's and their sockets
|
||||
|
||||
// std::map that maps an IP address to an index into fUmModuleIPs
|
||||
IpAddressUmMap_t fIpAddressUmMap;
|
||||
// std::map that maps an IP address to an index into fUmModuleIPs
|
||||
IpAddressUmMap_t fIpAddressUmMap;
|
||||
};
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
@ -164,80 +164,84 @@ class UmSocketSelector
|
||||
//------------------------------------------------------------------------------
|
||||
class UmModuleIPs
|
||||
{
|
||||
public:
|
||||
/** @brief UmModuleIPs constructor.
|
||||
*
|
||||
* @param moduleName (in) UM module name for this UmModuleIPs object.
|
||||
*/
|
||||
explicit UmModuleIPs ( const std::string& moduleName ) :
|
||||
fUmModuleName(moduleName),
|
||||
fNextUmIPSocketIdx(NEXT_IP_SOCKET_UNASSIGNED)
|
||||
{ }
|
||||
public:
|
||||
/** @brief UmModuleIPs constructor.
|
||||
*
|
||||
* @param moduleName (in) UM module name for this UmModuleIPs object.
|
||||
*/
|
||||
explicit UmModuleIPs ( const std::string& moduleName ) :
|
||||
fUmModuleName(moduleName),
|
||||
fNextUmIPSocketIdx(NEXT_IP_SOCKET_UNASSIGNED)
|
||||
{ }
|
||||
|
||||
/** @brief UmModuleIPs destructor.
|
||||
*
|
||||
*/
|
||||
~UmModuleIPs ( )
|
||||
{ };
|
||||
/** @brief UmModuleIPs destructor.
|
||||
*
|
||||
*/
|
||||
~UmModuleIPs ( )
|
||||
{ };
|
||||
|
||||
/** @brief Accessor to number of IP's from Columnstore.xml for this UM.
|
||||
*
|
||||
* @return Number of IP addresses read from Columnstore.xml for this UM.
|
||||
*/
|
||||
uint32_t ipAddressCount() const
|
||||
{ return fUmIPSocketConns.size(); }
|
||||
/** @brief Accessor to number of IP's from Columnstore.xml for this UM.
|
||||
*
|
||||
* @return Number of IP addresses read from Columnstore.xml for this UM.
|
||||
*/
|
||||
uint32_t ipAddressCount() const
|
||||
{
|
||||
return fUmIPSocketConns.size();
|
||||
}
|
||||
|
||||
/** @brief Accessor to the module name for this UmModuleIPs object.
|
||||
*
|
||||
* @return UM module name.
|
||||
*/
|
||||
const std::string& moduleName() const
|
||||
{ return fUmModuleName; }
|
||||
/** @brief Accessor to the module name for this UmModuleIPs object.
|
||||
*
|
||||
* @return UM module name.
|
||||
*/
|
||||
const std::string& moduleName() const
|
||||
{
|
||||
return fUmModuleName;
|
||||
}
|
||||
|
||||
/** @brief Add an IP address to this UM module.
|
||||
*
|
||||
* @param ip (in) IP address to be added (in network byte order)
|
||||
*/
|
||||
void addIP ( in_addr_t ip );
|
||||
/** @brief Add an IP address to this UM module.
|
||||
*
|
||||
* @param ip (in) IP address to be added (in network byte order)
|
||||
*/
|
||||
void addIP ( in_addr_t ip );
|
||||
|
||||
/** @brief Add specified socket/port to the connection list for this UM.
|
||||
*
|
||||
* @param ioSock (in) socket/port to add to the connection list.
|
||||
* @param writeLock (in) mutex to use when writing to ioSock.
|
||||
* @return boolean indicating if socket/port connection was added.
|
||||
*/
|
||||
bool addSocketConn ( const SP_UM_IOSOCK& ioSock,
|
||||
const SP_UM_MUTEX& writeLock );
|
||||
/** @brief Add specified socket/port to the connection list for this UM.
|
||||
*
|
||||
* @param ioSock (in) socket/port to add to the connection list.
|
||||
* @param writeLock (in) mutex to use when writing to ioSock.
|
||||
* @return boolean indicating if socket/port connection was added.
|
||||
*/
|
||||
bool addSocketConn ( const SP_UM_IOSOCK& ioSock,
|
||||
const SP_UM_MUTEX& writeLock );
|
||||
|
||||
/** @brief Delete specified socket/port from the connection list.
|
||||
*
|
||||
* @param ioSock (in) socket/port to delete from the connection list.
|
||||
*/
|
||||
void delSocketConn ( const IOSocket& ioSock );
|
||||
/** @brief Delete specified socket/port from the connection list.
|
||||
*
|
||||
* @param ioSock (in) socket/port to delete from the connection list.
|
||||
*/
|
||||
void delSocketConn ( const IOSocket& ioSock );
|
||||
|
||||
/** @brief Get the "next" available socket/port for this UM module.
|
||||
*
|
||||
* @param outIos (out) socket/port connection to use for the response.
|
||||
* @param writeLock (out) mutex to use when writing to outIos.
|
||||
* @return bool flag indicating whether a socket/port was available.
|
||||
*/
|
||||
bool nextIOSocket ( SP_UM_IOSOCK& outIos, SP_UM_MUTEX& writeLock );
|
||||
/** @brief Get the "next" available socket/port for this UM module.
|
||||
*
|
||||
* @param outIos (out) socket/port connection to use for the response.
|
||||
* @param writeLock (out) mutex to use when writing to outIos.
|
||||
* @return bool flag indicating whether a socket/port was available.
|
||||
*/
|
||||
bool nextIOSocket ( SP_UM_IOSOCK& outIos, SP_UM_MUTEX& writeLock );
|
||||
|
||||
/** @brief toString method used in logging, debugging, etc.
|
||||
*
|
||||
*/
|
||||
const std::string toString();
|
||||
/** @brief toString method used in logging, debugging, etc.
|
||||
*
|
||||
*/
|
||||
const std::string toString();
|
||||
|
||||
private:
|
||||
void advanceToNextIP();
|
||||
private:
|
||||
void advanceToNextIP();
|
||||
|
||||
static const int32_t NEXT_IP_SOCKET_UNASSIGNED;
|
||||
std::string fUmModuleName; // UM module name
|
||||
int32_t fNextUmIPSocketIdx; //index to "next" IP address
|
||||
boost::mutex fUmModuleMutex;
|
||||
static const int32_t NEXT_IP_SOCKET_UNASSIGNED;
|
||||
std::string fUmModuleName; // UM module name
|
||||
int32_t fNextUmIPSocketIdx; //index to "next" IP address
|
||||
boost::mutex fUmModuleMutex;
|
||||
|
||||
// collection of IP addresses and their corresponding socket/port conns
|
||||
std::vector<SP_UM_IPCONNS> fUmIPSocketConns;
|
||||
// collection of IP addresses and their corresponding socket/port conns
|
||||
std::vector<SP_UM_IPCONNS> fUmIPSocketConns;
|
||||
};
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
@ -255,81 +259,85 @@ class UmModuleIPs
|
||||
//------------------------------------------------------------------------------
|
||||
class UmIPSocketConns
|
||||
{
|
||||
public:
|
||||
struct UmIOSocketData
|
||||
{
|
||||
SP_UM_IOSOCK fSock; // an output IOSocket
|
||||
SP_UM_MUTEX fMutex; // mutex to be use when writing to fSock
|
||||
};
|
||||
public:
|
||||
struct UmIOSocketData
|
||||
{
|
||||
SP_UM_IOSOCK fSock; // an output IOSocket
|
||||
SP_UM_MUTEX fMutex; // mutex to be use when writing to fSock
|
||||
};
|
||||
|
||||
/** @brief UmIPSocketConns constructor.
|
||||
*
|
||||
* @param ip (in) IP address for this UmIPSocketConns object.
|
||||
*/
|
||||
explicit UmIPSocketConns( in_addr_t ip ) :
|
||||
fIpAddress(ip),
|
||||
fNextIOSocketIdx(NEXT_IOSOCKET_UNASSIGNED)
|
||||
{ }
|
||||
/** @brief UmIPSocketConns constructor.
|
||||
*
|
||||
* @param ip (in) IP address for this UmIPSocketConns object.
|
||||
*/
|
||||
explicit UmIPSocketConns( in_addr_t ip ) :
|
||||
fIpAddress(ip),
|
||||
fNextIOSocketIdx(NEXT_IOSOCKET_UNASSIGNED)
|
||||
{ }
|
||||
|
||||
/** @brief UmIPSocketConns destructor.
|
||||
*
|
||||
*/
|
||||
~UmIPSocketConns( )
|
||||
{ }
|
||||
/** @brief UmIPSocketConns destructor.
|
||||
*
|
||||
*/
|
||||
~UmIPSocketConns( )
|
||||
{ }
|
||||
|
||||
/** @brief Accessor to the IP address for this UmIPSocketConns object.
|
||||
*
|
||||
* @return IP address (in network byte order).
|
||||
*/
|
||||
in_addr_t ipAddress ( )
|
||||
{ return fIpAddress; }
|
||||
/** @brief Accessor to the IP address for this UmIPSocketConns object.
|
||||
*
|
||||
* @return IP address (in network byte order).
|
||||
*/
|
||||
in_addr_t ipAddress ( )
|
||||
{
|
||||
return fIpAddress;
|
||||
}
|
||||
|
||||
/** @brief Accessor to socket/port connection count for this IP address.
|
||||
*
|
||||
* @return socket/port connection count.
|
||||
*/
|
||||
uint32_t count( )
|
||||
{ return fIOSockets.size(); }
|
||||
/** @brief Accessor to socket/port connection count for this IP address.
|
||||
*
|
||||
* @return socket/port connection count.
|
||||
*/
|
||||
uint32_t count( )
|
||||
{
|
||||
return fIOSockets.size();
|
||||
}
|
||||
|
||||
/** @brief Add specified socket/port to the connection list.
|
||||
*
|
||||
* @param ioSock (in) socket/port to add to the connection list.
|
||||
* @param writeLock (in) mutex to use when writing to ioSock.
|
||||
*/
|
||||
void addSocketConn ( const SP_UM_IOSOCK& ioSock,
|
||||
const SP_UM_MUTEX& writeLock );
|
||||
/** @brief Add specified socket/port to the connection list.
|
||||
*
|
||||
* @param ioSock (in) socket/port to add to the connection list.
|
||||
* @param writeLock (in) mutex to use when writing to ioSock.
|
||||
*/
|
||||
void addSocketConn ( const SP_UM_IOSOCK& ioSock,
|
||||
const SP_UM_MUTEX& writeLock );
|
||||
|
||||
/** @brief Delete specified socket/port from the connection list.
|
||||
*
|
||||
* @param ioSock (in) socket/port to delete from the connection list.
|
||||
*/
|
||||
void delSocketConn ( const IOSocket& ioSock );
|
||||
/** @brief Delete specified socket/port from the connection list.
|
||||
*
|
||||
* @param ioSock (in) socket/port to delete from the connection list.
|
||||
*/
|
||||
void delSocketConn ( const IOSocket& ioSock );
|
||||
|
||||
/** @brief Get the "next" available socket/port for this IP address.
|
||||
*
|
||||
* @param outIos (out) socket/port connection to use for the response.
|
||||
* @param writeLock (out) mutex to use when writing to outIos.
|
||||
*/
|
||||
void nextIOSocket ( SP_UM_IOSOCK& outIos, SP_UM_MUTEX& writeLock );
|
||||
/** @brief Get the "next" available socket/port for this IP address.
|
||||
*
|
||||
* @param outIos (out) socket/port connection to use for the response.
|
||||
* @param writeLock (out) mutex to use when writing to outIos.
|
||||
*/
|
||||
void nextIOSocket ( SP_UM_IOSOCK& outIos, SP_UM_MUTEX& writeLock );
|
||||
|
||||
/** @brief Convert network byte ordered IP address to string
|
||||
*
|
||||
* @param ipString (out) IP address string;
|
||||
* ipString must be an array of size INET_ADDRSTRLEN.
|
||||
* @return IP address string (same as ipString)
|
||||
*/
|
||||
static char* nwToString( in_addr_t addr, char* ipString );
|
||||
/** @brief Convert network byte ordered IP address to string
|
||||
*
|
||||
* @param ipString (out) IP address string;
|
||||
* ipString must be an array of size INET_ADDRSTRLEN.
|
||||
* @return IP address string (same as ipString)
|
||||
*/
|
||||
static char* nwToString( in_addr_t addr, char* ipString );
|
||||
|
||||
/** @brief toString method used in logging, debugging, etc.
|
||||
*
|
||||
*/
|
||||
const std::string toString() const;
|
||||
/** @brief toString method used in logging, debugging, etc.
|
||||
*
|
||||
*/
|
||||
const std::string toString() const;
|
||||
|
||||
private:
|
||||
static const int32_t NEXT_IOSOCKET_UNASSIGNED;
|
||||
in_addr_t fIpAddress; // IP address in network byte order
|
||||
int32_t fNextIOSocketIdx;//index to "next" socket/port
|
||||
std::vector<UmIOSocketData> fIOSockets;//socket/port list for fIpAddress
|
||||
private:
|
||||
static const int32_t NEXT_IOSOCKET_UNASSIGNED;
|
||||
in_addr_t fIpAddress; // IP address in network byte order
|
||||
int32_t fNextIOSocketIdx;//index to "next" socket/port
|
||||
std::vector<UmIOSocketData> fIOSockets;//socket/port list for fIpAddress
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user