Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ut for cast real as xxx #3824

Merged
merged 14 commits into from
Jan 27, 2022
Merged

Add ut for cast real as xxx #3824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2db4c7d
init what need to test
SeaRise Jan 5, 2022
52a46e2
update
SeaRise Jan 5, 2022
95754ea
add only null tests
SeaRise Jan 6, 2022
69fedb5
add as int, float, string tests
SeaRise Jan 6, 2022
31f8d5f
udpate
SeaRise Jan 6, 2022
e3ee0f8
cast real as time test
SeaRise Jan 10, 2022
d363314
decimal tests
SeaRise Jan 10, 2022
15e6ea2
find bug
SeaRise Jan 10, 2022
3dd2812
Merge branch 'master' into add_ut_for_cast_real_as_xxx
SeaRise Jan 27, 2022
d6f42a9
address comments
SeaRise Jan 27, 2022
e3c28cf
udpate
SeaRise Jan 27, 2022
7368f88
fix
SeaRise Jan 27, 2022
b0ad315
update
SeaRise Jan 27, 2022
434c806
Merge branch 'master' into add_ut_for_cast_real_as_xxx
ti-chi-bot Jan 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion dbms/src/Flash/Coprocessor/DAGContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,11 @@ class DAGContext
warnings_.push_back(error);
}
}
void clearWarnings() { warnings.clear(); }
void clearWarnings()
{
warnings.clear();
warning_count = 0;
}
UInt64 getWarningCount() { return warning_count; }
const mpp::TaskMeta & getMPPTaskMeta() const { return mpp_task_meta; }
bool isBatchCop() const { return is_batch_cop; }
Expand Down
45 changes: 31 additions & 14 deletions dbms/src/Functions/FunctionsTiDBConversion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,9 +940,9 @@ struct TiDBConvertToDecimal
if (need_to_round)
{
if (value < 0)
value--;
--value;
else
value++;
++value;
}
}

Expand Down Expand Up @@ -1217,6 +1217,7 @@ struct TiDBConvertToDecimal
template <typename FromDataType, typename ToDataType, bool return_nullable>
struct TiDBConvertToTime
{
public:
static_assert(std::is_same_v<ToDataType, DataTypeMyDate> || std::is_same_v<ToDataType, DataTypeMyDateTime>);

using FromFieldType = typename FromDataType::FieldType;
Expand Down Expand Up @@ -1252,7 +1253,6 @@ struct TiDBConvertToTime
col_null_map_to = ColumnUInt8::create(size, 0);
vec_null_map_to = &col_null_map_to->getData();
}

if constexpr (std::is_same_v<FromDataType, DataTypeString>)
{
// cast string as time
Expand All @@ -1262,7 +1262,7 @@ struct TiDBConvertToTime
const ColumnString::Offsets * offsets = &col_from->getOffsets();

size_t current_offset = 0;
for (size_t i = 0; i < size; i++)
for (size_t i = 0; i < size; ++i)
{
size_t next_offset = (*offsets)[i];
size_t string_size = next_offset - current_offset - 1;
Expand All @@ -1287,7 +1287,8 @@ struct TiDBConvertToTime
{
// Fill NULL if cannot parse
(*vec_null_map_to)[i] = 1;
context.getDAGContext()->handleInvalidTime("Invalid time value: '" + string_value + "'", Errors::Types::WrongValue);
vec_to[i] = 0;
handleInvalidTime(context, string_value);
}
current_offset = next_offset;
}
Expand All @@ -1298,7 +1299,7 @@ struct TiDBConvertToTime
const auto * col_from = checkAndGetColumn<ColumnUInt64>(block.getByPosition(arguments[0]).column.get());
const ColumnUInt64::Container & vec_from = col_from->getData();

for (size_t i = 0; i < size; i++)
for (size_t i = 0; i < size; ++i)
{
MyDateTime datetime(vec_from[i]);

Expand Down Expand Up @@ -1347,7 +1348,7 @@ struct TiDBConvertToTime

const typename ColumnVector<FromFieldType>::Container & vec_from = col_from->getData();

for (size_t i = 0; i < size; i++)
for (size_t i = 0; i < size; ++i)
{
try
{
Expand All @@ -1368,9 +1369,8 @@ struct TiDBConvertToTime
{
// Cannot cast, fill with NULL
(*vec_null_map_to)[i] = 1;
context.getDAGContext()->handleInvalidTime(
"Invalid time value: '" + toString(vec_from[i]) + "'",
Errors::Types::WrongValue);
vec_to[i] = 0;
handleInvalidTime(context, vec_from[i]);
}
}
}
Expand All @@ -1384,7 +1384,7 @@ struct TiDBConvertToTime

const typename ColumnVector<FromFieldType>::Container & vec_from = col_from->getData();

for (size_t i = 0; i < size; i++)
for (size_t i = 0; i < size; ++i)
{
Float64 value = vec_from[i];
// Convert to string and then parse to time
Expand All @@ -1393,6 +1393,7 @@ struct TiDBConvertToTime
if (value_str == "0")
{
(*vec_null_map_to)[i] = 1;
vec_to[i] = 0;
}
else
{
Expand All @@ -1415,7 +1416,15 @@ struct TiDBConvertToTime
{
// Fill NULL if cannot parse
(*vec_null_map_to)[i] = 1;
context.getDAGContext()->handleInvalidTime("Invalid time value: '" + value_str + "'", Errors::Types::WrongValue);
vec_to[i] = 0;
handleInvalidTime(context, value_str);
}
catch (const std::exception &)
{
// Fill NULL if cannot parse
(*vec_null_map_to)[i] = 1;
vec_to[i] = 0;
handleInvalidTime(context, value_str);
}
}
}
Expand Down Expand Up @@ -1446,14 +1455,15 @@ struct TiDBConvertToTime
catch (const Exception &)
{
(*vec_null_map_to)[i] = 1;
context.getDAGContext()->handleInvalidTime("Invalid time value: '" + value_str + "'", Errors::Types::WrongValue);
vec_to[i] = 0;
handleInvalidTime(context, value_str);
}
}
}
else
{
throw Exception(
"Illegal column " + block.getByPosition(arguments[0]).column->getName() + " of first argument of function tidb_cast",
fmt::format("Illegal column {} of first argument of function tidb_cast", block.getByPosition(arguments[0]).column->getName()),
ErrorCodes::ILLEGAL_COLUMN);
}

Expand All @@ -1462,6 +1472,13 @@ struct TiDBConvertToTime
else
block.getByPosition(result).column = std::move(col_to);
}

private:
template <typename T>
static void handleInvalidTime(const Context & context, const T & value)
{
context.getDAGContext()->handleInvalidTime(fmt::format("Invalid time value: '{}'", value), Errors::Types::WrongValue);
}
};

/// cast duration as duration
Expand Down
Loading