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

Commita6cab6a

Browse files
Harmonize function parameter names for Postgres 18.
Make sure that function declarations use names that exactly match thecorresponding names from function definitions in a few places. Theseinconsistencies were all introduced during Postgres 18 development.This commit was written with help from clang-tidy, by mechanicallyapplying the same rules as similar clean-up commits (the earliest suchcommit was commit035ce1f).
1 parentfdb69dd commita6cab6a

File tree

27 files changed

+45
-51
lines changed

27 files changed

+45
-51
lines changed

‎contrib/pg_overexplain/pg_overexplain.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static void overexplain_alias(const char *qlabel, Alias *alias,
5454
ExplainState*es);
5555
staticvoidoverexplain_bitmapset(constchar*qlabel,Bitmapset*bms,
5656
ExplainState*es);
57-
staticvoidoverexplain_intlist(constchar*qlabel,List*intlist,
57+
staticvoidoverexplain_intlist(constchar*qlabel,List*list,
5858
ExplainState*es);
5959

6060
staticintes_extension_id;

‎contrib/postgres_fdw/postgres_fdw.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ static void adjust_foreign_grouping_path_cost(PlannerInfo *root,
444444
doubleretrieved_rows,
445445
doublewidth,
446446
doublelimit_tuples,
447-
int*disabled_nodes,
447+
int*p_disabled_nodes,
448448
Cost*p_startup_cost,
449449
Cost*p_run_cost);
450450
staticboolec_member_matches_foreign(PlannerInfo*root,RelOptInfo*rel,

‎src/backend/access/gin/gininsert.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,11 @@ static void _gin_begin_parallel(GinBuildState *buildstate, Relation heap, Relati
180180
boolisconcurrent,intrequest);
181181
staticvoid_gin_end_parallel(GinLeader*ginleader,GinBuildState*state);
182182
staticSize_gin_parallel_estimate_shared(Relationheap,Snapshotsnapshot);
183-
staticdouble_gin_parallel_heapscan(GinBuildState*buildstate);
184-
staticdouble_gin_parallel_merge(GinBuildState*buildstate);
183+
staticdouble_gin_parallel_heapscan(GinBuildState*state);
184+
staticdouble_gin_parallel_merge(GinBuildState*state);
185185
staticvoid_gin_leader_participate_as_worker(GinBuildState*buildstate,
186186
Relationheap,Relationindex);
187-
staticvoid_gin_parallel_scan_and_build(GinBuildState*buildstate,
187+
staticvoid_gin_parallel_scan_and_build(GinBuildState*state,
188188
GinBuildShared*ginshared,
189189
Sharedsort*sharedsort,
190190
Relationheap,Relationindex,

‎src/backend/commands/tablecmds.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ static bool ATExecAlterConstraintInternal(List **wqueue, ATAlterConstraint *cmdc
397397
bool recurse, LOCKMODE lockmode);
398398
static bool ATExecAlterConstrEnforceability(List **wqueue, ATAlterConstraint *cmdcon,
399399
Relation conrel, Relation tgrel,
400-
constOid fkrelid, const Oid pkrelid,
400+
Oid fkrelid, Oid pkrelid,
401401
HeapTuple contuple, LOCKMODE lockmode,
402402
Oid ReferencedParentDelTrigger,
403403
Oid ReferencedParentUpdTrigger,
@@ -415,7 +415,7 @@ static void AlterConstrTriggerDeferrability(Oid conoid, Relation tgrel, Relation
415415
List **otherrelids);
416416
static void AlterConstrEnforceabilityRecurse(List **wqueue, ATAlterConstraint *cmdcon,
417417
Relation conrel, Relation tgrel,
418-
constOid fkrelid, const Oid pkrelid,
418+
Oid fkrelid, Oid pkrelid,
419419
HeapTuple contuple, LOCKMODE lockmode,
420420
Oid ReferencedParentDelTrigger,
421421
Oid ReferencedParentUpdTrigger,
@@ -503,7 +503,7 @@ static ObjectAddress ATExecDropNotNull(Relation rel, const char *colName, bool r
503503
static void set_attnotnull(List **wqueue, Relation rel, AttrNumber attnum,
504504
bool is_valid, bool queue_validation);
505505
static ObjectAddress ATExecSetNotNull(List **wqueue, Relation rel,
506-
char *constrname, char *colName,
506+
char *conName, char *colName,
507507
bool recurse, bool recursing,
508508
LOCKMODE lockmode);
509509
static bool NotNullImpliedByRelConstraints(Relation rel, Form_pg_attribute attr);
@@ -733,7 +733,7 @@ static ObjectAddress ATExecAttachPartitionIdx(List **wqueue, Relation parentIdx,
733733
static void validatePartitionedIndex(Relation partedIdx, Relation partedTbl);
734734
static void refuseDupeIndexAttach(Relation parentIdx, Relation partIdx,
735735
Relation partitionTbl);
736-
static void verifyPartitionIndexNotNull(IndexInfo *iinfo, RelationpartIdx);
736+
static void verifyPartitionIndexNotNull(IndexInfo *iinfo, Relationpartition);
737737
static List *GetParentedForeignKeyRefs(Relation partition);
738738
static void ATDetachCheckNoForeignKeyRefs(Relation partition);
739739
static char GetAttributeCompression(Oid atttypid, const char *compression);

‎src/backend/executor/execPartition.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ static void InitPartitionPruneContext(PartitionPruneContext *context,
191191
PartitionKeypartkey,
192192
PlanState*planstate,
193193
ExprContext*econtext);
194-
staticvoidInitExecPartitionPruneContexts(PartitionPruneState*prunstate,
194+
staticvoidInitExecPartitionPruneContexts(PartitionPruneState*prunestate,
195195
PlanState*parent_plan,
196196
Bitmapset*initially_valid_subplans,
197197
intn_total_subplans);

‎src/backend/nodes/queryjumblefuncs.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ boolquery_id_enabled = false;
5858
staticJumbleState*InitJumble(void);
5959
staticuint64DoJumble(JumbleState*jstate,Node*node);
6060
staticvoidAppendJumble(JumbleState*jstate,
61-
constunsignedchar*item,Sizesize);
61+
constunsignedchar*value,Sizesize);
6262
staticvoidFlushPendingNulls(JumbleState*jstate);
6363
staticvoidRecordConstLocation(JumbleState*jstate,
64-
intlocation,boolmerged);
64+
intlocation,boolsquashed);
6565
staticvoid_jumbleNode(JumbleState*jstate,Node*node);
6666
staticvoid_jumbleElements(JumbleState*jstate,List*elements);
6767
staticvoid_jumbleA_Const(JumbleState*jstate,Node*node);

‎src/backend/storage/buffer/bufmgr.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ static inline BufferDesc *BufferAlloc(SMgrRelation smgr,
527527
BlockNumberblockNum,
528528
BufferAccessStrategystrategy,
529529
bool*foundPtr,IOContextio_context);
530-
staticboolAsyncReadBuffers(ReadBuffersOperation*operation,int*nblocks);
530+
staticboolAsyncReadBuffers(ReadBuffersOperation*operation,int*nblocks_progress);
531531
staticvoidCheckReadBuffersOperation(ReadBuffersOperation*operation,boolis_complete);
532532
staticBufferGetVictimBuffer(BufferAccessStrategystrategy,IOContextio_context);
533533
staticvoidFlushBuffer(BufferDesc*buf,SMgrRelationreln,

‎src/backend/storage/smgr/md.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ static BlockNumber _mdnblocks(SMgrRelation reln, ForkNumber forknum,
154154
MdfdVec*seg);
155155

156156
staticPgAioResultmd_readv_complete(PgAioHandle*ioh,PgAioResultprior_result,uint8cb_data);
157-
staticvoidmd_readv_report(PgAioResultresult,constPgAioTargetData*target_data,intelevel);
157+
staticvoidmd_readv_report(PgAioResultresult,constPgAioTargetData*td,intelevel);
158158

159159
constPgAioHandleCallbacksaio_md_readv_cb= {
160160
.complete_shared=md_readv_complete,

‎src/backend/utils/adt/acl.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ static AclMode convert_tablespace_priv_string(text *priv_type_text);
127127
staticOidconvert_type_name(text*typename);
128128
staticAclModeconvert_type_priv_string(text*priv_type_text);
129129
staticAclModeconvert_parameter_priv_string(text*priv_text);
130-
staticAclModeconvert_largeobject_priv_string(text*priv_text);
130+
staticAclModeconvert_largeobject_priv_string(text*priv_type_text);
131131
staticAclModeconvert_role_priv_string(text*priv_type_text);
132132
staticAclResultpg_role_aclcheck(Oidrole_oid,Oidroleid,AclModemode);
133133

‎src/backend/utils/adt/pg_locale_builtin.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
externpg_locale_tcreate_pg_locale_builtin(Oidcollid,
2626
MemoryContextcontext);
2727
externchar*get_collation_actual_version_builtin(constchar*collcollate);
28-
externsize_tstrlower_builtin(char*dst,size_tdstsize,constchar*src,
28+
externsize_tstrlower_builtin(char*dest,size_tdestsize,constchar*src,
2929
ssize_tsrclen,pg_locale_tlocale);
30-
externsize_tstrtitle_builtin(char*dst,size_tdstsize,constchar*src,
30+
externsize_tstrtitle_builtin(char*dest,size_tdestsize,constchar*src,
3131
ssize_tsrclen,pg_locale_tlocale);
32-
externsize_tstrupper_builtin(char*dst,size_tdstsize,constchar*src,
32+
externsize_tstrupper_builtin(char*dest,size_tdestsize,constchar*src,
3333
ssize_tsrclen,pg_locale_tlocale);
34-
externsize_tstrfold_builtin(char*dst,size_tdstsize,constchar*src,
34+
externsize_tstrfold_builtin(char*dest,size_tdestsize,constchar*src,
3535
ssize_tsrclen,pg_locale_tlocale);
3636

3737

0 commit comments

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