database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-09 22:41:56 +03:00
Code Activity

Get rid of page-level locking in btree-s.

Browse Source 
BT_READ/BT_WRITE are BUFFER_LOCK_SHARE/BUFFER_LOCK_EXCLUSIVE now.
Also get rid of #define BT_VERSION_1 - we use version 1 as default
for near two years now.
This commit is contained in:
Vadim B. Mikheev
1999-05-25 18:31:28 +00:00
parent 7d443a85af
commit 519cd36d06
2 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/include/access/nbtree.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: nbtree.h,v 1.25 1999/05/25 16:13:32 momjian Exp $ * $Id: nbtree.h,v 1.26 1999/05/25 18:31:28 vadim Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -19,7 +19,7 @@
#include <storage/page.h> #include <storage/page.h>
#include <access/funcindex.h> #include <access/funcindex.h>
#include <access/itup.h> #include <access/itup.h>
#include <storage/buf.h> #include <storage/bufmgr.h> /* don't remove, required by BT_READ/BT_WRITE */
#include <storage/itemptr.h> #include <storage/itemptr.h>
/* /*
@ -107,26 +107,17 @@ typedef BTScanOpaqueData *BTScanOpaque;
typedef struct BTItemData typedef struct BTItemData
{ {
#ifndef BTREE_VERSION_1
Oid bti_oid;
int32 bti_dummy; /* padding to make bti_itup align at
* 8-byte boundary */
#endif
IndexTupleData bti_itup; IndexTupleData bti_itup;
} BTItemData; } BTItemData;
typedef BTItemData *BTItem; typedef BTItemData *BTItem;
#ifdef BTREE_VERSION_1
#define BTItemSame(i1, i2) ( i1->bti_itup.t_tid.ip_blkid.bi_hi == \ #define BTItemSame(i1, i2) ( i1->bti_itup.t_tid.ip_blkid.bi_hi == \
i2->bti_itup.t_tid.ip_blkid.bi_hi && \ i2->bti_itup.t_tid.ip_blkid.bi_hi && \
i1->bti_itup.t_tid.ip_blkid.bi_lo == \ i1->bti_itup.t_tid.ip_blkid.bi_lo == \
i2->bti_itup.t_tid.ip_blkid.bi_lo && \ i2->bti_itup.t_tid.ip_blkid.bi_lo && \
i1->bti_itup.t_tid.ip_posid == \ i1->bti_itup.t_tid.ip_posid == \
i2->bti_itup.t_tid.ip_posid ) i2->bti_itup.t_tid.ip_posid )
#else
#define BTItemSame(i1, i2) ( i1->bti_oid == i2->bti_oid )
#endif
/* /*
* BTStackData -- As we descend a tree, we push the (key, pointer) * BTStackData -- As we descend a tree, we push the (key, pointer)
@ -165,8 +156,8 @@ typedef struct BTPageState
* requests for pages, in order to do locking correctly. * requests for pages, in order to do locking correctly.
*/ */
#define BT_READ 0 #define BT_READ BUFFER_LOCK_SHARE
#define BT_WRITE 1 #define BT_WRITE BUFFER_LOCK_EXCLUSIVE
/* /*
* Similarly, the difference between insertion and non-insertion binary * Similarly, the difference between insertion and non-insertion binary

9
src/include/config.h.in
View File

@ -506,15 +506,6 @@ extern void srandom(unsigned int seed);
*/ */
#define FASTBUILD /* access/nbtree/nbtsort.c */ #define FASTBUILD /* access/nbtree/nbtsort.c */
/*
* BTREE_VERSION_1: we must guarantee that all tuples in A LEVEL
* are unique, not in ALL INDEX. So, we can use bti_itup->t_tid
* as unique identifier for a given index tuple (logical position
* within a level) and take off bti_oid & bti_dummy (8 bytes total)
* from btree items.
*/
#define BTREE_VERSION_1
/* /*
* TBL_FREE_CMD_MEMORY: free memory allocated for an user query inside * TBL_FREE_CMD_MEMORY: free memory allocated for an user query inside
* transaction block after this query is done. * transaction block after this query is done.