Kouhei Sutou
null+****@clear*****
Thu Jul 20 23:40:23 JST 2017
Kouhei Sutou 2017-07-20 23:40:23 +0900 (Thu, 20 Jul 2017) New Revision: 0e906c818db1da79e66e20b1db230ec51d684b3e https://github.com/mroonga/mroonga/commit/0e906c818db1da79e66e20b1db230ec51d684b3e Message: mysql80: handler::keys_to_user_for_scanning() is removed Modified files: ha_mroonga.cpp ha_mroonga.hpp Modified: ha_mroonga.cpp (+2 -0) =================================================================== --- ha_mroonga.cpp 2017-07-20 23:34:09 +0900 (1e0da30) +++ ha_mroonga.cpp 2017-07-20 23:40:23 +0900 (12d50c4) @@ -13268,6 +13268,7 @@ double ha_mroonga::read_time(uint index, uint ranges, ha_rows rows) DBUG_RETURN(time); } +#ifdef MRN_HANDLER_HAVE_KEYS_TO_USE_FOR_SCANNING const key_map *ha_mroonga::wrapper_keys_to_use_for_scanning() { const key_map *res; @@ -13298,6 +13299,7 @@ const key_map *ha_mroonga::keys_to_use_for_scanning() } DBUG_RETURN(key_map); } +#endif ha_rows ha_mroonga::wrapper_estimate_rows_upper_bound() { Modified: ha_mroonga.hpp (+8 -0) =================================================================== --- ha_mroonga.hpp 2017-07-20 23:34:09 +0900 (b6b4e10) +++ ha_mroonga.hpp 2017-07-20 23:40:23 +0900 (310209e) @@ -227,6 +227,10 @@ extern "C" { # define MRN_HANDLER_RECORDS_RETURN_ERROR #endif +#if MYSQL_VERSION_ID < 80002 || defined(MRN_MARIADB_P) +# define MRN_HANDLER_HAVE_KEYS_TO_USE_FOR_SCANNING +#endif + class ha_mroonga; /* structs */ @@ -489,7 +493,9 @@ public: int truncate(); double scan_time(); double read_time(uint index, uint ranges, ha_rows rows); +#ifdef MRN_HANDLER_HAVE_KEYS_TO_USE_FOR_SCANNING const key_map *keys_to_use_for_scanning(); +#endif ha_rows estimate_rows_upper_bound(); void update_create_info(HA_CREATE_INFO* create_info); int rename_table(const char *from, const char *to); @@ -1093,8 +1099,10 @@ private: double storage_scan_time(); double wrapper_read_time(uint index, uint ranges, ha_rows rows); double storage_read_time(uint index, uint ranges, ha_rows rows); +#ifdef MRN_HANDLER_HAVE_KEYS_TO_USE_FOR_SCANNING const key_map *wrapper_keys_to_use_for_scanning(); const key_map *storage_keys_to_use_for_scanning(); +#endif ha_rows wrapper_estimate_rows_upper_bound(); ha_rows storage_estimate_rows_upper_bound(); void wrapper_update_create_info(HA_CREATE_INFO* create_info); -------------- next part -------------- HTML����������������������������...Download