@@ -199,12 +199,19 @@ typedef struct QueuePosition
199
199
(x).page != (y).page ? (y) : \
200
200
(x).offset < (y).offset ? (x) : (y))
201
201
202
+ /* choose logically larger QueuePosition */
203
+ #define QUEUE_POS_MAX (x ,y ) \
204
+ (asyncQueuePagePrecedes((x).page, (y).page) ? (y) : \
205
+ (x).page != (y).page ? (x) : \
206
+ (x).offset > (y).offset ? (x) : (y))
207
+
202
208
/*
203
209
* Struct describing a listening backend's status
204
210
*/
205
211
typedef struct QueueBackendStatus
206
212
{
207
213
int32 pid ; /* either a PID or InvalidPid */
214
+ Oid dboid ; /* backend's database OID, or InvalidOid */
208
215
QueuePosition pos ; /* backend has read queue up to here */
209
216
} QueueBackendStatus ;
210
217
@@ -221,6 +228,7 @@ typedef struct QueueBackendStatus
221
228
* When holding the lock in EXCLUSIVE mode, backends can inspect the entries
222
229
* of other backends and also change the head and tail pointers.
223
230
*
231
+ * AsyncCtlLock is used as the control lock for the pg_notify SLRU buffers.
224
232
* In order to avoid deadlocks, whenever we need both locks, we always first
225
233
* get AsyncQueueLock and then AsyncCtlLock.
226
234
*
@@ -231,8 +239,8 @@ typedef struct QueueBackendStatus
231
239
typedef struct AsyncQueueControl
232
240
{
233
241
QueuePosition head ; /* head points to the next free location */
234
- QueuePosition tail ; /* the global tail is equivalent to the tail
235
- * of the "slowest" backend */
242
+ QueuePosition tail ; /* the global tail is equivalent to the pos of
243
+ * the "slowest" backend */
236
244
TimestampTz lastQueueFillWarn ; /* time of last queue-full msg */
237
245
QueueBackendStatus backend [1 ]; /* actually of length MaxBackends+1 */
238
246
/* DO NOT ADD FURTHER STRUCT MEMBERS HERE */
@@ -243,6 +251,7 @@ static AsyncQueueControl *asyncQueueControl;
243
251
#define QUEUE_HEAD (asyncQueueControl->head)
244
252
#define QUEUE_TAIL (asyncQueueControl->tail)
245
253
#define QUEUE_BACKEND_PID (i ) (asyncQueueControl->backend[i].pid)
254
+ #define QUEUE_BACKEND_DBOID (i ) (asyncQueueControl->backend[i].dboid)
246
255
#define QUEUE_BACKEND_POS (i ) (asyncQueueControl->backend[i].pos)
247
256
248
257
/*
@@ -461,6 +470,7 @@ AsyncShmemInit(void)
461
470
for (i = 0 ; i <= MaxBackends ; i ++ )
462
471
{
463
472
QUEUE_BACKEND_PID (i ) = InvalidPid ;
473
+ QUEUE_BACKEND_DBOID (i ) = InvalidOid ;
464
474
SET_QUEUE_POS (QUEUE_BACKEND_POS (i ), 0 , 0 );
465
475
}
466
476
}
@@ -906,6 +916,10 @@ AtCommit_Notify(void)
906
916
static void
907
917
Exec_ListenPreCommit (void )
908
918
{
919
+ QueuePosition head ;
920
+ QueuePosition max ;
921
+ int i ;
922
+
909
923
/*
910
924
* Nothing to do if we are already listening to something, nor if we
911
925
* already ran this routine in this transaction.
@@ -933,10 +947,34 @@ Exec_ListenPreCommit(void)
933
947
* over already-committed notifications. This ensures we cannot miss any
934
948
* not-yet-committed notifications. We might get a few more but that
935
949
* doesn't hurt.
950
+ *
951
+ * In some scenarios there might be a lot of committed notifications that
952
+ * have not yet been pruned away (because some backend is being lazy about
953
+ * reading them). To reduce our startup time, we can look at other
954
+ * backends and adopt the maximum "pos" pointer of any backend that's in
955
+ * our database; any notifications it's already advanced over are surely
956
+ * committed and need not be re-examined by us. (We must consider only
957
+ * backends connected to our DB, because others will not have bothered to
958
+ * check committed-ness of notifications in our DB.) But we only bother
959
+ * with that if there's more than a page worth of notifications
960
+ * outstanding, otherwise scanning all the other backends isn't worth it.
961
+ *
962
+ * We need exclusive lock here so we can look at other backends' entries.
936
963
*/
937
- LWLockAcquire (AsyncQueueLock , LW_SHARED );
938
- QUEUE_BACKEND_POS (MyBackendId ) = QUEUE_TAIL ;
964
+ LWLockAcquire (AsyncQueueLock , LW_EXCLUSIVE );
965
+ head = QUEUE_HEAD ;
966
+ max = QUEUE_TAIL ;
967
+ if (QUEUE_POS_PAGE (max ) != QUEUE_POS_PAGE (head ))
968
+ {
969
+ for (i = 1 ; i <= MaxBackends ; i ++ )
970
+ {
971
+ if (QUEUE_BACKEND_DBOID (i ) == MyDatabaseId )
972
+ max = QUEUE_POS_MAX (max , QUEUE_BACKEND_POS (i ));
973
+ }
974
+ }
975
+ QUEUE_BACKEND_POS (MyBackendId ) = max ;
939
976
QUEUE_BACKEND_PID (MyBackendId ) = MyProcPid ;
977
+ QUEUE_BACKEND_DBOID (MyBackendId ) = MyDatabaseId ;
940
978
LWLockRelease (AsyncQueueLock );
941
979
942
980
/* Now we are listed in the global array, so remember we're listening */
@@ -952,7 +990,8 @@ Exec_ListenPreCommit(void)
952
990
*
953
991
* This will also advance the global tail pointer if possible.
954
992
*/
955
- asyncQueueReadAllNotifications ();
993
+ if (!QUEUE_POS_EQUAL (max , head ))
994
+ asyncQueueReadAllNotifications ();
956
995
}
957
996
958
997
/*
@@ -1155,6 +1194,7 @@ asyncQueueUnregister(void)
1155
1194
QUEUE_POS_EQUAL (QUEUE_BACKEND_POS (MyBackendId ), QUEUE_TAIL );
1156
1195
/* ... then mark it invalid */
1157
1196
QUEUE_BACKEND_PID (MyBackendId ) = InvalidPid ;
1197
+ QUEUE_BACKEND_DBOID (MyBackendId ) = InvalidOid ;
1158
1198
LWLockRelease (AsyncQueueLock );
1159
1199
1160
1200
/* mark ourselves as no longer listed in the global array */
0 commit comments