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 tipb::ColumnInfo to TiDB::ColumnInfo #9086

Merged
merged 5 commits into from
May 27, 2024
Merged

*: fix tipb::ColumnInfo to TiDB::ColumnInfo #9086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b5a9fc1
*: fix tipb::ColumnInfo to TiDB::ColumnInfo
Lloyd-Pottiger May 27, 2024
eda9772
default_value -> origin_default_value
Lloyd-Pottiger May 27, 2024
1a0561e
comments
Lloyd-Pottiger May 27, 2024
602dbd5
Merge branch 'master' into fix-convert-column-info
Lloyd-Pottiger May 27, 2024
d12736b
Update dbms/src/TiDB/Schema/TiDB.cpp
Lloyd-Pottiger May 27, 2024
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/Flash/Coprocessor/GenSchemaAndColumn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <TiDB/Decode/TypeMapping.h>
#include <TiDB/Schema/TiDB.h>


namespace DB
{
namespace
Expand Down Expand Up @@ -121,7 +122,6 @@ std::tuple<DM::ColumnDefinesPtr, int> genColumnDefinesForDisaggregatedRead(const
break;
}
default:
// TODO: Is it ok to use the default value here?
column_defines->emplace_back(DM::ColumnDefine{
column_info.id,
output_name,
Expand Down
5 changes: 5 additions & 0 deletions dbms/src/TiDB/Schema/TiDB.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1264,6 +1264,11 @@ ColumnInfo toTiDBColumnInfo(const tipb::ColumnInfo & tipb_column_info)
tidb_column_info.flag = tipb_column_info.flag();
tidb_column_info.flen = tipb_column_info.columnlen();
tidb_column_info.decimal = tipb_column_info.decimal();
// TiFlash get default value from origin_default_value, check `Field ColumnInfo::defaultValueToField() const`
// So we need to set origin_default_value to tipb_column_info.default_val()
Lloyd-Pottiger marked this conversation as resolved.
Show resolved Hide resolved
// Related logic in tidb, https://github.com/pingcap/tidb/blob/45318da24d8e4c0c6aab836d291a33f949dd18bf/pkg/table/tables/tables.go#L2303-L2329
tidb_column_info.origin_default_value = tipb_column_info.default_val();
JaySon-Huang marked this conversation as resolved.
Show resolved Hide resolved
tidb_column_info.collate = tipb_column_info.collation();
for (int i = 0; i < tipb_column_info.elems_size(); ++i)
tidb_column_info.elems.emplace_back(tipb_column_info.elems(i), i + 1);
return tidb_column_info;
Expand Down