database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-07 03:22:57 +03:00
Code Activity

MCOL-352 Fix VARCHAR with no NUL

Browse Source 
It is possible to have a VARCHAR column that isn't NUL terminated, an
example of this is a union of two CHAR columns. So the length should
always act as a terminator when there is no NUL.
This commit is contained in:
Andrew Hutchings
2016-10-26 17:07:15 +01:00
parent 4a28e908e6
commit a1eb952332
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
utils/rowgroup/rowgroup.h
View File

@@ -581,12 +581,9 @@ inline std::string Row::getStringField(uint32_t colIndex) const
if (inStringTable(colIndex)) if (inStringTable(colIndex))
return strings->getString(*((uint32_t *) &data[offsets[colIndex]]), return strings->getString(*((uint32_t *) &data[offsets[colIndex]]),
*((uint32_t *) &data[offsets[colIndex] + 4])); *((uint32_t *) &data[offsets[colIndex] + 4]));
if (types[colIndex] == execplan::CalpontSystemCatalog::VARCHAR) // Not all CHAR/VARCHAR are NUL terminated so use length
return std::string((char *) &data[offsets[colIndex]]); return std::string((char *) &data[offsets[colIndex]],
else // types where we can't rely on NULL termination... strnlen((char *) &data[offsets[colIndex]], getColumnWidth(colIndex)));
return std::string((char *) &data[offsets[colIndex]],
strnlen((char *) &data[offsets[colIndex]], getColumnWidth(colIndex)));
// return std::string((char *) &data[offsets[colIndex]], getColumnWidth(colIndex));
} }
inline std::string Row::getVarBinaryStringField(uint32_t colIndex) const inline std::string Row::getVarBinaryStringField(uint32_t colIndex) const