Skip to content

Commit eaedf0d

Browse files
robertmhaasrobertmhaas
committed
Update typedefs.list and re-run pgindent
Discussion: http://postgr.es/m/CA+TgmoaA9=1RWKtBWpDaj+sF3Stgc8sHgf5z=KGtbjwPLQVDMA@mail.gmail.com
1 parent 801386a commit eaedf0d

File tree

52 files changed

+224
-197
lines changed

Some content is hidden

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

52 files changed

+224
-197
lines changed

‎contrib/fuzzystrmatch/fuzzystrmatch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ soundex_code(char letter)
104104
#define TH '0'
105105

106106
static char Lookahead(char *word, int how_far);
107-
static void _metaphone(char *word, int max_phonemes, char **phoned_word);
107+
static void _metaphone(char *word, int max_phonemes, char **phoned_word);
108108

109109
/* Metachar.h ... little bits about characters for metaphone */
110110

‎contrib/isn/isn.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,7 @@ string2ean(const char *str, bool errorOK, ean13 *result,
925925
* Exported routines.
926926
*---------------------------------------------------------*/
927927

928-
void _PG_init(void);
928+
void _PG_init(void);
929929

930930
void
931931
_PG_init(void)

‎src/backend/access/brin/brin.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,8 +1314,8 @@ brinsummarize(Relation index, Relation heapRel, BlockNumber pageRange,
13141314

13151315
/*
13161316
* Unless requested to summarize even a partial range, go away now if
1317-
* we think the next range is partial. Caller would pass true when
1318-
* it is typically run once bulk data loading is done
1317+
* we think the next range is partial. Caller would pass true when it
1318+
* is typically run once bulk data loading is done
13191319
* (brin_summarize_new_values), and false when it is typically the
13201320
* result of arbitrarily-scheduled maintenance command (vacuuming).
13211321
*/

‎src/backend/access/common/printsimple.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ printsimple_startup(DestReceiver *self, int operation, TupleDesc tupdesc)
4141
Form_pg_attribute attr = TupleDescAttr(tupdesc, i);
4242

4343
pq_sendstring(&buf, NameStr(attr->attname));
44-
pq_sendint32(&buf, 0); /* table oid */
45-
pq_sendint16(&buf, 0); /* attnum */
44+
pq_sendint32(&buf, 0); /* table oid */
45+
pq_sendint16(&buf, 0); /* attnum */
4646
pq_sendint32(&buf, (int) attr->atttypid);
4747
pq_sendint16(&buf, attr->attlen);
4848
pq_sendint32(&buf, attr->atttypmod);
49-
pq_sendint16(&buf, 0); /* format code */
49+
pq_sendint16(&buf, 0); /* format code */
5050
}
5151

5252
pq_endmessage(&buf);

‎src/backend/access/transam/xlog.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6586,10 +6586,10 @@ StartupXLOG(void)
65866586
else
65876587
{
65886588
/*
6589-
* We used to attempt to go back to a secondary checkpoint
6590-
* record here, but only when not in standby_mode. We now
6591-
* just fail if we can't read the last checkpoint because
6592-
* this allows us to simplify processing around checkpoints.
6589+
* We used to attempt to go back to a secondary checkpoint record
6590+
* here, but only when not in standby_mode. We now just fail if we
6591+
* can't read the last checkpoint because this allows us to
6592+
* simplify processing around checkpoints.
65936593
*/
65946594
ereport(PANIC,
65956595
(errmsg("could not locate a valid checkpoint record")));
@@ -8888,7 +8888,8 @@ CreateCheckPoint(int flags)
88888888
(errmsg("concurrent write-ahead log activity while database system is shutting down")));
88898889

88908890
/*
8891-
* Remember the prior checkpoint's redo ptr for UpdateCheckPointDistanceEstimate()
8891+
* Remember the prior checkpoint's redo ptr for
8892+
* UpdateCheckPointDistanceEstimate()
88928893
*/
88938894
PriorRedoPtr = ControlFile->checkPointCopy.redo;
88948895

@@ -9211,7 +9212,8 @@ CreateRestartPoint(int flags)
92119212
CheckPointGuts(lastCheckPoint.redo, flags);
92129213

92139214
/*
9214-
* Remember the prior checkpoint's redo ptr for UpdateCheckPointDistanceEstimate()
9215+
* Remember the prior checkpoint's redo ptr for
9216+
* UpdateCheckPointDistanceEstimate()
92159217
*/
92169218
PriorRedoPtr = ControlFile->checkPointCopy.redo;
92179219

‎src/backend/access/transam/xlogutils.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,7 @@ void
802802
XLogReadDetermineTimeline(XLogReaderState *state, XLogRecPtr wantPage, uint32 wantLength)
803803
{
804804
const XLogRecPtr lastReadPage = state->readSegNo *
805-
state->wal_segment_size + state->readOff;
805+
state->wal_segment_size + state->readOff;
806806

807807
Assert(wantPage != InvalidXLogRecPtr && wantPage % XLOG_BLCKSZ == 0);
808808
Assert(wantLength <= XLOG_BLCKSZ);

‎src/backend/catalog/partition.c

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2134,7 +2134,7 @@ get_qual_for_range(Relation parent, PartitionBoundSpec *spec,
21342134

21352135
if (or_expr_args != NIL)
21362136
{
2137-
Expr *other_parts_constr;
2137+
Expr *other_parts_constr;
21382138

21392139
/*
21402140
* Combine the constraints obtained for non-default partitions
@@ -2143,20 +2143,20 @@ get_qual_for_range(Relation parent, PartitionBoundSpec *spec,
21432143
* useless repetition). Add the same now.
21442144
*/
21452145
other_parts_constr =
2146-
makeBoolExpr(AND_EXPR,
2147-
lappend(get_range_nulltest(key),
2148-
list_length(or_expr_args) > 1
2149-
? makeBoolExpr(OR_EXPR, or_expr_args,
2150-
-1)
2151-
: linitial(or_expr_args)),
2152-
-1);
2146+
makeBoolExpr(AND_EXPR,
2147+
lappend(get_range_nulltest(key),
2148+
list_length(or_expr_args) > 1
2149+
? makeBoolExpr(OR_EXPR, or_expr_args,
2150+
-1)
2151+
: linitial(or_expr_args)),
2152+
-1);
21532153

21542154
/*
21552155
* Finally, the default partition contains everything *NOT*
21562156
* contained in the non-default partitions.
21572157
*/
21582158
result = list_make1(makeBoolExpr(NOT_EXPR,
2159-
list_make1(other_parts_constr), -1));
2159+
list_make1(other_parts_constr), -1));
21602160
}
21612161

21622162
return result;
@@ -2502,9 +2502,9 @@ generate_partition_qual(Relation rel)
25022502
int
25032503
get_partition_for_tuple(Relation relation, Datum *values, bool *isnull)
25042504
{
2505-
int bound_offset;
2506-
int part_index = -1;
2507-
PartitionKey key = RelationGetPartitionKey(relation);
2505+
int bound_offset;
2506+
int part_index = -1;
2507+
PartitionKey key = RelationGetPartitionKey(relation);
25082508
PartitionDesc partdesc = RelationGetPartitionDesc(relation);
25092509

25102510
/* Route as appropriate based on partitioning strategy. */
@@ -2513,8 +2513,8 @@ get_partition_for_tuple(Relation relation, Datum *values, bool *isnull)
25132513
case PARTITION_STRATEGY_HASH:
25142514
{
25152515
PartitionBoundInfo boundinfo = partdesc->boundinfo;
2516-
int greatest_modulus = get_greatest_modulus(boundinfo);
2517-
uint64 rowHash = compute_hash_value(key, values, isnull);
2516+
int greatest_modulus = get_greatest_modulus(boundinfo);
2517+
uint64 rowHash = compute_hash_value(key, values, isnull);
25182518

25192519
part_index = boundinfo->indexes[rowHash % greatest_modulus];
25202520
}
@@ -2548,8 +2548,7 @@ get_partition_for_tuple(Relation relation, Datum *values, bool *isnull)
25482548

25492549
/*
25502550
* No range includes NULL, so this will be accepted by the
2551-
* default partition if there is one, and otherwise
2552-
* rejected.
2551+
* default partition if there is one, and otherwise rejected.
25532552
*/
25542553
for (i = 0; i < key->partnatts; i++)
25552554
{
@@ -2563,7 +2562,7 @@ get_partition_for_tuple(Relation relation, Datum *values, bool *isnull)
25632562
if (!range_partkey_has_null)
25642563
{
25652564
bound_offset = partition_bound_bsearch(key,
2566-
partdesc->boundinfo,
2565+
partdesc->boundinfo,
25672566
values,
25682567
false,
25692568
&equal);
@@ -2585,8 +2584,8 @@ get_partition_for_tuple(Relation relation, Datum *values, bool *isnull)
25852584
}
25862585

25872586
/*
2588-
* part_index < 0 means we failed to find a partition of this parent.
2589-
* Use the default partition, if there is one.
2587+
* part_index < 0 means we failed to find a partition of this parent. Use
2588+
* the default partition, if there is one.
25902589
*/
25912590
if (part_index < 0)
25922591
part_index = partdesc->boundinfo->default_index;
@@ -3125,7 +3124,7 @@ satisfies_hash_partition(PG_FUNCTION_ARGS)
31253124
bool variadic_typbyval;
31263125
char variadic_typalign;
31273126
FmgrInfo partsupfunc[PARTITION_MAX_KEYS];
3128-
} ColumnsHashData;
3127+
} ColumnsHashData;
31293128
Oid parentId;
31303129
int modulus;
31313130
int remainder;

‎src/backend/commands/copy.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ typedef struct CopyStateData
168168
PartitionDispatch *partition_dispatch_info;
169169
int num_dispatch; /* Number of entries in the above array */
170170
int num_partitions; /* Number of members in the following arrays */
171-
ResultRelInfo **partitions; /* Per partition result relation pointers */
171+
ResultRelInfo **partitions; /* Per partition result relation pointers */
172172
TupleConversionMap **partition_tupconv_maps;
173173
TupleTableSlot *partition_tuple_slot;
174174
TransitionCaptureState *transition_capture;
@@ -360,7 +360,7 @@ SendCopyBegin(CopyState cstate)
360360
pq_sendbyte(&buf, format); /* overall format */
361361
pq_sendint16(&buf, natts);
362362
for (i = 0; i < natts; i++)
363-
pq_sendint16(&buf, format); /* per-column formats */
363+
pq_sendint16(&buf, format); /* per-column formats */
364364
pq_endmessage(&buf);
365365
cstate->copy_dest = COPY_NEW_FE;
366366
}
@@ -393,7 +393,7 @@ ReceiveCopyBegin(CopyState cstate)
393393
pq_sendbyte(&buf, format); /* overall format */
394394
pq_sendint16(&buf, natts);
395395
for (i = 0; i < natts; i++)
396-
pq_sendint16(&buf, format); /* per-column formats */
396+
pq_sendint16(&buf, format); /* per-column formats */
397397
pq_endmessage(&buf);
398398
cstate->copy_dest = COPY_NEW_FE;
399399
cstate->fe_msgbuf = makeStringInfo();

‎src/backend/commands/vacuumlazy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ lazy_vacuum_rel(Relation onerel, int options, VacuumParams *params,
355355
params->log_min_duration))
356356
{
357357
StringInfoData buf;
358-
char *msgfmt;
358+
char *msgfmt;
359359

360360
TimestampDifference(starttime, endtime, &secs, &usecs);
361361

‎src/backend/executor/execPartition.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,10 @@ ExecFindPartition(ResultRelInfo *resultRelInfo, PartitionDispatch *pd,
184184
parent = pd[0];
185185
while (true)
186186
{
187-
PartitionDesc partdesc;
187+
PartitionDesc partdesc;
188188
TupleTableSlot *myslot = parent->tupslot;
189189
TupleConversionMap *map = parent->tupmap;
190-
int cur_index = -1;
190+
int cur_index = -1;
191191

192192
rel = parent->reldesc;
193193
partdesc = RelationGetPartitionDesc(rel);

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