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

MCOL-877 Fix I_S / LDI cpimport escaping

Browse Source 
Backslashes need escaping otherwise they are not sent to cpimport
correctly.
This commit is contained in:
Andrew Hutchings
2017-09-15 11:17:58 +01:00
committed by David Hall
parent 54cc870b82
commit 1b17175d3b
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
dbcon/mysql/ha_calpont_dml.cpp
View File

@ -711,6 +711,7 @@ int ha_calpont_impl_write_batch_row_(uchar *buf, TABLE* table, cal_impl_if::cal_
uint16_t colpos = 0; uint16_t colpos = 0;
buf = buf + ci.headerLength; // Number of bytes used for null bits. buf = buf + ci.headerLength; // Number of bytes used for null bits.
//@Bug 6122 if all columns have not null constraint, there is no information in the header //@Bug 6122 if all columns have not null constraint, there is no information in the header
std::string escape;
char nullBits = *bufHdr++; char nullBits = *bufHdr++;
if (!ci.useXbit) if (!ci.useXbit)
{ {
@ -831,8 +832,11 @@ int ha_calpont_impl_write_batch_row_(uchar *buf, TABLE* table, cal_impl_if::cal_
if (current_thd->variables.sql_mode & MODE_PAD_CHAR_TO_FULL_LENGTH) if (current_thd->variables.sql_mode & MODE_PAD_CHAR_TO_FULL_LENGTH)
{ {
// Pad to the full length of the field // Pad to the full length of the field
fprintf(ci.filePtr, "%c%.*s%c%c", ci.enclosed_by, ci.columnTypes[colpos].colWidth, escape.assign((char*)buf, ci.columnTypes[colpos].colWidth);
buf, ci.enclosed_by, ci.delimiter); boost::replace_all(escape, "\\", "\\\\");
fprintf(ci.filePtr, "%c%.*s%c%c", ci.enclosed_by, (int)escape.length(),
escape.c_str(), ci.enclosed_by, ci.delimiter);
} }
else else
{ {
@ -841,8 +845,10 @@ int ha_calpont_impl_write_batch_row_(uchar *buf, TABLE* table, cal_impl_if::cal_
bitmap_set_bit(table->read_set, field->field_index); bitmap_set_bit(table->read_set, field->field_index);
String attribute; String attribute;
field->val_str(&attribute); field->val_str(&attribute);
fprintf(ci.filePtr, "%c%.*s%c%c", ci.enclosed_by, attribute.length(), escape.assign((char*)buf, attribute.length());
buf, ci.enclosed_by, ci.delimiter); boost::replace_all(escape, "\\", "\\\\");
fprintf(ci.filePtr, "%c%.*s%c%c", ci.enclosed_by, (int)escape.length(),
escape.c_str(), ci.enclosed_by, ci.delimiter);
} }
} }
@ -895,7 +901,9 @@ int ha_calpont_impl_write_batch_row_(uchar *buf, TABLE* table, cal_impl_if::cal_
dataLength = *(int16_t*) buf; dataLength = *(int16_t*) buf;
buf = buf + 2 ; buf = buf + 2 ;
} }
fprintf(ci.filePtr, "%c%.*s%c%c", ci.enclosed_by, dataLength, buf, ci.enclosed_by, ci.delimiter); escape.assign((char*)buf, dataLength);
boost::replace_all(escape, "\\", "\\\\");
fprintf(ci.filePtr, "%c%.*s%c%c", ci.enclosed_by, (int)escape.length(), escape.c_str(), ci.enclosed_by, ci.delimiter);
} }
else //utf8 else //utf8
{ {
@ -911,8 +919,11 @@ int ha_calpont_impl_write_batch_row_(uchar *buf, TABLE* table, cal_impl_if::cal_
} }
if ( dataLength > ci.columnTypes[colpos].colWidth) if ( dataLength > ci.columnTypes[colpos].colWidth)
dataLength = ci.columnTypes[colpos].colWidth; dataLength = ci.columnTypes[colpos].colWidth;
fprintf(ci.filePtr, "%c%.*s%c%c", ci.enclosed_by, dataLength, buf, ci.enclosed_by, ci.delimiter); escape.assign((char*)buf, dataLength);
boost::replace_all(escape, "\\", "\\\\");
fprintf(ci.filePtr, "%c%.*s%c%c", ci.enclosed_by, (int)escape.length(), escape.c_str(), ci.enclosed_by, ci.delimiter);
} }
} }
//buf += ci.columnTypes[colpos].colWidth; //buf += ci.columnTypes[colpos].colWidth;