Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5da417f

Browse files
committed
Remove pointless const qualifiers from function arguments in the SSI code.
As Tom Lane pointed out, "const Relation foo" doesn't guarantee that youcan't modify the data the "foo" pointer points to. It just means that youcan't change the pointer to point to something else within the function,which is not very useful.
1 parent503c730 commit5da417f

File tree

2 files changed

+59
-61
lines changed

2 files changed

+59
-61
lines changed

‎src/backend/storage/lmgr/predicate.c

Lines changed: 46 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ static void ReleasePredXact(SERIALIZABLEXACT *sxact);
388388
staticSERIALIZABLEXACT*FirstPredXact(void);
389389
staticSERIALIZABLEXACT*NextPredXact(SERIALIZABLEXACT*sxact);
390390

391-
staticboolRWConflictExists(constSERIALIZABLEXACT*reader,constSERIALIZABLEXACT*writer);
391+
staticboolRWConflictExists(SERIALIZABLEXACT*reader,SERIALIZABLEXACT*writer);
392392
staticvoidSetRWConflict(SERIALIZABLEXACT*reader,SERIALIZABLEXACT*writer);
393393
staticvoidSetPossibleUnsafeConflict(SERIALIZABLEXACT*roXact,SERIALIZABLEXACT*activeXact);
394394
staticvoidReleaseRWConflict(RWConflictconflict);
@@ -404,27 +404,27 @@ static uint32 predicatelock_hash(const void *key, Size keysize);
404404
staticvoidSummarizeOldestCommittedSxact(void);
405405
staticSnapshotGetSafeSnapshot(Snapshotsnapshot);
406406
staticSnapshotRegisterSerializableTransactionInt(Snapshotsnapshot);
407-
staticboolPredicateLockExists(constPREDICATELOCKTARGETTAG*targettag);
408-
staticboolGetParentPredicateLockTag(constPREDICATELOCKTARGETTAG*tag,
407+
staticboolPredicateLockExists(PREDICATELOCKTARGETTAG*targettag);
408+
staticboolGetParentPredicateLockTag(PREDICATELOCKTARGETTAG*tag,
409409
PREDICATELOCKTARGETTAG*parent);
410-
staticboolCoarserLockCovers(constPREDICATELOCKTARGETTAG*newtargettag);
410+
staticboolCoarserLockCovers(PREDICATELOCKTARGETTAG*newtargettag);
411411
staticvoidRemoveScratchTarget(boollockheld);
412412
staticvoidRestoreScratchTarget(boollockheld);
413413
staticvoidRemoveTargetIfNoLongerUsed(PREDICATELOCKTARGET*target,
414414
uint32targettaghash);
415-
staticvoidDeleteChildTargetLocks(constPREDICATELOCKTARGETTAG*newtargettag);
416-
staticintPredicateLockPromotionThreshold(constPREDICATELOCKTARGETTAG*tag);
417-
staticboolCheckAndPromotePredicateLockRequest(constPREDICATELOCKTARGETTAG*reqtag);
418-
staticvoidDecrementParentLocks(constPREDICATELOCKTARGETTAG*targettag);
419-
staticvoidCreatePredicateLock(constPREDICATELOCKTARGETTAG*targettag,
415+
staticvoidDeleteChildTargetLocks(PREDICATELOCKTARGETTAG*newtargettag);
416+
staticintPredicateLockPromotionThreshold(PREDICATELOCKTARGETTAG*tag);
417+
staticboolCheckAndPromotePredicateLockRequest(PREDICATELOCKTARGETTAG*reqtag);
418+
staticvoidDecrementParentLocks(PREDICATELOCKTARGETTAG*targettag);
419+
staticvoidCreatePredicateLock(PREDICATELOCKTARGETTAG*targettag,
420420
uint32targettaghash,
421421
SERIALIZABLEXACT*sxact);
422422
staticvoidDeleteLockTarget(PREDICATELOCKTARGET*target,uint32targettaghash);
423-
staticboolTransferPredicateLocksToNewTarget(constPREDICATELOCKTARGETTAGoldtargettag,
424-
constPREDICATELOCKTARGETTAGnewtargettag,
423+
staticboolTransferPredicateLocksToNewTarget(PREDICATELOCKTARGETTAGoldtargettag,
424+
PREDICATELOCKTARGETTAGnewtargettag,
425425
boolremoveOld);
426-
staticvoidPredicateLockAcquire(constPREDICATELOCKTARGETTAG*targettag);
427-
staticvoidDropAllPredicateLocksFromTable(constRelationrelation,
426+
staticvoidPredicateLockAcquire(PREDICATELOCKTARGETTAG*targettag);
427+
staticvoidDropAllPredicateLocksFromTable(Relationrelation,
428428
booltransfer);
429429
staticvoidSetNewSxactGlobalXmin(void);
430430
staticvoidClearOldPredicateLocks(void);
@@ -433,7 +433,7 @@ static void ReleaseOneSerializableXact(SERIALIZABLEXACT *sxact, bool partial,
433433
staticboolXidIsConcurrent(TransactionIdxid);
434434
staticvoidCheckTargetForConflictsIn(PREDICATELOCKTARGETTAG*targettag);
435435
staticvoidFlagRWConflict(SERIALIZABLEXACT*reader,SERIALIZABLEXACT*writer);
436-
staticvoidOnConflict_CheckForSerializationFailure(constSERIALIZABLEXACT*reader,
436+
staticvoidOnConflict_CheckForSerializationFailure(SERIALIZABLEXACT*reader,
437437
SERIALIZABLEXACT*writer);
438438

439439

@@ -601,7 +601,7 @@ NextPredXact(SERIALIZABLEXACT *sxact)
601601
* These functions manage primitive access to the RWConflict pool and lists.
602602
*/
603603
staticbool
604-
RWConflictExists(constSERIALIZABLEXACT*reader,constSERIALIZABLEXACT*writer)
604+
RWConflictExists(SERIALIZABLEXACT*reader,SERIALIZABLEXACT*writer)
605605
{
606606
RWConflictconflict;
607607

@@ -1337,7 +1337,7 @@ PredicateLockShmemSize(void)
13371337
staticuint32
13381338
predicatelock_hash(constvoid*key,Sizekeysize)
13391339
{
1340-
constPREDICATELOCKTAG*predicatelocktag= (constPREDICATELOCKTAG*)key;
1340+
PREDICATELOCKTAG*predicatelocktag= (PREDICATELOCKTAG*)key;
13411341
uint32targethash;
13421342

13431343
Assert(keysize==sizeof(PREDICATELOCKTAG));
@@ -1699,7 +1699,7 @@ RegisterSerializableTransactionInt(Snapshot snapshot)
16991699
* Also store it for easy reference in MySerializableXact.
17001700
*/
17011701
void
1702-
RegisterPredicateLockingXid(constTransactionIdxid)
1702+
RegisterPredicateLockingXid(TransactionIdxid)
17031703
{
17041704
SERIALIZABLEXIDTAGsxidtag;
17051705
SERIALIZABLEXID*sxid;
@@ -1748,7 +1748,7 @@ RegisterPredicateLockingXid(const TransactionId xid)
17481748
* One use is to support proper behavior during GiST index vacuum.
17491749
*/
17501750
bool
1751-
PageIsPredicateLocked(constRelationrelation,constBlockNumberblkno)
1751+
PageIsPredicateLocked(Relationrelation,BlockNumberblkno)
17521752
{
17531753
PREDICATELOCKTARGETTAGtargettag;
17541754
uint32targettaghash;
@@ -1785,7 +1785,7 @@ PageIsPredicateLocked(const Relation relation, const BlockNumber blkno)
17851785
* acceptable!
17861786
*/
17871787
staticbool
1788-
PredicateLockExists(constPREDICATELOCKTARGETTAG*targettag)
1788+
PredicateLockExists(PREDICATELOCKTARGETTAG*targettag)
17891789
{
17901790
LOCALPREDICATELOCK*lock;
17911791

@@ -1812,7 +1812,7 @@ PredicateLockExists(const PREDICATELOCKTARGETTAG *targettag)
18121812
* returns false if none exists.
18131813
*/
18141814
staticbool
1815-
GetParentPredicateLockTag(constPREDICATELOCKTARGETTAG*tag,
1815+
GetParentPredicateLockTag(PREDICATELOCKTARGETTAG*tag,
18161816
PREDICATELOCKTARGETTAG*parent)
18171817
{
18181818
switch (GET_PREDICATELOCKTARGETTAG_TYPE(*tag))
@@ -1851,7 +1851,7 @@ GetParentPredicateLockTag(const PREDICATELOCKTARGETTAG *tag,
18511851
* negative, but it will never return a false positive.
18521852
*/
18531853
staticbool
1854-
CoarserLockCovers(constPREDICATELOCKTARGETTAG*newtargettag)
1854+
CoarserLockCovers(PREDICATELOCKTARGETTAG*newtargettag)
18551855
{
18561856
PREDICATELOCKTARGETTAGtargettag,
18571857
parenttag;
@@ -1952,7 +1952,7 @@ RemoveTargetIfNoLongerUsed(PREDICATELOCKTARGET *target, uint32 targettaghash)
19521952
* locks.
19531953
*/
19541954
staticvoid
1955-
DeleteChildTargetLocks(constPREDICATELOCKTARGETTAG*newtargettag)
1955+
DeleteChildTargetLocks(PREDICATELOCKTARGETTAG*newtargettag)
19561956
{
19571957
SERIALIZABLEXACT*sxact;
19581958
PREDICATELOCK*predlock;
@@ -2029,7 +2029,7 @@ DeleteChildTargetLocks(const PREDICATELOCKTARGETTAG *newtargettag)
20292029
* entirely arbitrarily (and without benchmarking).
20302030
*/
20312031
staticint
2032-
PredicateLockPromotionThreshold(constPREDICATELOCKTARGETTAG*tag)
2032+
PredicateLockPromotionThreshold(PREDICATELOCKTARGETTAG*tag)
20332033
{
20342034
switch (GET_PREDICATELOCKTARGETTAG_TYPE(*tag))
20352035
{
@@ -2063,7 +2063,7 @@ PredicateLockPromotionThreshold(const PREDICATELOCKTARGETTAG *tag)
20632063
* Returns true if a parent lock was acquired and false otherwise.
20642064
*/
20652065
staticbool
2066-
CheckAndPromotePredicateLockRequest(constPREDICATELOCKTARGETTAG*reqtag)
2066+
CheckAndPromotePredicateLockRequest(PREDICATELOCKTARGETTAG*reqtag)
20672067
{
20682068
PREDICATELOCKTARGETTAGtargettag,
20692069
nexttag,
@@ -2128,7 +2128,7 @@ CheckAndPromotePredicateLockRequest(const PREDICATELOCKTARGETTAG *reqtag)
21282128
* this information is no longer needed.
21292129
*/
21302130
staticvoid
2131-
DecrementParentLocks(constPREDICATELOCKTARGETTAG*targettag)
2131+
DecrementParentLocks(PREDICATELOCKTARGETTAG*targettag)
21322132
{
21332133
PREDICATELOCKTARGETTAGparenttag,
21342134
nexttag;
@@ -2190,7 +2190,7 @@ DecrementParentLocks(const PREDICATELOCKTARGETTAG *targettag)
21902190
* PredicateLockAcquire for that.
21912191
*/
21922192
staticvoid
2193-
CreatePredicateLock(constPREDICATELOCKTARGETTAG*targettag,
2193+
CreatePredicateLock(PREDICATELOCKTARGETTAG*targettag,
21942194
uint32targettaghash,
21952195
SERIALIZABLEXACT*sxact)
21962196
{
@@ -2251,7 +2251,7 @@ CreatePredicateLock(const PREDICATELOCKTARGETTAG *targettag,
22512251
* any finer-grained locks covered by the new one.
22522252
*/
22532253
staticvoid
2254-
PredicateLockAcquire(constPREDICATELOCKTARGETTAG*targettag)
2254+
PredicateLockAcquire(PREDICATELOCKTARGETTAG*targettag)
22552255
{
22562256
uint32targettaghash;
22572257
boolfound;
@@ -2310,7 +2310,7 @@ PredicateLockAcquire(const PREDICATELOCKTARGETTAG *targettag)
23102310
* Clear any finer-grained predicate locks this session has on the relation.
23112311
*/
23122312
void
2313-
PredicateLockRelation(constRelationrelation,constSnapshotsnapshot)
2313+
PredicateLockRelation(Relationrelation,Snapshotsnapshot)
23142314
{
23152315
PREDICATELOCKTARGETTAGtag;
23162316

@@ -2333,8 +2333,7 @@ PredicateLockRelation(const Relation relation, const Snapshot snapshot)
23332333
* Clear any finer-grained predicate locks this session has on the relation.
23342334
*/
23352335
void
2336-
PredicateLockPage(constRelationrelation,constBlockNumberblkno,
2337-
constSnapshotsnapshot)
2336+
PredicateLockPage(Relationrelation,BlockNumberblkno,Snapshotsnapshot)
23382337
{
23392338
PREDICATELOCKTARGETTAGtag;
23402339

@@ -2356,8 +2355,7 @@ PredicateLockPage(const Relation relation, const BlockNumber blkno,
23562355
* Skip if this is a temporary table.
23572356
*/
23582357
void
2359-
PredicateLockTuple(constRelationrelation,constHeapTupletuple,
2360-
constSnapshotsnapshot)
2358+
PredicateLockTuple(Relationrelation,HeapTupletuple,Snapshotsnapshot)
23612359
{
23622360
PREDICATELOCKTARGETTAGtag;
23632361
ItemPointertid;
@@ -2495,8 +2493,8 @@ DeleteLockTarget(PREDICATELOCKTARGET *target, uint32 targettaghash)
24952493
* Caller must hold SerializablePredicateLockListLock.
24962494
*/
24972495
staticbool
2498-
TransferPredicateLocksToNewTarget(constPREDICATELOCKTARGETTAGoldtargettag,
2499-
constPREDICATELOCKTARGETTAGnewtargettag,
2496+
TransferPredicateLocksToNewTarget(PREDICATELOCKTARGETTAGoldtargettag,
2497+
PREDICATELOCKTARGETTAGnewtargettag,
25002498
boolremoveOld)
25012499
{
25022500
uint32oldtargettaghash;
@@ -2712,7 +2710,7 @@ TransferPredicateLocksToNewTarget(const PREDICATELOCKTARGETTAG oldtargettag,
27122710
* transaction which executed DROP TABLE, the false condition will be useful.
27132711
*/
27142712
staticvoid
2715-
DropAllPredicateLocksFromTable(constRelationrelation,booltransfer)
2713+
DropAllPredicateLocksFromTable(Relationrelation,booltransfer)
27162714
{
27172715
HASH_SEQ_STATUSseqstat;
27182716
PREDICATELOCKTARGET*oldtarget;
@@ -2908,7 +2906,7 @@ DropAllPredicateLocksFromTable(const Relation relation, bool transfer)
29082906
*relation to a single relation lock on the heap.
29092907
*/
29102908
void
2911-
TransferPredicateLocksToHeapRelation(constRelationrelation)
2909+
TransferPredicateLocksToHeapRelation(Relationrelation)
29122910
{
29132911
DropAllPredicateLocksFromTable(relation, true);
29142912
}
@@ -2929,8 +2927,8 @@ TransferPredicateLocksToHeapRelation(const Relation relation)
29292927
* which hold the locks getting in and noticing.
29302928
*/
29312929
void
2932-
PredicateLockPageSplit(constRelationrelation,constBlockNumberoldblkno,
2933-
constBlockNumbernewblkno)
2930+
PredicateLockPageSplit(Relationrelation,BlockNumberoldblkno,
2931+
BlockNumbernewblkno)
29342932
{
29352933
PREDICATELOCKTARGETTAGoldtargettag;
29362934
PREDICATELOCKTARGETTAGnewtargettag;
@@ -3014,8 +3012,8 @@ PredicateLockPageSplit(const Relation relation, const BlockNumber oldblkno,
30143012
* occurs in the context of another transaction isolation level.
30153013
*/
30163014
void
3017-
PredicateLockPageCombine(constRelationrelation,constBlockNumberoldblkno,
3018-
constBlockNumbernewblkno)
3015+
PredicateLockPageCombine(Relationrelation,BlockNumberoldblkno,
3016+
BlockNumbernewblkno)
30193017
{
30203018
/*
30213019
* Page combines differ from page splits in that we ought to be able to
@@ -3086,7 +3084,7 @@ SetNewSxactGlobalXmin(void)
30863084
* holding locks.
30873085
*/
30883086
void
3089-
ReleasePredicateLocks(constboolisCommit)
3087+
ReleasePredicateLocks(boolisCommit)
30903088
{
30913089
boolneedToClear;
30923090
RWConflictconflict,
@@ -3736,9 +3734,9 @@ XidIsConcurrent(TransactionId xid)
37363734
* currently no known reason to call this function from an index AM.
37373735
*/
37383736
void
3739-
CheckForSerializableConflictOut(constboolvisible,constRelationrelation,
3740-
constHeapTupletuple,constBufferbuffer,
3741-
constSnapshotsnapshot)
3737+
CheckForSerializableConflictOut(boolvisible,Relationrelation,
3738+
HeapTupletuple,Bufferbuffer,
3739+
Snapshotsnapshot)
37423740
{
37433741
TransactionIdxid;
37443742
SERIALIZABLEXIDTAGsxidtag;
@@ -4117,8 +4115,8 @@ CheckTargetForConflictsIn(PREDICATELOCKTARGETTAG *targettag)
41174115
* tuple itself.
41184116
*/
41194117
void
4120-
CheckForSerializableConflictIn(constRelationrelation,constHeapTupletuple,
4121-
constBufferbuffer)
4118+
CheckForSerializableConflictIn(Relationrelation,HeapTupletuple,
4119+
Bufferbuffer)
41224120
{
41234121
PREDICATELOCKTARGETTAGtargettag;
41244122

@@ -4202,7 +4200,7 @@ CheckForSerializableConflictIn(const Relation relation, const HeapTuple tuple,
42024200
* lead to some false positives, but it doesn't seem worth the trouble.)
42034201
*/
42044202
void
4205-
CheckTableForSerializableConflictIn(constRelationrelation)
4203+
CheckTableForSerializableConflictIn(Relationrelation)
42064204
{
42074205
HASH_SEQ_STATUSseqstat;
42084206
PREDICATELOCKTARGET*target;
@@ -4329,7 +4327,7 @@ FlagRWConflict(SERIALIZABLEXACT *reader, SERIALIZABLEXACT *writer)
43294327
*----------------------------------------------------------------------------
43304328
*/
43314329
staticvoid
4332-
OnConflict_CheckForSerializationFailure(constSERIALIZABLEXACT*reader,
4330+
OnConflict_CheckForSerializationFailure(SERIALIZABLEXACT*reader,
43334331
SERIALIZABLEXACT*writer)
43344332
{
43354333
boolfailure;

‎src/include/storage/predicate.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,24 +39,24 @@ extern Size PredicateLockShmemSize(void);
3939
externvoidCheckPointPredicate(void);
4040

4141
/* predicate lock reporting */
42-
externboolPageIsPredicateLocked(constRelationrelation,constBlockNumberblkno);
42+
externboolPageIsPredicateLocked(Relationrelation,BlockNumberblkno);
4343

4444
/* predicate lock maintenance */
4545
externSnapshotRegisterSerializableTransaction(Snapshotsnapshot);
46-
externvoidRegisterPredicateLockingXid(constTransactionIdxid);
47-
externvoidPredicateLockRelation(constRelationrelation,constSnapshotsnapshot);
48-
externvoidPredicateLockPage(constRelationrelation,constBlockNumberblkno,constSnapshotsnapshot);
49-
externvoidPredicateLockTuple(constRelationrelation,constHeapTupletuple,constSnapshotsnapshot);
50-
externvoidPredicateLockPageSplit(constRelationrelation,constBlockNumberoldblkno,constBlockNumbernewblkno);
51-
externvoidPredicateLockPageCombine(constRelationrelation,constBlockNumberoldblkno,constBlockNumbernewblkno);
52-
externvoidTransferPredicateLocksToHeapRelation(constRelationrelation);
53-
externvoidReleasePredicateLocks(constboolisCommit);
46+
externvoidRegisterPredicateLockingXid(TransactionIdxid);
47+
externvoidPredicateLockRelation(Relationrelation,Snapshotsnapshot);
48+
externvoidPredicateLockPage(Relationrelation,BlockNumberblkno,Snapshotsnapshot);
49+
externvoidPredicateLockTuple(Relationrelation,HeapTupletuple,Snapshotsnapshot);
50+
externvoidPredicateLockPageSplit(Relationrelation,BlockNumberoldblkno,BlockNumbernewblkno);
51+
externvoidPredicateLockPageCombine(Relationrelation,BlockNumberoldblkno,BlockNumbernewblkno);
52+
externvoidTransferPredicateLocksToHeapRelation(Relationrelation);
53+
externvoidReleasePredicateLocks(boolisCommit);
5454

5555
/* conflict detection (may also trigger rollback) */
56-
externvoidCheckForSerializableConflictOut(constboolvalid,constRelationrelation,constHeapTupletuple,
57-
constBufferbuffer,constSnapshotsnapshot);
58-
externvoidCheckForSerializableConflictIn(constRelationrelation,constHeapTupletuple,constBufferbuffer);
59-
externvoidCheckTableForSerializableConflictIn(constRelationrelation);
56+
externvoidCheckForSerializableConflictOut(boolvalid,Relationrelation,HeapTupletuple,
57+
Bufferbuffer,Snapshotsnapshot);
58+
externvoidCheckForSerializableConflictIn(Relationrelation,HeapTupletuple,Bufferbuffer);
59+
externvoidCheckTableForSerializableConflictIn(Relationrelation);
6060

6161
/* final rollback checking */
6262
externvoidPreCommit_CheckForSerializationFailure(void);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp