Commit 5aea4062 authored by Bruce Momjian's avatar Bruce Momjian

Inline function, rename libpq variablees, change lrel to lockrel.

parent 8bac4ca8
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-dumpdata.c,v 1.15 1998/03/30 16:46:29 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-dumpdata.c,v 1.16 1998/07/13 16:34:48 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -194,8 +194,8 @@ be_typeinit(PortalEntry *entry, ...@@ -194,8 +194,8 @@ be_typeinit(PortalEntry *entry,
for (i = 0; i < natts; ++i) for (i = 0; i < natts; ++i)
{ {
strncpy(group->types[i].name, attrs[i]->attname.data, NAMEDATALEN); strncpy(group->types[i].name, attrs[i]->attname.data, NAMEDATALEN);
group->types[i].adtid = attrs[i]->atttypid; group->types[i].typid = attrs[i]->atttypid;
group->types[i].adtsize = attrs[i]->attlen; group->types[i].typlen = attrs[i]->attlen;
} }
} }
} }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.14 1998/06/15 19:28:27 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.15 1998/07/13 16:34:48 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -327,7 +327,7 @@ PQftypeGroup(PortalBuffer *portal, int group_index, int field_number) ...@@ -327,7 +327,7 @@ PQftypeGroup(PortalBuffer *portal, int group_index, int field_number)
if ((gbp = pbuf_findGroup(portal, group_index)) && if ((gbp = pbuf_findGroup(portal, group_index)) &&
in_range("PQftypeGroup: field number", field_number, 0, gbp->no_fields)) in_range("PQftypeGroup: field number", field_number, 0, gbp->no_fields))
return (gbp->types[field_number].adtid); return (gbp->types[field_number].typid);
return (-1); return (-1);
} }
...@@ -348,7 +348,7 @@ PQfsizeGroup(PortalBuffer *portal, int group_index, int field_number) ...@@ -348,7 +348,7 @@ PQfsizeGroup(PortalBuffer *portal, int group_index, int field_number)
if ((gbp = pbuf_findGroup(portal, group_index)) && if ((gbp = pbuf_findGroup(portal, group_index)) &&
in_range("PQfsizeGroup: field number", field_number, 0, gbp->no_fields)) in_range("PQfsizeGroup: field number", field_number, 0, gbp->no_fields))
return (gbp->types[field_number].adtsize); return (gbp->types[field_number].typlen);
return (-1); return (-1);
} }
...@@ -481,8 +481,8 @@ PQftype(PortalBuffer *portal, int tuple_index, int field_number) ...@@ -481,8 +481,8 @@ PQftype(PortalBuffer *portal, int tuple_index, int field_number)
return (-1); return (-1);
if ((gbp = PQgroup(portal, tuple_index)) && if ((gbp = PQgroup(portal, tuple_index)) &&
in_range("PQftype: field number", field_number, 0, gbp->no_fields)) in_range("PQftype: field number", field_number, 0, gbp->no_fields))
return (gbp->types[field_number].adtid); return (gbp->types[field_number].typid);
return (-1); return (-1);
} }
...@@ -502,7 +502,7 @@ PQfsize(PortalBuffer *portal, int tuple_index, int field_number) ...@@ -502,7 +502,7 @@ PQfsize(PortalBuffer *portal, int tuple_index, int field_number)
if ((gbp = PQgroup(portal, tuple_index)) && if ((gbp = PQgroup(portal, tuple_index)) &&
in_range("PQfsize: field number", field_number, 0, gbp->no_fields)) in_range("PQfsize: field number", field_number, 0, gbp->no_fields))
return (gbp->types[field_number].adtsize); return (gbp->types[field_number].typlen);
return (-1); return (-1);
} }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.38 1998/06/15 19:29:09 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.39 1998/07/13 16:34:49 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -114,14 +114,14 @@ RelationGetBufferWithBuffer(Relation relation, ...@@ -114,14 +114,14 @@ RelationGetBufferWithBuffer(Relation relation,
Buffer buffer) Buffer buffer)
{ {
BufferDesc *bufHdr; BufferDesc *bufHdr;
LRelId lrelId; LockRelId lrelId;
if (BufferIsValid(buffer)) if (BufferIsValid(buffer))
{ {
if (!BufferIsLocal(buffer)) if (!BufferIsLocal(buffer))
{ {
bufHdr = &BufferDescriptors[buffer - 1]; bufHdr = &BufferDescriptors[buffer - 1];
lrelId = RelationGetLRelId(relation); lrelId = RelationGetLockRelId(relation);
SpinAcquire(BufMgrLock); SpinAcquire(BufMgrLock);
if (bufHdr->tag.blockNum == blockNumber && if (bufHdr->tag.blockNum == blockNumber &&
bufHdr->tag.relId.relId == lrelId.relId && bufHdr->tag.relId.relId == lrelId.relId &&
...@@ -1282,7 +1282,7 @@ BufferGetRelation(Buffer buffer) ...@@ -1282,7 +1282,7 @@ BufferGetRelation(Buffer buffer)
Assert(!BufferIsLocal(buffer)); /* not supported for local buffers */ Assert(!BufferIsLocal(buffer)); /* not supported for local buffers */
/* XXX should be a critical section */ /* XXX should be a critical section */
relid = LRelIdGetRelationId(BufferDescriptors[buffer - 1].tag.relId); relid = LockRelIdGetRelationId(BufferDescriptors[buffer - 1].tag.relId);
relation = RelationIdGetRelation(relid); relation = RelationIdGetRelation(relid);
RelationDecrementReferenceCount(relation); RelationDecrementReferenceCount(relation);
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.11 1998/06/27 04:53:36 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.12 1998/07/13 16:34:49 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -85,7 +85,7 @@ SISetActiveProcess(SISeg *segInOutP, BackendId backendId) ...@@ -85,7 +85,7 @@ SISetActiveProcess(SISeg *segInOutP, BackendId backendId)
int int
SIBackendInit(SISeg *segInOutP) SIBackendInit(SISeg *segInOutP)
{ {
LRelId LtCreateRelId(); LockRelId LtCreateRelId();
TransactionId LMITransactionIdCopy(); TransactionId LMITransactionIdCopy();
Assert(MyBackendTag > 0); Assert(MyBackendTag > 0);
......
This diff is collapsed.
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.19 1998/06/30 02:33:31 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.20 1998/07/13 16:34:51 momjian Exp $
* *
* NOTES: * NOTES:
* (1) The lock.c module assumes that the caller here is doing * (1) The lock.c module assumes that the caller here is doing
...@@ -113,7 +113,7 @@ InitMultiLevelLocks() ...@@ -113,7 +113,7 @@ InitMultiLevelLocks()
* Returns: TRUE if the lock can be set, FALSE otherwise. * Returns: TRUE if the lock can be set, FALSE otherwise.
*/ */
bool bool
MultiLockReln(LockInfo linfo, LOCKMODE lockmode) MultiLockReln(LockInfo lockinfo, LOCKMODE lockmode)
{ {
LOCKTAG tag; LOCKTAG tag;
...@@ -122,8 +122,8 @@ MultiLockReln(LockInfo linfo, LOCKMODE lockmode) ...@@ -122,8 +122,8 @@ MultiLockReln(LockInfo linfo, LOCKMODE lockmode)
* will return miss if the padding bytes aren't zero'd. * will return miss if the padding bytes aren't zero'd.
*/ */
MemSet(&tag, 0, sizeof(tag)); MemSet(&tag, 0, sizeof(tag));
tag.relId = linfo->lRelId.relId; tag.relId = lockinfo->lockRelId.relId;
tag.dbId = linfo->lRelId.dbId; tag.dbId = lockinfo->lockRelId.dbId;
return (MultiAcquire(MultiTableId, &tag, lockmode, RELN_LEVEL)); return (MultiAcquire(MultiTableId, &tag, lockmode, RELN_LEVEL));
} }
...@@ -136,7 +136,7 @@ MultiLockReln(LockInfo linfo, LOCKMODE lockmode) ...@@ -136,7 +136,7 @@ MultiLockReln(LockInfo linfo, LOCKMODE lockmode)
* at the page and relation level. * at the page and relation level.
*/ */
bool bool
MultiLockTuple(LockInfo linfo, ItemPointer tidPtr, LOCKMODE lockmode) MultiLockTuple(LockInfo lockinfo, ItemPointer tidPtr, LOCKMODE lockmode)
{ {
LOCKTAG tag; LOCKTAG tag;
...@@ -146,8 +146,8 @@ MultiLockTuple(LockInfo linfo, ItemPointer tidPtr, LOCKMODE lockmode) ...@@ -146,8 +146,8 @@ MultiLockTuple(LockInfo linfo, ItemPointer tidPtr, LOCKMODE lockmode)
*/ */
MemSet(&tag, 0, sizeof(tag)); MemSet(&tag, 0, sizeof(tag));
tag.relId = linfo->lRelId.relId; tag.relId = lockinfo->lockRelId.relId;
tag.dbId = linfo->lRelId.dbId; tag.dbId = lockinfo->lockRelId.dbId;
/* not locking any valid Tuple, just the page */ /* not locking any valid Tuple, just the page */
tag.tupleId = *tidPtr; tag.tupleId = *tidPtr;
...@@ -158,7 +158,7 @@ MultiLockTuple(LockInfo linfo, ItemPointer tidPtr, LOCKMODE lockmode) ...@@ -158,7 +158,7 @@ MultiLockTuple(LockInfo linfo, ItemPointer tidPtr, LOCKMODE lockmode)
* same as above at page level * same as above at page level
*/ */
bool bool
MultiLockPage(LockInfo linfo, ItemPointer tidPtr, LOCKMODE lockmode) MultiLockPage(LockInfo lockinfo, ItemPointer tidPtr, LOCKMODE lockmode)
{ {
LOCKTAG tag; LOCKTAG tag;
...@@ -178,8 +178,8 @@ MultiLockPage(LockInfo linfo, ItemPointer tidPtr, LOCKMODE lockmode) ...@@ -178,8 +178,8 @@ MultiLockPage(LockInfo linfo, ItemPointer tidPtr, LOCKMODE lockmode)
* when we say lock the page we mean the 8k block. -Jeff 16 July 1991 * when we say lock the page we mean the 8k block. -Jeff 16 July 1991
* ---------------------------- * ----------------------------
*/ */
tag.relId = linfo->lRelId.relId; tag.relId = lockinfo->lockRelId.relId;
tag.dbId = linfo->lRelId.dbId; tag.dbId = lockinfo->lockRelId.dbId;
BlockIdCopy(&(tag.tupleId.ip_blkid), &(tidPtr->ip_blkid)); BlockIdCopy(&(tag.tupleId.ip_blkid), &(tidPtr->ip_blkid));
return (MultiAcquire(MultiTableId, &tag, lockmode, PAGE_LEVEL)); return (MultiAcquire(MultiTableId, &tag, lockmode, PAGE_LEVEL));
} }
...@@ -302,7 +302,7 @@ MultiAcquire(LOCKMETHOD lockmethod, ...@@ -302,7 +302,7 @@ MultiAcquire(LOCKMETHOD lockmethod,
*/ */
#ifdef NOT_USED #ifdef NOT_USED
bool bool
MultiReleasePage(LockInfo linfo, ItemPointer tidPtr, LOCKMODE lockmode) MultiReleasePage(LockInfo lockinfo, ItemPointer tidPtr, LOCKMODE lockmode)
{ {
LOCKTAG tag; LOCKTAG tag;
...@@ -314,8 +314,8 @@ MultiReleasePage(LockInfo linfo, ItemPointer tidPtr, LOCKMODE lockmode) ...@@ -314,8 +314,8 @@ MultiReleasePage(LockInfo linfo, ItemPointer tidPtr, LOCKMODE lockmode)
*/ */
MemSet(&tag, 0, sizeof(LOCKTAG)); MemSet(&tag, 0, sizeof(LOCKTAG));
tag.relId = linfo->lRelId.relId; tag.relId = lockinfo->lockRelId.relId;
tag.dbId = linfo->lRelId.dbId; tag.dbId = lockinfo->lockRelId.dbId;
BlockIdCopy(&(tag.tupleId.ip_blkid), &(tidPtr->ip_blkid)); BlockIdCopy(&(tag.tupleId.ip_blkid), &(tidPtr->ip_blkid));
return (MultiRelease(MultiTableId, &tag, lockmode, PAGE_LEVEL)); return (MultiRelease(MultiTableId, &tag, lockmode, PAGE_LEVEL));
...@@ -328,7 +328,7 @@ MultiReleasePage(LockInfo linfo, ItemPointer tidPtr, LOCKMODE lockmode) ...@@ -328,7 +328,7 @@ MultiReleasePage(LockInfo linfo, ItemPointer tidPtr, LOCKMODE lockmode)
* ------------------ * ------------------
*/ */
bool bool
MultiReleaseReln(LockInfo linfo, LOCKMODE lockmode) MultiReleaseReln(LockInfo lockinfo, LOCKMODE lockmode)
{ {
LOCKTAG tag; LOCKTAG tag;
...@@ -339,8 +339,8 @@ MultiReleaseReln(LockInfo linfo, LOCKMODE lockmode) ...@@ -339,8 +339,8 @@ MultiReleaseReln(LockInfo linfo, LOCKMODE lockmode)
* ------------------ * ------------------
*/ */
MemSet(&tag, 0, sizeof(LOCKTAG)); MemSet(&tag, 0, sizeof(LOCKTAG));
tag.relId = linfo->lRelId.relId; tag.relId = lockinfo->lockRelId.relId;
tag.dbId = linfo->lRelId.dbId; tag.dbId = lockinfo->lockRelId.dbId;
return (MultiRelease(MultiTableId, &tag, lockmode, RELN_LEVEL)); return (MultiRelease(MultiTableId, &tag, lockmode, RELN_LEVEL));
} }
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/single.c,v 1.7 1998/06/30 02:33:32 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/single.c,v 1.8 1998/07/13 16:34:52 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
* Returns: TRUE if the lock can be set, FALSE otherwise. * Returns: TRUE if the lock can be set, FALSE otherwise.
*/ */
bool bool
SingleLockReln(LockInfo linfo, LOCKMODE lockmode, int action) SingleLockReln(LockInfo lockinfo, LOCKMODE lockmode, int action)
{ {
LOCKTAG tag; LOCKTAG tag;
...@@ -41,8 +41,8 @@ SingleLockReln(LockInfo linfo, LOCKMODE lockmode, int action) ...@@ -41,8 +41,8 @@ SingleLockReln(LockInfo linfo, LOCKMODE lockmode, int action)
* will return miss if the padding bytes aren't zero'd. * will return miss if the padding bytes aren't zero'd.
*/ */
MemSet(&tag, 0, sizeof(tag)); MemSet(&tag, 0, sizeof(tag));
tag.relId = linfo->lRelId.relId; tag.relId = lockinfo->lockRelId.relId;
tag.dbId = linfo->lRelId.dbId; tag.dbId = lockinfo->lockRelId.dbId;
BlockIdSet(&(tag.tupleId.ip_blkid), InvalidBlockNumber); BlockIdSet(&(tag.tupleId.ip_blkid), InvalidBlockNumber);
tag.tupleId.ip_posid = InvalidOffsetNumber; tag.tupleId.ip_posid = InvalidOffsetNumber;
...@@ -61,7 +61,7 @@ SingleLockReln(LockInfo linfo, LOCKMODE lockmode, int action) ...@@ -61,7 +61,7 @@ SingleLockReln(LockInfo linfo, LOCKMODE lockmode, int action)
* *
*/ */
bool bool
SingleLockPage(LockInfo linfo, SingleLockPage(LockInfo lockinfo,
ItemPointer tidPtr, ItemPointer tidPtr,
LOCKMODE lockmode, LOCKMODE lockmode,
int action) int action)
...@@ -73,8 +73,8 @@ SingleLockPage(LockInfo linfo, ...@@ -73,8 +73,8 @@ SingleLockPage(LockInfo linfo,
* will return miss if the padding bytes aren't zero'd. * will return miss if the padding bytes aren't zero'd.
*/ */
MemSet(&tag, 0, sizeof(tag)); MemSet(&tag, 0, sizeof(tag));
tag.relId = linfo->lRelId.relId; tag.relId = lockinfo->lockRelId.relId;
tag.dbId = linfo->lRelId.dbId; tag.dbId = lockinfo->lockRelId.dbId;
BlockIdCopy(&(tag.tupleId.ip_blkid), &(tidPtr->ip_blkid)); BlockIdCopy(&(tag.tupleId.ip_blkid), &(tidPtr->ip_blkid));
tag.tupleId.ip_posid = InvalidOffsetNumber; tag.tupleId.ip_posid = InvalidOffsetNumber;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: libpq.h,v 1.17 1998/07/09 03:29:01 scrappy Exp $ * $Id: libpq.h,v 1.18 1998/07/13 16:34:53 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -49,8 +49,8 @@ typedef struct ...@@ -49,8 +49,8 @@ typedef struct
typedef struct TypeBlock typedef struct TypeBlock
{ {
char name[NAMEDATALEN]; /* name of the attribute */ char name[NAMEDATALEN]; /* name of the attribute */
int adtid; /* adtid of the type */ int typid; /* typid of the type */
int adtsize; /* adtsize of the type */ int typlen; /* typlen of the type */
} TypeBlock; } TypeBlock;
/* ---------------- /* ----------------
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: buf_internals.h,v 1.22 1998/06/15 18:40:01 momjian Exp $ * $Id: buf_internals.h,v 1.23 1998/07/13 16:34:55 momjian Exp $
* *
* NOTE * NOTE
* If BUFFERPAGE0 is defined, then 0 will be used as a * If BUFFERPAGE0 is defined, then 0 will be used as a
...@@ -51,7 +51,7 @@ typedef long **BufferBlock; ...@@ -51,7 +51,7 @@ typedef long **BufferBlock;
struct buftag struct buftag
{ {
LRelId relId; LockRelId relId;
BlockNumber blockNum; /* blknum relative to begin of reln */ BlockNumber blockNum; /* blknum relative to begin of reln */
}; };
...@@ -65,14 +65,14 @@ struct buftag ...@@ -65,14 +65,14 @@ struct buftag
#define INIT_BUFFERTAG(a,xx_reln,xx_blockNum) \ #define INIT_BUFFERTAG(a,xx_reln,xx_blockNum) \
( \ ( \
(a)->blockNum = xx_blockNum, \ (a)->blockNum = xx_blockNum, \
(a)->relId = RelationGetLRelId(xx_reln) \ (a)->relId = RelationGetLockRelId(xx_reln) \
) )
#ifdef NOT_USED #ifdef NOT_USED
#define COPY_BUFFERTAG(a,b) \ #define COPY_BUFFERTAG(a,b) \
( \ ( \
(a)->blockNum = (b)->blockNum, \ (a)->blockNum = (b)->blockNum, \
LRelIdAssign(*(a),*(b)) \ LockRelIdAssign(*(a),*(b)) \
) )
#define EQUAL_BUFFERTAG(a,b) \ #define EQUAL_BUFFERTAG(a,b) \
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: lmgr.h,v 1.12 1998/06/30 02:33:32 momjian Exp $ * $Id: lmgr.h,v 1.13 1998/07/13 16:34:56 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -15,32 +15,57 @@ ...@@ -15,32 +15,57 @@
#include <storage/lock.h> #include <storage/lock.h>
#include <utils/rel.h> #include <utils/rel.h>
#include <catalog/catname.h>
/* /*
* This was moved from pladt.h for the new lock manager. Want to obsolete * This was moved from pladt.h for the new lock manager. Want to obsolete
* all of the old code. * all of the old code.
*/ */
typedef struct LRelId typedef struct LockRelId
{ {
Oid relId; /* a relation identifier */ Oid relId; /* a relation identifier */
Oid dbId; /* a database identifier */ Oid dbId; /* a database identifier */
} LRelId; } LockRelId;
typedef struct LockInfoData typedef struct LockInfoData
{ {
bool initialized; bool initialized;
LRelId lRelId; LockRelId lockRelId;
TransactionId transactionIdData; TransactionId transactionIdData;
uint16 flags; uint16 flags;
} LockInfoData; } LockInfoData;
typedef LockInfoData *LockInfo; typedef LockInfoData *LockInfo;
#define LockInfoIsValid(linfo) \ #define LockInfoIsValid(lockinfo) \
((PointerIsValid(linfo)) && ((LockInfo) linfo)->initialized) ((PointerIsValid(lockinfo)) && ((LockInfo) lockinfo)->initialized)
extern LockRelId VariableRelationLockRelId;
/*
* RelationGetLockRelId --
* Returns "lock" relation identifier for a relation.
*/
/* ----------------
* final condition is a hack to prevent problems during
* VARIABLE relation initialization
* ----------------
*/
#define RelationGetLockRelId(relation) \
( \
AssertMacro(RelationIsValid(relation)), \
(!LockInfoIsValid((LockInfo)(relation)->lockInfo)) ? \
RelationInitLockInfo(relation) \
: \
(void)NULL, \
(strcmp(RelationGetRelationName(relation)->data, \
VariableRelationName) == 0) ? \
VariableRelationLockRelId \
: \
((LockInfo)(relation)->lockInfo)->lockRelId \
)
extern LRelId RelationGetLRelId(Relation relation); extern Oid LockRelIdGetRelationId(LockRelId lockRelId);
extern Oid LRelIdGetRelationId(LRelId lRelId);
extern void RelationInitLockInfo(Relation relation); extern void RelationInitLockInfo(Relation relation);
extern void RelationSetLockForDescriptorOpen(Relation relation); extern void RelationSetLockForDescriptorOpen(Relation relation);
extern void RelationSetLockForRead(Relation relation); extern void RelationSetLockForRead(Relation relation);
...@@ -72,9 +97,9 @@ extern void RelationSetWIntentLock(Relation relation); ...@@ -72,9 +97,9 @@ extern void RelationSetWIntentLock(Relation relation);
extern void RelationUnsetWIntentLock(Relation relation); extern void RelationUnsetWIntentLock(Relation relation);
/* single.c */ /* single.c */
extern bool SingleLockReln(LockInfo linfo, LOCKMODE lockmode, int action); extern bool SingleLockReln(LockInfo lockinfo, LOCKMODE lockmode, int action);
extern bool extern bool
SingleLockPage(LockInfo linfo, ItemPointer tidPtr, SingleLockPage(LockInfo lockinfo, ItemPointer tidPtr,
LOCKMODE lockmode, int action); LOCKMODE lockmode, int action);
/* proc.c */ /* proc.c */
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: multilev.h,v 1.10 1998/06/30 02:33:33 momjian Exp $ * $Id: multilev.h,v 1.11 1998/07/13 16:34:58 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -52,9 +52,9 @@ extern LOCKMETHOD ShortTermTableId; ...@@ -52,9 +52,9 @@ extern LOCKMETHOD ShortTermTableId;
* function prototypes * function prototypes
*/ */
extern LOCKMETHOD InitMultiLevelLocks(void); extern LOCKMETHOD InitMultiLevelLocks(void);
extern bool MultiLockReln(LockInfo linfo, LOCKMODE lockmode); extern bool MultiLockReln(LockInfo lockinfo, LOCKMODE lockmode);
extern bool MultiLockTuple(LockInfo linfo, ItemPointer tidPtr, LOCKMODE lockmode); extern bool MultiLockTuple(LockInfo lockinfo, ItemPointer tidPtr, LOCKMODE lockmode);
extern bool MultiLockPage(LockInfo linfo, ItemPointer tidPtr, LOCKMODE lockmode); extern bool MultiLockPage(LockInfo lockinfo, ItemPointer tidPtr, LOCKMODE lockmode);
extern bool MultiReleaseReln(LockInfo linfo, LOCKMODE lockmode); extern bool MultiReleaseReln(LockInfo lockinfo, LOCKMODE lockmode);
#endif /* MULTILEV_H */ #endif /* MULTILEV_H */
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.58 1998/07/13 02:41:58 momjian Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.59 1998/07/13 16:35:00 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -497,12 +497,12 @@ getRowDescriptions(PGconn *conn) ...@@ -497,12 +497,12 @@ getRowDescriptions(PGconn *conn)
for (i = 0; i < nfields; i++) for (i = 0; i < nfields; i++)
{ {
char typName[MAX_MESSAGE_LEN]; char typName[MAX_MESSAGE_LEN];
int adtid; int typid;
int typlen; int typlen;
int atttypmod = -1; int atttypmod = -1;
if (pqGets(typName, MAX_MESSAGE_LEN, conn) || if (pqGets(typName, MAX_MESSAGE_LEN, conn) ||
pqGetInt(&adtid, 4, conn) || pqGetInt(&typid, 4, conn) ||
pqGetInt(&typlen, 2, conn) || pqGetInt(&typlen, 2, conn) ||
pqGetInt(&atttypmod, 4, conn)) pqGetInt(&atttypmod, 4, conn))
{ {
...@@ -510,7 +510,7 @@ getRowDescriptions(PGconn *conn) ...@@ -510,7 +510,7 @@ getRowDescriptions(PGconn *conn)
return EOF; return EOF;
} }
result->attDescs[i].name = strdup(typName); result->attDescs[i].name = strdup(typName);
result->attDescs[i].adtid = adtid; result->attDescs[i].typid = typid;
result->attDescs[i].typlen = (short) typlen; result->attDescs[i].typlen = (short) typlen;
result->attDescs[i].atttypmod = atttypmod; result->attDescs[i].atttypmod = atttypmod;
} }
...@@ -1272,7 +1272,7 @@ PQftype(PGresult *res, int field_num) ...@@ -1272,7 +1272,7 @@ PQftype(PGresult *res, int field_num)
return InvalidOid; return InvalidOid;
} }
if (res->attDescs) if (res->attDescs)
return res->attDescs[field_num].adtid; return res->attDescs[field_num].typid;
else else
return InvalidOid; return InvalidOid;
} }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: libpq-fe.h,v 1.33 1998/07/13 02:41:59 momjian Exp $ * $Id: libpq-fe.h,v 1.34 1998/07/13 16:35:02 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -76,8 +76,8 @@ extern "C" ...@@ -76,8 +76,8 @@ extern "C"
typedef struct pgresAttDesc typedef struct pgresAttDesc
{ {
char *name; /* type name */ char *name; /* type name */
Oid adtid; /* type id */ Oid typid; /* type id */
short adtsize; /* type size */ short typlen; /* type size */
int atttypmod; /* type-specific modifier info */ int atttypmod; /* type-specific modifier info */
} PGresAttDesc; } PGresAttDesc;
......
...@@ -223,7 +223,7 @@ mylog("getCharPrecision: type=%d, col=%d, unknown = %d\n", type,col,handle_unkno ...@@ -223,7 +223,7 @@ mylog("getCharPrecision: type=%d, col=%d, unknown = %d\n", type,col,handle_unkno
if (stmt->manual_result) { if (stmt->manual_result) {
flds = result->fields; flds = result->fields;
if (flds) if (flds)
return flds->adtsize[col]; return flds->typlen[col];
else else
return maxsize; return maxsize;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment