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

Commit554ebf6

Browse files
committed
Compact for loops
Declare loop variable in for loop, for readability and to save space.Reviewed-by: Corey Huinker <corey.huinker@gmail.com>Discussion:https://www.postgresql.org/message-id/flat/0ccdd3e1-10b0-dd05-d8a7-183507c11eb1%402ndquadrant.com
1 parent05d6047 commit554ebf6

File tree

1 file changed

+17
-30
lines changed

1 file changed

+17
-30
lines changed

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

Lines changed: 17 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ RI_FKey_check(TriggerData *trigdata)
238238
TupleTableSlot*newslot;
239239
RI_QueryKeyqkey;
240240
SPIPlanPtrqplan;
241-
inti;
242241

243242
riinfo=ri_FetchConstraintInfo(trigdata->tg_trigger,
244243
trigdata->tg_relation, false);
@@ -379,7 +378,7 @@ RI_FKey_check(TriggerData *trigdata)
379378
quoteRelationName(pkrelname,pk_rel);
380379
appendStringInfo(&querybuf,"SELECT 1 FROM ONLY %s x",pkrelname);
381380
querysep="WHERE";
382-
for (i=0;i<riinfo->nkeys;i++)
381+
for (inti=0;i<riinfo->nkeys;i++)
383382
{
384383
Oidpk_type=RIAttType(pk_rel,riinfo->pk_attnums[i]);
385384
Oidfk_type=RIAttType(fk_rel,riinfo->fk_attnums[i]);
@@ -468,7 +467,6 @@ ri_Check_Pk_Match(Relation pk_rel, Relation fk_rel,
468467
{
469468
SPIPlanPtrqplan;
470469
RI_QueryKeyqkey;
471-
inti;
472470
boolresult;
473471

474472
/* Only called for non-null rows */
@@ -504,7 +502,7 @@ ri_Check_Pk_Match(Relation pk_rel, Relation fk_rel,
504502
quoteRelationName(pkrelname,pk_rel);
505503
appendStringInfo(&querybuf,"SELECT 1 FROM ONLY %s x",pkrelname);
506504
querysep="WHERE";
507-
for (i=0;i<riinfo->nkeys;i++)
505+
for (inti=0;i<riinfo->nkeys;i++)
508506
{
509507
Oidpk_type=RIAttType(pk_rel,riinfo->pk_attnums[i]);
510508

@@ -675,7 +673,6 @@ ri_restrict(TriggerData *trigdata, bool is_no_action)
675673
constchar*querysep;
676674
Oidqueryoids[RI_MAX_NUMKEYS];
677675
constchar*fk_only;
678-
inti;
679676

680677
/* ----------
681678
* The query string built is
@@ -692,7 +689,7 @@ ri_restrict(TriggerData *trigdata, bool is_no_action)
692689
appendStringInfo(&querybuf,"SELECT 1 FROM %s%s x",
693690
fk_only,fkrelname);
694691
querysep="WHERE";
695-
for (i=0;i<riinfo->nkeys;i++)
692+
for (inti=0;i<riinfo->nkeys;i++)
696693
{
697694
Oidpk_type=RIAttType(pk_rel,riinfo->pk_attnums[i]);
698695
Oidfk_type=RIAttType(fk_rel,riinfo->fk_attnums[i]);
@@ -747,7 +744,6 @@ RI_FKey_cascade_del(PG_FUNCTION_ARGS)
747744
TupleTableSlot*old_slot;
748745
RI_QueryKeyqkey;
749746
SPIPlanPtrqplan;
750-
inti;
751747

752748
/* Check that this is a valid trigger call on the right time and event. */
753749
ri_CheckTrigger(fcinfo,"RI_FKey_cascade_del",RI_TRIGTYPE_DELETE);
@@ -795,7 +791,7 @@ RI_FKey_cascade_del(PG_FUNCTION_ARGS)
795791
appendStringInfo(&querybuf,"DELETE FROM %s%s",
796792
fk_only,fkrelname);
797793
querysep="WHERE";
798-
for (i=0;i<riinfo->nkeys;i++)
794+
for (inti=0;i<riinfo->nkeys;i++)
799795
{
800796
Oidpk_type=RIAttType(pk_rel,riinfo->pk_attnums[i]);
801797
Oidfk_type=RIAttType(fk_rel,riinfo->fk_attnums[i]);
@@ -851,8 +847,6 @@ RI_FKey_cascade_upd(PG_FUNCTION_ARGS)
851847
TupleTableSlot*old_slot;
852848
RI_QueryKeyqkey;
853849
SPIPlanPtrqplan;
854-
inti;
855-
intj;
856850

857851
/* Check that this is a valid trigger call on the right time and event. */
858852
ri_CheckTrigger(fcinfo,"RI_FKey_cascade_upd",RI_TRIGTYPE_UPDATE);
@@ -909,7 +903,7 @@ RI_FKey_cascade_upd(PG_FUNCTION_ARGS)
909903
fk_only,fkrelname);
910904
querysep="";
911905
qualsep="WHERE";
912-
for (i=0,j=riinfo->nkeys;i<riinfo->nkeys;i++,j++)
906+
for (inti=0,j=riinfo->nkeys;i<riinfo->nkeys;i++,j++)
913907
{
914908
Oidpk_type=RIAttType(pk_rel,riinfo->pk_attnums[i]);
915909
Oidfk_type=RIAttType(fk_rel,riinfo->fk_attnums[i]);
@@ -998,7 +992,6 @@ ri_setnull(TriggerData *trigdata)
998992
TupleTableSlot*old_slot;
999993
RI_QueryKeyqkey;
1000994
SPIPlanPtrqplan;
1001-
inti;
1002995

1003996
riinfo=ri_FetchConstraintInfo(trigdata->tg_trigger,
1004997
trigdata->tg_relation, true);
@@ -1051,7 +1044,7 @@ ri_setnull(TriggerData *trigdata)
10511044
fk_only,fkrelname);
10521045
querysep="";
10531046
qualsep="WHERE";
1054-
for (i=0;i<riinfo->nkeys;i++)
1047+
for (inti=0;i<riinfo->nkeys;i++)
10551048
{
10561049
Oidpk_type=RIAttType(pk_rel,riinfo->pk_attnums[i]);
10571050
Oidfk_type=RIAttType(fk_rel,riinfo->fk_attnums[i]);
@@ -1173,7 +1166,6 @@ ri_setdefault(TriggerData *trigdata)
11731166
constchar*qualsep;
11741167
Oidqueryoids[RI_MAX_NUMKEYS];
11751168
constchar*fk_only;
1176-
inti;
11771169

11781170
/* ----------
11791171
* The query string built is
@@ -1192,7 +1184,7 @@ ri_setdefault(TriggerData *trigdata)
11921184
fk_only,fkrelname);
11931185
querysep="";
11941186
qualsep="WHERE";
1195-
for (i=0;i<riinfo->nkeys;i++)
1187+
for (inti=0;i<riinfo->nkeys;i++)
11961188
{
11971189
Oidpk_type=RIAttType(pk_rel,riinfo->pk_attnums[i]);
11981190
Oidfk_type=RIAttType(fk_rel,riinfo->fk_attnums[i]);
@@ -1402,7 +1394,6 @@ RI_Initial_Check(Trigger *trigger, Relation fk_rel, Relation pk_rel)
14021394
RangeTblEntry*fkrte;
14031395
constchar*sep;
14041396
constchar*fk_only;
1405-
inti;
14061397
intsave_nestlevel;
14071398
charworkmembuf[32];
14081399
intspi_result;
@@ -1431,7 +1422,7 @@ RI_Initial_Check(Trigger *trigger, Relation fk_rel, Relation pk_rel)
14311422
fkrte->rellockmode=AccessShareLock;
14321423
fkrte->requiredPerms=ACL_SELECT;
14331424

1434-
for (i=0;i<riinfo->nkeys;i++)
1425+
for (inti=0;i<riinfo->nkeys;i++)
14351426
{
14361427
intattno;
14371428

@@ -1475,7 +1466,7 @@ RI_Initial_Check(Trigger *trigger, Relation fk_rel, Relation pk_rel)
14751466
initStringInfo(&querybuf);
14761467
appendStringInfoString(&querybuf,"SELECT ");
14771468
sep="";
1478-
for (i=0;i<riinfo->nkeys;i++)
1469+
for (inti=0;i<riinfo->nkeys;i++)
14791470
{
14801471
quoteOneName(fkattname,
14811472
RIAttName(fk_rel,riinfo->fk_attnums[i]));
@@ -1494,7 +1485,7 @@ RI_Initial_Check(Trigger *trigger, Relation fk_rel, Relation pk_rel)
14941485
strcpy(pkattname,"pk.");
14951486
strcpy(fkattname,"fk.");
14961487
sep="(";
1497-
for (i=0;i<riinfo->nkeys;i++)
1488+
for (inti=0;i<riinfo->nkeys;i++)
14981489
{
14991490
Oidpk_type=RIAttType(pk_rel,riinfo->pk_attnums[i]);
15001491
Oidfk_type=RIAttType(fk_rel,riinfo->fk_attnums[i]);
@@ -1522,7 +1513,7 @@ RI_Initial_Check(Trigger *trigger, Relation fk_rel, Relation pk_rel)
15221513
appendStringInfo(&querybuf,") WHERE pk.%s IS NULL AND (",pkattname);
15231514

15241515
sep="";
1525-
for (i=0;i<riinfo->nkeys;i++)
1516+
for (inti=0;i<riinfo->nkeys;i++)
15261517
{
15271518
quoteOneName(fkattname,RIAttName(fk_rel,riinfo->fk_attnums[i]));
15281519
appendStringInfo(&querybuf,
@@ -1613,7 +1604,7 @@ RI_Initial_Check(Trigger *trigger, Relation fk_rel, Relation pk_rel)
16131604
* or fk_rel's tupdesc.
16141605
*/
16151606
memcpy(&fake_riinfo,riinfo,sizeof(RI_ConstraintInfo));
1616-
for (i=0;i<fake_riinfo.nkeys;i++)
1607+
for (inti=0;i<fake_riinfo.nkeys;i++)
16171608
fake_riinfo.fk_attnums[i]=i+1;
16181609

16191610
/*
@@ -2195,15 +2186,14 @@ ri_ExtractValues(Relation rel, TupleTableSlot *slot,
21952186
Datum*vals,char*nulls)
21962187
{
21972188
constint16*attnums;
2198-
inti;
21992189
boolisnull;
22002190

22012191
if (rel_is_pk)
22022192
attnums=riinfo->pk_attnums;
22032193
else
22042194
attnums=riinfo->fk_attnums;
22052195

2206-
for (i=0;i<riinfo->nkeys;i++)
2196+
for (inti=0;i<riinfo->nkeys;i++)
22072197
{
22082198
vals[i]=slot_getattr(slot,attnums[i],&isnull);
22092199
nulls[i]=isnull ?'n' :' ';
@@ -2229,7 +2219,6 @@ ri_ReportViolation(const RI_ConstraintInfo *riinfo,
22292219
StringInfoDatakey_values;
22302220
boolonfk;
22312221
constint16*attnums;
2232-
intidx;
22332222
Oidrel_oid;
22342223
AclResultaclresult;
22352224
boolhas_perm= true;
@@ -2271,7 +2260,7 @@ ri_ReportViolation(const RI_ConstraintInfo *riinfo,
22712260
if (aclresult!=ACLCHECK_OK)
22722261
{
22732262
/* Try for column-level permissions */
2274-
for (idx=0;idx<riinfo->nkeys;idx++)
2263+
for (intidx=0;idx<riinfo->nkeys;idx++)
22752264
{
22762265
aclresult=pg_attribute_aclcheck(rel_oid,attnums[idx],
22772266
GetUserId(),
@@ -2294,7 +2283,7 @@ ri_ReportViolation(const RI_ConstraintInfo *riinfo,
22942283
/* Get printable versions of the keys involved */
22952284
initStringInfo(&key_names);
22962285
initStringInfo(&key_values);
2297-
for (idx=0;idx<riinfo->nkeys;idx++)
2286+
for (intidx=0;idx<riinfo->nkeys;idx++)
22982287
{
22992288
intfnum=attnums[idx];
23002289
Form_pg_attributeatt=TupleDescAttr(tupdesc,fnum-1);
@@ -2370,7 +2359,6 @@ ri_NullCheck(TupleDesc tupDesc,
23702359
constRI_ConstraintInfo*riinfo,boolrel_is_pk)
23712360
{
23722361
constint16*attnums;
2373-
inti;
23742362
boolallnull= true;
23752363
boolnonenull= true;
23762364

@@ -2379,7 +2367,7 @@ ri_NullCheck(TupleDesc tupDesc,
23792367
else
23802368
attnums=riinfo->fk_attnums;
23812369

2382-
for (i=0;i<riinfo->nkeys;i++)
2370+
for (inti=0;i<riinfo->nkeys;i++)
23832371
{
23842372
if (slot_attisnull(slot,attnums[i]))
23852373
nonenull= false;
@@ -2533,7 +2521,6 @@ ri_KeysEqual(Relation rel, TupleTableSlot *oldslot, TupleTableSlot *newslot,
25332521
{
25342522
constint16*attnums;
25352523
constOid*eq_oprs;
2536-
inti;
25372524

25382525
if (rel_is_pk)
25392526
{
@@ -2547,7 +2534,7 @@ ri_KeysEqual(Relation rel, TupleTableSlot *oldslot, TupleTableSlot *newslot,
25472534
}
25482535

25492536
/* XXX: could be worthwhile to fetch all necessary attrs at once */
2550-
for (i=0;i<riinfo->nkeys;i++)
2537+
for (inti=0;i<riinfo->nkeys;i++)
25512538
{
25522539
Datumoldvalue;
25532540
Datumnewvalue;

0 commit comments

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