database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

The patch I sent to -patches a little while ago wasn't applied: it

Browse Source 
was in the thread "make BufferGetBlockNumber() a macro". Tom
objected to the original patch, so I prepared a new one which
doesn't change BufferGetBlockNumber() into a macro, it just
cleans up some comments and fixes an assertion. The patch
is attached.

Neil Conway
This commit is contained in:
Bruce Momjian
2002-04-15 23:47:12 +00:00
parent 33d1bb76c6
commit 171824087c
3 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/storage/buffer/bufmgr.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.122 2002/03/06 06:10:02 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.123 2002/04/15 23:47:12 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1026,7 +1026,7 @@ BufmgrCommit(void)
BlockNumber BlockNumber
BufferGetBlockNumber(Buffer buffer) BufferGetBlockNumber(Buffer buffer)
{ {
Assert(BufferIsValid(buffer)); Assert(BufferIsPinned(buffer));
if (BufferIsLocal(buffer)) if (BufferIsLocal(buffer))
return LocalBufferDescriptors[-buffer - 1].tag.blockNum; return LocalBufferDescriptors[-buffer - 1].tag.blockNum;

10
src/include/storage/buf.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: buf.h,v 1.12 2001/11/05 17:46:35 momjian Exp $ * $Id: buf.h,v 1.13 2002/04/15 23:47:12 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -36,12 +36,4 @@ typedef int Buffer;
*/ */
#define BufferIsLocal(buffer) ((buffer) < 0) #define BufferIsLocal(buffer) ((buffer) < 0)
/*
* If NO_BUFFERISVALID is defined, all error checking using BufferIsValid()
* are suppressed. Decision-making using BufferIsValid is not affected.
* This should be set only if one is sure there will be no errors.
* - plai 9/10/90
*/
#undef NO_BUFFERISVALID
#endif /* BUF_H */ #endif /* BUF_H */

10
src/include/storage/bufmgr.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: bufmgr.h,v 1.57 2001/11/10 23:51:14 tgl Exp $ * $Id: bufmgr.h,v 1.58 2002/04/15 23:47:12 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -44,13 +44,6 @@ extern long *LocalRefCount;
#define BUFFER_LOCK_SHARE 1 #define BUFFER_LOCK_SHARE 1
#define BUFFER_LOCK_EXCLUSIVE 2 #define BUFFER_LOCK_EXCLUSIVE 2
/**********************************************************************
the rest is function defns in the bufmgr that are externally callable
**********************************************************************/
/* /*
* These routines are beaten on quite heavily, hence the macroization. * These routines are beaten on quite heavily, hence the macroization.
*/ */
@ -150,7 +143,6 @@ extern long *LocalRefCount;
BufferBlockPointers[(buffer) - 1] \ BufferBlockPointers[(buffer) - 1] \
) )
/* /*
* prototypes for functions in bufmgr.c * prototypes for functions in bufmgr.c
*/ */