From 902d1cb35f69464e1e13015b9e05abdb76a7444d Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sun, 2 Nov 2008 01:45:28 +0000 Subject: Remove all uses of the deprecated functions heap_formtuple, heap_modifytuple, and heap_deformtuple in favor of the newer functions heap_form_tuple et al (which do the same things but use bool control flags instead of arbitrary char values). Eliminate the former duplicate coding of these functions, reducing the deprecated functions to mere wrappers around the newer ones. We can't get rid of them entirely because add-on modules probably still contain many instances of the old coding style. Kris Jurka --- src/backend/utils/adt/lockfuncs.c | 88 +++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 44 deletions(-) (limited to 'src/backend/utils/adt/lockfuncs.c') diff --git a/src/backend/utils/adt/lockfuncs.c b/src/backend/utils/adt/lockfuncs.c index 7724a75b55f..98657c2f978 100644 --- a/src/backend/utils/adt/lockfuncs.c +++ b/src/backend/utils/adt/lockfuncs.c @@ -6,7 +6,7 @@ * Copyright (c) 2002-2008, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/lockfuncs.c,v 1.34 2008/05/12 00:00:51 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/lockfuncs.c,v 1.35 2008/11/02 01:45:28 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -144,7 +144,7 @@ pg_lock_status(PG_FUNCTION_ARGS) const char *locktypename; char tnbuf[32]; Datum values[14]; - char nulls[14]; + bool nulls[14]; HeapTuple tuple; Datum result; @@ -203,7 +203,7 @@ pg_lock_status(PG_FUNCTION_ARGS) * Form tuple with appropriate data. */ MemSet(values, 0, sizeof(values)); - MemSet(nulls, ' ', sizeof(nulls)); + MemSet(nulls, false, sizeof(nulls)); if (lock->tag.locktag_type <= LOCKTAG_LAST_TYPE) locktypename = LockTagTypeNames[lock->tag.locktag_type]; @@ -221,58 +221,58 @@ pg_lock_status(PG_FUNCTION_ARGS) case LOCKTAG_RELATION_EXTEND: values[1] = ObjectIdGetDatum(lock->tag.locktag_field1); values[2] = ObjectIdGetDatum(lock->tag.locktag_field2); - nulls[3] = 'n'; - nulls[4] = 'n'; - nulls[5] = 'n'; - nulls[6] = 'n'; - nulls[7] = 'n'; - nulls[8] = 'n'; - nulls[9] = 'n'; + nulls[3] = true; + nulls[4] = true; + nulls[5] = true; + nulls[6] = true; + nulls[7] = true; + nulls[8] = true; + nulls[9] = true; break; case LOCKTAG_PAGE: values[1] = ObjectIdGetDatum(lock->tag.locktag_field1); values[2] = ObjectIdGetDatum(lock->tag.locktag_field2); values[3] = UInt32GetDatum(lock->tag.locktag_field3); - nulls[4] = 'n'; - nulls[5] = 'n'; - nulls[6] = 'n'; - nulls[7] = 'n'; - nulls[8] = 'n'; - nulls[9] = 'n'; + nulls[4] = true; + nulls[5] = true; + nulls[6] = true; + nulls[7] = true; + nulls[8] = true; + nulls[9] = true; break; case LOCKTAG_TUPLE: values[1] = ObjectIdGetDatum(lock->tag.locktag_field1); values[2] = ObjectIdGetDatum(lock->tag.locktag_field2); values[3] = UInt32GetDatum(lock->tag.locktag_field3); values[4] = UInt16GetDatum(lock->tag.locktag_field4); - nulls[5] = 'n'; - nulls[6] = 'n'; - nulls[7] = 'n'; - nulls[8] = 'n'; - nulls[9] = 'n'; + nulls[5] = true; + nulls[6] = true; + nulls[7] = true; + nulls[8] = true; + nulls[9] = true; break; case LOCKTAG_TRANSACTION: values[6] = TransactionIdGetDatum(lock->tag.locktag_field1); - nulls[1] = 'n'; - nulls[2] = 'n'; - nulls[3] = 'n'; - nulls[4] = 'n'; - nulls[5] = 'n'; - nulls[7] = 'n'; - nulls[8] = 'n'; - nulls[9] = 'n'; + nulls[1] = true; + nulls[2] = true; + nulls[3] = true; + nulls[4] = true; + nulls[5] = true; + nulls[7] = true; + nulls[8] = true; + nulls[9] = true; break; case LOCKTAG_VIRTUALTRANSACTION: values[5] = VXIDGetDatum(lock->tag.locktag_field1, lock->tag.locktag_field2); - nulls[1] = 'n'; - nulls[2] = 'n'; - nulls[3] = 'n'; - nulls[4] = 'n'; - nulls[6] = 'n'; - nulls[7] = 'n'; - nulls[8] = 'n'; - nulls[9] = 'n'; + nulls[1] = true; + nulls[2] = true; + nulls[3] = true; + nulls[4] = true; + nulls[6] = true; + nulls[7] = true; + nulls[8] = true; + nulls[9] = true; break; case LOCKTAG_OBJECT: case LOCKTAG_USERLOCK: @@ -282,11 +282,11 @@ pg_lock_status(PG_FUNCTION_ARGS) values[7] = ObjectIdGetDatum(lock->tag.locktag_field2); values[8] = ObjectIdGetDatum(lock->tag.locktag_field3); values[9] = Int16GetDatum(lock->tag.locktag_field4); - nulls[2] = 'n'; - nulls[3] = 'n'; - nulls[4] = 'n'; - nulls[5] = 'n'; - nulls[6] = 'n'; + nulls[2] = true; + nulls[3] = true; + nulls[4] = true; + nulls[5] = true; + nulls[6] = true; break; } @@ -294,11 +294,11 @@ pg_lock_status(PG_FUNCTION_ARGS) if (proc->pid != 0) values[11] = Int32GetDatum(proc->pid); else - nulls[11] = 'n'; + nulls[11] = true; values[12] = CStringGetTextDatum(GetLockmodeName(LOCK_LOCKMETHOD(*lock), mode)); values[13] = BoolGetDatum(granted); - tuple = heap_formtuple(funcctx->tuple_desc, values, nulls); + tuple = heap_form_tuple(funcctx->tuple_desc, values, nulls); result = HeapTupleGetDatum(tuple); SRF_RETURN_NEXT(funcctx, result); } -- cgit v1.2.3