Fix an Assert bug(was my fault) pointed out by Tom Lane.

Hiroshi Inoue · Hiroshi Inoue · commit 8a5851880ebf · 2000-04-10T00:45:42.000Z
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.70 2000/02/24 04:36:01 inoue Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.71 2000/04/10 00:45:42 inoue Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,7 +47,7 @@
  *		This is so that we can support more backends. (system-wide semaphore
  *		sets run out pretty fast.)				  -ay 4/95
  *
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.70 2000/02/24 04:36:01 inoue Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.71 2000/04/10 00:45:42 inoue Exp $
  */
 #include <sys/time.h>
 #include <unistd.h>
@@ -493,7 +493,12 @@ void	SetWaitingForLock(bool waiting)
 	lockWaiting = waiting;
 	if (lockWaiting)
 	{
-		Assert(MyProc->links.next != INVALID_OFFSET);
+		/* The lock was already released ? */
+		if (MyProc->links.next == INVALID_OFFSET)
+		{
+			lockWaiting = false;
+			return;
+		}
 		if (QueryCancel) /* cancel request pending */
 		{
 			if (GetOffWaitqueue(MyProc))

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.70 2000/02/24 04:36:01 inoue Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.71 2000/04/10 00:45:42 inoue Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -47,7 +47,7 @@`
`47`	`47`	`* This is so that we can support more backends. (system-wide semaphore`
`48`	`48`	`* sets run out pretty fast.) -ay 4/95`
`49`	`49`	`*`
`50`		`- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.70 2000/02/24 04:36:01 inoue Exp $`
	`50`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.71 2000/04/10 00:45:42 inoue Exp $`
`51`	`51`	`*/`
`52`	`52`	`#include <sys/time.h>`
`53`	`53`	`#include <unistd.h>`
`@@ -493,7 +493,12 @@ void SetWaitingForLock(bool waiting)`
`493`	`493`	`lockWaiting = waiting;`
`494`	`494`	`if (lockWaiting)`
`495`	`495`	`{`
`496`		`- Assert(MyProc->links.next != INVALID_OFFSET);`
	`496`	`+ /* The lock was already released ? */`
	`497`	`+ if (MyProc->links.next == INVALID_OFFSET)`
	`498`	`+ {`
	`499`	`+ lockWaiting = false;`
	`500`	`+ return;`
	`501`	`+ }`
`497`	`502`	`if (QueryCancel) /* cancel request pending */`
`498`	`503`	`{`
`499`	`504`	`if (GetOffWaitqueue(MyProc))`