You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-07-30 19:23:07 +03:00
Reformat all code to coding standard
This commit is contained in:
Andrew Hutchings
@ -62,176 +62,199 @@ namespace messageqcpp
|
||||
|
||||
CompressedInetStreamSocket::CompressedInetStreamSocket()
|
||||
{
|
||||
config::Config *config = config::Config::makeConfig();
|
||||
string val;
|
||||
|
||||
try {
|
||||
val = config->getConfig("NetworkCompression", "Enabled");
|
||||
}
|
||||
catch(...) { }
|
||||
|
||||
if (val == "" || val == "Y")
|
||||
useCompression = true;
|
||||
else
|
||||
useCompression = false;
|
||||
config::Config* config = config::Config::makeConfig();
|
||||
string val;
|
||||
|
||||
try
|
||||
{
|
||||
val = config->getConfig("NetworkCompression", "Enabled");
|
||||
}
|
||||
catch (...) { }
|
||||
|
||||
if (val == "" || val == "Y")
|
||||
useCompression = true;
|
||||
else
|
||||
useCompression = false;
|
||||
}
|
||||
|
||||
Socket * CompressedInetStreamSocket::clone() const
|
||||
|
||||
Socket* CompressedInetStreamSocket::clone() const
|
||||
{
|
||||
return new CompressedInetStreamSocket(*this);
|
||||
return new CompressedInetStreamSocket(*this);
|
||||
}
|
||||
|
||||
const SBS CompressedInetStreamSocket::read(const struct timespec* timeout, bool* isTimeOut,
|
||||
Stats *stats) const
|
||||
Stats* stats) const
|
||||
{
|
||||
SBS readBS, ret;
|
||||
size_t uncompressedSize;
|
||||
bool err;
|
||||
|
||||
readBS = InetStreamSocket::read(timeout, isTimeOut, stats);
|
||||
if (readBS->length() == 0 || fMagicBuffer == BYTESTREAM_MAGIC)
|
||||
return readBS;
|
||||
SBS readBS, ret;
|
||||
size_t uncompressedSize;
|
||||
bool err;
|
||||
|
||||
err = alg.getUncompressedSize((char *) readBS->buf(), readBS->length(), &uncompressedSize);
|
||||
if (!err)
|
||||
return SBS(new ByteStream(0));
|
||||
readBS = InetStreamSocket::read(timeout, isTimeOut, stats);
|
||||
|
||||
ret.reset(new ByteStream(uncompressedSize));
|
||||
alg.uncompress((char *) readBS->buf(), readBS->length(), (char *) ret->getInputPtr());
|
||||
ret->advanceInputPtr(uncompressedSize);
|
||||
|
||||
return ret;
|
||||
if (readBS->length() == 0 || fMagicBuffer == BYTESTREAM_MAGIC)
|
||||
return readBS;
|
||||
|
||||
err = alg.getUncompressedSize((char*) readBS->buf(), readBS->length(), &uncompressedSize);
|
||||
|
||||
if (!err)
|
||||
return SBS(new ByteStream(0));
|
||||
|
||||
ret.reset(new ByteStream(uncompressedSize));
|
||||
alg.uncompress((char*) readBS->buf(), readBS->length(), (char*) ret->getInputPtr());
|
||||
ret->advanceInputPtr(uncompressedSize);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
void CompressedInetStreamSocket::write(const ByteStream &msg, Stats *stats)
|
||||
void CompressedInetStreamSocket::write(const ByteStream& msg, Stats* stats)
|
||||
{
|
||||
size_t outLen=0;
|
||||
uint32_t len = msg.length();
|
||||
|
||||
if (useCompression && (len > 512)) {
|
||||
ByteStream smsg(alg.maxCompressedSize(len));
|
||||
|
||||
alg.compress((char *) msg.buf(), len, (char *) smsg.getInputPtr(), &outLen);
|
||||
smsg.advanceInputPtr(outLen);
|
||||
if (outLen < len)
|
||||
do_write(smsg, COMPRESSED_BYTESTREAM_MAGIC, stats);
|
||||
else
|
||||
InetStreamSocket::write(msg, stats);
|
||||
}
|
||||
else
|
||||
InetStreamSocket::write(msg, stats);
|
||||
size_t outLen = 0;
|
||||
uint32_t len = msg.length();
|
||||
|
||||
if (useCompression && (len > 512))
|
||||
{
|
||||
ByteStream smsg(alg.maxCompressedSize(len));
|
||||
|
||||
alg.compress((char*) msg.buf(), len, (char*) smsg.getInputPtr(), &outLen);
|
||||
smsg.advanceInputPtr(outLen);
|
||||
|
||||
if (outLen < len)
|
||||
do_write(smsg, COMPRESSED_BYTESTREAM_MAGIC, stats);
|
||||
else
|
||||
InetStreamSocket::write(msg, stats);
|
||||
}
|
||||
else
|
||||
InetStreamSocket::write(msg, stats);
|
||||
}
|
||||
|
||||
void CompressedInetStreamSocket::write(SBS msg, Stats *stats)
|
||||
void CompressedInetStreamSocket::write(SBS msg, Stats* stats)
|
||||
{
|
||||
write(*msg, stats);
|
||||
write(*msg, stats);
|
||||
}
|
||||
|
||||
/* this was cut & pasted from InetStreamSocket;
|
||||
/* this was cut & pasted from InetStreamSocket;
|
||||
* is there a clean way to wrap ISS::accept()?
|
||||
*/
|
||||
const IOSocket CompressedInetStreamSocket::accept(const struct timespec* timeout)
|
||||
{
|
||||
int clientfd;
|
||||
long msecs = 0;
|
||||
int clientfd;
|
||||
long msecs = 0;
|
||||
|
||||
struct pollfd pfd[1];
|
||||
pfd[0].fd = socketParms().sd();
|
||||
pfd[0].events = POLLIN;
|
||||
struct pollfd pfd[1];
|
||||
pfd[0].fd = socketParms().sd();
|
||||
pfd[0].events = POLLIN;
|
||||
|
||||
if (timeout != 0)
|
||||
{
|
||||
msecs = timeout->tv_sec * 1000 + timeout->tv_nsec / 1000000;
|
||||
if (poll(pfd, 1, msecs) != 1 || (pfd[0].revents & POLLIN) == 0 ||
|
||||
pfd[0].revents & (POLLERR | POLLHUP | POLLNVAL))
|
||||
return IOSocket(new CompressedInetStreamSocket());
|
||||
}
|
||||
if (timeout != 0)
|
||||
{
|
||||
msecs = timeout->tv_sec * 1000 + timeout->tv_nsec / 1000000;
|
||||
|
||||
struct sockaddr sa;
|
||||
socklen_t sl = sizeof(sa);
|
||||
int e;
|
||||
do
|
||||
{
|
||||
clientfd = ::accept(socketParms().sd(), &sa, &sl);
|
||||
e = errno;
|
||||
} while (clientfd < 0 && (e == EINTR ||
|
||||
if (poll(pfd, 1, msecs) != 1 || (pfd[0].revents & POLLIN) == 0 ||
|
||||
pfd[0].revents & (POLLERR | POLLHUP | POLLNVAL))
|
||||
return IOSocket(new CompressedInetStreamSocket());
|
||||
}
|
||||
|
||||
struct sockaddr sa;
|
||||
|
||||
socklen_t sl = sizeof(sa);
|
||||
|
||||
int e;
|
||||
|
||||
do
|
||||
{
|
||||
clientfd = ::accept(socketParms().sd(), &sa, &sl);
|
||||
e = errno;
|
||||
}
|
||||
while (clientfd < 0 && (e == EINTR ||
|
||||
#ifdef ERESTART
|
||||
e == ERESTART ||
|
||||
e == ERESTART ||
|
||||
#endif
|
||||
#ifdef ECONNABORTED
|
||||
e == ECONNABORTED ||
|
||||
e == ECONNABORTED ||
|
||||
#endif
|
||||
false));
|
||||
if (clientfd < 0)
|
||||
{
|
||||
string msg = "CompressedInetStreamSocket::accept: accept() error: ";
|
||||
scoped_array<char> buf(new char[80]);
|
||||
false));
|
||||
|
||||
if (clientfd < 0)
|
||||
{
|
||||
string msg = "CompressedInetStreamSocket::accept: accept() error: ";
|
||||
scoped_array<char> buf(new char[80]);
|
||||
#if STRERROR_R_CHAR_P
|
||||
const char* p;
|
||||
if ((p = strerror_r(e, buf.get(), 80)) != 0)
|
||||
msg += p;
|
||||
const char* p;
|
||||
|
||||
if ((p = strerror_r(e, buf.get(), 80)) != 0)
|
||||
msg += p;
|
||||
|
||||
#else
|
||||
int p;
|
||||
if ((p = strerror_r(e, buf.get(), 80)) == 0)
|
||||
msg += buf.get();
|
||||
int p;
|
||||
|
||||
if ((p = strerror_r(e, buf.get(), 80)) == 0)
|
||||
msg += buf.get();
|
||||
|
||||
#endif
|
||||
throw runtime_error(msg);
|
||||
}
|
||||
throw runtime_error(msg);
|
||||
}
|
||||
|
||||
if (fSyncProto)
|
||||
{
|
||||
/* send a byte to artificially synchronize with connect() on the remote */
|
||||
char b = 'A';
|
||||
int ret;
|
||||
if (fSyncProto)
|
||||
{
|
||||
/* send a byte to artificially synchronize with connect() on the remote */
|
||||
char b = 'A';
|
||||
int ret;
|
||||
|
||||
ret = ::send(clientfd, &b, 1, 0);
|
||||
e = errno;
|
||||
if (ret < 0) {
|
||||
ostringstream os;
|
||||
char blah[80];
|
||||
ret = ::send(clientfd, &b, 1, 0);
|
||||
e = errno;
|
||||
|
||||
if (ret < 0)
|
||||
{
|
||||
ostringstream os;
|
||||
char blah[80];
|
||||
#if STRERROR_R_CHAR_P
|
||||
const char* p;
|
||||
if ((p = strerror_r(e, blah, 80)) != 0)
|
||||
os << "CompressedInetStreamSocket::accept sync: " << p;
|
||||
#else
|
||||
int p;
|
||||
if ((p = strerror_r(e, blah, 80)) == 0)
|
||||
os << "CompressedInetStreamSocket::accept sync: " << blah;
|
||||
#endif
|
||||
::close(clientfd);
|
||||
throw runtime_error(os.str());
|
||||
}
|
||||
else if (ret == 0) {
|
||||
::close(clientfd);
|
||||
throw runtime_error("CompressedInetStreamSocket::accept sync: got unexpected error code");
|
||||
}
|
||||
}
|
||||
const char* p;
|
||||
|
||||
CompressedInetStreamSocket *ciss = new CompressedInetStreamSocket();
|
||||
IOSocket ios;
|
||||
sockaddr_in *sin = (sockaddr_in *) &sa;
|
||||
|
||||
if ((sin->sin_addr.s_addr == fSa.sin_addr.s_addr) ||
|
||||
sin->sin_addr.s_addr == inet_addr("127.0.0.1"))
|
||||
ciss->useCompression = false;
|
||||
|
||||
ios.setSocketImpl(ciss);
|
||||
SocketParms sp;
|
||||
sp = ios.socketParms();
|
||||
sp.sd(clientfd);
|
||||
ios.socketParms(sp);
|
||||
ios.sa(&sa);
|
||||
return ios;
|
||||
if ((p = strerror_r(e, blah, 80)) != 0)
|
||||
os << "CompressedInetStreamSocket::accept sync: " << p;
|
||||
|
||||
#else
|
||||
int p;
|
||||
|
||||
if ((p = strerror_r(e, blah, 80)) == 0)
|
||||
os << "CompressedInetStreamSocket::accept sync: " << blah;
|
||||
|
||||
#endif
|
||||
::close(clientfd);
|
||||
throw runtime_error(os.str());
|
||||
}
|
||||
else if (ret == 0)
|
||||
{
|
||||
::close(clientfd);
|
||||
throw runtime_error("CompressedInetStreamSocket::accept sync: got unexpected error code");
|
||||
}
|
||||
}
|
||||
|
||||
CompressedInetStreamSocket* ciss = new CompressedInetStreamSocket();
|
||||
IOSocket ios;
|
||||
sockaddr_in* sin = (sockaddr_in*) &sa;
|
||||
|
||||
if ((sin->sin_addr.s_addr == fSa.sin_addr.s_addr) ||
|
||||
sin->sin_addr.s_addr == inet_addr("127.0.0.1"))
|
||||
ciss->useCompression = false;
|
||||
|
||||
ios.setSocketImpl(ciss);
|
||||
SocketParms sp;
|
||||
sp = ios.socketParms();
|
||||
sp.sd(clientfd);
|
||||
ios.socketParms(sp);
|
||||
ios.sa(&sa);
|
||||
return ios;
|
||||
}
|
||||
|
||||
void CompressedInetStreamSocket::connect(const sockaddr* serv_addr)
|
||||
{
|
||||
sockaddr_in *sin = (sockaddr_in *) serv_addr;
|
||||
|
||||
if (sin->sin_addr.s_addr == fSa.sin_addr.s_addr ||
|
||||
sin->sin_addr.s_addr == inet_addr("127.0.0.1"))
|
||||
useCompression = false;
|
||||
InetStreamSocket::connect(serv_addr);
|
||||
sockaddr_in* sin = (sockaddr_in*) serv_addr;
|
||||
|
||||
if (sin->sin_addr.s_addr == fSa.sin_addr.s_addr ||
|
||||
sin->sin_addr.s_addr == inet_addr("127.0.0.1"))
|
||||
useCompression = false;
|
||||
|
||||
InetStreamSocket::connect(serv_addr);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user