database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

Merge branch 'develop-1.1' into merge-up-dev

Browse Source
This commit is contained in:
Andrew Hutchings
2017-11-24 11:10:09 +02:00
parent a347a8f5aa 573d465a75
commit 932819ba23
50 changed files with 1070 additions and 1168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dbcon/mysql/is_columnstore_extents.cpp
View File

@ -168,14 +168,18 @@ static int is_columnstore_extents_fill(THD* thd, TABLE_LIST* tables, COND* cond)
table->field[14]->store("Unknown", strlen("Unknown"), cs);
}
// MCOL-454: special case, sometimes blockOffset can be > 0 and HWM can be 0
// MCOL-1016: on multiple segments HWM is set to 0 on the lower
// segments, we don't want these to show as 8KB. The down side is
// if the column has less than 1 block it will show as 0 bytes.
// We have no lookahead without it getting messy so this is the
// best compromise.
if (iter->HWM == 0)
{
table->field[15]->store(8192);
table->field[15]->store(0);
}
else
{
table->field[15]->store((iter->HWM - iter->blockOffset + 1) * 8192);
table->field[15]->store((iter->HWM + 1) * 8192);
}
if (schema_table_store_record(thd, table))