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-1786 Handle "true" keyword for numeric data types in cpimport

Browse Source
This commit is contained in:
Gagan Goel
2018-10-10 01:13:39 -04:00
parent 46775f8868
commit f8a9ce0fb5
1 changed files with 82 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
writeengine/bulk/we_bulkloadbuffer.cpp
View File

@@ -30,6 +30,9 @@
#include <cmath> #include <cmath>
#include <ctype.h> #include <ctype.h>
#include <cfloat> #include <cfloat>
#include <boost/algorithm/string/predicate.hpp>
#include "we_bulkload.h" #include "we_bulkload.h"
#include "we_bulkloadbuffer.h" #include "we_bulkloadbuffer.h"
#include "we_brm.h" #include "we_brm.h"
@@ -366,11 +369,19 @@ void BulkLoadBuffer::convert(char* field, int fieldLength,
else else
{ {
errno = 0; errno = 0;
if (iequals(field, "true"))
{
fVal = 1;
}
else
{
#ifdef _MSC_VER #ifdef _MSC_VER
fVal = (float)strtod( field, 0 ); fVal = (float)strtod( field, 0 );
#else #else
fVal = strtof( field, 0 ); fVal = strtof( field, 0 );
#endif #endif
}
if (errno == ERANGE) if (errno == ERANGE)
{ {
@@ -462,7 +473,15 @@ void BulkLoadBuffer::convert(char* field, int fieldLength,
else else
{ {
errno = 0; errno = 0;
dVal = strtod(field, 0);
if (iequals(field, "true"))
{
dVal = 1;
}
else
{
dVal = strtod(field, 0);
}
if (errno == ERANGE) if (errno == ERANGE)
{ {
@@ -610,6 +629,12 @@ void BulkLoadBuffer::convert(char* field, int fieldLength,
} }
else else
{ {
if (iequals(field, "true"))
{
strcpy(field, "1");
fieldLength = 1;
}
if ( (column.dataType == CalpontSystemCatalog::DECIMAL ) || if ( (column.dataType == CalpontSystemCatalog::DECIMAL ) ||
(column.dataType == CalpontSystemCatalog::UDECIMAL) ) (column.dataType == CalpontSystemCatalog::UDECIMAL) )
{ {
@@ -696,7 +721,15 @@ void BulkLoadBuffer::convert(char* field, int fieldLength,
else else
{ {
errno = 0; errno = 0;
origVal = strtoll(field, 0, 10);
if (iequals(field, "true"))
{
origVal = 1;
}
else
{
origVal = strtoll(field, 0, 10);
}
if (errno == ERANGE) if (errno == ERANGE)
bSatVal = true; bSatVal = true;
@@ -772,6 +805,12 @@ void BulkLoadBuffer::convert(char* field, int fieldLength,
} }
else else
{ {
if (iequals(field, "true"))
{
strcpy(field, "1");
fieldLength = 1;
}
if ( (column.dataType == CalpontSystemCatalog::DECIMAL ) || if ( (column.dataType == CalpontSystemCatalog::DECIMAL ) ||
(column.dataType == CalpontSystemCatalog::UDECIMAL)) (column.dataType == CalpontSystemCatalog::UDECIMAL))
{ {
@@ -858,7 +897,15 @@ void BulkLoadBuffer::convert(char* field, int fieldLength,
else else
{ {
errno = 0; errno = 0;
origVal = strtoll(field, 0, 10);
if (iequals(field, "true"))
{
origVal = 1;
}
else
{
origVal = strtoll(field, 0, 10);
}
if (errno == ERANGE) if (errno == ERANGE)
bSatVal = true; bSatVal = true;
@@ -934,6 +981,12 @@ void BulkLoadBuffer::convert(char* field, int fieldLength,
} }
else else
{ {
if (iequals(field, "true"))
{
strcpy(field, "1");
fieldLength = 1;
}
if ( (column.dataType == CalpontSystemCatalog::DECIMAL) || if ( (column.dataType == CalpontSystemCatalog::DECIMAL) ||
(column.dataType == CalpontSystemCatalog::UDECIMAL)) (column.dataType == CalpontSystemCatalog::UDECIMAL))
{ {
@@ -1145,7 +1198,15 @@ void BulkLoadBuffer::convert(char* field, int fieldLength,
else else
{ {
errno = 0; errno = 0;
ullVal = strtoull(field, 0, 10);
if (iequals(field, "true"))
{
ullVal = 1;
}
else
{
ullVal = strtoull(field, 0, 10);
}
if (errno == ERANGE) if (errno == ERANGE)
bSatVal = true; bSatVal = true;
@@ -1214,7 +1275,15 @@ void BulkLoadBuffer::convert(char* field, int fieldLength,
else else
{ {
errno = 0; errno = 0;
origVal = strtoll(field, 0, 10);
if (iequals(field, "true"))
{
origVal = 1;
}
else
{
origVal = strtoll(field, 0, 10);
}
if (errno == ERANGE) if (errno == ERANGE)
bSatVal = true; bSatVal = true;
@@ -1292,6 +1361,12 @@ void BulkLoadBuffer::convert(char* field, int fieldLength,
} }
else else
{ {
if (iequals(field, "true"))
{
strcpy(field, "1");
fieldLength = 1;
}
if ( (column.dataType == CalpontSystemCatalog::DECIMAL) || if ( (column.dataType == CalpontSystemCatalog::DECIMAL) ||
(column.dataType == CalpontSystemCatalog::UDECIMAL)) (column.dataType == CalpontSystemCatalog::UDECIMAL))
{ {