mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lmgr.c:DescribeLockTag was never taught about virtual xids, per Greg Stark.

Browse Source 
Also a couple of minor tweaks to try to future-proof the code a bit better
against future locktag additions.
This commit is contained in:
Tom Lane 2008-01-08 23:18:51 +00:00
parent bbd3bdba3e
commit da3df47c84
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/backend/storage/lmgr/lmgr.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/storage/lmgr/lmgr.c,v 1.95 2008/01/01 19:45:52 momjian Exp $ * $PostgreSQL: pgsql/src/backend/storage/lmgr/lmgr.c,v 1.96 2008/01/08 23:18:50 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -672,7 +672,7 @@ UnlockSharedObject(Oid classid, Oid objid, uint16 objsubid,
bool bool
LockTagIsTemp(const LOCKTAG *tag) LockTagIsTemp(const LOCKTAG *tag)
{ {
switch (tag->locktag_type) switch ((LockTagType) tag->locktag_type)
{ {
case LOCKTAG_RELATION: case LOCKTAG_RELATION:
case LOCKTAG_RELATION_EXTEND: case LOCKTAG_RELATION_EXTEND:
@ -686,6 +686,7 @@ LockTagIsTemp(const LOCKTAG *tag)
return true; return true;
break; break;
case LOCKTAG_TRANSACTION: case LOCKTAG_TRANSACTION:
case LOCKTAG_VIRTUALTRANSACTION:
/* there are no temp transactions */ /* there are no temp transactions */
break; break;
case LOCKTAG_OBJECT: case LOCKTAG_OBJECT:
@ -710,7 +711,7 @@ LockTagIsTemp(const LOCKTAG *tag)
void void
DescribeLockTag(StringInfo buf, const LOCKTAG *tag) DescribeLockTag(StringInfo buf, const LOCKTAG *tag)
{ {
switch (tag->locktag_type) switch ((LockTagType) tag->locktag_type)
{ {
case LOCKTAG_RELATION: case LOCKTAG_RELATION:
appendStringInfo(buf, appendStringInfo(buf,
@ -744,6 +745,12 @@ DescribeLockTag(StringInfo buf, const LOCKTAG *tag)
_("transaction %u"), _("transaction %u"),
tag->locktag_field1); tag->locktag_field1);
break; break;
case LOCKTAG_VIRTUALTRANSACTION:
appendStringInfo(buf,
_("virtual transaction %d/%u"),
tag->locktag_field1,
tag->locktag_field2);
break;
case LOCKTAG_OBJECT: case LOCKTAG_OBJECT:
appendStringInfo(buf, appendStringInfo(buf,
_("object %u of class %u of database %u"), _("object %u of class %u of database %u"),
@ -770,7 +777,7 @@ DescribeLockTag(StringInfo buf, const LOCKTAG *tag)
default: default:
appendStringInfo(buf, appendStringInfo(buf,
_("unrecognized locktag type %d"), _("unrecognized locktag type %d"),
tag->locktag_type); (int) tag->locktag_type);
break; break;
} }
} }

6
src/backend/utils/adt/lockfuncs.c
View File

@ -6,7 +6,7 @@
* Copyright (c) 2002-2008, PostgreSQL Global Development Group * Copyright (c) 2002-2008, PostgreSQL Global Development Group
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/lockfuncs.c,v 1.31 2008/01/01 19:45:52 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/lockfuncs.c,v 1.32 2008/01/08 23:18:51 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -206,7 +206,7 @@ pg_lock_status(PG_FUNCTION_ARGS)
MemSet(values, 0, sizeof(values)); MemSet(values, 0, sizeof(values));
MemSet(nulls, ' ', sizeof(nulls)); MemSet(nulls, ' ', sizeof(nulls));
if (lock->tag.locktag_type <= LOCKTAG_ADVISORY) if (lock->tag.locktag_type <= LOCKTAG_LAST_TYPE)
locktypename = LockTagTypeNames[lock->tag.locktag_type]; locktypename = LockTagTypeNames[lock->tag.locktag_type];
else else
{ {
@ -217,7 +217,7 @@ pg_lock_status(PG_FUNCTION_ARGS)
values[0] = DirectFunctionCall1(textin, values[0] = DirectFunctionCall1(textin,
CStringGetDatum(locktypename)); CStringGetDatum(locktypename));
switch (lock->tag.locktag_type) switch ((LockTagType) lock->tag.locktag_type)
{ {
case LOCKTAG_RELATION: case LOCKTAG_RELATION:
case LOCKTAG_RELATION_EXTEND: case LOCKTAG_RELATION_EXTEND:

4
src/include/storage/lock.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/include/storage/lock.h,v 1.111 2008/01/01 19:45:59 momjian Exp $ * $PostgreSQL: pgsql/src/include/storage/lock.h,v 1.112 2008/01/08 23:18:51 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -186,6 +186,8 @@ typedef enum LockTagType
LOCKTAG_ADVISORY /* advisory user locks */ LOCKTAG_ADVISORY /* advisory user locks */
} LockTagType; } LockTagType;
#define LOCKTAG_LAST_TYPE LOCKTAG_ADVISORY
/* /*
* The LOCKTAG struct is defined with malice aforethought to fit into 16 * The LOCKTAG struct is defined with malice aforethought to fit into 16
* bytes with no padding. Note that this would need adjustment if we were * bytes with no padding. Note that this would need adjustment if we were