database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

MCOL-423 Fixes to I_S tables

Browse Source 
Fixes the following:

* Compression ratio calculation was incorrect
* Possible issues due to system catalog thread ID usage
* Compressed file size data count was leaking many FDs when the table
  wasn't compressed
* Compressed file size data count was allocating random large amounts
  of RAM and then leaking it when the table wasn't compressed
This commit is contained in:
Andrew Hutchings
2016-11-29 10:45:38 +00:00
parent 08ae2dac1a
commit f586f3b46a
5 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
utils/idbdatafile/PosixFileSystem.cpp
View File

@ -159,7 +159,7 @@ size_t readFillBuffer(
off64_t PosixFileSystem::compressedSize(const char *path) const
{
IDBDataFile *pFile = 0;
IDBDataFile *pFile = NULL;
size_t nBytes;
off64_t dataSize = 0;
@ -178,6 +178,14 @@ off64_t PosixFileSystem::compressedSize(const char *path) const
nBytes = readFillBuffer( pFile,hdr1,compress::IDBCompressInterface::HDR_BUF_LEN);
if ( nBytes != compress::IDBCompressInterface::HDR_BUF_LEN )
{
delete pFile;
return -1;
}
// Verify we are a compressed file
if (decompressor.verifyHdr(hdr1) < 0)
{
delete pFile;
return -1;
}
@ -186,6 +194,8 @@ off64_t PosixFileSystem::compressedSize(const char *path) const
nBytes = readFillBuffer( pFile,hdr2,ptrSecSize);
if ( (int64_t)nBytes != ptrSecSize )
{
delete[] hdr2;
delete pFile;
return -1;
}
@ -194,17 +204,24 @@ off64_t PosixFileSystem::compressedSize(const char *path) const
delete[] hdr2;
if (rc != 0)
{
delete pFile;
return -1;
}
unsigned k = chunkPtrs.size();
// last header's offset + length will be the data bytes
if (k < 1)
{
delete pFile;
return -1;
}
dataSize = chunkPtrs[k-1].first + chunkPtrs[k-1].second;
delete pFile;
return dataSize;
}
catch (...)
{
delete pFile;
return -1;
}
}