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 rdb_i_s_sst_props_fields_info #1267

Open
wants to merge 3 commits into
base: fb-mysql-8.0.28
Choose a base branch
from
Open

Fix rdb_i_s_sst_props_fields_info #1267

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2da1502
rdb_i_s_sst_props_fill_table: store string `NULL` before set_null
rockeet Jan 26, 2023
5e23914
rdb_i_s_sst_props_fields_info: Add missing MY_I_S_MAYBE_NULL
rockeet Jan 29, 2023
d22d385
rdb_i_s_sst_props_fill_table: Add missing set_notnull
rockeet Aug 4, 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
11 changes: 8 additions & 3 deletions storage/rocksdb/rdb_i_s.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1689,16 +1689,18 @@ static ST_FIELD_INFO rdb_i_s_sst_props_fields_info[] = {
MYSQL_TYPE_LONGLONG, 0),
ROCKSDB_FIELD_INFO("FILTER_BLOCK_SIZE", sizeof(int64_t),
MYSQL_TYPE_LONGLONG, 0),
ROCKSDB_FIELD_INFO("COMPRESSION_ALGO", NAME_LEN + 1, MYSQL_TYPE_STRING, 0),
ROCKSDB_FIELD_INFO("COMPRESSION_ALGO", NAME_LEN + 1, MYSQL_TYPE_STRING,
MY_I_S_MAYBE_NULL),
ROCKSDB_FIELD_INFO("CREATION_TIME", sizeof(int64_t), MYSQL_TYPE_LONGLONG,
0),
ROCKSDB_FIELD_INFO("FILE_CREATION_TIME", sizeof(int64_t),
MYSQL_TYPE_LONGLONG, 0),
ROCKSDB_FIELD_INFO("OLDEST_KEY_TIME", sizeof(int64_t), MYSQL_TYPE_LONGLONG,
0),
ROCKSDB_FIELD_INFO("FILTER_POLICY", NAME_LEN + 1, MYSQL_TYPE_STRING, 0),
ROCKSDB_FIELD_INFO("FILTER_POLICY", NAME_LEN + 1, MYSQL_TYPE_STRING,
MY_I_S_MAYBE_NULL),
ROCKSDB_FIELD_INFO("COMPRESSION_OPTIONS", NAME_LEN + 1, MYSQL_TYPE_STRING,
0),
MY_I_S_MAYBE_NULL),
ROCKSDB_FIELD_INFO_END};

static int rdb_i_s_sst_props_fill_table(
Expand Down Expand Up @@ -1767,6 +1769,7 @@ static int rdb_i_s_sst_props_fill_table(
if (props.second->compression_name.empty()) {
field[RDB_SST_PROPS_FIELD::COMPRESSION_ALGO]->set_null();
} else {
field[RDB_SST_PROPS_FIELD::COMPRESSION_ALGO]->set_notnull();
field[RDB_SST_PROPS_FIELD::COMPRESSION_ALGO]->store(
props.second->compression_name.c_str(),
props.second->compression_name.size(), system_charset_info);
Expand All @@ -1780,13 +1783,15 @@ static int rdb_i_s_sst_props_fill_table(
if (props.second->filter_policy_name.empty()) {
field[RDB_SST_PROPS_FIELD::FILTER_POLICY]->set_null();
} else {
field[RDB_SST_PROPS_FIELD::FILTER_POLICY]->set_notnull();
field[RDB_SST_PROPS_FIELD::FILTER_POLICY]->store(
props.second->filter_policy_name.c_str(),
props.second->filter_policy_name.size(), system_charset_info);
}
if (props.second->compression_options.empty()) {
field[RDB_SST_PROPS_FIELD::COMPRESSION_OPTIONS]->set_null();
} else {
field[RDB_SST_PROPS_FIELD::COMPRESSION_OPTIONS]->set_notnull();
field[RDB_SST_PROPS_FIELD::COMPRESSION_OPTIONS]->store(
props.second->compression_options.c_str(),
props.second->compression_options.size(), system_charset_info);
Expand Down