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

MCOL-698 Fix joiner for TEXT columns

Browse Source 
Joiner was thinking TEXT was INT
This commit is contained in:
Andrew Hutchings
2017-05-03 22:32:27 +01:00
parent cb788c0be2
commit 2cbf57c053
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
utils/joiner/tuplejoiner.cpp
View File

@@ -109,7 +109,9 @@ TupleJoiner::TupleJoiner(
for (uint32_t i = keyLength = 0; i < smallKeyColumns.size(); i++) { for (uint32_t i = keyLength = 0; i < smallKeyColumns.size(); i++) {
if (smallRG.getColTypes()[smallKeyColumns[i]] == CalpontSystemCatalog::CHAR || if (smallRG.getColTypes()[smallKeyColumns[i]] == CalpontSystemCatalog::CHAR ||
smallRG.getColTypes()[smallKeyColumns[i]] == CalpontSystemCatalog::VARCHAR) smallRG.getColTypes()[smallKeyColumns[i]] == CalpontSystemCatalog::VARCHAR
||
smallRG.getColTypes()[smallKeyColumns[i]] == CalpontSystemCatalog::TEXT)
keyLength += smallRG.getColumnWidth(smallKeyColumns[i]) + 1; // +1 null char keyLength += smallRG.getColumnWidth(smallKeyColumns[i]) + 1; // +1 null char
else else
keyLength += 8; keyLength += 8;
@@ -611,7 +613,9 @@ TypelessData makeTypelessKey(const Row &r, const vector<uint32_t> &keyCols,
ret.data = (uint8_t *) fa->allocate(); ret.data = (uint8_t *) fa->allocate();
for (i = 0; i < keyCols.size(); i++) { for (i = 0; i < keyCols.size(); i++) {
type = r.getColTypes()[keyCols[i]]; type = r.getColTypes()[keyCols[i]];
if (type == CalpontSystemCatalog::VARCHAR || type == CalpontSystemCatalog::CHAR) { if (type == CalpontSystemCatalog::VARCHAR ||
type == CalpontSystemCatalog::CHAR ||
type == CalpontSystemCatalog::TEXT) {
// 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]);
@@ -664,7 +668,9 @@ TypelessData makeTypelessKey(const Row &r, const vector<uint32_t> &keyCols, Pool
ret.data = (uint8_t *) fa->allocate(keylen); ret.data = (uint8_t *) fa->allocate(keylen);
for (i = 0; i < keyCols.size(); i++) { for (i = 0; i < keyCols.size(); i++) {
type = r.getColTypes()[keyCols[i]]; type = r.getColTypes()[keyCols[i]];
if (type == CalpontSystemCatalog::VARCHAR || type == CalpontSystemCatalog::CHAR) { if (type == CalpontSystemCatalog::VARCHAR ||
type == CalpontSystemCatalog::CHAR ||
type == CalpontSystemCatalog::TEXT) {
// 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]);
@@ -698,7 +704,9 @@ uint64_t getHashOfTypelessKey(const Row &r, const vector<uint32_t> &keyCols, uin
for (i = 0; i < keyCols.size(); i++) { for (i = 0; i < keyCols.size(); i++) {
type = r.getColTypes()[keyCols[i]]; type = r.getColTypes()[keyCols[i]];
if (type == CalpontSystemCatalog::VARCHAR || type == CalpontSystemCatalog::CHAR) { if (type == CalpontSystemCatalog::VARCHAR ||
type == CalpontSystemCatalog::CHAR ||
type == CalpontSystemCatalog::TEXT) {
// 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 len = r.getStringLength(keyCols[i]); uint32_t len = r.getStringLength(keyCols[i]);