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

MCOL-673 Fix I_S/LDI for larger BLOBs

Browse Source 
BLOBs that are longer than half the maximum length of the column would
be turned into a negative length due to signed int casting. This would
cause them to turn into NULL inserts. Unsigned now used.
This commit is contained in:
Andrew Hutchings
2017-04-20 19:29:41 +01:00
parent e1a71a5628
commit 944d76445b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dbcon/mysql/ha_calpont_dml.cpp
View File

@@ -1588,28 +1588,28 @@ int ha_calpont_impl_write_batch_row_(uchar *buf, TABLE* table, cal_impl_if::cal_
case CalpontSystemCatalog::BLOB:
case CalpontSystemCatalog::TEXT:
{
int dataLength = 0;
uint32_t dataLength = 0;
uintptr_t *dataptr;
uchar *ucharptr;
if (ci.columnTypes[colpos].colWidth < 256)
{
dataLength = *(int8_t*) buf;
dataLength = *(uint8_t*) buf;
buf++;
}
else if (ci.columnTypes[colpos].colWidth < 65536)
{
dataLength = *(int16_t*) buf;
dataLength = *(uint16_t*) buf;
buf = buf + 2 ;
}
else if (ci.columnTypes[colpos].colWidth < 16777216)
{
dataLength = *(int32_t*) buf;
dataLength = *(uint32_t*) buf;
buf = buf + 3 ;
}
else
{
dataLength = *(int32_t*) buf;
dataLength = *(uint32_t*) buf;
buf = buf + 4 ;
}
@@ -1622,7 +1622,7 @@ int ha_calpont_impl_write_batch_row_(uchar *buf, TABLE* table, cal_impl_if::cal_
buf+= sizeof(uintptr_t);
if (ci.columnTypes[colpos].colDataType == CalpontSystemCatalog::BLOB)
{
for (int32_t i=0; i<dataLength; i++)
for (uint32_t i=0; i<dataLength; i++)
{
fprintf(ci.filePtr, "%02x", *(uint8_t*)ucharptr);
ucharptr++;