From owner-freebsd-ports-bugs@FreeBSD.ORG Fri May 18 06:10:05 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 34430106564A for ; Fri, 18 May 2012 06:10:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 0C3708FC14 for ; Fri, 18 May 2012 06:10:05 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q4I6A4UP086941 for ; Fri, 18 May 2012 06:10:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q4I6A4OC086940; Fri, 18 May 2012 06:10:04 GMT (envelope-from gnats) Resent-Date: Fri, 18 May 2012 06:10:04 GMT Resent-Message-Id: <201205180610.q4I6A4OC086940@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Gea-Suan Lin Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 746C31065670; Fri, 18 May 2012 06:01:26 +0000 (UTC) (envelope-from gslin@colo-p.gslin.org) Received: from colo-p.gslin.org (gslin-1-pt.tunnel.tserv3.fmt2.ipv6.he.net [IPv6:2001:470:1f04:18a1::2]) by mx1.freebsd.org (Postfix) with ESMTP id E816E8FC1B; Fri, 18 May 2012 06:01:25 +0000 (UTC) Received: by colo-p.gslin.org (Postfix, from userid 1000) id 95BA47E81B; Fri, 18 May 2012 14:01:24 +0800 (CST) Message-Id: <20120518060124.95BA47E81B@colo-p.gslin.org> Date: Fri, 18 May 2012 14:01:24 +0800 (CST) From: Gea-Suan Lin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: gslin@gslin.org, matthew@FreeBSD.org Subject: ports/168094: [PATCH] databases/mytop: Support qps data after MySQL 5.0.76 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2012 06:10:05 -0000 >Number: 168094 >Category: ports >Synopsis: [PATCH] databases/mytop: Support qps data after MySQL 5.0.76 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri May 18 06:10:04 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Gea-Suan Lin >Release: FreeBSD 8.3-RELEASE i386 >Organization: >Environment: System: FreeBSD colo-p.gslin.org 8.3-RELEASE FreeBSD 8.3-RELEASE #0: Mon Apr 9 21:47:23 UTC >Description: - After MySQL 5.0.76, we need to get another variable to calculate qps. - This patch is merged from gentoo-portage: http://kambing.ui.ac.id/gentoo-portage/dev-db/mytop/files/mytop-1.6-queries-vs-questions-mysql-5.0.76.patch Port maintainer (matthew@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports) >How-To-Repeat: >Fix: --- mytop-1.6_8.patch begins here --- diff -ruN --exclude=CVS /usr/ports/databases/mytop/Makefile ./Makefile --- /usr/ports/databases/mytop/Makefile 2012-04-29 16:16:26.000000000 +0800 +++ ./Makefile 2012-05-18 13:59:14.000000000 +0800 @@ -7,7 +7,7 @@ PORTNAME= mytop PORTVERSION= 1.6 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= databases MASTER_SITES= http://jeremy.zawodny.com/mysql/mytop/ diff -ruN --exclude=CVS /usr/ports/databases/mytop/files/patch-mytop ./files/patch-mytop --- /usr/ports/databases/mytop/files/patch-mytop 2009-10-26 23:56:07.000000000 +0800 +++ ./files/patch-mytop 2012-05-18 13:58:42.000000000 +0800 @@ -1,5 +1,5 @@ ---- mytop.orig 2007-02-17 05:57:46.000000000 +0100 -+++ mytop 2009-10-15 00:19:14.000000000 +0200 +--- mytop.orig 2007-02-17 12:57:46.000000000 +0800 ++++ mytop 2012-05-18 13:58:30.000000000 +0800 @@ -153,7 +153,7 @@ "idle|i" => \$config{idle}, "resolve|r" => \$config{resolve}, @@ -54,16 +54,62 @@ ## if the server died or we lost connectivity if (not @recs) -@@ -819,7 +825,7 @@ +@@ -800,8 +806,15 @@ + + ## Queries per second... + +- my $avg_queries_per_sec = sprintf("%.2f", $STATUS{Questions} / $STATUS{Uptime}); +- my $num_queries = $STATUS{Questions}; ++ my ($num_queries, $old_num_queries); ++ if(defined($STATUS{Queries})) { ++ $num_queries = $STATUS{Queries}; ++ $old_num_queries = $OLD_STATUS{Queries}; ++ } else { ++ $num_queries = $STATUS{Questions}; ++ $old_num_queries = $OLD_STATUS{Questions}; ++ } ++ my $avg_queries_per_sec = sprintf("%.2f", $num_queries / $STATUS{Uptime}); + + my @t = localtime(time); + +@@ -819,26 +832,26 @@ $lines_left--; - printf " Queries: %-5s qps: %4.0f Slow: %7s Se/In/Up/De(%%): %02.0f/%02.0f/%02.0f/%02.0f \n", +- make_short( $STATUS{Questions} ), # q total +- $STATUS{Questions} / $STATUS{Uptime}, # qps, average + printf " Queries: %-6s qps: %4.0f Slow: %7s Se/In/Up/De(%%): %02.0f/%02.0f/%02.0f/%02.0f \n", - make_short( $STATUS{Questions} ), # q total - $STATUS{Questions} / $STATUS{Uptime}, # qps, average ++ make_short( $num_queries ), # q total ++ $num_queries / $STATUS{Uptime}, # qps, average make_short( $STATUS{Slow_queries} ), # slow -@@ -889,8 +895,42 @@ + + # hmm. a Qcache hit is really a select and should be counted. +- 100 * ($STATUS{Com_select} + ($STATUS{Qcache_hits}||0) ) / $STATUS{Questions}, +- 100 * ($STATUS{Com_insert} + $STATUS{Com_replace} ) / $STATUS{Questions}, +- 100 * ($STATUS{Com_update} ) / $STATUS{Questions}, +- 100 * $STATUS{Com_delete} / $STATUS{Questions}; ++ 100 * ($STATUS{Com_select} + ($STATUS{Qcache_hits}||0) ) / $num_queries, ++ 100 * ($STATUS{Com_insert} + $STATUS{Com_replace} ) / $num_queries, ++ 100 * ($STATUS{Com_update} ) / $num_queries, ++ 100 * $STATUS{Com_delete} / $num_queries; + + $lines_left--; + + if ($t_delta) + { +- my $q_diff = ( $STATUS{Questions} - $OLD_STATUS{Questions} ); +-# print("q_diff: $STATUS{Questions} - $OLD_STATUS{Questions} / $t_delta = $q_diff\n"); ++ my $q_diff = ( $num_queries - $old_num_queries ); ++# print("q_diff: $num_queries - $old_num_queries / $t_delta = $q_diff\n"); + + printf(" qps now: %4.0f Slow qps: %3.1f Threads: %4.0f (%4.0f/%4.0f) %02.0f/%02.0f/%02.0f/%02.0f \n", +- ( $STATUS{Questions} - $OLD_STATUS{Questions} ) / $t_delta, ++ ( $num_queries - $old_num_queries ) / $t_delta, + ( # slow now (qps) + ($STATUS{Slow_queries} ) ? + ( $STATUS{Slow_queries} - $OLD_STATUS{Slow_queries} ) / $t_delta : +@@ -889,8 +902,42 @@ make_short(($STATUS{Bytes_received} - $OLD_STATUS{Bytes_received}) / $t_delta ), make_short(($STATUS{Bytes_sent} - $OLD_STATUS{Bytes_sent}) / $t_delta )) if ($t_delta); @@ -107,7 +153,7 @@ $lines_left--; } -@@ -952,8 +992,11 @@ +@@ -952,8 +999,11 @@ { $thread->{Host} =~ s/:\d+$//; my $host = gethostbyaddr(inet_aton($thread->{Host}), AF_INET); @@ -121,7 +167,7 @@ } ## Fix possible undefs -@@ -1099,8 +1142,8 @@ +@@ -1099,8 +1149,8 @@ my @data = Hashes("SHOW INNODB STATUS"); open P, "|$config{pager}" or die "$!"; --- mytop-1.6_8.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: