@@ -1432,8 +1432,7 @@ GetSafeSnapshot(Snapshot origSnapshot)
1432
1432
* them marked us as conflicted.
1433
1433
*/
1434
1434
MySerializableXact -> flags |= SXACT_FLAG_DEFERRABLE_WAITING ;
1435
- while (!(SHMQueueEmpty ((SHM_QUEUE * )
1436
- & MySerializableXact -> possibleUnsafeConflicts ) ||
1435
+ while (!(SHMQueueEmpty (& MySerializableXact -> possibleUnsafeConflicts ) ||
1437
1436
SxactIsROUnsafe (MySerializableXact )))
1438
1437
{
1439
1438
LWLockRelease (SerializableXactHashLock );
@@ -3114,13 +3113,13 @@ ReleasePredicateLocks(const bool isCommit)
3114
3113
* opposed to 'outLink' for the r/w xacts.
3115
3114
*/
3116
3115
possibleUnsafeConflict = (RWConflict )
3117
- SHMQueueNext (( SHM_QUEUE * ) & MySerializableXact -> possibleUnsafeConflicts ,
3118
- ( SHM_QUEUE * ) & MySerializableXact -> possibleUnsafeConflicts ,
3116
+ SHMQueueNext (& MySerializableXact -> possibleUnsafeConflicts ,
3117
+ & MySerializableXact -> possibleUnsafeConflicts ,
3119
3118
offsetof(RWConflictData , inLink ));
3120
3119
while (possibleUnsafeConflict )
3121
3120
{
3122
3121
nextConflict = (RWConflict )
3123
- SHMQueueNext (( SHM_QUEUE * ) & MySerializableXact -> possibleUnsafeConflicts ,
3122
+ SHMQueueNext (& MySerializableXact -> possibleUnsafeConflicts ,
3124
3123
& possibleUnsafeConflict -> inLink ,
3125
3124
offsetof(RWConflictData , inLink ));
3126
3125
@@ -3153,13 +3152,13 @@ ReleasePredicateLocks(const bool isCommit)
3153
3152
* previously committed transactions.
3154
3153
*/
3155
3154
conflict = (RWConflict )
3156
- SHMQueueNext (( SHM_QUEUE * ) & MySerializableXact -> outConflicts ,
3157
- ( SHM_QUEUE * ) & MySerializableXact -> outConflicts ,
3155
+ SHMQueueNext (& MySerializableXact -> outConflicts ,
3156
+ & MySerializableXact -> outConflicts ,
3158
3157
offsetof(RWConflictData , outLink ));
3159
3158
while (conflict )
3160
3159
{
3161
3160
nextConflict = (RWConflict )
3162
- SHMQueueNext (( SHM_QUEUE * ) & MySerializableXact -> outConflicts ,
3161
+ SHMQueueNext (& MySerializableXact -> outConflicts ,
3163
3162
& conflict -> outLink ,
3164
3163
offsetof(RWConflictData , outLink ));
3165
3164
@@ -3186,13 +3185,13 @@ ReleasePredicateLocks(const bool isCommit)
3186
3185
* we're rolling back, clear them all.
3187
3186
*/
3188
3187
conflict = (RWConflict )
3189
- SHMQueueNext (( SHM_QUEUE * ) & MySerializableXact -> inConflicts ,
3190
- ( SHM_QUEUE * ) & MySerializableXact -> inConflicts ,
3188
+ SHMQueueNext (& MySerializableXact -> inConflicts ,
3189
+ & MySerializableXact -> inConflicts ,
3191
3190
offsetof(RWConflictData , inLink ));
3192
3191
while (conflict )
3193
3192
{
3194
3193
nextConflict = (RWConflict )
3195
- SHMQueueNext (( SHM_QUEUE * ) & MySerializableXact -> inConflicts ,
3194
+ SHMQueueNext (& MySerializableXact -> inConflicts ,
3196
3195
& conflict -> inLink ,
3197
3196
offsetof(RWConflictData , inLink ));
3198
3197
@@ -3213,13 +3212,13 @@ ReleasePredicateLocks(const bool isCommit)
3213
3212
* up if they are known safe or known unsafe.
3214
3213
*/
3215
3214
possibleUnsafeConflict = (RWConflict )
3216
- SHMQueueNext (( SHM_QUEUE * ) & MySerializableXact -> possibleUnsafeConflicts ,
3217
- ( SHM_QUEUE * ) & MySerializableXact -> possibleUnsafeConflicts ,
3215
+ SHMQueueNext (& MySerializableXact -> possibleUnsafeConflicts ,
3216
+ & MySerializableXact -> possibleUnsafeConflicts ,
3218
3217
offsetof(RWConflictData , outLink ));
3219
3218
while (possibleUnsafeConflict )
3220
3219
{
3221
3220
nextConflict = (RWConflict )
3222
- SHMQueueNext (( SHM_QUEUE * ) & MySerializableXact -> possibleUnsafeConflicts ,
3221
+ SHMQueueNext (& MySerializableXact -> possibleUnsafeConflicts ,
3223
3222
& possibleUnsafeConflict -> outLink ,
3224
3223
offsetof(RWConflictData , outLink ));
3225
3224
@@ -3290,7 +3289,7 @@ ReleasePredicateLocks(const bool isCommit)
3290
3289
/* Add this to the list of transactions to check for later cleanup. */
3291
3290
if (isCommit )
3292
3291
SHMQueueInsertBefore (FinishedSerializableTransactions ,
3293
- ( SHM_QUEUE * ) & ( MySerializableXact -> finishedLink ) );
3292
+ & MySerializableXact -> finishedLink );
3294
3293
3295
3294
if (!isCommit )
3296
3295
ReleaseOneSerializableXact (MySerializableXact , false, false);
@@ -3789,7 +3788,7 @@ CheckForSerializableConflictOut(const bool visible, const Relation relation,
3789
3788
errhint ("The transaction might succeed if retried." )));
3790
3789
3791
3790
if (SxactHasSummaryConflictIn (MySerializableXact )
3792
- || !SHMQueueEmpty (( SHM_QUEUE * ) & MySerializableXact -> inConflicts ))
3791
+ || !SHMQueueEmpty (& MySerializableXact -> inConflicts ))
3793
3792
ereport (ERROR ,
3794
3793
(errcode (ERRCODE_T_R_SERIALIZATION_FAILURE ),
3795
3794
errmsg ("could not serialize access due to read/write dependencies among transactions" ),
@@ -4462,8 +4461,8 @@ PreCommit_CheckForSerializationFailure(void)
4462
4461
}
4463
4462
4464
4463
nearConflict = (RWConflict )
4465
- SHMQueueNext (( SHM_QUEUE * ) & MySerializableXact -> inConflicts ,
4466
- ( SHM_QUEUE * ) & MySerializableXact -> inConflicts ,
4464
+ SHMQueueNext (& MySerializableXact -> inConflicts ,
4465
+ & MySerializableXact -> inConflicts ,
4467
4466
offsetof(RWConflictData , inLink ));
4468
4467
while (nearConflict )
4469
4468
{
@@ -4496,7 +4495,7 @@ PreCommit_CheckForSerializationFailure(void)
4496
4495
}
4497
4496
4498
4497
nearConflict = (RWConflict )
4499
- SHMQueueNext (( SHM_QUEUE * ) & MySerializableXact -> inConflicts ,
4498
+ SHMQueueNext (& MySerializableXact -> inConflicts ,
4500
4499
& nearConflict -> inLink ,
4501
4500
offsetof(RWConflictData , inLink ));
4502
4501
}
@@ -4543,9 +4542,9 @@ AtPrepare_PredicateLocks(void)
4543
4542
* outConflicts lists, if they're non-empty we'll represent that by
4544
4543
* setting the appropriate summary conflict flags.
4545
4544
*/
4546
- if (!SHMQueueEmpty (( SHM_QUEUE * ) & MySerializableXact -> inConflicts ))
4545
+ if (!SHMQueueEmpty (& MySerializableXact -> inConflicts ))
4547
4546
xactRecord -> flags |= SXACT_FLAG_SUMMARY_CONFLICT_IN ;
4548
- if (!SHMQueueEmpty (( SHM_QUEUE * ) & MySerializableXact -> outConflicts ))
4547
+ if (!SHMQueueEmpty (& MySerializableXact -> outConflicts ))
4549
4548
xactRecord -> flags |= SXACT_FLAG_SUMMARY_CONFLICT_OUT ;
4550
4549
4551
4550
RegisterTwoPhaseRecord (TWOPHASE_RM_PREDICATELOCK_ID , 0 ,
0 commit comments