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-3605 Fix Block Filling

Browse Source
This commit is contained in:
Ubuntu
2019-11-08 15:20:01 +00:00
committed by Andrew Hutchings
parent 11f194b5fe
commit e8837f7137
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
writeengine/dictionary/we_dctnry.cpp
View File

@ -667,9 +667,9 @@ int Dctnry::insertDctnry2(Signature& sig)
while (sig.size > 0) while (sig.size > 0)
{ {
if (sig.size > (m_freeSpace - m_totalHdrBytes)) if (sig.size > (m_freeSpace - HDR_UNIT_SIZE))
{ {
write_size = (m_freeSpace - m_totalHdrBytes); write_size = (m_freeSpace - HDR_UNIT_SIZE);
} }
else else
{ {
@ -891,8 +891,8 @@ int Dctnry::insertDctnry(const char* buf,
//...String not found in cache, so proceed. //...String not found in cache, so proceed.
// If room is available in current block then insert into block. // If room is available in current block then insert into block.
// @bug 3960: Add MAX_OP_COUNT check to handle case after bulk rollback // @bug 3960: Add MAX_OP_COUNT check to handle case after bulk rollback
if ( ((totalUseSize <= m_freeSpace) || if ( ((totalUseSize <= m_freeSpace - HDR_UNIT_SIZE) ||
((curSig.size > 8176) && (m_freeSpace > m_totalHdrBytes))) && ((curSig.size > 8176) && (m_freeSpace > HDR_UNIT_SIZE))) &&
(m_curOp < (MAX_OP_COUNT - 1)) ) (m_curOp < (MAX_OP_COUNT - 1)) )
{ {
RETURN_ON_ERROR(insertDctnry2(curSig)); //m_freeSpace updated! RETURN_ON_ERROR(insertDctnry2(curSig)); //m_freeSpace updated!
@ -1115,14 +1115,14 @@ int Dctnry::insertDctnry(const int& sgnature_size,
for (i = m_lastFbo; i < m_numBlocks; i++) for (i = m_lastFbo; i < m_numBlocks; i++)
{ {
// @bug 3960: Add MAX_OP_COUNT check to handle case after bulk rollback // @bug 3960: Add MAX_OP_COUNT check to handle case after bulk rollback
if ( ((m_freeSpace >= size) || if ( ((m_freeSpace - HDR_UNIT_SIZE >= size) ||
((size > 8176) && (m_freeSpace > m_totalHdrBytes))) && ((size > 8176) && (m_freeSpace > HDR_UNIT_SIZE))) &&
(m_curOp < (MAX_OP_COUNT - 1)) ) (m_curOp < (MAX_OP_COUNT - 1)) )
{ {
// found the perfect block; signature size fit in this block // found the perfect block; signature size fit in this block
if (size > (m_freeSpace - m_totalHdrBytes)) if (size > (m_freeSpace - HDR_UNIT_SIZE))
{ {
write_size = (m_freeSpace - m_totalHdrBytes); write_size = (m_freeSpace - HDR_UNIT_SIZE);
} }
else else
{ {