1. Vacuum is updated for MVCC.

2. Much faster btree tuples deletion in the case when first on page
   index tuple is deleted (no movement to the left page(s)).
3. Remember blkno of new root page in BTPageOpaque of
   left/right siblings when root page is splitted.

1 files changed, 1 insertions, 52 deletions

diff --git a/src/backend/storage/lmgr/multi.c b/src/backend/storage/lmgr/multi.c
index 6807e9d7cc0..38e2d194d65 100644
--- a/src/backend/storage/lmgr/multi.c
+++ b/src/backend/storage/lmgr/multi.c
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.27 1999/02/13 23:18:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.28 1999/03/28 20:32:25 vadim Exp $
  *
  * NOTES:
  *	 (1) The lock.c module assumes that the caller here is doing
@@ -34,55 +34,6 @@ static bool MultiAcquire(LOCKMETHOD lockmethod, LOCKTAG *tag,
 static bool MultiRelease(LOCKMETHOD lockmethod, LOCKTAG *tag,
 			 LOCKMODE lockmode, PG_LOCK_LEVEL level);
 
-#ifdef LowLevelLocking
-
-static MASK MultiConflicts[] = {
-	(int) NULL,
-
-/* RowShareLock */
-	(1 << ExclusiveLock),
-
-/* RowExclusiveLock */
-	(1 << ExclusiveLock) | (1 << ShareRowExclusiveLock) | (1 << ShareLock),
-
-/* ShareLock */
-	(1 << ExclusiveLock) | (1 << ShareRowExclusiveLock) |
-	(1 << RowExclusiveLock),
-
-/* ShareRowExclusiveLock */
-	(1 << ExclusiveLock) | (1 << ShareRowExclusiveLock) |
-	(1 << ShareLock) | (1 << RowExclusiveLock),
-
-/* ExclusiveLock */
-	(1 << ExclusiveLock) | (1 << ShareRowExclusiveLock) | (1 << ShareLock) |
-	(1 << RowExclusiveLock) | (1 << RowShareLock),
-
-/* ObjShareLock */
-	(1 << ObjExclusiveLock),
-
-/* ObjExclusiveLock */
-	(1 << ObjExclusiveLock) | (1 << ObjShareLock),
-
-/* ExtendLock */
-	(1 << ExtendLock)
-
-};
-
-/*
- * write locks have higher priority than read locks and extend locks.  May
- * want to treat INTENT locks differently.
- */
-static int	MultiPrios[] = {
-	(int) NULL,
-	2,
-	1,
-	2,
-	1,
-	1
-};
-
-#else
-
 /*
  * INTENT indicates to higher level that a lower level lock has been
  * set.  For example, a write lock on a tuple conflicts with a write
@@ -121,8 +72,6 @@ static int	MultiPrios[] = {
 	1
 };
 
-#endif	 /* !LowLevelLocking */
-
 /*
  * Lock table identifier for this lock table.  The multi-level
  * lock table is ONE lock table, not three.