Fix typo and comments related to the recent no-wait lock improvements

michaelpq · michaelpq · commit f7ab71ba0c7b · 2024-05-23T13:47:12.000+09:00
The argument of dontWait at the top of ProcSleep() was documented backwards, and there was a typo in lock.c. Thinkos in 2346df6. Author: Will Mortensen Reviewed-by: Jingxian Li, Michael Paquier Discussion: https://postgr.es/m/CAMpnoC5f+eiS7tdy8PUpd_LacSTVT-pYpVooKfjHRQQmkHPZ2g@mail.gmail.com
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
@@ -1060,7 +1060,7 @@ LockAcquireExtended(const LOCKTAG *locktag,
 
 		/*
 		 * Check the proclock entry status. If dontWait = true, this is an
-		 * expected case; otherwise, it will open happen if something in the
+		 * expected case; otherwise, it will only happen if something in the
 		 * ipc communication doesn't work correctly.
 		 */
 		if (!(proclock->holdMask & LOCKBIT_ON(lockmode)))
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
@@ -1054,8 +1054,8 @@ AuxiliaryPidGetProc(int pid)
  * at exit.
  *
  * Result: PROC_WAIT_STATUS_OK if we acquired the lock, PROC_WAIT_STATUS_ERROR
- * if not (if dontWait = true, this is a deadlock; if dontWait = false, we
- * would have had to wait).
+ * if not (if dontWait = true, we would have had to wait; if dontWait = false,
+ * this is a deadlock).
  *
  * ASSUME: that no one will fiddle with the queue until after
  *		we release the partition lock.

Original file line number	Diff line number	Diff line change
`@@ -1054,8 +1054,8 @@ AuxiliaryPidGetProc(int pid)`
`1054`	`1054`	`* at exit.`
`1055`	`1055`	`*`
`1056`	`1056`	`* Result: PROC_WAIT_STATUS_OK if we acquired the lock, PROC_WAIT_STATUS_ERROR`
`1057`		`- * if not (if dontWait = true, this is a deadlock; if dontWait = false, we`
`1058`		`- * would have had to wait).`
	`1057`	`+ * if not (if dontWait = true, we would have had to wait; if dontWait = false,`
	`1058`	`+ * this is a deadlock).`
`1059`	`1059`	`*`
`1060`	`1060`	`* ASSUME: that no one will fiddle with the queue until after`
`1061`	`1061`	`* we release the partition lock.`