Kouhei Sutou
null+****@clear*****
Fri Aug 10 16:34:37 JST 2018
Kouhei Sutou 2018-08-10 16:34:37 +0900 (Fri, 10 Aug 2018) New Revision: afe9cde65b2b044cbca9663d6978a932a94822fd https://github.com/mroonga/mroonga/commit/afe9cde65b2b044cbca9663d6978a932a94822fd Message: Add handler::get_memory_buffer_size() availability check Modified files: ha_mroonga.cpp ha_mroonga.hpp Modified: ha_mroonga.cpp (+2 -0) =================================================================== --- ha_mroonga.cpp 2018-08-10 16:29:43 +0900 (8652dd82) +++ ha_mroonga.cpp 2018-08-10 16:34:37 +0900 (76c6b823) @@ -13157,6 +13157,7 @@ bool ha_mroonga::get_foreign_dup_key(char *child_table_name, DBUG_RETURN(success); } +#ifdef MRN_HANDLER_HAVE_GET_MEMORY_BUFFER_SIZE longlong ha_mroonga::wrapper_get_memory_buffer_size() const { MRN_DBUG_ENTER_METHOD(); @@ -13186,6 +13187,7 @@ longlong ha_mroonga::get_memory_buffer_size() const } DBUG_RETURN(size); } +#endif #ifdef MRN_HANDLER_HAVE_TABLE_CACHE_TYPE uint8 ha_mroonga::wrapper_table_cache_type() Modified: ha_mroonga.hpp (+8 -0) =================================================================== --- ha_mroonga.hpp 2018-08-10 16:29:43 +0900 (fe9762a0) +++ ha_mroonga.hpp 2018-08-10 16:34:37 +0900 (9eba40b6) @@ -376,6 +376,10 @@ typedef uint mrn_alter_table_flags; # define MRN_HANDLER_HAVE_IS_INDEX_ALGORITHM_SUPPORTED #endif +#if MYSQL_VERSION_ID >= 50631 && !defined(MRN_MARIADB_P) +# define MRN_HANDLER_HAVE_GET_MEMORY_BUFFER_SIZE +#endif + #if defined(HAVE_PSI_INTERFACE) && \ (MYSQL_VERSION_ID < 80002 || defined(MRN_MARIADB_P)) # define MRN_HAVE_PSI_SERVER @@ -655,7 +659,9 @@ public: void change_table_ptr(TABLE *table_arg, TABLE_SHARE *share_arg) mrn_override; double scan_time() mrn_override; double read_time(uint index, uint ranges, ha_rows rows) mrn_override; +#ifdef MRN_HANDLER_HAVE_GET_MEMORY_BUFFER_SIZE longlong get_memory_buffer_size() const mrn_override; +#endif #ifdef MRN_HANDLER_HAVE_TABLE_CACHE_TYPE uint8 table_cache_type(); #endif @@ -1326,8 +1332,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_GET_MEMORY_BUFFER_SIZE longlong wrapper_get_memory_buffer_size() const; longlong storage_get_memory_buffer_size() const; +#endif #ifdef MRN_HANDLER_HAVE_TABLE_CACHE_TYPE uint8 wrapper_table_cache_type(); uint8 storage_table_cache_type(); -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20180810/b56ecee4/attachment-0001.htm
