diff options
| author | Bruce Momjian <bruce@momjian.us> | 2003-02-19 23:41:15 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2003-02-19 23:41:15 +0000 |
| commit | 69c049cef4ad2bce1b6ac9e96544cbaaa907378e (patch) | |
| tree | 410877efaea77947caf292a33b386b517018ccd5 /src/backend/utils/adt/lockfuncs.c | |
| parent | e2a618fe25f9e02f17dacff4c3d2f117b56c7715 (diff) | |
| download | postgresql-69c049cef4ad2bce1b6ac9e96544cbaaa907378e.tar.gz postgresql-69c049cef4ad2bce1b6ac9e96544cbaaa907378e.zip | |
Back out LOCKTAG changes by Rod Taylor, pending code review. Sorry.
Diffstat (limited to 'src/backend/utils/adt/lockfuncs.c')
| -rw-r--r-- | src/backend/utils/adt/lockfuncs.c | 42 |
1 files changed, 18 insertions, 24 deletions
diff --git a/src/backend/utils/adt/lockfuncs.c b/src/backend/utils/adt/lockfuncs.c index 25bc726cba2..1469034fde1 100644 --- a/src/backend/utils/adt/lockfuncs.c +++ b/src/backend/utils/adt/lockfuncs.c @@ -6,7 +6,7 @@ * Copyright (c) 2002, PostgreSQL Global Development Group * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/lockfuncs.c,v 1.9 2003/02/19 04:02:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/lockfuncs.c,v 1.10 2003/02/19 23:41:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -53,20 +53,18 @@ pg_lock_status(PG_FUNCTION_ARGS) /* build tupdesc for result tuples */ /* this had better match pg_locks view in initdb.sh */ - tupdesc = CreateTemplateTupleDesc(7, false); - TupleDescInitEntry(tupdesc, (AttrNumber) 1, "object", + tupdesc = CreateTemplateTupleDesc(6, false); + TupleDescInitEntry(tupdesc, (AttrNumber) 1, "relation", OIDOID, -1, 0, false); - TupleDescInitEntry(tupdesc, (AttrNumber) 2, "class", + TupleDescInitEntry(tupdesc, (AttrNumber) 2, "database", OIDOID, -1, 0, false); - TupleDescInitEntry(tupdesc, (AttrNumber) 3, "database", - OIDOID, -1, 0, false); - TupleDescInitEntry(tupdesc, (AttrNumber) 4, "transaction", + TupleDescInitEntry(tupdesc, (AttrNumber) 3, "transaction", XIDOID, -1, 0, false); - TupleDescInitEntry(tupdesc, (AttrNumber) 5, "pid", + TupleDescInitEntry(tupdesc, (AttrNumber) 4, "pid", INT4OID, -1, 0, false); - TupleDescInitEntry(tupdesc, (AttrNumber) 6, "mode", + TupleDescInitEntry(tupdesc, (AttrNumber) 5, "mode", TEXTOID, -1, 0, false); - TupleDescInitEntry(tupdesc, (AttrNumber) 7, "granted", + TupleDescInitEntry(tupdesc, (AttrNumber) 6, "granted", BOOLOID, -1, 0, false); funcctx->slot = TupleDescGetSlot(tupdesc); @@ -95,8 +93,8 @@ pg_lock_status(PG_FUNCTION_ARGS) PGPROC *proc; bool granted; LOCKMODE mode; - Datum values[7]; - char nulls[7]; + Datum values[6]; + char nulls[6]; HeapTuple tuple; Datum result; @@ -154,30 +152,26 @@ pg_lock_status(PG_FUNCTION_ARGS) MemSet(values, 0, sizeof(values)); MemSet(nulls, ' ', sizeof(nulls)); - if (lock->tag.objId == InvalidOid - && lock->tag.classId == XactLockTableId - && lock->tag.dbId == InvalidOid) + if (lock->tag.relId == XactLockTableId && lock->tag.dbId == 0) { /* Lock is for transaction ID */ nulls[0] = 'n'; nulls[1] = 'n'; - nulls[2] = 'n'; - values[3] = TransactionIdGetDatum(lock->tag.objsubId.xid); + values[2] = TransactionIdGetDatum(lock->tag.objId.xid); } else { /* Lock is for a relation */ - values[0] = ObjectIdGetDatum(lock->tag.objId); - values[1] = ObjectIdGetDatum(lock->tag.classId); - values[2] = ObjectIdGetDatum(lock->tag.dbId); - nulls[3] = 'n'; + values[0] = ObjectIdGetDatum(lock->tag.relId); + values[1] = ObjectIdGetDatum(lock->tag.dbId); + nulls[2] = 'n'; } - values[4] = Int32GetDatum(proc->pid); - values[5] = DirectFunctionCall1(textin, + values[3] = Int32GetDatum(proc->pid); + values[4] = DirectFunctionCall1(textin, CStringGetDatum(GetLockmodeName(mode))); - values[6] = BoolGetDatum(granted); + values[5] = BoolGetDatum(granted); tuple = heap_formtuple(funcctx->slot->ttc_tupleDescriptor, values, nulls); |