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

Fix an invalid default value cause bootstrap failed #4916

Merged
merged 12 commits into from
May 27, 2022
Merged

Fix an invalid default value cause bootstrap failed #4916

Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f7a0fd8
add a try catch statement for convert Poco::Dynamic::Var to Int64
Lloyd-Pottiger May 17, 2022
6f0c1f1
remove useless include
Lloyd-Pottiger May 17, 2022
bd35f5f
fix remove mistakenly
Lloyd-Pottiger May 17, 2022
279ee2e
format
Lloyd-Pottiger May 18, 2022
334a048
fix
Lloyd-Pottiger May 27, 2022
d8b3baf
remove useless comment
Lloyd-Pottiger May 27, 2022
e239ead
add comments for unsigned
Lloyd-Pottiger May 27, 2022
53b9d98
Merge branch 'master' into fix-invalid-default-value
ti-chi-bot May 27, 2022
9dbac99
format
Lloyd-Pottiger May 27, 2022
1e92a72
Merge branch 'fix-invalid-default-value' of github.com:Lloyd-Pottiger…
Lloyd-Pottiger May 27, 2022
ee0b143
clear tidy
Lloyd-Pottiger May 27, 2022
7b46575
Merge branch 'master' into fix-invalid-default-value
JaySon-Huang May 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
19 changes: 17 additions & 2 deletions dbms/src/Storages/Transaction/TiDB.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <Storages/Transaction/Collator.h>
#include <Storages/Transaction/SchemaNameMapper.h>
#include <Storages/Transaction/TiDB.h>
#include <cmath>

namespace DB
{
Expand Down Expand Up @@ -110,14 +111,28 @@ Field ColumnInfo::defaultValueToField() const
}
switch (tp)
{
// TODO: Consider unsigned?
JaySon-Huang marked this conversation as resolved.
Show resolved Hide resolved
// Integer Type.
case TypeTiny:
case TypeShort:
case TypeLong:
case TypeLongLong:
case TypeInt24:
return value.convert<Int64>();
{
// In c++, cast a unsigned integer to signed integer will not change the value.
// like 9223372036854775808 which is larger than the maximum value of Int64,
// static_cast<UInt64>(static_cast<Int64>(9223372036854775808)) == 9223372036854775808
// so we don't need consider unsigned here.
try
{
return value.convert<Int64>();
}
catch (...)
{
// due to https://github.com/pingcap/tidb/issues/34881
// we do this to avoid exception in older version of TiDB.
return static_cast<Int64>(std::llround(value.convert<double>()));
}
}
case TypeBit:
{
// TODO: We shall use something like `orig_default_bit`, which will never change once created,
Expand Down