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

Jump to bottom

Fix an invalid default value cause bootstrap failed (#4916) #5333

Merged
merged 4 commits into from
Dec 8, 2022
Merged

Fix an invalid default value cause bootstrap failed (#4916) #5333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2774dae
This is an automated cherry-pick of #4916
Lloyd-Pottiger May 27, 2022
44c75f7
Merge branch 'release-5.1' into cherry-pick-4916-to-release-5.1
Lloyd-Pottiger Dec 8, 2022
282a5b4
fix
Lloyd-Pottiger Dec 8, 2022
771b864
fix
Lloyd-Pottiger Dec 8, 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
2 changes: 1 addition & 1 deletion dbms/src/Storages/DeltaMerge/File/DMFilePackFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ class DMFilePackFilter
after_filter += u;
ProfileEvents::increment(ProfileEvents::DMFileFilterAftRoughSet, after_filter);

Float64 filter_rate = (Float64)(after_read_packs - after_filter) * 100 / after_read_packs;
Float64 filter_rate = static_cast<Float64>(after_read_packs - after_filter) * 100 / after_read_packs;
LOG_DEBUG(log,
"RSFilter exclude rate: " << ((after_read_packs == 0) ? "nan" : DB::toString(filter_rate, 2))
<< ", after_pk: " << after_pk << ", after_read_packs: " << after_read_packs
Expand Down
21 changes: 19 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 @@ -10,6 +10,8 @@
#include <Storages/Transaction/SchemaNameMapper.h>
#include <Storages/Transaction/TiDB.h>

#include <cmath>

namespace DB
{
extern const UInt8 TYPE_CODE_LITERAL;
Expand Down Expand Up @@ -52,7 +54,22 @@ Field ColumnInfo::defaultValueToField() const
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 Expand Up @@ -976,4 +993,4 @@ ColumnInfo fieldTypeToColumnInfo(const tipb::FieldType & field_type)
return ret;
}

} // namespace TiDB
} // namespace TiDB