Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 13000b4

Browse files
committed
Remove now-unnecessary casts.
Kevin Grittner
1 parent 5fe241c commit 13000b4

File tree

1 file changed

+20
-21
lines changed

1 file changed

+20
-21
lines changed

src/backend/storage/lmgr/predicate.c

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1432,8 +1432,7 @@ GetSafeSnapshot(Snapshot origSnapshot)
14321432
* them marked us as conflicted.
14331433
*/
14341434
MySerializableXact->flags |= SXACT_FLAG_DEFERRABLE_WAITING;
1435-
while (!(SHMQueueEmpty((SHM_QUEUE *)
1436-
&MySerializableXact->possibleUnsafeConflicts) ||
1435+
while (!(SHMQueueEmpty(&MySerializableXact->possibleUnsafeConflicts) ||
14371436
SxactIsROUnsafe(MySerializableXact)))
14381437
{
14391438
LWLockRelease(SerializableXactHashLock);
@@ -3114,13 +3113,13 @@ ReleasePredicateLocks(const bool isCommit)
31143113
* opposed to 'outLink' for the r/w xacts.
31153114
*/
31163115
possibleUnsafeConflict = (RWConflict)
3117-
SHMQueueNext((SHM_QUEUE *) &MySerializableXact->possibleUnsafeConflicts,
3118-
(SHM_QUEUE *) &MySerializableXact->possibleUnsafeConflicts,
3116+
SHMQueueNext(&MySerializableXact->possibleUnsafeConflicts,
3117+
&MySerializableXact->possibleUnsafeConflicts,
31193118
offsetof(RWConflictData, inLink));
31203119
while (possibleUnsafeConflict)
31213120
{
31223121
nextConflict = (RWConflict)
3123-
SHMQueueNext((SHM_QUEUE *) &MySerializableXact->possibleUnsafeConflicts,
3122+
SHMQueueNext(&MySerializableXact->possibleUnsafeConflicts,
31243123
&possibleUnsafeConflict->inLink,
31253124
offsetof(RWConflictData, inLink));
31263125

@@ -3153,13 +3152,13 @@ ReleasePredicateLocks(const bool isCommit)
31533152
* previously committed transactions.
31543153
*/
31553154
conflict = (RWConflict)
3156-
SHMQueueNext((SHM_QUEUE *) &MySerializableXact->outConflicts,
3157-
(SHM_QUEUE *) &MySerializableXact->outConflicts,
3155+
SHMQueueNext(&MySerializableXact->outConflicts,
3156+
&MySerializableXact->outConflicts,
31583157
offsetof(RWConflictData, outLink));
31593158
while (conflict)
31603159
{
31613160
nextConflict = (RWConflict)
3162-
SHMQueueNext((SHM_QUEUE *) &MySerializableXact->outConflicts,
3161+
SHMQueueNext(&MySerializableXact->outConflicts,
31633162
&conflict->outLink,
31643163
offsetof(RWConflictData, outLink));
31653164

@@ -3186,13 +3185,13 @@ ReleasePredicateLocks(const bool isCommit)
31863185
* we're rolling back, clear them all.
31873186
*/
31883187
conflict = (RWConflict)
3189-
SHMQueueNext((SHM_QUEUE *) &MySerializableXact->inConflicts,
3190-
(SHM_QUEUE *) &MySerializableXact->inConflicts,
3188+
SHMQueueNext(&MySerializableXact->inConflicts,
3189+
&MySerializableXact->inConflicts,
31913190
offsetof(RWConflictData, inLink));
31923191
while (conflict)
31933192
{
31943193
nextConflict = (RWConflict)
3195-
SHMQueueNext((SHM_QUEUE *) &MySerializableXact->inConflicts,
3194+
SHMQueueNext(&MySerializableXact->inConflicts,
31963195
&conflict->inLink,
31973196
offsetof(RWConflictData, inLink));
31983197

@@ -3213,13 +3212,13 @@ ReleasePredicateLocks(const bool isCommit)
32133212
* up if they are known safe or known unsafe.
32143213
*/
32153214
possibleUnsafeConflict = (RWConflict)
3216-
SHMQueueNext((SHM_QUEUE *) &MySerializableXact->possibleUnsafeConflicts,
3217-
(SHM_QUEUE *) &MySerializableXact->possibleUnsafeConflicts,
3215+
SHMQueueNext(&MySerializableXact->possibleUnsafeConflicts,
3216+
&MySerializableXact->possibleUnsafeConflicts,
32183217
offsetof(RWConflictData, outLink));
32193218
while (possibleUnsafeConflict)
32203219
{
32213220
nextConflict = (RWConflict)
3222-
SHMQueueNext((SHM_QUEUE *) &MySerializableXact->possibleUnsafeConflicts,
3221+
SHMQueueNext(&MySerializableXact->possibleUnsafeConflicts,
32233222
&possibleUnsafeConflict->outLink,
32243223
offsetof(RWConflictData, outLink));
32253224

@@ -3290,7 +3289,7 @@ ReleasePredicateLocks(const bool isCommit)
32903289
/* Add this to the list of transactions to check for later cleanup. */
32913290
if (isCommit)
32923291
SHMQueueInsertBefore(FinishedSerializableTransactions,
3293-
(SHM_QUEUE *) &(MySerializableXact->finishedLink));
3292+
&MySerializableXact->finishedLink);
32943293

32953294
if (!isCommit)
32963295
ReleaseOneSerializableXact(MySerializableXact, false, false);
@@ -3789,7 +3788,7 @@ CheckForSerializableConflictOut(const bool visible, const Relation relation,
37893788
errhint("The transaction might succeed if retried.")));
37903789

37913790
if (SxactHasSummaryConflictIn(MySerializableXact)
3792-
|| !SHMQueueEmpty((SHM_QUEUE *) &MySerializableXact->inConflicts))
3791+
|| !SHMQueueEmpty(&MySerializableXact->inConflicts))
37933792
ereport(ERROR,
37943793
(errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
37953794
errmsg("could not serialize access due to read/write dependencies among transactions"),
@@ -4462,8 +4461,8 @@ PreCommit_CheckForSerializationFailure(void)
44624461
}
44634462

44644463
nearConflict = (RWConflict)
4465-
SHMQueueNext((SHM_QUEUE *) &MySerializableXact->inConflicts,
4466-
(SHM_QUEUE *) &MySerializableXact->inConflicts,
4464+
SHMQueueNext(&MySerializableXact->inConflicts,
4465+
&MySerializableXact->inConflicts,
44674466
offsetof(RWConflictData, inLink));
44684467
while (nearConflict)
44694468
{
@@ -4496,7 +4495,7 @@ PreCommit_CheckForSerializationFailure(void)
44964495
}
44974496

44984497
nearConflict = (RWConflict)
4499-
SHMQueueNext((SHM_QUEUE *) &MySerializableXact->inConflicts,
4498+
SHMQueueNext(&MySerializableXact->inConflicts,
45004499
&nearConflict->inLink,
45014500
offsetof(RWConflictData, inLink));
45024501
}
@@ -4543,9 +4542,9 @@ AtPrepare_PredicateLocks(void)
45434542
* outConflicts lists, if they're non-empty we'll represent that by
45444543
* setting the appropriate summary conflict flags.
45454544
*/
4546-
if (!SHMQueueEmpty((SHM_QUEUE *) &MySerializableXact->inConflicts))
4545+
if (!SHMQueueEmpty(&MySerializableXact->inConflicts))
45474546
xactRecord->flags |= SXACT_FLAG_SUMMARY_CONFLICT_IN;
4548-
if (!SHMQueueEmpty((SHM_QUEUE *) &MySerializableXact->outConflicts))
4547+
if (!SHMQueueEmpty(&MySerializableXact->outConflicts))
45494548
xactRecord->flags |= SXACT_FLAG_SUMMARY_CONFLICT_OUT;
45504549

45514550
RegisterTwoPhaseRecord(TWOPHASE_RM_PREDICATELOCK_ID, 0,

0 commit comments

Comments
 (0)