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

Commit8255c7a

Browse files
committed
Phase 2 pgindent run for v12.
Switch to 2.1 version of pg_bsd_indent. This formatsmultiline function declarations "correctly", that is withadditional lines of parameter declarations indented to matchwhere the first line's left parenthesis is.Discussion:https://postgr.es/m/CAEepm=0P3FeTXRcU5B2W3jv3PgRVZ-kGUXLGfd42FFhUROO3ug@mail.gmail.com
1 parentbe76af1 commit8255c7a

File tree

712 files changed

+7437
-7451
lines changed

Some content is hidden

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

712 files changed

+7437
-7451
lines changed

‎contrib/amcheck/verify_nbtree.c

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -126,45 +126,45 @@ PG_FUNCTION_INFO_V1(bt_index_check);
126126
PG_FUNCTION_INFO_V1(bt_index_parent_check);
127127

128128
staticvoidbt_index_check_internal(Oidindrelid,boolparentcheck,
129-
boolheapallindexed,boolrootdescend);
129+
boolheapallindexed,boolrootdescend);
130130
staticinlinevoidbtree_index_checkable(Relationrel);
131131
staticvoidbt_check_every_level(Relationrel,Relationheaprel,
132-
boolheapkeyspace,boolreadonly,boolheapallindexed,
133-
boolrootdescend);
132+
boolheapkeyspace,boolreadonly,boolheapallindexed,
133+
boolrootdescend);
134134
staticBtreeLevelbt_check_level_from_leftmost(BtreeCheckState*state,
135-
BtreeLevellevel);
135+
BtreeLevellevel);
136136
staticvoidbt_target_page_check(BtreeCheckState*state);
137137
staticBTScanInsertbt_right_page_check_scankey(BtreeCheckState*state);
138138
staticvoidbt_downlink_check(BtreeCheckState*state,BTScanInserttargetkey,
139-
BlockNumberchildblock);
139+
BlockNumberchildblock);
140140
staticvoidbt_downlink_missing_check(BtreeCheckState*state);
141141
staticvoidbt_tuple_present_callback(Relationindex,HeapTuplehtup,
142-
Datum*values,bool*isnull,
143-
booltupleIsAlive,void*checkstate);
142+
Datum*values,bool*isnull,
143+
booltupleIsAlive,void*checkstate);
144144
staticIndexTuplebt_normalize_tuple(BtreeCheckState*state,
145-
IndexTupleitup);
145+
IndexTupleitup);
146146
staticboolbt_rootdescend(BtreeCheckState*state,IndexTupleitup);
147147
staticinlinebooloffset_is_negative_infinity(BTPageOpaqueopaque,
148-
OffsetNumberoffset);
148+
OffsetNumberoffset);
149149
staticinlineboolinvariant_l_offset(BtreeCheckState*state,BTScanInsertkey,
150-
OffsetNumberupperbound);
150+
OffsetNumberupperbound);
151151
staticinlineboolinvariant_leq_offset(BtreeCheckState*state,
152-
BTScanInsertkey,
153-
OffsetNumberupperbound);
152+
BTScanInsertkey,
153+
OffsetNumberupperbound);
154154
staticinlineboolinvariant_g_offset(BtreeCheckState*state,BTScanInsertkey,
155-
OffsetNumberlowerbound);
155+
OffsetNumberlowerbound);
156156
staticinlineboolinvariant_l_nontarget_offset(BtreeCheckState*state,
157-
BTScanInsertkey,
158-
BlockNumbernontargetblock,
159-
Pagenontarget,
160-
OffsetNumberupperbound);
157+
BTScanInsertkey,
158+
BlockNumbernontargetblock,
159+
Pagenontarget,
160+
OffsetNumberupperbound);
161161
staticPagepalloc_btree_page(BtreeCheckState*state,BlockNumberblocknum);
162162
staticinlineBTScanInsertbt_mkscankey_pivotsearch(Relationrel,
163-
IndexTupleitup);
163+
IndexTupleitup);
164164
staticItemIdPageGetItemIdCareful(BtreeCheckState*state,BlockNumberblock,
165-
Pagepage,OffsetNumberoffset);
165+
Pagepage,OffsetNumberoffset);
166166
staticinlineItemPointerBTreeTupleGetHeapTIDCareful(BtreeCheckState*state,
167-
IndexTupleitup,boolnonpivot);
167+
IndexTupleitup,boolnonpivot);
168168

169169
/*
170170
* bt_index_check(index regclass, heapallindexed boolean)

‎contrib/auto_explain/auto_explain.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ void_PG_fini(void);
7777

7878
staticvoidexplain_ExecutorStart(QueryDesc*queryDesc,inteflags);
7979
staticvoidexplain_ExecutorRun(QueryDesc*queryDesc,
80-
ScanDirectiondirection,
81-
uint64count,boolexecute_once);
80+
ScanDirectiondirection,
81+
uint64count,boolexecute_once);
8282
staticvoidexplain_ExecutorFinish(QueryDesc*queryDesc);
8383
staticvoidexplain_ExecutorEnd(QueryDesc*queryDesc);
8484

‎contrib/bloom/bloom.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -189,26 +189,26 @@ extern bool blvalidate(Oid opclassoid);
189189

190190
/* index access method interface functions */
191191
externboolblinsert(Relationindex,Datum*values,bool*isnull,
192-
ItemPointerht_ctid,RelationheapRel,
193-
IndexUniqueCheckcheckUnique,
194-
structIndexInfo*indexInfo);
192+
ItemPointerht_ctid,RelationheapRel,
193+
IndexUniqueCheckcheckUnique,
194+
structIndexInfo*indexInfo);
195195
externIndexScanDescblbeginscan(Relationr,intnkeys,intnorderbys);
196196
externint64blgetbitmap(IndexScanDescscan,TIDBitmap*tbm);
197197
externvoidblrescan(IndexScanDescscan,ScanKeyscankey,intnscankeys,
198-
ScanKeyorderbys,intnorderbys);
198+
ScanKeyorderbys,intnorderbys);
199199
externvoidblendscan(IndexScanDescscan);
200200
externIndexBuildResult*blbuild(Relationheap,Relationindex,
201-
structIndexInfo*indexInfo);
201+
structIndexInfo*indexInfo);
202202
externvoidblbuildempty(Relationindex);
203203
externIndexBulkDeleteResult*blbulkdelete(IndexVacuumInfo*info,
204-
IndexBulkDeleteResult*stats,IndexBulkDeleteCallbackcallback,
205-
void*callback_state);
204+
IndexBulkDeleteResult*stats,IndexBulkDeleteCallbackcallback,
205+
void*callback_state);
206206
externIndexBulkDeleteResult*blvacuumcleanup(IndexVacuumInfo*info,
207-
IndexBulkDeleteResult*stats);
207+
IndexBulkDeleteResult*stats);
208208
externbytea*bloptions(Datumreloptions,boolvalidate);
209209
externvoidblcostestimate(PlannerInfo*root,IndexPath*path,
210-
doubleloop_count,Cost*indexStartupCost,
211-
Cost*indexTotalCost,Selectivity*indexSelectivity,
212-
double*indexCorrelation,double*indexPages);
210+
doubleloop_count,Cost*indexStartupCost,
211+
Cost*indexTotalCost,Selectivity*indexSelectivity,
212+
double*indexCorrelation,double*indexPages);
213213

214214
#endif

‎contrib/btree_gist/btree_utils_num.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,26 +110,26 @@ do {\
110110
externInterval*abs_interval(Interval*a);
111111

112112
externboolgbt_num_consistent(constGBT_NUMKEY_R*key,constvoid*query,
113-
constStrategyNumber*strategy,boolis_leaf,
114-
constgbtree_ninfo*tinfo,FmgrInfo*flinfo);
113+
constStrategyNumber*strategy,boolis_leaf,
114+
constgbtree_ninfo*tinfo,FmgrInfo*flinfo);
115115

116116
externfloat8gbt_num_distance(constGBT_NUMKEY_R*key,constvoid*query,
117-
boolis_leaf,constgbtree_ninfo*tinfo,FmgrInfo*flinfo);
117+
boolis_leaf,constgbtree_ninfo*tinfo,FmgrInfo*flinfo);
118118

119119
externGIST_SPLITVEC*gbt_num_picksplit(constGistEntryVector*entryvec,GIST_SPLITVEC*v,
120-
constgbtree_ninfo*tinfo,FmgrInfo*flinfo);
120+
constgbtree_ninfo*tinfo,FmgrInfo*flinfo);
121121

122122
externGISTENTRY*gbt_num_compress(GISTENTRY*entry,constgbtree_ninfo*tinfo);
123123

124124
externGISTENTRY*gbt_num_fetch(GISTENTRY*entry,constgbtree_ninfo*tinfo);
125125

126126
externvoid*gbt_num_union(GBT_NUMKEY*out,constGistEntryVector*entryvec,
127-
constgbtree_ninfo*tinfo,FmgrInfo*flinfo);
127+
constgbtree_ninfo*tinfo,FmgrInfo*flinfo);
128128

129129
externboolgbt_num_same(constGBT_NUMKEY*a,constGBT_NUMKEY*b,
130-
constgbtree_ninfo*tinfo,FmgrInfo*flinfo);
130+
constgbtree_ninfo*tinfo,FmgrInfo*flinfo);
131131

132132
externvoidgbt_num_bin_union(Datum*u,GBT_NUMKEY*e,
133-
constgbtree_ninfo*tinfo,FmgrInfo*flinfo);
133+
constgbtree_ninfo*tinfo,FmgrInfo*flinfo);
134134

135135
#endif

‎contrib/btree_gist/btree_utils_var.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,22 @@ extern GBT_VARKEY *gbt_var_key_copy(const GBT_VARKEY_R *u);
5252
externGISTENTRY*gbt_var_compress(GISTENTRY*entry,constgbtree_vinfo*tinfo);
5353

5454
externGBT_VARKEY*gbt_var_union(constGistEntryVector*entryvec,int32*size,
55-
Oidcollation,constgbtree_vinfo*tinfo,FmgrInfo*flinfo);
55+
Oidcollation,constgbtree_vinfo*tinfo,FmgrInfo*flinfo);
5656

5757
externboolgbt_var_same(Datumd1,Datumd2,Oidcollation,
58-
constgbtree_vinfo*tinfo,FmgrInfo*flinfo);
58+
constgbtree_vinfo*tinfo,FmgrInfo*flinfo);
5959

6060
externfloat*gbt_var_penalty(float*res,constGISTENTRY*o,constGISTENTRY*n,
61-
Oidcollation,constgbtree_vinfo*tinfo,FmgrInfo*flinfo);
61+
Oidcollation,constgbtree_vinfo*tinfo,FmgrInfo*flinfo);
6262

6363
externboolgbt_var_consistent(GBT_VARKEY_R*key,constvoid*query,
64-
StrategyNumberstrategy,Oidcollation,boolis_leaf,
65-
constgbtree_vinfo*tinfo,FmgrInfo*flinfo);
64+
StrategyNumberstrategy,Oidcollation,boolis_leaf,
65+
constgbtree_vinfo*tinfo,FmgrInfo*flinfo);
6666

6767
externGIST_SPLITVEC*gbt_var_picksplit(constGistEntryVector*entryvec,GIST_SPLITVEC*v,
68-
Oidcollation,constgbtree_vinfo*tinfo,FmgrInfo*flinfo);
68+
Oidcollation,constgbtree_vinfo*tinfo,FmgrInfo*flinfo);
6969

7070
externvoidgbt_var_bin_union(Datum*u,GBT_VARKEY*e,Oidcollation,
71-
constgbtree_vinfo*tinfo,FmgrInfo*flinfo);
71+
constgbtree_vinfo*tinfo,FmgrInfo*flinfo);
7272

7373
#endif

‎contrib/dblink/dblink.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ typedef struct storeInfo
8989
staticDatumdblink_record_internal(FunctionCallInfofcinfo,boolis_async);
9090
staticvoidprepTuplestoreResult(FunctionCallInfofcinfo);
9191
staticvoidmaterializeResult(FunctionCallInfofcinfo,PGconn*conn,
92-
PGresult*res);
92+
PGresult*res);
9393
staticvoidmaterializeQueryResult(FunctionCallInfofcinfo,
94-
PGconn*conn,
95-
constchar*conname,
96-
constchar*sql,
97-
boolfail);
94+
PGconn*conn,
95+
constchar*conname,
96+
constchar*sql,
97+
boolfail);
9898
staticPGresult*storeQueryResult(volatilestoreInfo*sinfo,PGconn*conn,constchar*sql);
9999
staticvoidstoreRow(volatilestoreInfo*sinfo,PGresult*res,boolfirst);
100100
staticremoteConn*getConnectionByName(constchar*name);
@@ -114,14 +114,14 @@ static char *generate_relation_name(Relation rel);
114114
staticvoiddblink_connstr_check(constchar*connstr);
115115
staticvoiddblink_security_check(PGconn*conn,remoteConn*rconn);
116116
staticvoiddblink_res_error(PGconn*conn,constchar*conname,PGresult*res,
117-
boolfail,constchar*fmt,...)pg_attribute_printf(5,6);
117+
boolfail,constchar*fmt,...)pg_attribute_printf(5,6);
118118
staticchar*get_connect_string(constchar*servername);
119119
staticchar*escape_param_str(constchar*from);
120120
staticvoidvalidate_pkattnums(Relationrel,
121-
int2vector*pkattnums_arg,int32pknumatts_arg,
122-
int**pkattnums,int*pknumatts);
121+
int2vector*pkattnums_arg,int32pknumatts_arg,
122+
int**pkattnums,int*pknumatts);
123123
staticboolis_valid_dblink_option(constPQconninfoOption*options,
124-
constchar*option,Oidcontext);
124+
constchar*option,Oidcontext);
125125
staticintapplyRemoteGucs(PGconn*conn);
126126
staticvoidrestoreLocalGucs(intnestlevel);
127127

‎contrib/file_fdw/file_fdw.c

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -117,49 +117,49 @@ PG_FUNCTION_INFO_V1(file_fdw_validator);
117117
* FDW callback routines
118118
*/
119119
staticvoidfileGetForeignRelSize(PlannerInfo*root,
120-
RelOptInfo*baserel,
121-
Oidforeigntableid);
120+
RelOptInfo*baserel,
121+
Oidforeigntableid);
122122
staticvoidfileGetForeignPaths(PlannerInfo*root,
123-
RelOptInfo*baserel,
124-
Oidforeigntableid);
123+
RelOptInfo*baserel,
124+
Oidforeigntableid);
125125
staticForeignScan*fileGetForeignPlan(PlannerInfo*root,
126-
RelOptInfo*baserel,
127-
Oidforeigntableid,
128-
ForeignPath*best_path,
129-
List*tlist,
130-
List*scan_clauses,
131-
Plan*outer_plan);
126+
RelOptInfo*baserel,
127+
Oidforeigntableid,
128+
ForeignPath*best_path,
129+
List*tlist,
130+
List*scan_clauses,
131+
Plan*outer_plan);
132132
staticvoidfileExplainForeignScan(ForeignScanState*node,ExplainState*es);
133133
staticvoidfileBeginForeignScan(ForeignScanState*node,inteflags);
134134
staticTupleTableSlot*fileIterateForeignScan(ForeignScanState*node);
135135
staticvoidfileReScanForeignScan(ForeignScanState*node);
136136
staticvoidfileEndForeignScan(ForeignScanState*node);
137137
staticboolfileAnalyzeForeignTable(Relationrelation,
138-
AcquireSampleRowsFunc*func,
139-
BlockNumber*totalpages);
138+
AcquireSampleRowsFunc*func,
139+
BlockNumber*totalpages);
140140
staticboolfileIsForeignScanParallelSafe(PlannerInfo*root,RelOptInfo*rel,
141-
RangeTblEntry*rte);
141+
RangeTblEntry*rte);
142142

143143
/*
144144
* Helper functions
145145
*/
146146
staticboolis_valid_option(constchar*option,Oidcontext);
147147
staticvoidfileGetOptions(Oidforeigntableid,
148-
char**filename,
149-
bool*is_program,
150-
List**other_options);
148+
char**filename,
149+
bool*is_program,
150+
List**other_options);
151151
staticList*get_file_fdw_attribute_options(Oidrelid);
152152
staticboolcheck_selective_binary_conversion(RelOptInfo*baserel,
153-
Oidforeigntableid,
154-
List**columns);
153+
Oidforeigntableid,
154+
List**columns);
155155
staticvoidestimate_size(PlannerInfo*root,RelOptInfo*baserel,
156-
FileFdwPlanState*fdw_private);
156+
FileFdwPlanState*fdw_private);
157157
staticvoidestimate_costs(PlannerInfo*root,RelOptInfo*baserel,
158-
FileFdwPlanState*fdw_private,
159-
Cost*startup_cost,Cost*total_cost);
160-
staticintfile_acquire_sample_rows(Relationonerel,intelevel,
161-
HeapTuple*rows,inttargrows,
162-
double*totalrows,double*totaldeadrows);
158+
FileFdwPlanState*fdw_private,
159+
Cost*startup_cost,Cost*total_cost);
160+
staticintfile_acquire_sample_rows(Relationonerel,intelevel,
161+
HeapTuple*rows,inttargrows,
162+
double*totalrows,double*totaldeadrows);
163163

164164

165165
/*

‎contrib/intarray/_int_selfuncs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ PG_FUNCTION_INFO_V1(_int_matchsel);
3535

3636

3737
staticSelectivityint_query_opr_selec(ITEM*item,Datum*values,float4*freqs,
38-
intnmncelems,float4minfreq);
38+
intnmncelems,float4minfreq);
3939
staticintcompare_val_int4(constvoid*a,constvoid*b);
4040

4141
/*

‎contrib/jsonb_plpython/jsonb_plpython.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ static PyObject *decimal_constructor;
2626

2727
staticPyObject*PLyObject_FromJsonbContainer(JsonbContainer*jsonb);
2828
staticJsonbValue*PLyObject_ToJsonbValue(PyObject*obj,
29-
JsonbParseState**jsonb_state,boolis_elem);
29+
JsonbParseState**jsonb_state,boolis_elem);
3030

3131
#ifPY_MAJOR_VERSION >=3
3232
typedefPyObject*(*PLyUnicode_FromStringAndSize_t)

‎contrib/ltree/lquery_op.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ getlexeme(char *start, char *end, int *len)
5050
}
5151

5252
bool
53-
compare_subnode(ltree_level*t,char*qn,intlen,int (*cmpptr) (constchar*,constchar*,size_t),boolanyend)
53+
compare_subnode(ltree_level*t,char*qn,intlen,int (*cmpptr) (constchar*,constchar*,size_t),boolanyend)
5454
{
5555
char*endt=t->name+t->len;
5656
char*endq=qn+len;

‎contrib/ltree/ltree.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,13 @@ Datumltree_textadd(PG_FUNCTION_ARGS);
155155
/* Util function */
156156
Datumltree_in(PG_FUNCTION_ARGS);
157157

158-
boolltree_execute(ITEM*curitem,void*checkval,
159-
boolcalcnot,bool (*chkcond) (void*checkval,ITEM*val));
158+
boolltree_execute(ITEM*curitem,void*checkval,
159+
boolcalcnot,bool (*chkcond) (void*checkval,ITEM*val));
160160

161161
intltree_compare(constltree*a,constltree*b);
162162
boolinner_isparent(constltree*c,constltree*p);
163-
boolcompare_subnode(ltree_level*t,char*q,intlen,
164-
int (*cmpptr) (constchar*,constchar*,size_t),boolanyend);
163+
boolcompare_subnode(ltree_level*t,char*q,intlen,
164+
int (*cmpptr) (constchar*,constchar*,size_t),boolanyend);
165165
ltree*lca_inner(ltree**a,intlen);
166166
intltree_strncasecmp(constchar*a,constchar*b,size_ts);
167167

‎contrib/pageinspect/brinfuncs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ typedef struct brin_column_state
4141

4242

4343
staticPageverify_brin_page(bytea*raw_page,uint16type,
44-
constchar*strtype);
44+
constchar*strtype);
4545

4646
Datum
4747
brin_page_type(PG_FUNCTION_ARGS)

‎contrib/pageinspect/rawpage.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
PG_MODULE_MAGIC;
3434

3535
staticbytea*get_raw_page_internal(text*relname,ForkNumberforknum,
36-
BlockNumberblkno);
36+
BlockNumberblkno);
3737

3838

3939
/*

0 commit comments

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