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

Commita601366

Browse files
Harmonize more parameter names in bulk.
Make sure that function declarations use names that exactly match thecorresponding names from function definitions in optimizer, parser,utility, libpq, and "commands" code, as well as in remaining librarycode. Do the same for all code related to frontend programs (with theexception of pg_dump/pg_dumpall related code).Like other recent commits that cleaned up function parameter names, thiscommit was written with help from clang-tidy. Later commits will handleecpg and pg_dump/pg_dumpall.Author: Peter Geoghegan <pg@bowt.ie>Reviewed-By: David Rowley <dgrowleyml@gmail.com>Discussion:https://postgr.es/m/CAH2-WznJt9CMM9KJTMjJh_zbL5hD9oX44qdJ4aqZtjFi-zA3Tg@mail.gmail.com
1 parentc3382a3 commita601366

File tree

131 files changed

+297
-293
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+297
-293
lines changed

‎src/backend/backup/basebackup.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ typedef struct
7474
pg_checksum_typemanifest_checksum_type;
7575
}basebackup_options;
7676

77-
staticint64sendTablespace(bbsink*sink,char*path,char*oid,boolsizeonly,
77+
staticint64sendTablespace(bbsink*sink,char*path,char*spcoid,boolsizeonly,
7878
structbackup_manifest_info*manifest);
7979
staticint64sendDir(bbsink*sink,constchar*path,intbasepathlen,boolsizeonly,
8080
List*tablespaces,boolsendtblspclinks,

‎src/backend/bootstrap/bootstrap.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -463,19 +463,19 @@ boot_openrel(char *relname)
463463
* ----------------
464464
*/
465465
void
466-
closerel(char*name)
466+
closerel(char*relname)
467467
{
468-
if (name)
468+
if (relname)
469469
{
470470
if (boot_reldesc)
471471
{
472-
if (strcmp(RelationGetRelationName(boot_reldesc),name)!=0)
472+
if (strcmp(RelationGetRelationName(boot_reldesc),relname)!=0)
473473
elog(ERROR,"close of %s when %s was expected",
474-
name,RelationGetRelationName(boot_reldesc));
474+
relname,RelationGetRelationName(boot_reldesc));
475475
}
476476
else
477477
elog(ERROR,"close of %s before any relation was opened",
478-
name);
478+
relname);
479479
}
480480

481481
if (boot_reldesc==NULL)

‎src/backend/commands/event_trigger.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ static void AlterEventTriggerOwner_internal(Relation rel,
9494
staticvoiderror_duplicate_filter_variable(constchar*defname);
9595
staticDatumfilter_list_to_array(List*filterlist);
9696
staticOidinsert_event_trigger_tuple(constchar*trigname,constchar*eventname,
97-
OidevtOwner,Oidfuncoid,List*tags);
97+
OidevtOwner,Oidfuncoid,List*taglist);
9898
staticvoidvalidate_ddl_tags(constchar*filtervar,List*taglist);
9999
staticvoidvalidate_table_rewrite_tags(constchar*filtervar,List*taglist);
100100
staticvoidEventTriggerInvoke(List*fn_oid_list,EventTriggerData*trigdata);

‎src/backend/commands/explain.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ static void show_incremental_sort_info(IncrementalSortState *incrsortstate,
111111
staticvoidshow_hash_info(HashState*hashstate,ExplainState*es);
112112
staticvoidshow_memoize_info(MemoizeState*mstate,List*ancestors,
113113
ExplainState*es);
114-
staticvoidshow_hashagg_info(AggState*hashstate,ExplainState*es);
114+
staticvoidshow_hashagg_info(AggState*aggstate,ExplainState*es);
115115
staticvoidshow_tidbitmap_info(BitmapHeapScanState*planstate,
116116
ExplainState*es);
117117
staticvoidshow_instrumentation_count(constchar*qlabel,intwhich,

‎src/backend/commands/indexcmds.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ static OidReindexTable(RangeVar *relation, ReindexParams *params,
9898
boolisTopLevel);
9999
staticvoidReindexMultipleTables(constchar*objectName,
100100
ReindexObjectTypeobjectKind,ReindexParams*params);
101-
staticvoidreindex_error_callback(void*args);
101+
staticvoidreindex_error_callback(void*arg);
102102
staticvoidReindexPartitions(Oidrelid,ReindexParams*params,
103103
boolisTopLevel);
104104
staticvoidReindexMultipleInternal(List*relids,

‎src/backend/commands/lockcmds.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include"utils/syscache.h"
3030

3131
staticvoidLockTableRecurse(Oidreloid,LOCKMODElockmode,boolnowait);
32-
staticAclResultLockTableAclCheck(Oidrelid,LOCKMODElockmode,Oiduserid);
32+
staticAclResultLockTableAclCheck(Oidreloid,LOCKMODElockmode,Oiduserid);
3333
staticvoidRangeVarCallbackForLockTable(constRangeVar*rv,Oidrelid,
3434
Oidoldrelid,void*arg);
3535
staticvoidLockViewRecurse(Oidreloid,LOCKMODElockmode,boolnowait,

‎src/backend/commands/opclasscmds.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
staticvoidAlterOpFamilyAdd(AlterOpFamilyStmt*stmt,
5353
Oidamoid,Oidopfamilyoid,
5454
intmaxOpNumber,intmaxProcNumber,
55-
intopclassOptsProcNumber,List*items);
55+
intoptsProcNumber,List*items);
5656
staticvoidAlterOpFamilyDrop(AlterOpFamilyStmt*stmt,
5757
Oidamoid,Oidopfamilyoid,
5858
intmaxOpNumber,intmaxProcNumber,

‎src/backend/commands/schemacmds.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,16 +285,16 @@ RenameSchema(const char *oldname, const char *newname)
285285
}
286286

287287
void
288-
AlterSchemaOwner_oid(Oidoid,OidnewOwnerId)
288+
AlterSchemaOwner_oid(Oidschemaoid,OidnewOwnerId)
289289
{
290290
HeapTupletup;
291291
Relationrel;
292292

293293
rel=table_open(NamespaceRelationId,RowExclusiveLock);
294294

295-
tup=SearchSysCache1(NAMESPACEOID,ObjectIdGetDatum(oid));
295+
tup=SearchSysCache1(NAMESPACEOID,ObjectIdGetDatum(schemaoid));
296296
if (!HeapTupleIsValid(tup))
297-
elog(ERROR,"cache lookup failed for schema %u",oid);
297+
elog(ERROR,"cache lookup failed for schema %u",schemaoid);
298298

299299
AlterSchemaOwner_internal(tup,rel,newOwnerId);
300300

‎src/backend/commands/tablecmds.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ static ObjectAddress ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
550550
AlterTableCmd *cmd, LOCKMODE lockmode);
551551
static void RememberConstraintForRebuilding(Oid conoid, AlteredTableInfo *tab);
552552
static void RememberIndexForRebuilding(Oid indoid, AlteredTableInfo *tab);
553-
static void RememberStatisticsForRebuilding(Oidindoid, AlteredTableInfo *tab);
553+
static void RememberStatisticsForRebuilding(Oidstxoid, AlteredTableInfo *tab);
554554
static void ATPostAlterTypeCleanup(List **wqueue, AlteredTableInfo *tab,
555555
LOCKMODE lockmode);
556556
static void ATPostAlterTypeParse(Oid oldId, Oid oldRelId, Oid refRelId,
@@ -610,7 +610,7 @@ static void ComputePartitionAttrs(ParseState *pstate, Relation rel, List *partPa
610610
List **partexprs, Oid *partopclass, Oid *partcollation, char strategy);
611611
static void CreateInheritance(Relation child_rel, Relation parent_rel);
612612
static void RemoveInheritance(Relation child_rel, Relation parent_rel,
613-
boolallow_detached);
613+
boolexpect_detached);
614614
static ObjectAddress ATExecAttachPartition(List **wqueue, Relation rel,
615615
PartitionCmd *cmd,
616616
AlterTableUtilityContext *context);
@@ -627,7 +627,7 @@ static ObjectAddress ATExecDetachPartition(List **wqueue, AlteredTableInfo *tab,
627627
static void DetachPartitionFinalize(Relation rel, Relation partRel,
628628
bool concurrent, Oid defaultPartOid);
629629
static ObjectAddress ATExecDetachPartitionFinalize(Relation rel, RangeVar *name);
630-
static ObjectAddress ATExecAttachPartitionIdx(List **wqueue, Relationrel,
630+
static ObjectAddress ATExecAttachPartitionIdx(List **wqueue, RelationparentIdx,
631631
RangeVar *name);
632632
static void validatePartitionedIndex(Relation partedIdx, Relation partedTbl);
633633
static void refuseDupeIndexAttach(Relation parentIdx, Relation partIdx,

‎src/backend/commands/trigger.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ static bool GetTupleForTrigger(EState *estate,
8686
ItemPointertid,
8787
LockTupleModelockmode,
8888
TupleTableSlot*oldslot,
89-
TupleTableSlot**newSlot,
90-
TM_FailureData*tmfpd);
89+
TupleTableSlot**epqslot,
90+
TM_FailureData*tmfdp);
9191
staticboolTriggerEnabled(EState*estate,ResultRelInfo*relinfo,
9292
Trigger*trigger,TriggerEventevent,
9393
Bitmapset*modifiedCols,
@@ -101,7 +101,7 @@ static void AfterTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo,
101101
ResultRelInfo*src_partinfo,
102102
ResultRelInfo*dst_partinfo,
103103
intevent,boolrow_trigger,
104-
TupleTableSlot*oldtup,TupleTableSlot*newtup,
104+
TupleTableSlot*oldslot,TupleTableSlot*newslot,
105105
List*recheckIndexes,Bitmapset*modifiedCols,
106106
TransitionCaptureState*transition_capture,
107107
boolis_crosspart_update);
@@ -3871,7 +3871,7 @@ static void TransitionTableAddTuple(EState *estate,
38713871
Tuplestorestate*tuplestore);
38723872
staticvoidAfterTriggerFreeQuery(AfterTriggersQueryData*qs);
38733873
staticSetConstraintStateSetConstraintStateCreate(intnumalloc);
3874-
staticSetConstraintStateSetConstraintStateCopy(SetConstraintStatestate);
3874+
staticSetConstraintStateSetConstraintStateCopy(SetConstraintStateorigstate);
38753875
staticSetConstraintStateSetConstraintStateAddItem(SetConstraintStatestate,
38763876
Oidtgoid,booltgisdeferred);
38773877
staticvoidcancel_prior_stmt_triggers(Oidrelid,CmdTypecmdType,inttgevent);

0 commit comments

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