rpms/pg_top/F-11 pg_top-3.6.2-fix-totals.patch, NONE, 1.1 pg_top.spec, 1.3, 1.4

[Alexey Torkhov]

Author: atorkhov

Update of /cvs/pkgs/rpms/pg_top/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26555

Modified Files:
	pg_top.spec 
Added Files:
	pg_top-3.6.2-fix-totals.patch 
Log Message:
* Sat Sep 26 2009 Alexey Torkhov <atorkhov at gmail.com> - 3.6.2-8
- Fix display of cumulative statistics (BZ#525763)


pg_top-3.6.2-fix-totals.patch:
 pg.c |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE pg_top-3.6.2-fix-totals.patch ---
diff -Narup pg_top-3.6.2/pg.c pg_top-3.6.2.new/pg.c
--- pg_top-3.6.2/pg.c	2008-04-03 08:37:46.000000000 +0400
+++ pg_top-3.6.2.new/pg.c	2009-09-26 00:48:37.000000000 +0400
@@ -798,9 +798,9 @@ update_index_stats(struct index_node * n
 				   long long idx_tup_read, long long idx_tup_fetch)
 {
 	/* Add to the index totals */
-	node->total_idx_scan += idx_scan;
-	node->total_idx_tup_read += idx_tup_read;
-	node->total_idx_tup_fetch += idx_tup_fetch;
+	node->total_idx_scan = idx_scan;
+	node->total_idx_tup_read = idx_tup_read;
+	node->total_idx_tup_fetch = idx_tup_fetch;
 
 	/* Calculate difference between previous and current values. */
 	node->diff_idx_scan = idx_scan - node->old_idx_scan;
@@ -819,13 +819,13 @@ update_table_stats(struct table_node * n
 			   long long n_tup_ins, long long n_tup_upd, long long n_tup_del)
 {
 	/* Add to the table totals */
-	node->total_idx_scan += idx_scan;
-	node->total_idx_tup_fetch += idx_tup_fetch;
-	node->total_n_tup_del += n_tup_del;
-	node->total_n_tup_ins += n_tup_ins;
-	node->total_n_tup_upd += n_tup_upd;
-	node->total_seq_scan += seq_scan;
-	node->total_seq_tup_read += seq_tup_read;
+	node->total_idx_scan = idx_scan;
+	node->total_idx_tup_fetch = idx_tup_fetch;
+	node->total_n_tup_del = n_tup_del;
+	node->total_n_tup_ins = n_tup_ins;
+	node->total_n_tup_upd = n_tup_upd;
+	node->total_seq_scan = seq_scan;
+	node->total_seq_tup_read = seq_tup_read;
 
 	/* Calculate difference between previous and current values. */
 	node->diff_idx_scan = idx_scan - node->old_idx_scan;


Index: pg_top.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pg_top/F-11/pg_top.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pg_top.spec	15 Jul 2009 03:34:43 -0000	1.3
+++ pg_top.spec	25 Sep 2009 21:18:11 -0000	1.4
@@ -1,18 +1,23 @@
 Summary:	'top' for PostgreSQL process
 Name:		pg_top
 Version:	3.6.2
-Release:	5%{?dist}
+Release:	8%{?dist}
 License:	BSD
 Group:		Applications/Databases
 Source0:	http://pgfoundry.org/frs/download.php/1780/%{name}-%{version}.tar.bz2
 URL:		http://pgfoundry.org/projects/ptop
+# Reported upstream: http://pgfoundry.org/tracker/index.php?func=detail&aid=1010710&group_id=1000300&atid=1129
+Patch0:     pg_top-3.6.2-fix-totals.patch
 BuildRequires:	postgresql-devel
 BuildRequires:	libtermcap-devel
 BuildRequires:	elfutils-libelf-devel
-BuildRequires:  systemtap-sdt-devel
 Requires:	postgresql-server
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} >= 10
+BuildRequires:  systemtap-sdt-devel
+%endif
+
 
 %description
 pg_top is 'top' for PostgreSQL processes. See running queries, 
@@ -20,6 +25,7 @@ query plans, issued locks, and table and
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
 %configure
@@ -41,6 +47,15 @@ rm -rf %{buildroot}
 %doc FAQ HISTORY INSTALL LICENSE README TODO Y2K
 
 %changelog
+* Sat Sep 26 2009 Alexey Torkhov <atorkhov at gmail.com> - 3.6.2-8
+- Fix display of cumulative statistics (BZ#525763)
+
+* Fri Sep 25 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.2-7
+- starting building for EPEL too
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 15 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.6.2-5
 - fix buildrequires, systemtap-sdt-devel is required for <sys/sdt.h>