Fix key buffer usage multiple-byte units

The "Key buffer used" row showed 131072 bytes as 131K while it should be shown as 128K, so that it matches the multi-byte units key buffer size in the "Key buffer size / total MyISAM indexes" row below.

Furthermore, instead of calculating the used bytes from the previously calculated percentage, doing a round trip which involves rounding errors, calculate the used bytes from the variables directly which does not involve any diversion and hence no possible rounding errors.

Signed-off-by: MichaIng <micha@dietpi.com>
This commit is contained in:
MichaIng 2021-11-22 14:49:23 +01:00 committed by GitHub
parent cb74b1947e
commit 7d53af73cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3514,22 +3514,22 @@ sub mysql_myisam {
if ( defined( $mycalc{'pct_key_buffer_used'} ) ) { if ( defined( $mycalc{'pct_key_buffer_used'} ) ) {
if ( $mycalc{'pct_key_buffer_used'} < 90 ) { if ( $mycalc{'pct_key_buffer_used'} < 90 ) {
badprint "Key buffer used: $mycalc{'pct_key_buffer_used'}% (" badprint "Key buffer used: $mycalc{'pct_key_buffer_used'}% ("
. hr_num( $myvar{'key_buffer_size'} * . hr_bytes( $myvar{'key_buffer_size'} -
$mycalc{'pct_key_buffer_used'} / $mystat{'Key_blocks_unused'} *
100 ) $myvar{'key_cache_block_size'} )
. " used / " . " used / "
. hr_num( $myvar{'key_buffer_size'} ) . hr_bytes( $myvar{'key_buffer_size'} )
. " cache)"; . " cache)";
#push(@adjvars,"key_buffer_size (\~ ".hr_num( $myvar{'key_buffer_size'} * $mycalc{'pct_key_buffer_used'} / 100).")"); #push(@adjvars,"key_buffer_size (\~ ".hr_num( $myvar{'key_buffer_size'} * $mycalc{'pct_key_buffer_used'} / 100).")");
} }
else { else {
goodprint "Key buffer used: $mycalc{'pct_key_buffer_used'}% (" goodprint "Key buffer used: $mycalc{'pct_key_buffer_used'}% ("
. hr_num( $myvar{'key_buffer_size'} * . hr_bytes( $myvar{'key_buffer_size'} -
$mycalc{'pct_key_buffer_used'} / $mystat{'Key_blocks_unused'} *
100 ) $myvar{'key_cache_block_size'} )
. " used / " . " used / "
. hr_num( $myvar{'key_buffer_size'} ) . hr_bytes( $myvar{'key_buffer_size'} )
. " cache)"; . " cache)";
} }
} }
@ -3537,10 +3537,11 @@ sub mysql_myisam {
# No queries have run that would use keys # No queries have run that would use keys
debugprint "Key buffer used: $mycalc{'pct_key_buffer_used'}% (" debugprint "Key buffer used: $mycalc{'pct_key_buffer_used'}% ("
. hr_num( . hr_bytes( $myvar{'key_buffer_size'} -
$myvar{'key_buffer_size'} * $mycalc{'pct_key_buffer_used'} / 100 ) $mystat{'Key_blocks_unused'} *
$myvar{'key_cache_block_size'} )
. " used / " . " used / "
. hr_num( $myvar{'key_buffer_size'} ) . hr_bytes( $myvar{'key_buffer_size'} )
. " cache)"; . " cache)";
} }