Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitef4d38c

Browse files
committed
Rename recently-added pg_stat_activity column from txn_start to xact_start,
for consistency with other column names such as in pg_stat_database.
1 parent82a4798 commitef4d38c

File tree

8 files changed

+24
-25
lines changed

8 files changed

+24
-25
lines changed

‎src/backend/access/transam/xact.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.250 2007/09/08 20:31:14 tgl Exp $
13+
* $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.251 2007/09/11 03:28:05 tgl Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -1454,7 +1454,7 @@ StartTransaction(void)
14541454
*/
14551455
xactStartTimestamp=stmtStartTimestamp;
14561456
xactStopTimestamp=0;
1457-
pgstat_report_txn_timestamp(xactStartTimestamp);
1457+
pgstat_report_xact_timestamp(xactStartTimestamp);
14581458

14591459
/*
14601460
* initialize current transaction state fields
@@ -1648,7 +1648,7 @@ CommitTransaction(void)
16481648
AtEOXact_ComboCid();
16491649
AtEOXact_HashTables(true);
16501650
AtEOXact_PgStat(true);
1651-
pgstat_report_txn_timestamp(0);
1651+
pgstat_report_xact_timestamp(0);
16521652

16531653
CurrentResourceOwner=NULL;
16541654
ResourceOwnerDelete(TopTransactionResourceOwner);
@@ -1999,7 +1999,7 @@ AbortTransaction(void)
19991999
AtEOXact_ComboCid();
20002000
AtEOXact_HashTables(false);
20012001
AtEOXact_PgStat(false);
2002-
pgstat_report_txn_timestamp(0);
2002+
pgstat_report_xact_timestamp(0);
20032003

20042004
/*
20052005
* State remains TRANS_ABORT until CleanupTransaction().

‎src/backend/catalog/system_views.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (c) 1996-2007, PostgreSQL Global Development Group
55
*
6-
* $PostgreSQL: pgsql/src/backend/catalog/system_views.sql,v 1.42 2007/09/05 18:10:47 tgl Exp $
6+
* $PostgreSQL: pgsql/src/backend/catalog/system_views.sql,v 1.43 2007/09/11 03:28:05 tgl Exp $
77
*/
88

99
CREATEVIEWpg_rolesAS
@@ -347,7 +347,7 @@ CREATE VIEW pg_stat_activity AS
347347
U.rolnameAS usename,
348348
pg_stat_get_backend_activity(S.backendid)AS current_query,
349349
pg_stat_get_backend_waiting(S.backendid)AS waiting,
350-
pg_stat_get_backend_txn_start(S.backendid)AStxn_start,
350+
pg_stat_get_backend_xact_start(S.backendid)ASxact_start,
351351
pg_stat_get_backend_activity_start(S.backendid)AS query_start,
352352
pg_stat_get_backend_start(S.backendid)AS backend_start,
353353
pg_stat_get_backend_client_addr(S.backendid)AS client_addr,

‎src/backend/postmaster/pgstat.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*
1414
*Copyright (c) 2001-2007, PostgreSQL Global Development Group
1515
*
16-
*$PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.162 2007/08/02 23:39:44 adunstan Exp $
16+
*$PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.163 2007/09/11 03:28:05 tgl Exp $
1717
* ----------
1818
*/
1919
#include"postgres.h"
@@ -1854,7 +1854,7 @@ pgstat_bestart(void)
18541854
beentry->st_procpid=MyProcPid;
18551855
beentry->st_proc_start_timestamp=proc_start_timestamp;
18561856
beentry->st_activity_start_timestamp=0;
1857-
beentry->st_txn_start_timestamp=0;
1857+
beentry->st_xact_start_timestamp=0;
18581858
beentry->st_databaseid=MyDatabaseId;
18591859
beentry->st_userid=userid;
18601860
beentry->st_clientaddr=clientaddr;
@@ -1939,12 +1939,11 @@ pgstat_report_activity(const char *cmd_str)
19391939
}
19401940

19411941
/*
1942-
* Set the current transaction start timestamp to the specified
1943-
* value. If there is no current active transaction, this is signified
1944-
* by 0.
1942+
* Report current transaction start timestamp as the specified value.
1943+
* Zero means there is no active transaction.
19451944
*/
19461945
void
1947-
pgstat_report_txn_timestamp(TimestampTztstamp)
1946+
pgstat_report_xact_timestamp(TimestampTztstamp)
19481947
{
19491948
volatilePgBackendStatus*beentry=MyBEEntry;
19501949

@@ -1957,7 +1956,7 @@ pgstat_report_txn_timestamp(TimestampTz tstamp)
19571956
* here to ensure the compiler doesn't try to get cute.
19581957
*/
19591958
beentry->st_changecount++;
1960-
beentry->st_txn_start_timestamp=tstamp;
1959+
beentry->st_xact_start_timestamp=tstamp;
19611960
beentry->st_changecount++;
19621961
Assert((beentry->st_changecount&1)==0);
19631962
}

‎src/backend/utils/adt/pgstatfuncs.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/adt/pgstatfuncs.c,v 1.43 2007/06/28 00:02:39 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/adt/pgstatfuncs.c,v 1.44 2007/09/11 03:28:05 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -45,7 +45,7 @@ extern Datum pg_stat_get_backend_userid(PG_FUNCTION_ARGS);
4545
externDatumpg_stat_get_backend_activity(PG_FUNCTION_ARGS);
4646
externDatumpg_stat_get_backend_waiting(PG_FUNCTION_ARGS);
4747
externDatumpg_stat_get_backend_activity_start(PG_FUNCTION_ARGS);
48-
externDatumpg_stat_get_backend_txn_start(PG_FUNCTION_ARGS);
48+
externDatumpg_stat_get_backend_xact_start(PG_FUNCTION_ARGS);
4949
externDatumpg_stat_get_backend_start(PG_FUNCTION_ARGS);
5050
externDatumpg_stat_get_backend_client_addr(PG_FUNCTION_ARGS);
5151
externDatumpg_stat_get_backend_client_port(PG_FUNCTION_ARGS);
@@ -464,7 +464,7 @@ pg_stat_get_backend_activity_start(PG_FUNCTION_ARGS)
464464

465465

466466
Datum
467-
pg_stat_get_backend_txn_start(PG_FUNCTION_ARGS)
467+
pg_stat_get_backend_xact_start(PG_FUNCTION_ARGS)
468468
{
469469
int32beid=PG_GETARG_INT32(0);
470470
TimestampTzresult;
@@ -476,7 +476,7 @@ pg_stat_get_backend_txn_start(PG_FUNCTION_ARGS)
476476
if (!superuser()&&beentry->st_userid!=GetUserId())
477477
PG_RETURN_NULL();
478478

479-
result=beentry->st_txn_start_timestamp;
479+
result=beentry->st_xact_start_timestamp;
480480

481481
if (result==0)/* not in a transaction */
482482
PG_RETURN_NULL();

‎src/include/catalog/catversion.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
3838
* Portions Copyright (c) 1994, Regents of the University of California
3939
*
40-
* $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.423 2007/09/05 18:10:48 tgl Exp $
40+
* $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.424 2007/09/11 03:28:05 tgl Exp $
4141
*
4242
*-------------------------------------------------------------------------
4343
*/
@@ -53,6 +53,6 @@
5353
*/
5454

5555
/*yyyymmddN */
56-
#defineCATALOG_VERSION_NO200709042
56+
#defineCATALOG_VERSION_NO200709101
5757

5858
#endif

‎src/include/catalog/pg_proc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.468 2007/09/04 16:41:42 adunstan Exp $
10+
* $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.469 2007/09/11 03:28:05 tgl Exp $
1111
*
1212
* NOTES
1313
* The script catalog/genbki.sh reads this file and generates .bki
@@ -2899,7 +2899,7 @@ DATA(insert OID = 2853 ( pg_stat_get_backend_waitingPGNSP PGUID 12 1 0 f f t f
28992899
DESCR("statistics: is backend currently waiting for a lock");
29002900
DATA(insertOID=2094 (pg_stat_get_backend_activity_startPGNSPPGUID1210fftfs11184"23"_null__null__null_pg_stat_get_backend_activity_start-_null__null_ ));
29012901
DESCR("statistics: start time for current query of backend");
2902-
DATA(insertOID=2857 (pg_stat_get_backend_txn_startPGNSPPGUID1210fftfs11184"23"_null__null__null_pg_stat_get_backend_txn_start-_null__null_ ));
2902+
DATA(insertOID=2857 (pg_stat_get_backend_xact_startPGNSPPGUID1210fftfs11184"23"_null__null__null_pg_stat_get_backend_xact_start-_null__null_ ));
29032903
DESCR("statistics: start time for backend's current transaction");
29042904
DATA(insertOID=1391 (pg_stat_get_backend_startPGNSPPGUID1210fftfs11184"23"_null__null__null_pg_stat_get_backend_start-_null__null_ ));
29052905
DESCR("statistics: start time for current backend session");

‎src/include/pgstat.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
*Copyright (c) 2001-2007, PostgreSQL Global Development Group
77
*
8-
*$PostgreSQL: pgsql/src/include/pgstat.h,v 1.64 2007/07/08 22:23:16 tgl Exp $
8+
*$PostgreSQL: pgsql/src/include/pgstat.h,v 1.65 2007/09/11 03:28:05 tgl Exp $
99
* ----------
1010
*/
1111
#ifndefPGSTAT_H
@@ -430,7 +430,7 @@ typedef struct PgBackendStatus
430430

431431
/* Times when current backend, transaction, and activity started */
432432
TimestampTzst_proc_start_timestamp;
433-
TimestampTzst_txn_start_timestamp;
433+
TimestampTzst_xact_start_timestamp;
434434
TimestampTzst_activity_start_timestamp;
435435

436436
/* Database OID, owning user's OID, connection client address */
@@ -501,7 +501,7 @@ extern void pgstat_initialize(void);
501501
externvoidpgstat_bestart(void);
502502

503503
externvoidpgstat_report_activity(constchar*what);
504-
externvoidpgstat_report_txn_timestamp(TimestampTztstamp);
504+
externvoidpgstat_report_xact_timestamp(TimestampTztstamp);
505505
externvoidpgstat_report_waiting(boolwaiting);
506506

507507
externvoidpgstat_initstats(Relationrel);

‎src/test/regress/expected/rules.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,7 @@ SELECT viewname, definition FROM pg_views WHERE schemaname <> 'information_schem
12891289
pg_rules | SELECT n.nspname AS schemaname, c.relname AS tablename, r.rulename, pg_get_ruledef(r.oid) AS definition FROM ((pg_rewrite r JOIN pg_class c ON ((c.oid = r.ev_class))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE (r.rulename <> '_RETURN'::name);
12901290
pg_settings | SELECT a.name, a.setting, a.unit, a.category, a.short_desc, a.extra_desc, a.context, a.vartype, a.source, a.min_val, a.max_val FROM pg_show_all_settings() a(name text, setting text, unit text, category text, short_desc text, extra_desc text, context text, vartype text, source text, min_val text, max_val text);
12911291
pg_shadow | SELECT pg_authid.rolname AS usename, pg_authid.oid AS usesysid, pg_authid.rolcreatedb AS usecreatedb, pg_authid.rolsuper AS usesuper, pg_authid.rolcatupdate AS usecatupd, pg_authid.rolpassword AS passwd, (pg_authid.rolvaliduntil)::abstime AS valuntil, pg_authid.rolconfig AS useconfig FROM pg_authid WHERE pg_authid.rolcanlogin;
1292-
pg_stat_activity | SELECT d.oid AS datid, d.datname, pg_stat_get_backend_pid(s.backendid) AS procpid, pg_stat_get_backend_userid(s.backendid) AS usesysid, u.rolname AS usename, pg_stat_get_backend_activity(s.backendid) AS current_query, pg_stat_get_backend_waiting(s.backendid) AS waiting,pg_stat_get_backend_txn_start(s.backendid) AStxn_start, pg_stat_get_backend_activity_start(s.backendid) AS query_start, pg_stat_get_backend_start(s.backendid) AS backend_start, pg_stat_get_backend_client_addr(s.backendid) AS client_addr, pg_stat_get_backend_client_port(s.backendid) AS client_port FROM pg_database d, (SELECT pg_stat_get_backend_idset() AS backendid) s, pg_authid u WHERE ((pg_stat_get_backend_dbid(s.backendid) = d.oid) AND (pg_stat_get_backend_userid(s.backendid) = u.oid));
1292+
pg_stat_activity | SELECT d.oid AS datid, d.datname, pg_stat_get_backend_pid(s.backendid) AS procpid, pg_stat_get_backend_userid(s.backendid) AS usesysid, u.rolname AS usename, pg_stat_get_backend_activity(s.backendid) AS current_query, pg_stat_get_backend_waiting(s.backendid) AS waiting,pg_stat_get_backend_xact_start(s.backendid) ASxact_start, pg_stat_get_backend_activity_start(s.backendid) AS query_start, pg_stat_get_backend_start(s.backendid) AS backend_start, pg_stat_get_backend_client_addr(s.backendid) AS client_addr, pg_stat_get_backend_client_port(s.backendid) AS client_port FROM pg_database d, (SELECT pg_stat_get_backend_idset() AS backendid) s, pg_authid u WHERE ((pg_stat_get_backend_dbid(s.backendid) = d.oid) AND (pg_stat_get_backend_userid(s.backendid) = u.oid));
12931293
pg_stat_all_indexes | SELECT c.oid AS relid, i.oid AS indexrelid, n.nspname AS schemaname, c.relname, i.relname AS indexrelname, pg_stat_get_numscans(i.oid) AS idx_scan, pg_stat_get_tuples_returned(i.oid) AS idx_tup_read, pg_stat_get_tuples_fetched(i.oid) AS idx_tup_fetch FROM (((pg_class c JOIN pg_index x ON ((c.oid = x.indrelid))) JOIN pg_class i ON ((i.oid = x.indexrelid))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE (c.relkind = ANY (ARRAY['r'::"char", 't'::"char"]));
12941294
pg_stat_all_tables | SELECT c.oid AS relid, n.nspname AS schemaname, c.relname, pg_stat_get_numscans(c.oid) AS seq_scan, pg_stat_get_tuples_returned(c.oid) AS seq_tup_read, (sum(pg_stat_get_numscans(i.indexrelid)))::bigint AS idx_scan, ((sum(pg_stat_get_tuples_fetched(i.indexrelid)))::bigint + pg_stat_get_tuples_fetched(c.oid)) AS idx_tup_fetch, pg_stat_get_tuples_inserted(c.oid) AS n_tup_ins, pg_stat_get_tuples_updated(c.oid) AS n_tup_upd, pg_stat_get_tuples_deleted(c.oid) AS n_tup_del, pg_stat_get_live_tuples(c.oid) AS n_live_tup, pg_stat_get_dead_tuples(c.oid) AS n_dead_tup, pg_stat_get_last_vacuum_time(c.oid) AS last_vacuum, pg_stat_get_last_autovacuum_time(c.oid) AS last_autovacuum, pg_stat_get_last_analyze_time(c.oid) AS last_analyze, pg_stat_get_last_autoanalyze_time(c.oid) AS last_autoanalyze FROM ((pg_class c LEFT JOIN pg_index i ON ((c.oid = i.indrelid))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) WHERE (c.relkind = ANY (ARRAY['r'::"char", 't'::"char"])) GROUP BY c.oid, n.nspname, c.relname;
12951295
pg_stat_bgwriter | SELECT pg_stat_get_bgwriter_timed_checkpoints() AS checkpoints_timed, pg_stat_get_bgwriter_requested_checkpoints() AS checkpoints_req, pg_stat_get_bgwriter_buf_written_checkpoints() AS buffers_checkpoint, pg_stat_get_bgwriter_buf_written_clean() AS buffers_clean, pg_stat_get_bgwriter_maxwritten_clean() AS maxwritten_clean;

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp