This commit is an update of WL#7375 (Ndbinfo: Per-fragment memory usage reporting).

Column fixed_elem_free_rows in view ndbinfo.memory_per_fragment is renamed to fixed_elem_free_count to get a more consisten naming.

Author: Jan Wedvik

mysql-test/suite/ndb/t/ndbinfo.test

@@ -356,7 +356,7 @@ let $t1_id = query_get_value(select @t1_id as id, id, 1);
 
 # Create som views that we reuse after modifying t1 below.
 # This one sums usage counts for all fragments of each table.
-# Some values, such as fixed_elem_free_rows and fixed_elem_count for ordered 
+# Some values, such as fixed_elem_free_count and fixed_elem_count for ordered 
 # indexes may vary depending on the number of fragments and other factors. 
 # These are therefore not returned directly, but used in calculations that 
 # should provide stable results.
@@ -368,9 +368,9 @@ if (type="Ordered index",
     sum(fixed_elem_count)) as fixed_elem_count,
 max(fixed_elem_size_bytes) as fixed_elem_size_bytes,
 round(sum(fixed_elem_alloc_bytes/fixed_elem_size_bytes)
-  /sum(fixed_elem_count+fixed_elem_free_rows),1) as fixed_elem_alloc_ok,
+  /sum(fixed_elem_count+fixed_elem_free_count),1) as fixed_elem_alloc_ok,
 sum(fixed_elem_free_bytes/fixed_elem_size_bytes) = 
-   sum(fixed_elem_free_rows) as fixed_elem_free_bytes_ok,
+   sum(fixed_elem_free_count) as fixed_elem_free_bytes_ok,
 sum(var_elem_count) as var_elem_count,
 sum(var_elem_alloc_bytes) >= sum(var_elem_free_bytes) as var_bytes_ok
 from ndbinfo.memory_per_fragment

scripts/mysql_system_tables.sql

@@ -2359,7 +2359,7 @@ DROP PREPARE stmt;
 # ndbinfo.memory_per_fragment
 # The test for name.type<=6 is there to elimiate matching non-table objects 
 # (triggers, files etc.), since the 'id' of these may collide with table ids.
-SET @str=IF(@have_ndbinfo,'CREATE OR REPLACE DEFINER=`root`@`localhost` SQL SECURITY INVOKER VIEW `ndbinfo`.`memory_per_fragment` AS SELECT name.fq_name, parent_name.fq_name AS parent_fq_name, types.type_name AS type, table_id, node_id, block_instance, fragment_num, fixed_elem_alloc_bytes, fixed_elem_free_bytes, fixed_elem_size_bytes, fixed_elem_count, FLOOR(fixed_elem_free_bytes/fixed_elem_size_bytes) AS fixed_elem_free_rows, var_elem_alloc_bytes, var_elem_free_bytes, var_elem_count, hash_index_alloc_bytes FROM ndbinfo.ndb$frag_mem_use AS space JOIN ndbinfo.ndb$dict_obj_info AS name ON name.id=space.table_id AND name.type<=6 JOIN ndbinfo.dict_obj_types AS types ON name.type=types.type_id LEFT JOIN ndbinfo.ndb$dict_obj_info AS parent_name ON name.parent_obj_id=parent_name.id AND name.parent_obj_type=parent_name.type','SET @dummy = 0');
+SET @str=IF(@have_ndbinfo,'CREATE OR REPLACE DEFINER=`root`@`localhost` SQL SECURITY INVOKER VIEW `ndbinfo`.`memory_per_fragment` AS SELECT name.fq_name, parent_name.fq_name AS parent_fq_name, types.type_name AS type, table_id, node_id, block_instance, fragment_num, fixed_elem_alloc_bytes, fixed_elem_free_bytes, fixed_elem_size_bytes, fixed_elem_count, FLOOR(fixed_elem_free_bytes/fixed_elem_size_bytes) AS fixed_elem_free_count, var_elem_alloc_bytes, var_elem_free_bytes, var_elem_count, hash_index_alloc_bytes FROM ndbinfo.ndb$frag_mem_use AS space JOIN ndbinfo.ndb$dict_obj_info AS name ON name.id=space.table_id AND name.type<=6 JOIN ndbinfo.dict_obj_types AS types ON name.type=types.type_id LEFT JOIN ndbinfo.ndb$dict_obj_info AS parent_name ON name.parent_obj_id=parent_name.id AND name.parent_obj_type=parent_name.type','SET @dummy = 0');
 PREPARE stmt FROM @str;
 EXECUTE stmt;
 DROP PREPARE stmt;

storage/ndb/tools/ndbinfo_sql.cpp

@@ -336,7 +336,7 @@ struct view {
     "fragment_num, fixed_elem_count, fixed_elem_size_bytes, "
     "fixed_elem_alloc_bytes, fixed_elem_free_bytes,  "
     "FLOOR(fixed_elem_free_bytes/fixed_elem_size_bytes) AS "
-    "fixed_elem_free_rows, var_elem_count, var_elem_alloc_bytes, "
+    "fixed_elem_free_count, var_elem_count, var_elem_alloc_bytes, "
     "var_elem_free_bytes, hash_index_alloc_bytes "
     "FROM `<NDBINFO_DB>`.`<TABLE_PREFIX>frag_mem_use` AS space "
     "JOIN `<NDBINFO_DB>`.`<TABLE_PREFIX>dict_obj_info` "