database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-24 14:20:59 +03:00
Code Activity

Merge branch 'develop-1.0' into 1.0-merge-up

Browse Source
This commit is contained in:
Andrew Hutchings
2017-12-12 10:01:14 +00:00
parent ae9de1e426 22d47cd00b
commit 8babe4a35d
11 changed files with 129 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
writeengine/wrapper/we_colopcompress.cpp
View File

@@ -188,7 +188,13 @@ int ColumnOpCompress1::expandAbbrevColumnExtent(
IDBDataFile* pFile, uint16_t dbRoot, uint64_t emptyVal, int width)
{
// update the uncompressed initial chunk to full chunk
RETURN_ON_ERROR(m_chunkManager->expandAbbrevColumnExtent(pFile, emptyVal, width));
int rc = m_chunkManager->expandAbbrevColumnExtent(pFile, emptyVal, width);
// ERR_COMP_FILE_NOT_FOUND is acceptable here. It just means that the
// file hasn't been loaded into the chunk manager yet. No big deal.
if (rc != NO_ERROR && rc != ERR_COMP_FILE_NOT_FOUND)
{
return rc;
}
// let the base to physically expand extent.
return FileOp::expandAbbrevColumnExtent(pFile, dbRoot, emptyVal, width);