database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-10 22:42:30 +03:00
Code Activity

Merge pull request #893 from mariadb-corporation/MCOL-3547

Browse Source 
MCOL-3547: cleanup compile warnings from storagemanager.
This commit is contained in:
Patrick LeBlanc
2019-10-07 14:11:03 -05:00
committed by GitHub
parent deac0471bb 4a1ce93605
commit f613f1efaa
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
storage-manager/src/SessionManager.cpp
View File

@@ -300,7 +300,8 @@ int SessionManager::start()
//read this snippet and keep going //read this snippet and keep going
len = ::read(fds[socketIncr].fd, &recv_buffer[remainingBytes], peakLength); len = ::read(fds[socketIncr].fd, &recv_buffer[remainingBytes], peakLength);
remainingBytes = endOfData; remainingBytes = endOfData;
assert(len == peakLength); if (len != peakLength)
logger->log(LOG_ERR,"Read returned length != peakLength. ( %i != %i )", len, peakLength);
continue; continue;
} }
@@ -327,7 +328,8 @@ int SessionManager::start()
{ {
//logger->log(LOG_DEBUG,"No SM_MSG_START"); //logger->log(LOG_DEBUG,"No SM_MSG_START");
len = ::read(fds[socketIncr].fd, &recv_buffer[remainingBytes], peakLength); len = ::read(fds[socketIncr].fd, &recv_buffer[remainingBytes], peakLength);
assert(len == peakLength); if (len != peakLength)
logger->log(LOG_ERR,"Read returned length != peakLength. ( %i != %i )", len, peakLength);
// we know the msg header isn't in position [0, endOfData - i), so throw that out // we know the msg header isn't in position [0, endOfData - i), so throw that out
// and copy [i, endOfData) to the front of the buffer to be // and copy [i, endOfData) to the front of the buffer to be
// checked by the next iteration. // checked by the next iteration.
@@ -351,6 +353,8 @@ int SessionManager::start()
{ {
//logger->log(LOG_DEBUG,"SM_MSG_START data is next message"); //logger->log(LOG_DEBUG,"SM_MSG_START data is next message");
len = ::read(fds[socketIncr].fd, &recv_buffer[remainingBytes], peakLength); len = ::read(fds[socketIncr].fd, &recv_buffer[remainingBytes], peakLength);
if (len != peakLength)
logger->log(LOG_ERR,"Read returned length != peakLength. ( %i != %i )", len, peakLength);
} }
//Disable polling on this socket //Disable polling on this socket
fds[socketIncr].events = 0; fds[socketIncr].events = 0;