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-698 Stop joins bigger than 64KB

Browse Source 
Joins bigger than 64KB don't work and they would consume a lot of RAM if
they did, so error out if they are attempted.
This commit is contained in:
Andrew Hutchings
2017-05-05 14:53:49 +01:00
parent 00cd7f40c1
commit 33ed6698b1
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utils/joiner/tuplejoiner.cpp
View File

@@ -624,6 +624,10 @@ TypelessData makeTypelessKey(const Row &r, const vector<uint32_t> &keyCols,
// this is a string, copy a normalized version // this is a string, copy a normalized version
const uint8_t *str = r.getStringPointer(keyCols[i]); const uint8_t *str = r.getStringPointer(keyCols[i]);
uint32_t width = r.getStringLength(keyCols[i]); uint32_t width = r.getStringLength(keyCols[i]);
if (width > 65536)
{
throw runtime_error("Cannot join strings greater than 64KB");
}
for (j = 0; j < width && str[j] != 0; j++) { for (j = 0; j < width && str[j] != 0; j++) {
if (off >= keylen) if (off >= keylen)
goto toolong; goto toolong;
@@ -679,6 +683,10 @@ TypelessData makeTypelessKey(const Row &r, const vector<uint32_t> &keyCols, Pool
// this is a string, copy a normalized version // this is a string, copy a normalized version
const uint8_t *str = r.getStringPointer(keyCols[i]); const uint8_t *str = r.getStringPointer(keyCols[i]);
uint32_t width = r.getStringLength(keyCols[i]); uint32_t width = r.getStringLength(keyCols[i]);
if (width > 65536)
{
throw runtime_error("Cannot join strings greater than 64KB");
}
for (j = 0; j < width && str[j] != 0; j++) for (j = 0; j < width && str[j] != 0; j++)
ret.data[off++] = str[j]; ret.data[off++] = str[j];
ret.data[off++] = 0; ret.data[off++] = 0;