Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit eaa5d52

Browse files
committed
Fix some failures to initialize table entries induced by recent autovacuum
integration. Not clear this explains recent stats problems, but it's definitely wrong.
1 parent d007a95 commit eaa5d52

File tree

1 file changed

+18
-11
lines changed

1 file changed

+18
-11
lines changed

src/backend/postmaster/pgstat.c

+18-11
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*
1414
* Copyright (c) 2001-2005, PostgreSQL Global Development Group
1515
*
16-
* $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.100 2005/07/14 05:13:40 tgl Exp $
16+
* $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.101 2005/07/24 00:33:28 tgl Exp $
1717
* ----------
1818
*/
1919
#include "postgres.h"
@@ -2776,13 +2776,13 @@ pgstat_recv_vacuum(PgStat_MsgVacuum *msg, int len)
27762776
*/
27772777
if (!found)
27782778
{
2779-
tabentry->tableid = msg->m_tableoid;
2779+
tabentry->numscans = 0;
27802780

27812781
tabentry->tuples_returned = 0;
27822782
tabentry->tuples_fetched = 0;
2783-
tabentry->tuples_inserted = msg->m_tuples;
2784-
tabentry->tuples_deleted = 0;
2783+
tabentry->tuples_inserted = 0;
27852784
tabentry->tuples_updated = 0;
2785+
tabentry->tuples_deleted = 0;
27862786

27872787
tabentry->n_live_tuples = msg->m_tuples;
27882788
tabentry->n_dead_tuples = 0;
@@ -2794,11 +2794,13 @@ pgstat_recv_vacuum(PgStat_MsgVacuum *msg, int len)
27942794

27952795
tabentry->blocks_fetched = 0;
27962796
tabentry->blocks_hit = 0;
2797+
2798+
tabentry->destroy = 0;
27972799
}
27982800
else
27992801
{
2800-
tabentry->n_dead_tuples = 0;
28012802
tabentry->n_live_tuples = msg->m_tuples;
2803+
tabentry->n_dead_tuples = 0;
28022804
if (msg->m_analyze)
28032805
tabentry->last_anl_tuples = msg->m_tuples;
28042806
}
@@ -2827,20 +2829,22 @@ pgstat_recv_analyze(PgStat_MsgAnalyze *msg, int len)
28272829
*/
28282830
if (!found)
28292831
{
2830-
tabentry->tableid = msg->m_tableoid;
2832+
tabentry->numscans = 0;
28312833

28322834
tabentry->tuples_returned = 0;
28332835
tabentry->tuples_fetched = 0;
28342836
tabentry->tuples_inserted = 0;
2835-
tabentry->tuples_deleted = 0;
28362837
tabentry->tuples_updated = 0;
2838+
tabentry->tuples_deleted = 0;
28372839

28382840
tabentry->n_live_tuples = msg->m_live_tuples;
28392841
tabentry->n_dead_tuples = msg->m_dead_tuples;
28402842
tabentry->last_anl_tuples = msg->m_live_tuples + msg->m_dead_tuples;
28412843

28422844
tabentry->blocks_fetched = 0;
28432845
tabentry->blocks_hit = 0;
2846+
2847+
tabentry->destroy = 0;
28442848
}
28452849
else
28462850
{
@@ -2931,12 +2935,14 @@ pgstat_recv_tabstat(PgStat_MsgTabstat *msg, int len)
29312935
tabentry->tuples_inserted = tabmsg[i].t_tuples_inserted;
29322936
tabentry->tuples_updated = tabmsg[i].t_tuples_updated;
29332937
tabentry->tuples_deleted = tabmsg[i].t_tuples_deleted;
2934-
tabentry->blocks_fetched = tabmsg[i].t_blocks_fetched;
2935-
tabentry->blocks_hit = tabmsg[i].t_blocks_hit;
29362938

29372939
tabentry->n_live_tuples = tabmsg[i].t_tuples_inserted;
29382940
tabentry->n_dead_tuples = tabmsg[i].t_tuples_updated +
29392941
tabmsg[i].t_tuples_deleted;
2942+
tabentry->last_anl_tuples = 0;
2943+
2944+
tabentry->blocks_fetched = tabmsg[i].t_blocks_fetched;
2945+
tabentry->blocks_hit = tabmsg[i].t_blocks_hit;
29402946

29412947
tabentry->destroy = 0;
29422948
}
@@ -2951,12 +2957,13 @@ pgstat_recv_tabstat(PgStat_MsgTabstat *msg, int len)
29512957
tabentry->tuples_inserted += tabmsg[i].t_tuples_inserted;
29522958
tabentry->tuples_updated += tabmsg[i].t_tuples_updated;
29532959
tabentry->tuples_deleted += tabmsg[i].t_tuples_deleted;
2954-
tabentry->blocks_fetched += tabmsg[i].t_blocks_fetched;
2955-
tabentry->blocks_hit += tabmsg[i].t_blocks_hit;
29562960

29572961
tabentry->n_live_tuples += tabmsg[i].t_tuples_inserted;
29582962
tabentry->n_dead_tuples += tabmsg[i].t_tuples_updated +
29592963
tabmsg[i].t_tuples_deleted;
2964+
2965+
tabentry->blocks_fetched += tabmsg[i].t_blocks_fetched;
2966+
tabentry->blocks_hit += tabmsg[i].t_blocks_hit;
29602967
}
29612968

29622969
/*

0 commit comments

Comments
 (0)