<!--
Documentation of the system catalogs, directed toward PostgreSQL developers
- $PostgreSQL: pgsql/doc/src/sgml/catalogs.sgml,v 2.104 2005/06/17 22:32:41 tgl Exp $
+ $PostgreSQL: pgsql/doc/src/sgml/catalogs.sgml,v 2.105 2005/06/18 19:33:41 tgl Exp $
-->
<chapter id="catalogs">
<literal>extend</>,
<literal>page</>,
<literal>tuple</>,
- <literal>transaction</>,
+ <literal>transactionid</>,
<literal>object</>, or
<literal>userlock</>
</entry>
</entry>
</row>
<row>
- <entry><structfield>transaction</structfield></entry>
+ <entry><structfield>transactionid</structfield></entry>
<entry><type>xid</type></entry>
<entry></entry>
<entry>
zero. NULL if the object is not a general database object
</entry>
</row>
+ <row>
+ <entry><structfield>transaction</structfield></entry>
+ <entry><type>xid</type></entry>
+ <entry></entry>
+ <entry>
+ ID of the transaction that is holding or awaiting this lock.
+ </entry>
+ </row>
<row>
<entry><structfield>pid</structfield></entry>
<entry><type>integer</type></entry>
<entry></entry>
<entry>
Process ID of the server process holding or awaiting this
- lock. Zero if the lock is held by a prepared transaction.
+ lock. Null if the lock is held by a prepared transaction.
</entry>
</row>
<row>
<para>
<structfield>granted</structfield> is true in a row representing a lock
- held by the indicated session. False indicates that this session is
+ held by the indicated transaction. False indicates that this transaction is
currently waiting to acquire this lock, which implies that some other
- session is holding a conflicting lock mode on the same lockable object.
- The waiting session will sleep until the other lock is released (or a
- deadlock situation is detected). A single session can be waiting to acquire
- at most one lock at a time.
+ transaction is holding a conflicting lock mode on the same lockable object.
+ The waiting transaction will sleep until the other lock is released (or a
+ deadlock situation is detected). A single transaction can be waiting to
+ acquire at most one lock at a time.
</para>
<para>
<structfield>procpid</structfield> column of the
<structname>pg_stat_activity</structname> view to get more
information on the session holding or waiting to hold the lock.
+ Also, if you are using prepared transactions, the
+ <structfield>transaction</> column can be joined to the
+ <structfield>transaction</structfield> column of the
+ <structname>pg_prepared_xacts</structname> view to get more
+ information on prepared transactions that hold locks.
+ (A prepared transaction can never be waiting for a lock,
+ but it continues to hold the locks it acquired while running.)
</para>
</sect1>
Global transaction identifier that was assigned to the transaction
</entry>
</row>
+ <row>
+ <entry><structfield>prepared</structfield></entry>
+ <entry><type>timestamp with time zone</type></entry>
+ <entry></entry>
+ <entry>
+ Time at which the transaction was prepared for commit
+ </entry>
+ </row>
<row>
<entry><structfield>owner</structfield></entry>
<entry><type>name</type></entry>
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.2 2005/06/18 05:21:09 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.3 2005/06/18 19:33:41 tgl Exp $
*
* NOTES
* Each global transaction is associated with a global transaction
typedef struct GlobalTransactionData
{
PGPROC proc; /* dummy proc */
+ TimestampTz prepared_at; /* time of preparation */
AclId owner; /* ID of user that executed the xact */
TransactionId locking_xid; /* top-level XID of backend working on xact */
bool valid; /* TRUE if fully prepared */
* assuming that we can use very much backend context.
*/
GlobalTransaction
-MarkAsPreparing(TransactionId xid, Oid databaseid, char *gid, AclId owner)
+MarkAsPreparing(TransactionId xid, const char *gid,
+ TimestampTz prepared_at, AclId owner, Oid databaseid)
{
GlobalTransaction gxact;
int i;
gxact->proc.subxids.overflowed = false;
gxact->proc.subxids.nxids = 0;
+ gxact->prepared_at = prepared_at;
gxact->owner = owner;
gxact->locking_xid = xid;
gxact->valid = false;
* Locate the prepared transaction and mark it busy for COMMIT or PREPARE.
*/
static GlobalTransaction
-LockGXact(char *gid, AclId user)
+LockGXact(const char *gid, AclId user)
{
int i;
/* build tupdesc for result tuples */
/* this had better match pg_prepared_xacts view in system_views.sql */
- tupdesc = CreateTemplateTupleDesc(4, false);
+ tupdesc = CreateTemplateTupleDesc(5, false);
TupleDescInitEntry(tupdesc, (AttrNumber) 1, "transaction",
XIDOID, -1, 0);
TupleDescInitEntry(tupdesc, (AttrNumber) 2, "gid",
TEXTOID, -1, 0);
- TupleDescInitEntry(tupdesc, (AttrNumber) 3, "ownerid",
+ TupleDescInitEntry(tupdesc, (AttrNumber) 3, "prepared",
+ TIMESTAMPTZOID, -1, 0);
+ TupleDescInitEntry(tupdesc, (AttrNumber) 4, "ownerid",
INT4OID, -1, 0);
- TupleDescInitEntry(tupdesc, (AttrNumber) 4, "dbid",
+ TupleDescInitEntry(tupdesc, (AttrNumber) 5, "dbid",
OIDOID, -1, 0);
funcctx->tuple_desc = BlessTupleDesc(tupdesc);
while (status->array != NULL && status->currIdx < status->ngxacts)
{
GlobalTransaction gxact = &status->array[status->currIdx++];
- Datum values[4];
- bool nulls[4];
+ Datum values[5];
+ bool nulls[5];
HeapTuple tuple;
Datum result;
values[0] = TransactionIdGetDatum(gxact->proc.xid);
values[1] = DirectFunctionCall1(textin, CStringGetDatum(gxact->gid));
- values[2] = Int32GetDatum(gxact->owner);
- values[3] = ObjectIdGetDatum(gxact->proc.databaseId);
+ values[2] = TimestampTzGetDatum(gxact->prepared_at);
+ values[3] = Int32GetDatum(gxact->owner);
+ values[4] = ObjectIdGetDatum(gxact->proc.databaseId);
tuple = heap_form_tuple(funcctx->tuple_desc, values, nulls);
result = HeapTupleGetDatum(tuple);
/*
* Header for a 2PC state file
*/
-#define TWOPHASE_MAGIC 0x57F94530 /* format identifier */
+#define TWOPHASE_MAGIC 0x57F94531 /* format identifier */
typedef struct TwoPhaseFileHeader
{
uint32 total_len; /* actual file length */
TransactionId xid; /* original transaction XID */
Oid database; /* OID of database it was in */
+ TimestampTz prepared_at; /* time of preparation */
AclId owner; /* user running the transaction */
int32 nsubxacts; /* number of following subxact XIDs */
int32 ncommitrels; /* number of delete-on-commit rels */
hdr.magic = TWOPHASE_MAGIC;
hdr.total_len = 0; /* EndPrepare will fill this in */
hdr.xid = xid;
- hdr.database = MyDatabaseId;
- hdr.owner = GetUserId();
+ hdr.database = gxact->proc.databaseId;
+ hdr.prepared_at = gxact->prepared_at;
+ hdr.owner = gxact->owner;
hdr.nsubxacts = xactGetCommittedChildren(&children);
hdr.ncommitrels = smgrGetPendingDeletes(true, &commitrels);
hdr.nabortrels = smgrGetPendingDeletes(false, &abortrels);
* FinishPreparedTransaction: execute COMMIT PREPARED or ROLLBACK PREPARED
*/
void
-FinishPreparedTransaction(char *gid, bool isCommit)
+FinishPreparedTransaction(const char *gid, bool isCommit)
{
GlobalTransaction gxact;
TransactionId xid;
/*
* Reconstruct subtrans state for the transaction --- needed
- * because pg_subtrans is not preserved over a restart
+ * because pg_subtrans is not preserved over a restart. Note
+ * that we are linking all the subtransactions directly to the
+ * top-level XID; there may originally have been a more complex
+ * hierarchy, but there's no need to restore that exactly.
*/
for (i = 0; i < hdr->nsubxacts; i++)
SubTransSetParent(subxids[i], xid);
/*
* Recreate its GXACT and dummy PGPROC
*/
- gxact = MarkAsPreparing(xid, hdr->database, hdr->gid, hdr->owner);
+ gxact = MarkAsPreparing(xid, hdr->gid,
+ hdr->prepared_at,
+ hdr->owner, hdr->database);
GXactLoadSubxactData(gxact, hdr->nsubxacts, subxids);
MarkAsPrepared(gxact);
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.205 2005/06/17 22:32:42 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.206 2005/06/18 19:33:41 tgl Exp $
*
*-------------------------------------------------------------------------
*/
TransactionState s = CurrentTransactionState;
TransactionId xid = GetCurrentTransactionId();
GlobalTransaction gxact;
+ TimestampTz prepared_at;
+ AbsoluteTime PreparedSec; /* integer part */
+ int PreparedUSec; /* microsecond part */
ShowTransactionState("PrepareTransaction");
*/
s->state = TRANS_PREPARE;
+ PreparedSec = GetCurrentAbsoluteTimeUsec(&PreparedUSec);
+ prepared_at = AbsoluteTimeUsecToTimestampTz(PreparedSec, PreparedUSec);
+
/* Tell bufmgr and smgr to prepare for commit */
BufmgrCommit();
* Reserve the GID for this transaction. This could fail if the
* requested GID is invalid or already in use.
*/
- gxact = MarkAsPreparing(xid, MyDatabaseId, prepareGID, GetUserId());
+ gxact = MarkAsPreparing(xid, prepareGID, prepared_at,
+ GetUserId(), MyDatabaseId);
prepareGID = NULL;
/*
*
* Copyright (c) 1996-2005, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/backend/catalog/system_views.sql,v 1.14 2005/06/17 22:32:43 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/catalog/system_views.sql,v 1.15 2005/06/18 19:33:42 tgl Exp $
*/
CREATE VIEW pg_user AS
SELECT *
FROM pg_lock_status() AS L
(locktype text, database oid, relation oid, page int4, tuple int2,
- transaction xid, classid oid, objid oid, objsubid int2,
- pid int4, mode text, granted boolean);
+ transactionid xid, classid oid, objid oid, objsubid int2,
+ transaction xid, pid int4, mode text, granted boolean);
CREATE VIEW pg_prepared_xacts AS
- SELECT P.transaction, P.gid, U.usename AS owner, D.datname AS database
+ SELECT P.transaction, P.gid, P.prepared,
+ U.usename AS owner, D.datname AS database
FROM pg_prepared_xact() AS P
- (transaction xid, gid text, ownerid int4, dbid oid)
- LEFT JOIN pg_database D ON P.dbid = D.oid
- LEFT JOIN pg_shadow U ON P.ownerid = U.usesysid;
+ (transaction xid, gid text, prepared timestamptz, ownerid int4, dbid oid)
+ LEFT JOIN pg_shadow U ON P.ownerid = U.usesysid
+ LEFT JOIN pg_database D ON P.dbid = D.oid;
CREATE VIEW pg_settings AS
SELECT *
* Copyright (c) 2002-2005, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/lockfuncs.c,v 1.18 2005/05/17 21:46:10 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/lockfuncs.c,v 1.19 2005/06/18 19:33:42 tgl Exp $
*
*-------------------------------------------------------------------------
*/
"extend",
"page",
"tuple",
- "transaction",
+ "transactionid",
"object",
"userlock"
};
/* build tupdesc for result tuples */
/* this had better match pg_locks view in system_views.sql */
- tupdesc = CreateTemplateTupleDesc(12, false);
+ tupdesc = CreateTemplateTupleDesc(13, false);
TupleDescInitEntry(tupdesc, (AttrNumber) 1, "locktype",
TEXTOID, -1, 0);
TupleDescInitEntry(tupdesc, (AttrNumber) 2, "database",
INT4OID, -1, 0);
TupleDescInitEntry(tupdesc, (AttrNumber) 5, "tuple",
INT2OID, -1, 0);
- TupleDescInitEntry(tupdesc, (AttrNumber) 6, "transaction",
+ TupleDescInitEntry(tupdesc, (AttrNumber) 6, "transactionid",
XIDOID, -1, 0);
TupleDescInitEntry(tupdesc, (AttrNumber) 7, "classid",
OIDOID, -1, 0);
OIDOID, -1, 0);
TupleDescInitEntry(tupdesc, (AttrNumber) 9, "objsubid",
INT2OID, -1, 0);
- TupleDescInitEntry(tupdesc, (AttrNumber) 10, "pid",
+ TupleDescInitEntry(tupdesc, (AttrNumber) 10, "transaction",
+ XIDOID, -1, 0);
+ TupleDescInitEntry(tupdesc, (AttrNumber) 11, "pid",
INT4OID, -1, 0);
- TupleDescInitEntry(tupdesc, (AttrNumber) 11, "mode",
+ TupleDescInitEntry(tupdesc, (AttrNumber) 12, "mode",
TEXTOID, -1, 0);
- TupleDescInitEntry(tupdesc, (AttrNumber) 12, "granted",
+ TupleDescInitEntry(tupdesc, (AttrNumber) 13, "granted",
BOOLOID, -1, 0);
funcctx->tuple_desc = BlessTupleDesc(tupdesc);
LOCKMODE mode = 0;
const char *locktypename;
char tnbuf[32];
- Datum values[12];
- char nulls[12];
+ Datum values[13];
+ char nulls[13];
HeapTuple tuple;
Datum result;
break;
}
- values[9] = Int32GetDatum(proc->pid);
- values[10] = DirectFunctionCall1(textin,
+ values[9] = TransactionIdGetDatum(proc->xid);
+ if (proc->pid != 0)
+ values[10] = Int32GetDatum(proc->pid);
+ else
+ nulls[10] = 'n';
+ values[11] = DirectFunctionCall1(textin,
CStringGetDatum(GetLockmodeName(mode)));
- values[11] = BoolGetDatum(granted);
+ values[12] = BoolGetDatum(granted);
tuple = heap_formtuple(funcctx->tuple_desc, values, nulls);
result = HeapTupleGetDatum(tuple);
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/access/twophase.h,v 1.1 2005/06/17 22:32:48 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/access/twophase.h,v 1.2 2005/06/18 19:33:42 tgl Exp $
*
*-------------------------------------------------------------------------
*/
#define TWOPHASE_H
#include "storage/lock.h"
+#include "utils/timestamp.h"
/*
extern PGPROC *TwoPhaseGetDummyProc(TransactionId xid);
-extern GlobalTransaction MarkAsPreparing(TransactionId xid, Oid databaseid,
- char *gid, AclId owner);
+extern GlobalTransaction MarkAsPreparing(TransactionId xid, const char *gid,
+ TimestampTz prepared_at,
+ AclId owner, Oid databaseid);
extern void MarkAsPrepared(GlobalTransaction gxact);
extern void StartPrepare(GlobalTransaction gxact);
extern void RecreateTwoPhaseFile(TransactionId xid, void *content, int len);
extern void RemoveTwoPhaseFile(TransactionId xid, bool giveWarning);
-extern void FinishPreparedTransaction(char *gid, bool isCommit);
+extern void FinishPreparedTransaction(const char *gid, bool isCommit);
#endif /* TWOPHASE_H */
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.277 2005/06/17 22:32:48 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.278 2005/06/18 19:33:42 tgl Exp $
*
*-------------------------------------------------------------------------
*/
*/
/* yyyymmddN */
-#define CATALOG_VERSION_NO 200506171
+#define CATALOG_VERSION_NO 200506181
#endif
--------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
iexit | SELECT ih.name, ih.thepath, interpt_pp(ih.thepath, r.thepath) AS exit FROM ihighway ih, ramp r WHERE (ih.thepath ## r.thepath);
pg_indexes | SELECT n.nspname AS schemaname, c.relname AS tablename, i.relname AS indexname, t.spcname AS "tablespace", pg_get_indexdef(i.oid) AS indexdef FROM ((((pg_index x JOIN pg_class c ON ((c.oid = x.indrelid))) JOIN pg_class i ON ((i.oid = x.indexrelid))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) LEFT JOIN pg_tablespace t ON ((t.oid = i.reltablespace))) WHERE ((c.relkind = 'r'::"char") AND (i.relkind = 'i'::"char"));
- pg_locks | SELECT l.locktype, l."database", l.relation, l.page, l.tuple, l."transaction", l.classid, l.objid, l.objsubid, l.pid, l."mode", l.granted FROM pg_lock_status() l(locktype text, "database" oid, relation oid, page integer, tuple smallint, "transaction" xid, classid oid, objid oid, objsubid smallint, pid integer, "mode" text, granted boolean);
- pg_prepared_xacts | SELECT p."transaction", p.gid, u.usename AS "owner", d.datname AS "database" FROM ((pg_prepared_xact() p("transaction" xid, gid text, ownerid integer, dbid oid) LEFT JOIN pg_database d ON ((p.dbid = d.oid))) LEFT JOIN pg_shadow u ON ((p.ownerid = u.usesysid)));
+ pg_locks | SELECT l.locktype, l."database", l.relation, l.page, l.tuple, l.transactionid, l.classid, l.objid, l.objsubid, l."transaction", l.pid, l."mode", l.granted FROM pg_lock_status() l(locktype text, "database" oid, relation oid, page integer, tuple smallint, transactionid xid, classid oid, objid oid, objsubid smallint, "transaction" xid, pid integer, "mode" text, granted boolean);
+ pg_prepared_xacts | SELECT p."transaction", p.gid, p."prepared", u.usename AS "owner", d.datname AS "database" FROM ((pg_prepared_xact() p("transaction" xid, gid text, "prepared" timestamp with time zone, ownerid integer, dbid oid) LEFT JOIN pg_shadow u ON ((p.ownerid = u.usesysid))) LEFT JOIN pg_database d ON ((p.dbid = d.oid)));
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);
pg_settings | SELECT a.name, a.setting, 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, category text, short_desc text, extra_desc text, context text, vartype text, source text, min_val text, max_val text);
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.usename, pg_stat_get_backend_activity(s.backendid) AS current_query, 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_shadow u WHERE ((pg_stat_get_backend_dbid(s.backendid) = d.oid) AND (pg_stat_get_backend_userid(s.backendid) = u.usesysid));
projects / postgresql.git / commitdiff