Movatterモバイル変換

Skip to content

postgrespro/postgresPublic

forked frompostgres/postgres

NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitfa27dd4

tglsfdc

committed

Run pgindent with new pg_bsd_indent version 2.1.1.

Thomas Munro fixed a longstanding annoyance in pg_bsd_indent, thatit would misformat lines containing IsA() macros on the assumptionthat the IsA() call should be treated like a cast. This improvessome other cases involving field/variable names that match typedefs,too. The only places that get worse are a couple of uses of theOpenSSL macro STACK_OF(); we'll gladly take that trade-off.Discussion:https://postgr.es/m/20200114221814.GA19630@alvherre.pgsql

1 parente02ad57 commitfa27dd4Copy full SHA for fa27dd4

File tree

33 files changed

+47

-47

lines changed

src
- backend
  - commands
  - executor
    - nodeAgg.c
    - nodeProjectSet.c
  - libpq
    - be-secure-openssl.c
  - nodes
    - outfuncs.c
  - optimizer
    - path
      - costsize.c
    - plan
      - setrefs.c
    - util
      - pathnode.c
  - parser
  - statistics
    - extended_stats.c
  - utils/adt
- bin
  - pg_dump
    - pg_backup_directory.c
  - psql
    - tab-complete.c
- common
  - jsonapi.c
- interfaces
  - ecpg/ecpglib
    - execute.c
    - prepare.c
  - libpq
    - fe-secure-openssl.c
- pl/plpgsql/src
  - pl_exec.c
- timezone
- tools/pgindent
  - pgindent

33 files changed

+47

-47

lines changed

`‎src/backend/commands/explain.c‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -753,7 +753,7 @@ ExplainPrintPlan(ExplainState es, QueryDesc queryDesc)`
`753`	`753`	`* further down in the plan tree.`
`754`	`754`	`*/`
`755`	`755`	`ps=queryDesc->planstate;`
`756`		`-if (IsA(ps,GatherState)&&((Gather*)ps->plan)->invisible)`
	`756`	`+if (IsA(ps,GatherState)&&((Gather*)ps->plan)->invisible)`
`757`	`757`	`{`
`758`	`758`	`ps=outerPlanState(ps);`
`759`	`759`	`es->hide_workers= true;`
`@@ -2256,7 +2256,7 @@ show_scan_qual(List qual, const char qlabel,`
`2256`	`2256`	`{`
`2257`	`2257`	`booluseprefix;`
`2258`	`2258`
`2259`		`-useprefix= (IsA(planstate->plan,SubqueryScan)\|\|es->verbose);`
	`2259`	`+useprefix= (IsA(planstate->plan,SubqueryScan)\|\|es->verbose);`
`2260`	`2260`	`show_qual(qual,qlabel,planstate,ancestors,useprefix,es);`
`2261`	`2261`	`}`
`2262`	`2262`

`‎src/backend/commands/tablecmds.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11136,7 +11136,7 @@ ATColumnChangeRequiresRewrite(Node *expr, AttrNumber varattno)`
`11136`	`11136`	`for (;;)`
`11137`	`11137`	`{`
`11138`	`11138`	`/* only one varno, so no need to check that */`
`11139`		`-if (IsA(expr, Var) &&((Var *) expr)->varattno == varattno)`
	`11139`	`+if (IsA(expr, Var) &&((Var *) expr)->varattno == varattno)`
`11140`	`11140`	`return false;`
`11141`	`11141`	`else if (IsA(expr, RelabelType))`
`11142`	`11142`	`expr = (Node ) ((RelabelType ) expr)->arg;`

`‎src/backend/commands/typecmds.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2176,7 +2176,7 @@ AlterDomainDefault(List names, Node defaultRaw)`
`2176`	`2176`	`* DefineDomain.)`
`2177`	`2177`	`*/`
`2178`	`2178`	`if (defaultExpr==NULL\|\|`
`2179`		`-(IsA(defaultExpr,Const)&&((Const*)defaultExpr)->constisnull))`
	`2179`	`+(IsA(defaultExpr,Const)&&((Const*)defaultExpr)->constisnull))`
`2180`	`2180`	`{`
`2181`	`2181`	`/* Default is NULL, drop it */`
`2182`	`2182`	`defaultExpr=NULL;`

`‎src/backend/executor/nodeAgg.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1410,7 +1410,7 @@ find_unaggregated_cols_walker(Node node, Bitmapset *colnos)`
`1410`	`1410`	`colnos=bms_add_member(colnos,var->varattno);`
`1411`	`1411`	`return false;`
`1412`	`1412`	`}`
`1413`		`-if (IsA(node,Aggref)\|\|IsA(node,GroupingFunc))`
	`1413`	`+if (IsA(node,Aggref)\|\|IsA(node,GroupingFunc))`
`1414`	`1414`	`{`
`1415`	`1415`	`/* do not descend into aggregate exprs */`
`1416`	`1416`	`return false;`

`‎src/backend/executor/nodeProjectSet.c‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -277,8 +277,8 @@ ExecInitProjectSet(ProjectSet node, EState estate, int eflags)`
`277`	`277`	`TargetEntryte= (TargetEntry)lfirst(lc);`
`278`	`278`	`Expr*expr=te->expr;`
`279`	`279`
`280`		`-if ((IsA(expr,FuncExpr)&&((FuncExpr*)expr)->funcretset)\|\|`
`281`		`-(IsA(expr,OpExpr)&&((OpExpr*)expr)->opretset))`
	`280`	`+if ((IsA(expr,FuncExpr)&&((FuncExpr*)expr)->funcretset)\|\|`
	`281`	`+(IsA(expr,OpExpr)&&((OpExpr*)expr)->opretset))`
`282`	`282`	`{`
`283`	`283`	`state->elems[off]= (Node*)`
`284`	`284`	`ExecInitFunctionResultSet(expr,state->ps.ps_ExprContext,`

`‎src/backend/libpq/be-secure-openssl.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ static intssl_protocol_version_to_openssl(int v);`
`80`	`80`	`int`
`81`	`81`	`be_tls_init(boolisServerStart)`
`82`	`82`	`{`
`83`		`-STACK_OF(X509_NAME)*root_cert_list=NULL;`
	`83`	`+STACK_OF(X509_NAME)*root_cert_list=NULL;`
`84`	`84`	`SSL_CTX*context;`
`85`	`85`	`intssl_ver_min=-1;`
`86`	`86`	`intssl_ver_max=-1;`

`‎src/backend/nodes/outfuncs.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3682,7 +3682,7 @@ outNode(StringInfo str, const void *obj)`
`3682`	`3682`
`3683`	`3683`	`if (obj==NULL)`
`3684`	`3684`	`appendStringInfoString(str,"<>");`
`3685`		`-elseif (IsA(obj,List)\|\|IsA(obj,IntList)\|\|IsA(obj,OidList))`
	`3685`	`+elseif (IsA(obj,List)\|\|IsA(obj,IntList)\|\|IsA(obj,OidList))`
`3686`	`3686`	`_outList(str,obj);`
`3687`	`3687`	`elseif (IsA(obj,Integer)\|\|`
`3688`	`3688`	`IsA(obj,Float)\|\|`

`‎src/backend/optimizer/path/costsize.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3257,7 +3257,7 @@ final_cost_mergejoin(PlannerInfo root, MergePath path,`
`3257`	`3257`	`* The whole issue is moot if we are working from a unique-ified outer`
`3258`	`3258`	`* input, or if we know we don't need to mark/restore at all.`
`3259`	`3259`	`*/`
`3260`		`-if (IsA(outer_path,UniquePath)\|\|path->skip_mark_restore)`
	`3260`	`+if (IsA(outer_path,UniquePath)\|\|path->skip_mark_restore)`
`3261`	`3261`	`rescannedtuples=0;`
`3262`	`3262`	`else`
`3263`	`3263`	`{`

`‎src/backend/optimizer/plan/setrefs.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1960,7 +1960,7 @@ set_upper_references(PlannerInfo root, Plan plan, int rtoffset)`
`1960`	`1960`	`staticvoid`
`1961`	`1961`	`set_param_references(PlannerInforoot,Planplan)`
`1962`	`1962`	`{`
`1963`		`-Assert(IsA(plan,Gather)\|\|IsA(plan,GatherMerge));`
	`1963`	`+Assert(IsA(plan,Gather)\|\|IsA(plan,GatherMerge));`
`1964`	`1964`
`1965`	`1965`	`if (plan->lefttree->extParam)`
`1966`	`1966`	`{`

`‎src/backend/optimizer/util/pathnode.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2639,7 +2639,7 @@ apply_projection_to_path(PlannerInfo *root,`
`2639`	`2639`	`* workers can help project. But if there is something that is not`
`2640`	`2640`	`* parallel-safe in the target expressions, then we can't.`
`2641`	`2641`	`*/`
`2642`		`-if ((IsA(path,GatherPath)\|\|IsA(path,GatherMergePath))&&`
	`2642`	`+if ((IsA(path,GatherPath)\|\|IsA(path,GatherMergePath))&&`
`2643`	`2643`	`is_parallel_safe(root, (Node*)target->exprs))`
`2644`	`2644`	`{`
`2645`	`2645`	`/*`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp