summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/backend/parser/gram.y22
-rw-r--r--src/backend/storage/lmgr/lmgr.c44
-rw-r--r--src/backend/storage/lmgr/lock.c3
-rw-r--r--src/include/storage/lmgr.h15
-rw-r--r--src/include/storage/lock.h6
-rw-r--r--src/interfaces/ecpg/preproc/preproc.y20
6 files changed, 62 insertions, 48 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index cf518f3cadd..7e6f782984e 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.233 2001/06/30 22:03:25 petere Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.234 2001/07/09 22:18:33 tgl Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -153,7 +153,7 @@ static void doNegateFloat(Value *v);
%type <list> createdb_opt_list, createdb_opt_item
%type <ival> opt_lock, lock_type
-%type <boolean> opt_lmode, opt_force
+%type <boolean> opt_force
%type <ival> user_createdb_clause, user_createuser_clause
%type <str> user_passwd_clause
@@ -3277,18 +3277,18 @@ LockStmt: LOCK_P opt_table relation_name opt_lock
}
;
-opt_lock: IN lock_type MODE { $$ = $2; }
+opt_lock: IN lock_type MODE { $$ = $2; }
| /*EMPTY*/ { $$ = AccessExclusiveLock; }
;
-lock_type: SHARE ROW EXCLUSIVE { $$ = ShareRowExclusiveLock; }
- | ROW opt_lmode { $$ = ($2? RowShareLock: RowExclusiveLock); }
- | ACCESS opt_lmode { $$ = ($2? AccessShareLock: AccessExclusiveLock); }
- | opt_lmode { $$ = ($1? ShareLock: ExclusiveLock); }
- ;
-
-opt_lmode: SHARE { $$ = TRUE; }
- | EXCLUSIVE { $$ = FALSE; }
+lock_type: ACCESS SHARE { $$ = AccessShareLock; }
+ | ROW SHARE { $$ = RowShareLock; }
+ | ROW EXCLUSIVE { $$ = RowExclusiveLock; }
+ | SHARE UPDATE EXCLUSIVE { $$ = ShareUpdateExclusiveLock; }
+ | SHARE { $$ = ShareLock; }
+ | SHARE ROW EXCLUSIVE { $$ = ShareRowExclusiveLock; }
+ | EXCLUSIVE { $$ = ExclusiveLock; }
+ | ACCESS EXCLUSIVE { $$ = AccessExclusiveLock; }
;
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c
index fa3812a87eb..10861348e80 100644
--- a/src/backend/storage/lmgr/lmgr.c
+++ b/src/backend/storage/lmgr/lmgr.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.48 2001/06/22 00:04:59 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.49 2001/07/09 22:18:33 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -33,25 +33,35 @@ static LOCKMASK LockConflicts[] = {
(1 << ExclusiveLock) | (1 << AccessExclusiveLock),
/* RowExclusiveLock */
- (1 << ExclusiveLock) | (1 << ShareRowExclusiveLock) | (1 << ShareLock) |
- (1 << AccessExclusiveLock),
+ (1 << ShareLock) | (1 << ShareRowExclusiveLock) |
+ (1 << ExclusiveLock) | (1 << AccessExclusiveLock),
+
+ /* ShareUpdateExclusiveLock */
+ (1 << ShareUpdateExclusiveLock) |
+ (1 << ShareLock) | (1 << ShareRowExclusiveLock) |
+ (1 << ExclusiveLock) | (1 << AccessExclusiveLock),
/* ShareLock */
- (1 << ExclusiveLock) | (1 << ShareRowExclusiveLock) |
- (1 << RowExclusiveLock) | (1 << AccessExclusiveLock),
+ (1 << RowExclusiveLock) | (1 << ShareUpdateExclusiveLock) |
+ (1 << ShareRowExclusiveLock) |
+ (1 << ExclusiveLock) | (1 << AccessExclusiveLock),
/* ShareRowExclusiveLock */
- (1 << ExclusiveLock) | (1 << ShareRowExclusiveLock) |
- (1 << ShareLock) | (1 << RowExclusiveLock) | (1 << AccessExclusiveLock),
+ (1 << RowExclusiveLock) | (1 << ShareUpdateExclusiveLock) |
+ (1 << ShareLock) | (1 << ShareRowExclusiveLock) |
+ (1 << ExclusiveLock) | (1 << AccessExclusiveLock),
/* ExclusiveLock */
- (1 << ExclusiveLock) | (1 << ShareRowExclusiveLock) | (1 << ShareLock) |
- (1 << RowExclusiveLock) | (1 << RowShareLock) | (1 << AccessExclusiveLock),
+ (1 << RowShareLock) |
+ (1 << RowExclusiveLock) | (1 << ShareUpdateExclusiveLock) |
+ (1 << ShareLock) | (1 << ShareRowExclusiveLock) |
+ (1 << ExclusiveLock) | (1 << AccessExclusiveLock),
/* AccessExclusiveLock */
- (1 << ExclusiveLock) | (1 << ShareRowExclusiveLock) | (1 << ShareLock) |
- (1 << RowExclusiveLock) | (1 << RowShareLock) |
- (1 << AccessExclusiveLock) | (1 << AccessShareLock)
+ (1 << AccessShareLock) | (1 << RowShareLock) |
+ (1 << RowExclusiveLock) | (1 << ShareUpdateExclusiveLock) |
+ (1 << ShareLock) | (1 << ShareRowExclusiveLock) |
+ (1 << ExclusiveLock) | (1 << AccessExclusiveLock)
};
@@ -63,14 +73,16 @@ static int LockPrios[] = {
2,
/* RowExclusiveLock */
3,
- /* ShareLock */
+ /* ShareUpdateExclusiveLock */
4,
- /* ShareRowExclusiveLock */
+ /* ShareLock */
5,
- /* ExclusiveLock */
+ /* ShareRowExclusiveLock */
6,
+ /* ExclusiveLock */
+ 7,
/* AccessExclusiveLock */
- 7
+ 8
};
LOCKMETHOD LockTableId = (LOCKMETHOD) NULL;
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index 3eb01048274..cff407a4a81 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.90 2001/06/27 23:31:39 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.91 2001/07/09 22:18:33 tgl Exp $
*
* NOTES
* Outside modules can create a lock table and acquire/release
@@ -58,6 +58,7 @@ static char *lock_mode_names[] =
"AccessShareLock",
"RowShareLock",
"RowExclusiveLock",
+ "ShareUpdateExclusiveLock",
"ShareLock",
"ShareRowExclusiveLock",
"ExclusiveLock",
diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h
index c279ef63f2a..1fb490e6d69 100644
--- a/src/include/storage/lmgr.h
+++ b/src/include/storage/lmgr.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: lmgr.h,v 1.31 2001/06/22 00:04:59 tgl Exp $
+ * $Id: lmgr.h,v 1.32 2001/07/09 22:18:34 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -25,13 +25,14 @@
#define AccessShareLock 1 /* SELECT */
#define RowShareLock 2 /* SELECT FOR UPDATE */
#define RowExclusiveLock 3 /* INSERT, UPDATE, DELETE */
-#define ShareLock 4 /* CREATE INDEX */
-#define ShareRowExclusiveLock 5 /* like EXCLUSIVE MODE, allows
- * SHARE ROW */
-#define ExclusiveLock 6 /* blocks ROW SHARE/SELECT...FOR
+#define ShareUpdateExclusiveLock 4 /* VACUUM (non-FULL) */
+#define ShareLock 5 /* CREATE INDEX */
+#define ShareRowExclusiveLock 6 /* like EXCLUSIVE MODE, but allows
+ * ROW SHARE */
+#define ExclusiveLock 7 /* blocks ROW SHARE/SELECT...FOR
* UPDATE */
-#define AccessExclusiveLock 7 /* ALTER TABLE, DROP TABLE,
- * VACUUM, and unqualified LOCK
+#define AccessExclusiveLock 8 /* ALTER TABLE, DROP TABLE,
+ * VACUUM FULL, and unqualified LOCK
* TABLE */
/*
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index 30a13649e43..1010e6760b3 100644
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: lock.h,v 1.50 2001/06/27 23:31:39 tgl Exp $
+ * $Id: lock.h,v 1.51 2001/07/09 22:18:34 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -49,7 +49,7 @@ typedef int LOCKMODE;
typedef int LOCKMETHOD;
/* MAX_LOCKMODES cannot be larger than the # of bits in LOCKMASK */
-#define MAX_LOCKMODES 8
+#define MAX_LOCKMODES 10
/*
* MAX_LOCK_METHODS corresponds to the number of spin locks allocated in
@@ -91,7 +91,7 @@ typedef int LOCKMETHOD;
*
* prio -- each lockmode has a priority, so, for example, waiting
* writers can be given priority over readers (to avoid
- * starvation).
+ * starvation). XXX this field is not actually used at present!
*
* masterlock -- synchronizes access to the table
*/
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
index 2228c125d8a..e0626025d8f 100644
--- a/src/interfaces/ecpg/preproc/preproc.y
+++ b/src/interfaces/ecpg/preproc/preproc.y
@@ -326,7 +326,7 @@ make_name(void)
%type <str> createdb_opt_list opt_encoding OptInherit Geometric
%type <str> DropdbStmt ClusterStmt grantee RevokeStmt Bit bit
%type <str> GrantStmt privileges operation_commalist operation PosAllConst
-%type <str> opt_cursor opt_lmode ConstraintsSetStmt comment_tg AllConst
+%type <str> opt_cursor ConstraintsSetStmt comment_tg AllConst
%type <str> case_expr when_clause_list case_default case_arg when_clause
%type <str> select_clause opt_select_limit select_limit_value ConstraintTimeSpec
%type <str> select_offset_value ReindexStmt join_type opt_boolean
@@ -2440,15 +2440,15 @@ opt_lock: IN lock_type MODE { $$ = cat_str(3, make_str("in"), $2, ma
| /*EMPTY*/ { $$ = EMPTY;}
;
-lock_type: SHARE ROW EXCLUSIVE { $$ = make_str("share row exclusive"); }
- | ROW opt_lmode { $$ = cat2_str(make_str("row"), $2);}
- | ACCESS opt_lmode { $$ = cat2_str(make_str("access"), $2);}
- | opt_lmode { $$ = $1; }
- ;
-
-opt_lmode: SHARE { $$ = make_str("share"); }
- | EXCLUSIVE { $$ = make_str("exclusive"); }
- ;
+lock_type: ACCESS SHARE { $$ = make_str("access share"); }
+ | ROW SHARE { $$ = make_str("access share"); }
+ | ROW EXCLUSIVE { $$ = make_str("row exclusive"); }
+ | SHARE UPDATE EXCLUSIVE { $$ = make_str("share update exclusive"); }
+ | SHARE { $$ = make_str("share"); }
+ | SHARE ROW EXCLUSIVE { $$ = make_str("share row exclusive"); }
+ | EXCLUSIVE { $$ = make_str("exclusive"); }
+ | ACCESS EXCLUSIVE { $$ = make_str("access exclusive"); }
+ ;
/*****************************************************************************
*
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-19 03:19:32 +0000