Commit 4bd63bd5 authored by Sergei Petrunia's avatar Sergei Petrunia

MDEV-14679: RocksdB plugin fails to load with "Loading of unknown plugin ROCKSDB_CFSTATS

Set maturity level of all "Sub-plugins" to be the same as the main maturity level.
parent 73803763
...@@ -12499,6 +12499,7 @@ void print_keydup_error(TABLE *table, KEY *key, myf errflag, ...@@ -12499,6 +12499,7 @@ void print_keydup_error(TABLE *table, KEY *key, myf errflag,
its name generation. its name generation.
*/ */
struct st_mysql_storage_engine rocksdb_storage_engine = { struct st_mysql_storage_engine rocksdb_storage_engine = {
MYSQL_HANDLERTON_INTERFACE_VERSION}; MYSQL_HANDLERTON_INTERFACE_VERSION};
...@@ -12515,7 +12516,7 @@ maria_declare_plugin(rocksdb_se){ ...@@ -12515,7 +12516,7 @@ maria_declare_plugin(rocksdb_se){
myrocks::rocksdb_status_vars, /* status variables */ myrocks::rocksdb_status_vars, /* status variables */
myrocks::rocksdb_system_variables, /* system variables */ myrocks::rocksdb_system_variables, /* system variables */
"1.0", /* string version */ "1.0", /* string version */
MariaDB_PLUGIN_MATURITY_ALPHA /* maturity */ myrocks::MYROCKS_MARIADB_PLUGIN_MATURITY_LEVEL
}, },
myrocks::rdb_i_s_cfstats, myrocks::rdb_i_s_dbstats, myrocks::rdb_i_s_cfstats, myrocks::rdb_i_s_dbstats,
myrocks::rdb_i_s_perf_context, myrocks::rdb_i_s_perf_context_global, myrocks::rdb_i_s_perf_context, myrocks::rdb_i_s_perf_context_global,
......
...@@ -1411,4 +1411,7 @@ struct Rdb_inplace_alter_ctx : public my_core::inplace_alter_handler_ctx { ...@@ -1411,4 +1411,7 @@ struct Rdb_inplace_alter_ctx : public my_core::inplace_alter_handler_ctx {
Rdb_inplace_alter_ctx(const Rdb_inplace_alter_ctx &); Rdb_inplace_alter_ctx(const Rdb_inplace_alter_ctx &);
Rdb_inplace_alter_ctx &operator=(const Rdb_inplace_alter_ctx &); Rdb_inplace_alter_ctx &operator=(const Rdb_inplace_alter_ctx &);
}; };
const int MYROCKS_MARIADB_PLUGIN_MATURITY_LEVEL= MariaDB_PLUGIN_MATURITY_ALPHA;
} // namespace myrocks } // namespace myrocks
...@@ -64,3 +64,20 @@ set global rocksdb_strict_collation_check=off; ...@@ -64,3 +64,20 @@ set global rocksdb_strict_collation_check=off;
create table t1 (pk varchar(10) collate latin1_nopad_bin, primary key(pk)) engine=rocksdb; create table t1 (pk varchar(10) collate latin1_nopad_bin, primary key(pk)) engine=rocksdb;
ERROR HY000: MyRocks doesn't currently support collations with "No pad" attribute. ERROR HY000: MyRocks doesn't currently support collations with "No pad" attribute.
set global rocksdb_strict_collation_check=@tmp_rscc; set global rocksdb_strict_collation_check=@tmp_rscc;
#
# MDEV-14679: RocksdB plugin fails to load with "Loading of unknown plugin ROCKSDB_CFSTATS
#
select plugin_name, plugin_maturity from information_schema.plugins where plugin_name like '%rocksdb%';
plugin_name plugin_maturity
ROCKSDB Alpha
ROCKSDB_CFSTATS Alpha
ROCKSDB_DBSTATS Alpha
ROCKSDB_PERF_CONTEXT Alpha
ROCKSDB_PERF_CONTEXT_GLOBAL Alpha
ROCKSDB_CF_OPTIONS Alpha
ROCKSDB_COMPACTION_STATS Alpha
ROCKSDB_GLOBAL_INFO Alpha
ROCKSDB_DDL Alpha
ROCKSDB_INDEX_FILE_MAP Alpha
ROCKSDB_LOCKS Alpha
ROCKSDB_TRX Alpha
...@@ -67,3 +67,9 @@ set global rocksdb_strict_collation_check=off; ...@@ -67,3 +67,9 @@ set global rocksdb_strict_collation_check=off;
create table t1 (pk varchar(10) collate latin1_nopad_bin, primary key(pk)) engine=rocksdb; create table t1 (pk varchar(10) collate latin1_nopad_bin, primary key(pk)) engine=rocksdb;
set global rocksdb_strict_collation_check=@tmp_rscc; set global rocksdb_strict_collation_check=@tmp_rscc;
--echo #
--echo # MDEV-14679: RocksdB plugin fails to load with "Loading of unknown plugin ROCKSDB_CFSTATS
--echo #
select plugin_name, plugin_maturity from information_schema.plugins where plugin_name like '%rocksdb%';
...@@ -1484,7 +1484,7 @@ struct st_maria_plugin rdb_i_s_cfstats = { ...@@ -1484,7 +1484,7 @@ struct st_maria_plugin rdb_i_s_cfstats = {
nullptr, /* status variables */ nullptr, /* status variables */
nullptr, /* system variables */ nullptr, /* system variables */
nullptr, /* config options */ nullptr, /* config options */
0, /* flags */ MYROCKS_MARIADB_PLUGIN_MATURITY_LEVEL
}; };
struct st_maria_plugin rdb_i_s_dbstats = { struct st_maria_plugin rdb_i_s_dbstats = {
...@@ -1500,7 +1500,7 @@ struct st_maria_plugin rdb_i_s_dbstats = { ...@@ -1500,7 +1500,7 @@ struct st_maria_plugin rdb_i_s_dbstats = {
nullptr, /* status variables */ nullptr, /* status variables */
nullptr, /* system variables */ nullptr, /* system variables */
nullptr, /* config options */ nullptr, /* config options */
0, /* flags */ MYROCKS_MARIADB_PLUGIN_MATURITY_LEVEL
}; };
struct st_maria_plugin rdb_i_s_perf_context = { struct st_maria_plugin rdb_i_s_perf_context = {
...@@ -1516,7 +1516,7 @@ struct st_maria_plugin rdb_i_s_perf_context = { ...@@ -1516,7 +1516,7 @@ struct st_maria_plugin rdb_i_s_perf_context = {
nullptr, /* status variables */ nullptr, /* status variables */
nullptr, /* system variables */ nullptr, /* system variables */
nullptr, /* config options */ nullptr, /* config options */
0, /* flags */ MYROCKS_MARIADB_PLUGIN_MATURITY_LEVEL
}; };
struct st_maria_plugin rdb_i_s_perf_context_global = { struct st_maria_plugin rdb_i_s_perf_context_global = {
...@@ -1532,7 +1532,7 @@ struct st_maria_plugin rdb_i_s_perf_context_global = { ...@@ -1532,7 +1532,7 @@ struct st_maria_plugin rdb_i_s_perf_context_global = {
nullptr, /* status variables */ nullptr, /* status variables */
nullptr, /* system variables */ nullptr, /* system variables */
nullptr, /* config options */ nullptr, /* config options */
0, /* flags */ MYROCKS_MARIADB_PLUGIN_MATURITY_LEVEL
}; };
struct st_maria_plugin rdb_i_s_cfoptions = { struct st_maria_plugin rdb_i_s_cfoptions = {
...@@ -1548,7 +1548,7 @@ struct st_maria_plugin rdb_i_s_cfoptions = { ...@@ -1548,7 +1548,7 @@ struct st_maria_plugin rdb_i_s_cfoptions = {
nullptr, /* status variables */ nullptr, /* status variables */
nullptr, /* system variables */ nullptr, /* system variables */
nullptr, /* config options */ nullptr, /* config options */
0, /* flags */ MYROCKS_MARIADB_PLUGIN_MATURITY_LEVEL
}; };
struct st_maria_plugin rdb_i_s_global_info = { struct st_maria_plugin rdb_i_s_global_info = {
...@@ -1564,7 +1564,7 @@ struct st_maria_plugin rdb_i_s_global_info = { ...@@ -1564,7 +1564,7 @@ struct st_maria_plugin rdb_i_s_global_info = {
nullptr, /* status variables */ nullptr, /* status variables */
nullptr, /* system variables */ nullptr, /* system variables */
nullptr, /* config options */ nullptr, /* config options */
0, /* flags */ MYROCKS_MARIADB_PLUGIN_MATURITY_LEVEL
}; };
struct st_maria_plugin rdb_i_s_compact_stats = { struct st_maria_plugin rdb_i_s_compact_stats = {
...@@ -1580,7 +1580,7 @@ struct st_maria_plugin rdb_i_s_compact_stats = { ...@@ -1580,7 +1580,7 @@ struct st_maria_plugin rdb_i_s_compact_stats = {
nullptr, /* status variables */ nullptr, /* status variables */
nullptr, /* system variables */ nullptr, /* system variables */
nullptr, /* config options */ nullptr, /* config options */
0, /* flags */ MYROCKS_MARIADB_PLUGIN_MATURITY_LEVEL
}; };
struct st_maria_plugin rdb_i_s_ddl = { struct st_maria_plugin rdb_i_s_ddl = {
...@@ -1596,7 +1596,7 @@ struct st_maria_plugin rdb_i_s_ddl = { ...@@ -1596,7 +1596,7 @@ struct st_maria_plugin rdb_i_s_ddl = {
nullptr, /* status variables */ nullptr, /* status variables */
nullptr, /* system variables */ nullptr, /* system variables */
nullptr, /* config options */ nullptr, /* config options */
0, /* flags */ MYROCKS_MARIADB_PLUGIN_MATURITY_LEVEL
}; };
struct st_maria_plugin rdb_i_s_index_file_map = { struct st_maria_plugin rdb_i_s_index_file_map = {
...@@ -1612,7 +1612,7 @@ struct st_maria_plugin rdb_i_s_index_file_map = { ...@@ -1612,7 +1612,7 @@ struct st_maria_plugin rdb_i_s_index_file_map = {
nullptr, /* status variables */ nullptr, /* status variables */
nullptr, /* system variables */ nullptr, /* system variables */
nullptr, /* config options */ nullptr, /* config options */
0, /* flags */ MYROCKS_MARIADB_PLUGIN_MATURITY_LEVEL
}; };
struct st_maria_plugin rdb_i_s_lock_info = { struct st_maria_plugin rdb_i_s_lock_info = {
...@@ -1628,7 +1628,7 @@ struct st_maria_plugin rdb_i_s_lock_info = { ...@@ -1628,7 +1628,7 @@ struct st_maria_plugin rdb_i_s_lock_info = {
nullptr, /* status variables */ nullptr, /* status variables */
nullptr, /* system variables */ nullptr, /* system variables */
nullptr, /* config options */ nullptr, /* config options */
0, /* flags */ MYROCKS_MARIADB_PLUGIN_MATURITY_LEVEL
}; };
struct st_maria_plugin rdb_i_s_trx_info = { struct st_maria_plugin rdb_i_s_trx_info = {
...@@ -1644,6 +1644,6 @@ struct st_maria_plugin rdb_i_s_trx_info = { ...@@ -1644,6 +1644,6 @@ struct st_maria_plugin rdb_i_s_trx_info = {
nullptr, /* status variables */ nullptr, /* status variables */
nullptr, /* system variables */ nullptr, /* system variables */
nullptr, /* config options */ nullptr, /* config options */
0, /* flags */ MYROCKS_MARIADB_PLUGIN_MATURITY_LEVEL
}; };
} // namespace myrocks } // namespace myrocks
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment