Skip to content

Commit f03128e

Browse files
kovdb75kovdb75
committed
Pgindent fixes
1 parent eab5f7d commit f03128e

File tree

1 file changed

+42
-40
lines changed

1 file changed

+42
-40
lines changed

‎src/include/compat/pg_compat.h

Lines changed: 42 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@
6565
*/
6666
#if PG_VERSION_NUM >= 110000
6767
#define calc_nestloop_required_outer_compat(outer, inner) \
68-
calc_nestloop_required_outer((outer)->parent->relids, PATH_REQ_OUTER(outer), \
68+
calc_nestloop_required_outer((outer)->parent->relids, PATH_REQ_OUTER(outer), \
6969
(inner)->parent->relids, PATH_REQ_OUTER(inner))
7070
#else
7171
#define calc_nestloop_required_outer_compat(outer, inner) \
72-
calc_nestloop_required_outer((outer), (inner))
72+
calc_nestloop_required_outer((outer), (inner))
7373
#endif
7474

7575

@@ -120,14 +120,14 @@
120120
* CheckValidResultRel()
121121
*/
122122
#if PG_VERSION_NUM >= 170000
123-
#define CheckValidResultRelCompat(rri, cmd) \
124-
CheckValidResultRel((rri), (cmd), NIL)
123+
#define CheckValidResultRelCompat(rri, cmd) \
124+
CheckValidResultRel((rri), (cmd), NIL)
125125
#elif PG_VERSION_NUM >= 100000
126-
#define CheckValidResultRelCompat(rri, cmd) \
127-
CheckValidResultRel((rri), (cmd))
126+
#define CheckValidResultRelCompat(rri, cmd) \
127+
CheckValidResultRel((rri), (cmd))
128128
#elif PG_VERSION_NUM >= 90500
129-
#define CheckValidResultRelCompat(rri, cmd) \
130-
CheckValidResultRel((rri)->ri_RelationDesc, (cmd))
129+
#define CheckValidResultRelCompat(rri, cmd) \
130+
CheckValidResultRel((rri)->ri_RelationDesc, (cmd))
131131
#endif
132132

133133
/*
@@ -265,7 +265,7 @@
265265
#define create_append_path_compat(rel, subpaths, required_outer, parallel_workers) \
266266
create_append_path(NULL, (rel), (subpaths), NIL, NIL, (required_outer), \
267267
(parallel_workers), false, NIL, -1, false)
268-
#endif /* PGPRO_VERSION */
268+
#endif /* PGPRO_VERSION */
269269

270270
#elif PG_VERSION_NUM >= 110000
271271

@@ -277,7 +277,7 @@
277277
#define create_append_path_compat(rel, subpaths, required_outer, parallel_workers) \
278278
create_append_path(NULL, (rel), (subpaths), NIL, (required_outer), \
279279
(parallel_workers), false, NIL, -1, false, NIL)
280-
#endif /* PGPRO_VERSION */
280+
#endif /* PGPRO_VERSION */
281281

282282
#elif PG_VERSION_NUM >= 100000
283283

@@ -288,7 +288,7 @@
288288
#define create_append_path_compat(rel, subpaths, required_outer, parallel_workers) \
289289
create_append_path((rel), (subpaths), (required_outer), (parallel_workers), NIL, \
290290
false, NIL)
291-
#endif /* PGPRO_VERSION */
291+
#endif /* PGPRO_VERSION */
292292

293293
#elif PG_VERSION_NUM >= 90600
294294

@@ -299,12 +299,12 @@
299299
#define create_append_path_compat(rel, subpaths, required_outer, parallel_workers) \
300300
create_append_path((rel), (subpaths), (required_outer), \
301301
false, NIL, (parallel_workers))
302-
#endif /* PGPRO_VERSION */
302+
#endif /* PGPRO_VERSION */
303303

304304
#elif PG_VERSION_NUM >= 90500
305305
#define create_append_path_compat(rel, subpaths, required_outer, parallel_workers) \
306306
create_append_path((rel), (subpaths), (required_outer))
307-
#endif /* PG_VERSION_NUM */
307+
#endif /* PG_VERSION_NUM */
308308

309309

310310
/*
@@ -414,8 +414,8 @@ extern void create_plain_partial_paths(PlannerInfo *root,
414414
static inline Datum
415415
ExecEvalExprCompat(ExprState *expr, ExprContext *econtext, bool *isnull)
416416
{
417-
ExprDoneCond isdone;
418-
Datum result = ExecEvalExpr(expr, econtext, isnull, &isdone);
417+
ExprDoneCond isdone;
418+
Datum result = ExecEvalExpr(expr, econtext, isnull, &isdone);
419419

420420
if (isdone != ExprSingleResult)
421421
elog(ERROR, "expression should return single value");
@@ -432,9 +432,9 @@ ExecEvalExprCompat(ExprState *expr, ExprContext *econtext, bool *isnull)
432432
static inline bool
433433
ExecCheck(ExprState *state, ExprContext *econtext)
434434
{
435-
Datum ret;
436-
bool isnull;
437-
MemoryContext old_mcxt;
435+
Datum ret;
436+
bool isnull;
437+
MemoryContext old_mcxt;
438438

439439
/* short-circuit (here and in ExecInitCheck) for empty restriction list */
440440
if (state == NULL)
@@ -530,7 +530,7 @@ extern List *get_all_actual_clauses(List *restrictinfo_list);
530530
* get_rel_persistence()
531531
*/
532532
#if PG_VERSION_NUM >= 90500 && PG_VERSION_NUM < 90600
533-
char get_rel_persistence(Oid relid);
533+
char get_rel_persistence(Oid relid);
534534
#endif
535535

536536

@@ -583,8 +583,8 @@ char get_rel_persistence(Oid relid);
583583
* make_restrictinfo()
584584
*/
585585
#if PG_VERSION_NUM >= 100000
586-
extern List * make_restrictinfos_from_actual_clauses(PlannerInfo *root,
587-
List *clause_list);
586+
extern List *make_restrictinfos_from_actual_clauses(PlannerInfo *root,
587+
List *clause_list);
588588
#endif
589589

590590

@@ -607,17 +607,17 @@ extern Result *make_result(List *tlist,
607607
* McxtStatsInternal()
608608
*/
609609
#if PG_VERSION_NUM >= 90600
610-
void McxtStatsInternal(MemoryContext context, int level,
611-
bool examine_children,
612-
MemoryContextCounters *totals);
610+
void McxtStatsInternal(MemoryContext context, int level,
611+
bool examine_children,
612+
MemoryContextCounters *totals);
613613
#endif
614614

615615

616616
/*
617617
* oid_cmp()
618618
*/
619619
#if PG_VERSION_NUM >=90500 && PG_VERSION_NUM < 100000
620-
extern int oid_cmp(const void *p1, const void *p2);
620+
extern int oid_cmp(const void *p1, const void *p2);
621621
#endif
622622

623623

@@ -626,7 +626,7 @@ extern int oid_cmp(const void *p1, const void *p2);
626626
*
627627
* for v10 cast first arg to RawStmt type
628628
*/
629-
#if PG_VERSION_NUM >= 150000 /* for commit 791b1b71da35 */
629+
#if PG_VERSION_NUM >= 150000 /* for commit 791b1b71da35 */
630630
#define parse_analyze_compat(parse_tree, query_string, param_types, nparams, \
631631
query_env) \
632632
parse_analyze_fixedparams((RawStmt *) (parse_tree), (query_string), (param_types), \
@@ -649,7 +649,7 @@ extern int oid_cmp(const void *p1, const void *p2);
649649
*
650650
* for v10 cast first arg to RawStmt type
651651
*/
652-
#if PG_VERSION_NUM >= 150000 /* for commit 791b1b71da35 */
652+
#if PG_VERSION_NUM >= 150000 /* for commit 791b1b71da35 */
653653
#define pg_analyze_and_rewrite_compat(parsetree, query_string, param_types, \
654654
nparams, query_env) \
655655
pg_analyze_and_rewrite_fixedparams((RawStmt *) (parsetree), (query_string), \
@@ -722,7 +722,7 @@ extern int oid_cmp(const void *p1, const void *p2);
722722
* set_dummy_rel_pathlist()
723723
*/
724724
#if PG_VERSION_NUM >= 90500 && PG_VERSION_NUM < 90600
725-
void set_dummy_rel_pathlist(RelOptInfo *rel);
725+
void set_dummy_rel_pathlist(RelOptInfo *rel);
726726
#endif
727727

728728

@@ -744,8 +744,9 @@ extern void set_rel_consider_parallel(PlannerInfo *root,
744744
* in compat version the type of first argument is (Expr *)
745745
*/
746746
#if PG_VERSION_NUM >= 100000
747-
#if PG_VERSION_NUM >= 140000 /* function removed in 375398244168add84a884347625d14581a421e71 */
748-
extern TargetEntry *tlist_member_ignore_relabel(Expr * node, List * targetlist);
747+
#if PG_VERSION_NUM >= 140000 /* function removed in
748+
* 375398244168add84a884347625d14581a421e71 */
749+
extern TargetEntry *tlist_member_ignore_relabel(Expr *node, List *targetlist);
749750
#endif
750751
#define tlist_member_ignore_relabel_compat(expr, targetlist) \
751752
tlist_member_ignore_relabel((expr), (targetlist))
@@ -775,7 +776,7 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,
775776
tupleid, fdw_trigtuple, newslot) \
776777
ExecBRUpdateTriggers((estate), (epqstate), (relinfo), (tupleid), \
777778
(fdw_trigtuple), (newslot), NULL, NULL)
778-
#elif PG_VERSION_NUM >= 150000 /* for commit 7103ebb7aae8 */
779+
#elif PG_VERSION_NUM >= 150000 /* for commit 7103ebb7aae8 */
779780
#define ExecBRUpdateTriggersCompat(estate, epqstate, relinfo, \
780781
tupleid, fdw_trigtuple, newslot) \
781782
ExecBRUpdateTriggers((estate), (epqstate), (relinfo), (tupleid), \
@@ -826,7 +827,7 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,
826827
/*
827828
* ExecARDeleteTriggers()
828829
*/
829-
#if PG_VERSION_NUM >= 150000 /* for commit ba9a7e392171 */
830+
#if PG_VERSION_NUM >= 150000 /* for commit ba9a7e392171 */
830831
#define ExecARDeleteTriggersCompat(estate, relinfo, tupleid, \
831832
fdw_trigtuple, transition_capture) \
832833
ExecARDeleteTriggers((estate), (relinfo), (tupleid), \
@@ -970,9 +971,9 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,
970971
* we need access to entire tuple, not just its header.
971972
*/
972973
#ifdef XID_IS_64BIT
973-
# define HeapTupleGetXminCompat(htup) HeapTupleGetXmin(htup)
974+
#define HeapTupleGetXminCompat(htup) HeapTupleGetXmin(htup)
974975
#else
975-
# define HeapTupleGetXminCompat(htup) HeapTupleHeaderGetXmin((htup)->t_data)
976+
#define HeapTupleGetXminCompat(htup) HeapTupleHeaderGetXmin((htup)->t_data)
976977
#endif
977978

978979
/*
@@ -1115,9 +1116,10 @@ static inline TupleTableSlot *
11151116
ExecInitExtraTupleSlotCompatHorse(EState *s, TupleDesc t)
11161117
{
11171118
#if PG_VERSION_NUM >= 110000
1118-
return ExecInitExtraTupleSlot(s,t);
1119+
return ExecInitExtraTupleSlot(s, t);
11191120
#else
1120-
TupleTableSlot *res = ExecInitExtraTupleSlot(s);
1121+
TupleTableSlot *res = ExecInitExtraTupleSlot(s);
1122+
11211123
if (t)
11221124
ExecSetSlotDescriptor(res, t);
11231125

@@ -1149,7 +1151,7 @@ CustomEvalParamExternCompat(Param *param,
11491151
return prm;
11501152
}
11511153

1152-
void set_append_rel_size_compat(PlannerInfo *root, RelOptInfo *rel, Index rti);
1154+
void set_append_rel_size_compat(PlannerInfo *root, RelOptInfo *rel, Index rti);
11531155

11541156
/*
11551157
* lnext()
@@ -1210,8 +1212,8 @@ void set_append_rel_size_compat(PlannerInfo *root, RelOptInfo *rel, Index rti);
12101212
#define make_restrictinfo_compat(r, c, ipd, od, p, sl, rr, or, nr) make_restrictinfo((r), (c), (ipd), (od), (p), (sl), (rr), (or), (nr))
12111213
#else
12121214
#define make_restrictinfo_compat(r, c, ipd, od, p, sl, rr, or, nr) make_restrictinfo((c), (ipd), (od), (p), (sl), (rr), (or), (nr))
1213-
#endif /* #if PG_VERSION_NUM >= 140000 */
1214-
#endif /* #if PG_VERSION_NUM >= 160000 */
1215+
#endif /* #if PG_VERSION_NUM >= 140000 */
1216+
#endif /* #if PG_VERSION_NUM >= 160000 */
12151217

12161218
/*
12171219
* pull_varnos()
@@ -1243,4 +1245,4 @@ void set_append_rel_size_compat(PlannerInfo *root, RelOptInfo *rel, Index rti);
12431245
#define EvalPlanQualInit_compat(epqstate, parentestate, subplan, auxrowmarks, epqParam) EvalPlanQualInit(epqstate, parentestate, subplan, auxrowmarks, epqParam)
12441246
#endif
12451247

1246-
#endif /* PG_COMPAT_H */
1248+
#endif /* PG_COMPAT_H */

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy