Hello community, here is the log from the commit of package innotop for openSUSE:Factory checked in at 2017-04-11 09:33:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/innotop (Old) and /work/SRC/openSUSE:Factory/.innotop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "innotop" Tue Apr 11 09:33:39 2017 rev:5 rq:482738 version:1.11.4 Changes: -------- --- /work/SRC/openSUSE:Factory/innotop/innotop.changes 2017-01-24 10:36:47.353547091 +0100 +++ /work/SRC/openSUSE:Factory/.innotop.new/innotop.changes 2017-04-11 09:33:40.866400635 +0200 @@ -1,0 +2,15 @@ +Sun Mar 26 12:12:49 UTC 2017 - [email protected] + +- innotop 1.11.4: + * add SUM function for ONLY_FULL_GROUP_BY + * Undisplay handlersocket's threads in hide_inactive + * fix runtime error regarding redundant sprintf argument + * add sort on connection-name in display M, after sql/io running, + seconds behind master and channel_name + * fix bug that removed value for cxn and channel_name columns in + display M + * added sort on replication delay, so that the + replication-display will sort on slave_sql_running, timelag + (in minutes) and channel_name. + +------------------------------------------------------------------- Old: ---- innotop-1.11.1.tar.gz New: ---- innotop-1.11.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ innotop.spec ++++++ --- /var/tmp/diff_new_pack.C6Mhz4/_old 2017-04-11 09:33:41.466315888 +0200 +++ /var/tmp/diff_new_pack.C6Mhz4/_new 2017-04-11 09:33:41.470315324 +0200 @@ -17,7 +17,7 @@ Name: innotop -Version: 1.11.1 +Version: 1.11.4 Release: 0 Summary: A MySQL and InnoDB monitor program License: GPL-2.0 ++++++ innotop-1.11.1.tar.gz -> innotop-1.11.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/innotop-1.11.1/Changelog new/innotop-1.11.4/Changelog --- old/innotop-1.11.1/Changelog 2016-06-14 13:56:00.000000000 +0200 +++ new/innotop-1.11.4/Changelog 2017-01-20 23:42:40.000000000 +0100 @@ -1,7 +1,16 @@ Changelog for innotop: -2014-09-25: version 1.10.0 - * Support for MariaDB 10.0 in InnoDB row (issue 93) +2017-01-20: version 1.11.4 + * add SUM function for ONLY_FULL_GROUP_BY + +2017-01-20: version 1.11.3 + + * Undisplay handlersocket's threads in hide_inactive + * fix runtime error regarding redundant sprintf argument #122 + * added sort on connection-name in display M, after sql/io running, seconds behind master and channel_name + * fixed bug that removed value for cxn and channel_name columns in display M + * added sort on replication delay, so that the replication-display will sort on slave_sql_running, timelag (in minutes) and channel_name. + * support for MariaDB 10.0 in InnoDB row (issue 93) 2013-07-12: version 1.9.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/innotop-1.11.1/innotop new/innotop-1.11.4/innotop --- old/innotop-1.11.1/innotop 2016-06-14 13:56:00.000000000 +0200 +++ new/innotop-1.11.4/innotop 2017-01-20 23:42:40.000000000 +0100 @@ -22,7 +22,7 @@ use strict; use warnings FATAL => 'all'; -our $VERSION = '1.11.1'; +our $VERSION = '1.11.4'; # Find the home directory; it's different on different OSes. our $homepath = $ENV{HOME} || $ENV{HOMEPATH} || $ENV{USERPROFILE} || '.'; @@ -1570,7 +1570,7 @@ # Convenience so I can copy/paste these in several places... # ########################################################################### my %exprs = ( - Host => q{my $host = host || hostname || ''; ($host) = $host =~ m/^((?:[\d.]+(?=:))|(?:[a-z0-9-]+))/i; return $host || ''}, + Host => q{my $host = host || hostname || ''; ($host) = $host =~ m/^((?:[\d.]+(?=:|$))|(?:[a-z0-9-]+))/i; return $host || ''}, Port => q{my ($p) = host =~ m/:(.*)$/; return $p || 0}, OldVersions => q{dulint_to_int(IB_tx_trx_id_counter) - dulint_to_int(IB_tx_purge_done_for)}, MaxTxnTime => q/max(map{ $_->{active_secs} } @{ IB_tx_transactions }) || 0/, @@ -1579,6 +1579,8 @@ BufPoolFill => q{ $cur->{IB_bp_pages_total} / ($cur->{IB_bp_buf_pool_size} || 1) }, ServerLoad => q{ $cur->{Threads_connected}/(Questions||1)/Uptime_hires }, Connection => q{ max_connections || $cur->{Threads_connected} }, + chcxn_2_cxn => q{ if ( defined($cur->{cxn}) ) { return $cur->{cxn}; } else { my ($cha, $conn) = split ("=",$cur->{chcxn}) ; return $conn; } }, + chcxn_2_ch => q{ if ( defined($cur->{channel_name}) ) { return $cur->{channel_name}; } else { my ($cha, $conn) = split ("=",$cur->{chcxn}) ; $cha = '' if ($cha = /no_channels/); return $cha || 'failed'; } }, TxnTimeRemain => q{ defined undo_log_entries && defined $pre->{undo_log_entries} && undo_log_entries < $pre->{undo_log_entries} ? undo_log_entries / (($pre->{undo_log_entries} - undo_log_entries)/((active_secs-$pre->{active_secs})||1))||1 : 0}, SlaveCatchupRate => ' defined $cur->{seconds_behind_master} && defined $pre->{seconds_behind_master} && $cur->{seconds_behind_master} < $pre->{seconds_behind_master} ? ($pre->{seconds_behind_master}-$cur->{seconds_behind_master})/($cur->{Uptime_hires}-$pre->{Uptime_hires}) : 0', QcacheHitRatio => q{(Qcache_hits||0)/(((Com_select||0)+(Qcache_hits||0))||1)}, @@ -1824,6 +1826,7 @@ slave_open_temp_tables => { hdr => 'Temp', num => 1, label => 'Slave open temp tables' }, slave_running => { hdr => 'Repl', num => 0, label => 'Slave running' }, slave_sql_running => { hdr => 'Slave-SQL', num => 0, label => 'Whether the slave SQL thread is running' }, + sort_time => { hdr => 'SortTimeLag', num => 1, label => 'Time slave lags master sort' }, slow => { hdr => 'Slow', num => 1, label => 'How many slow queries', }, space_id => { hdr => 'Space', num => 1, label => 'Tablespace ID' }, special => { hdr => 'Special', num => 0, label => 'Special/Other info' }, @@ -1913,11 +1916,19 @@ text => <<' END', return ( !defined($set->{txn_status}) || $set->{txn_status} ne 'not started' ) && ( !defined($set->{cmd}) || $set->{cmd} !~ m/Sleep|Binlog Dump/ ) + && ( !defined($set->{state}) || $set->{state} !~ m/^handlersocket/ ) && ( !defined($set->{info}) || $set->{info} =~ m/\S/ ); END note => 'Removes processes which are not doing anything', tbls => [qw(innodb_transactions processlist)], }, + hide_connect => { + text => <<' END', + return ( !defined($set->{cmd}) || $set->{cmd} !~ m/Connect/ ); + END + note => 'Removes the slave processes from the list', + tbls => [qw(processlist)], + }, hide_slave_io => { text => <<' END', return !$set->{state} || $set->{state} !~ m/^(?:Waiting for master|read all relay)/; @@ -2659,7 +2670,7 @@ capt => 'Master Status', cust => {}, cols => { - cxn => { src => 'cxn' }, + cxn => { src => $exprs{chcxn_2_cxn}, hdr => 'CXN' }, binlog_do_db => { src => 'binlog_do_db' }, binlog_ignore_db => { src => 'binlog_ignore_db' }, master_file => { src => 'file' }, @@ -2667,13 +2678,14 @@ binlog_cache_overflow => { src => '(Binlog_cache_disk_use||0)/(Binlog_cache_use||1)', trans => [ qw(percent) ] }, executed_gtid_set => { src => '(executed_gtid_set||"N/A")' }, server_uuid => { src => '(server_uuid||"N/A")' }, + channel_name => { src => $exprs{chcxn_2_ch}, hdr => 'Channel'}, }, - visible => [ qw(cxn master_file master_pos binlog_cache_overflow executed_gtid_set server_uuid)], + visible => [ qw(cxn channel_name master_file master_pos binlog_cache_overflow executed_gtid_set server_uuid)], filters => [ qw(cxn_is_master) ], sort_cols => 'cxn', sort_dir => '1', innodb => '', - group_by => [], + group_by => [qw(channel_name)], aggregate => 0, }, pending_io => { @@ -2755,7 +2767,7 @@ cnt => { src => 'id', minw => 0, maxw => 0 }, }, visible => [ qw(cxn cmd cnt mysql_thread_id state user hostname db time info)], - filters => [ qw(hide_self hide_inactive hide_slave_io hide_event) ], + filters => [ qw(hide_self hide_inactive hide_slave_io hide_event hide_connect) ], sort_cols => '-time cxn hostname mysql_thread_id', sort_dir => '1', innodb => '', @@ -2880,7 +2892,7 @@ capt => 'Slave I/O Status', cust => {}, cols => { - cxn => { src => 'cxn' }, + cxn => { src => $exprs{chcxn_2_cxn}, hdr => 'CXN' }, connect_retry => { src => 'connect_retry' }, master_host => { src => 'master_host', hdr => 'Master'}, master_uuid => { src => '(master_uuid||"N/A")' }, @@ -2897,11 +2909,11 @@ relay_log_size => { src => 'relay_log_space', trans => [qw(shorten)] }, slave_io_running => { src => 'slave_io_running', hdr => 'On?' }, slave_io_state => { src => 'slave_io_state', hdr => 'State' }, - channel_name => { src => 'channel_name', hdr => 'Channel'}, + channel_name => { src => $exprs{chcxn_2_ch}, hdr => 'Channel'}, }, visible => [ qw(cxn channel_name master_host master_uuid slave_io_running master_log_file relay_log_size read_master_log_pos slave_io_state)], filters => [ qw( cxn_is_slave ) ], - sort_cols => 'slave_io_running cxn', + sort_cols => 'slave_io_running channel_name cxn', colors => [ { col => 'slave_io_running', op => 'ne', arg => 'Yes', color => 'black on_red' }, ], @@ -2914,7 +2926,7 @@ capt => 'Slave SQL Status', cust => {}, cols => { - cxn => { src => 'cxn' }, + cxn => { src => $exprs{chcxn_2_cxn}, hdr => 'CXN' }, exec_master_log_pos => { src => 'exec_master_log_pos', hdr => 'Master Pos' }, last_errno => { src => 'last_errno' }, last_error => { src => 'last_error' }, @@ -2932,6 +2944,7 @@ replicate_wild_ignore_table => { src => 'replicate_wild_ignore_table' }, skip_counter => { src => 'skip_counter' }, slave_sql_running => { src => 'slave_sql_running', hdr => 'On?' }, + sort_time => { src => 'int(seconds_behind_master/60)' }, until_condition => { src => 'until_condition' }, until_log_file => { src => 'until_log_file' }, until_log_pos => { src => 'until_log_pos' }, @@ -2941,11 +2954,11 @@ slave_open_temp_tables => { src => 'Slave_open_temp_tables' }, retrieved_gtid_set => { src => '(retrieved_gtid_set||"N/A")' }, executed_gtid_set => { src => '(executed_gtid_set||"N/A")' }, - channel_name => { src => 'channel_name', hdr => 'Channel'}, + channel_name => { src => $exprs{chcxn_2_ch}, hdr => 'Channel'}, }, visible => [ qw(cxn channel_name master_host master_uuid slave_sql_running time_behind_master slave_catchup_rate slave_open_temp_tables relay_log_pos last_error retrieved_gtid_set executed_gtid_set)], filters => [ qw( cxn_is_slave ) ], - sort_cols => 'slave_sql_running cxn', + sort_cols => 'slave_sql_running -sort_time channel_name cxn', sort_dir => '1', innodb => '', colors => [ @@ -3418,6 +3431,10 @@ action => sub { choose_sort_cols('processlist'); }, label => "Change the display's sort column", }, + t => { + action => sub { toggle_filter('processlist', 'hide_connect') }, + label => 'Toggle slave processes', + }, x => { action => sub { kill_query('QUERY') }, label => "Kill a query", @@ -4499,8 +4516,10 @@ eval { # This can fail if the table doesn't exist, INFORMATION_SCHEMA doesn't exist, etc. my $cols = $dbh->selectall_arrayref(q{SHOW /*innotop*/ COLUMNS FROM INFORMATION_SCHEMA.INDEX_STATISTICS}); if ( @$cols ) { - $sth = $dbh->prepare(q{SELECT /*innotop*/ L.TABLE_SCHEMA, L.TABLE_NAME, L.ROWS_READ, } - . q{SUM(R.ROWS_READ) AS ROWS_READ_FROM_INDEXES, L.ROWS_CHANGED, L.ROWS_CHANGED_X_INDEXES } + $sth = $dbh->prepare(q{SELECT /*innotop*/ L.TABLE_SCHEMA, L.TABLE_NAME, } + . q{SUM(L.ROWS_READ) AS ROWS_READ, SUM(R.ROWS_READ) AS ROWS_READ_FROM_INDEXES, } + . q{SUM(L.ROWS_CHANGED) AS ROWS_CHANGED, } + . q{SUM(L.ROWS_CHANGED_X_INDEXES) AS ROWS_CHANGED_X_INDEXES } . q{FROM INFORMATION_SCHEMA.TABLE_STATISTICS AS L LEFT JOIN INFORMATION_SCHEMA.INDEX_STATISTICS AS R } . q{USING(TABLE_SCHEMA, TABLE_NAME) GROUP BY L.TABLE_SCHEMA, L.TABLE_NAME}); } @@ -5595,7 +5614,7 @@ if ( length $channel < 1 ) { $channel = 'no_channels'; } - my $chcxn = $channel . $cxn; + my $chcxn = $channel . '=' . $cxn; get_slave_status($cxn,$channel); my $set = $config{status_inc}->{val} ? inc(0, $chcxn) : $vars{$chcxn}->{$clock}; my $pre = $vars{$chcxn}->{$clock - 1} || $set; @@ -5608,7 +5627,7 @@ } if ( $linecount < 1 ) { $channel = 'no_channels'; - my $chcxn = $channel . $cxn; + my $chcxn = $channel . '=' . $cxn; get_slave_status($cxn,$channel); my $set = $config{status_inc}->{val} ? inc(0, $chcxn) : $vars{$chcxn}->{$clock}; my $pre = $vars{$chcxn}->{$clock - 1} || $set; @@ -7655,7 +7674,7 @@ # Compares versions like 5.0.27 and 4.1.15-standard-log sub version_ge { my ( $dbh, $target ) = @_; - my $version = sprintf('%03d%03d%03d', $dbh->{mysql_serverinfo} =~ m/(\d+)/g); + my $version = sprintf('%03d%03d%03d', $dbh->{mysql_serverinfo} =~ m/^(\d+).(\d+).(\d+)/g); return $version ge sprintf('%03d%03d%03d', $target =~ m/(\d+)/g); } @@ -9784,7 +9803,7 @@ # Separated handling of slave status to support 5.7 and replication channels sub get_slave_status { my ($cxn, $channel) = @_; - my $chcxn = $channel . $cxn; + my $chcxn = $channel . '=' . $cxn; $vars{$chcxn}->{$clock} ||= {}; my $vars = $vars{$chcxn}->{$clock}; $vars->{chcxn} = $chcxn; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/innotop-1.11.1/innotop.spec new/innotop-1.11.4/innotop.spec --- old/innotop-1.11.1/innotop.spec 2016-06-14 13:56:00.000000000 +0200 +++ new/innotop-1.11.4/innotop.spec 2017-01-20 23:42:40.000000000 +0100 @@ -3,7 +3,7 @@ # Name: innotop Summary: A MySQL and InnoDB monitor program. -Version: 1.10.0 +Version: 1.11.4 Release: 1%{?dist} Vendor: Baron Schwartz <[email protected]> Packager: Frederic Descamps <[email protected]> @@ -122,6 +122,9 @@ %defattr(-,root,root) %changelog +* Fri Jan 20 2017 Frederic Descamps <[email protected]> - 1.11.4-1 + - Package for github new tag 1.11.4 + * Fri Jul 12 2013 Frederic Descamps <[email protected]> - 1.9.1-1 - Package for svn source code revision 113
