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
Merge pull request #1842 from denis0x0D/MCOL-987_LZ
MCOL-987 LZ4 compression support.
This commit is contained in:
@ -696,13 +696,25 @@ blockReadRetry:
|
||||
i = fp->pread( &cmpHdrBuf[0], 0, 4096 * 3);
|
||||
|
||||
CompChunkPtrList ptrList;
|
||||
IDBCompressInterface decompressor;
|
||||
std::unique_ptr<CompressInterface> decompressor(
|
||||
compress::getCompressInterfaceByType(
|
||||
compress::CompressInterface::getCompressionType(
|
||||
&cmpHdrBuf[0])));
|
||||
|
||||
if (!decompressor)
|
||||
{
|
||||
// Use default?
|
||||
decompressor.reset(
|
||||
new compress::CompressInterfaceSnappy());
|
||||
}
|
||||
|
||||
int dcrc = 0;
|
||||
|
||||
if (i == 4096 * 3)
|
||||
{
|
||||
uint64_t numHdrs = 0; // extra headers
|
||||
dcrc = decompressor.getPtrList(&cmpHdrBuf[4096], 4096, ptrList);
|
||||
dcrc = compress::CompressInterface::getPtrList(
|
||||
&cmpHdrBuf[4096], 4096, ptrList);
|
||||
|
||||
if (dcrc == 0 && ptrList.size() > 0)
|
||||
numHdrs = ptrList[0].first / 4096ULL - 2ULL;
|
||||
@ -723,7 +735,8 @@ blockReadRetry:
|
||||
i = fp->pread( &nextHdrBufPtr[0], 4096 * 2, numHdrs * 4096 );
|
||||
|
||||
CompChunkPtrList nextPtrList;
|
||||
dcrc = decompressor.getPtrList(&nextHdrBufPtr[0], numHdrs * 4096, nextPtrList);
|
||||
dcrc = compress::CompressInterface::getPtrList(
|
||||
&nextHdrBufPtr[0], numHdrs * 4096, nextPtrList);
|
||||
|
||||
if (dcrc == 0)
|
||||
ptrList.insert(ptrList.end(), nextPtrList.begin(), nextPtrList.end());
|
||||
@ -777,11 +790,11 @@ blockReadRetry:
|
||||
cmpBuf = (char*) alignedBuffer;
|
||||
}
|
||||
|
||||
unsigned blen = 4 * 1024 * 1024;
|
||||
size_t blen = 4 * 1024 * 1024;
|
||||
|
||||
i = fp->pread( cmpBuf, cmpBufOff, cmpBufSz );
|
||||
|
||||
dcrc = decompressor.uncompressBlock(cmpBuf, cmpBufSz, uCmpBuf, blen);
|
||||
dcrc = decompressor->uncompressBlock(cmpBuf, cmpBufSz, uCmpBuf, blen);
|
||||
|
||||
if (dcrc == 0)
|
||||
{
|
||||
|
Reference in New Issue
Block a user