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

Commite6c32d9

Browse files
committed
Clean up newlines following left parentheses
Most came in during the 17 cycle, so backpatch there. Some(particularly reorderbuffer.h) are very old, but backpatching doesn'tseem useful.Like commitsc9d2977,c4f113e.
1 parent2a7b2d9 commite6c32d9

File tree

9 files changed

+32
-55
lines changed

9 files changed

+32
-55
lines changed

‎contrib/bloom/bloom.h

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,9 @@ typedef struct BloomOptions
110110
* FreeBlockNumberArray - array of block numbers sized so that metadata fill
111111
* all space in metapage.
112112
*/
113-
typedefBlockNumberFreeBlockNumberArray[
114-
MAXALIGN_DOWN(
115-
BLCKSZ-SizeOfPageHeaderData-MAXALIGN(sizeof(BloomPageOpaqueData))
116-
-MAXALIGN(sizeof(uint16)*2+sizeof(uint32)+sizeof(BloomOptions))
117-
) /sizeof(BlockNumber)
118-
];
113+
typedefBlockNumberFreeBlockNumberArray[MAXALIGN_DOWN(BLCKSZ-SizeOfPageHeaderData-MAXALIGN(sizeof(BloomPageOpaqueData))
114+
-MAXALIGN(sizeof(uint16)*2+sizeof(uint32)+sizeof(BloomOptions)))
115+
/sizeof(BlockNumber)];
119116

120117
/* Metadata of bloom index */
121118
typedefstructBloomMetaPageData

‎src/backend/backup/basebackup_incremental.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,8 @@ AppendIncrementalManifestData(IncrementalBackupInfo *ib, const char *data,
205205
* time for an incremental parse. We'll do all but the last MIN_CHUNK
206206
* so that we have enough left for the final piece.
207207
*/
208-
json_parse_manifest_incremental_chunk(
209-
ib->inc_state,ib->buf.data,ib->buf.len-MIN_CHUNK, false);
208+
json_parse_manifest_incremental_chunk(ib->inc_state,ib->buf.data,
209+
ib->buf.len-MIN_CHUNK, false);
210210
/* now remove what we just parsed */
211211
memmove(ib->buf.data,ib->buf.data+ (ib->buf.len-MIN_CHUNK),
212212
MIN_CHUNK+1);
@@ -232,8 +232,8 @@ FinalizeIncrementalManifest(IncrementalBackupInfo *ib)
232232
oldcontext=MemoryContextSwitchTo(ib->mcxt);
233233

234234
/* Parse the last chunk of the manifest */
235-
json_parse_manifest_incremental_chunk(
236-
ib->inc_state,ib->buf.data,ib->buf.len, true);
235+
json_parse_manifest_incremental_chunk(ib->inc_state,ib->buf.data,
236+
ib->buf.len, true);
237237

238238
/* Done with the buffer, so release memory. */
239239
pfree(ib->buf.data);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,8 +1374,8 @@ init_database_collation(void)
13741374
default_locale.collate_is_c= true;
13751375
default_locale.ctype_is_c= (strcmp(datlocale,"C")==0);
13761376

1377-
default_locale.info.builtin.locale=MemoryContextStrdup(
1378-
TopMemoryContext,datlocale);
1377+
default_locale.info.builtin.locale=MemoryContextStrdup(TopMemoryContext,
1378+
datlocale);
13791379
}
13801380
elseif (dbform->datlocprovider==COLLPROVIDER_ICU)
13811381
{

‎src/backend/utils/cache/relcache.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5643,8 +5643,7 @@ RelationGetExclusionInfo(Relation indexRelation,
56435643

56445644
/* We want the exclusion constraint owning the index */
56455645
if ((conform->contype!=CONSTRAINT_EXCLUSION&&
5646-
!(conform->conperiod&& (
5647-
conform->contype==CONSTRAINT_PRIMARY
5646+
!(conform->conperiod&& (conform->contype==CONSTRAINT_PRIMARY
56485647
||conform->contype==CONSTRAINT_UNIQUE)))||
56495648
conform->conindid!=RelationGetRelid(indexRelation))
56505649
continue;

‎src/bin/pg_combinebackup/load_manifest.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,7 @@ load_backup_manifest(char *backup_directory)
204204
(long longint)statbuf.st_size);
205205
}
206206
bytes_left-=rc;
207-
json_parse_manifest_incremental_chunk(
208-
inc_state,buffer,rc,bytes_left==0);
207+
json_parse_manifest_incremental_chunk(inc_state,buffer,rc,bytes_left==0);
209208
}
210209

211210
/* Release the incremental state memory */

‎src/common/parse_manifest.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,8 @@ json_parse_manifest_incremental_shutdown(JsonManifestParseIncrementalState *incs
182182
*/
183183

184184
void
185-
json_parse_manifest_incremental_chunk(
186-
JsonManifestParseIncrementalState*incstate,constchar*chunk,size_tsize,
187-
boolis_last)
185+
json_parse_manifest_incremental_chunk(JsonManifestParseIncrementalState*incstate,
186+
constchar*chunk,size_tsize,boolis_last)
188187
{
189188
JsonParseErrorTyperes,
190189
expected;

‎src/common/unicode/category_test.c

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -74,22 +74,14 @@ icu_test()
7474
boolprop_hex_digit=pg_u_prop_hex_digit(code);
7575
boolprop_join_control=pg_u_prop_join_control(code);
7676

77-
boolicu_prop_alphabetic=u_hasBinaryProperty(
78-
code,UCHAR_ALPHABETIC);
79-
boolicu_prop_lowercase=u_hasBinaryProperty(
80-
code,UCHAR_LOWERCASE);
81-
boolicu_prop_uppercase=u_hasBinaryProperty(
82-
code,UCHAR_UPPERCASE);
83-
boolicu_prop_cased=u_hasBinaryProperty(
84-
code,UCHAR_CASED);
85-
boolicu_prop_case_ignorable=u_hasBinaryProperty(
86-
code,UCHAR_CASE_IGNORABLE);
87-
boolicu_prop_white_space=u_hasBinaryProperty(
88-
code,UCHAR_WHITE_SPACE);
89-
boolicu_prop_hex_digit=u_hasBinaryProperty(
90-
code,UCHAR_HEX_DIGIT);
91-
boolicu_prop_join_control=u_hasBinaryProperty(
92-
code,UCHAR_JOIN_CONTROL);
77+
boolicu_prop_alphabetic=u_hasBinaryProperty(code,UCHAR_ALPHABETIC);
78+
boolicu_prop_lowercase=u_hasBinaryProperty(code,UCHAR_LOWERCASE);
79+
boolicu_prop_uppercase=u_hasBinaryProperty(code,UCHAR_UPPERCASE);
80+
boolicu_prop_cased=u_hasBinaryProperty(code,UCHAR_CASED);
81+
boolicu_prop_case_ignorable=u_hasBinaryProperty(code,UCHAR_CASE_IGNORABLE);
82+
boolicu_prop_white_space=u_hasBinaryProperty(code,UCHAR_WHITE_SPACE);
83+
boolicu_prop_hex_digit=u_hasBinaryProperty(code,UCHAR_HEX_DIGIT);
84+
boolicu_prop_join_control=u_hasBinaryProperty(code,UCHAR_JOIN_CONTROL);
9385

9486
/*
9587
* Compare with ICU for character classes using:

‎src/include/common/parse_manifest.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ struct JsonManifestParseContext
5050
externvoidjson_parse_manifest(JsonManifestParseContext*context,
5151
constchar*buffer,size_tsize);
5252
externJsonManifestParseIncrementalState*json_parse_manifest_incremental_init(JsonManifestParseContext*context);
53-
externvoidjson_parse_manifest_incremental_chunk(
54-
JsonManifestParseIncrementalState*incstate,constchar*chunk,size_tsize,
53+
externvoidjson_parse_manifest_incremental_chunk(JsonManifestParseIncrementalState*incstate,
54+
constchar*chunk,size_tsize,
5555
boolis_last);
5656
externvoidjson_parse_manifest_incremental_shutdown(JsonManifestParseIncrementalState*incstate);
5757

‎src/include/replication/reorderbuffer.h

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -482,62 +482,53 @@ typedef void (*ReorderBufferRollbackPreparedCB) (ReorderBuffer *rb,
482482
TimestampTzprepare_time);
483483

484484
/* start streaming transaction callback signature */
485-
typedefvoid (*ReorderBufferStreamStartCB) (
486-
ReorderBuffer*rb,
485+
typedefvoid (*ReorderBufferStreamStartCB) (ReorderBuffer*rb,
487486
ReorderBufferTXN*txn,
488487
XLogRecPtrfirst_lsn);
489488

490489
/* stop streaming transaction callback signature */
491-
typedefvoid (*ReorderBufferStreamStopCB) (
492-
ReorderBuffer*rb,
490+
typedefvoid (*ReorderBufferStreamStopCB) (ReorderBuffer*rb,
493491
ReorderBufferTXN*txn,
494492
XLogRecPtrlast_lsn);
495493

496494
/* discard streamed transaction callback signature */
497-
typedefvoid (*ReorderBufferStreamAbortCB) (
498-
ReorderBuffer*rb,
495+
typedefvoid (*ReorderBufferStreamAbortCB) (ReorderBuffer*rb,
499496
ReorderBufferTXN*txn,
500497
XLogRecPtrabort_lsn);
501498

502499
/* prepare streamed transaction callback signature */
503-
typedefvoid (*ReorderBufferStreamPrepareCB) (
504-
ReorderBuffer*rb,
500+
typedefvoid (*ReorderBufferStreamPrepareCB) (ReorderBuffer*rb,
505501
ReorderBufferTXN*txn,
506502
XLogRecPtrprepare_lsn);
507503

508504
/* commit streamed transaction callback signature */
509-
typedefvoid (*ReorderBufferStreamCommitCB) (
510-
ReorderBuffer*rb,
505+
typedefvoid (*ReorderBufferStreamCommitCB) (ReorderBuffer*rb,
511506
ReorderBufferTXN*txn,
512507
XLogRecPtrcommit_lsn);
513508

514509
/* stream change callback signature */
515-
typedefvoid (*ReorderBufferStreamChangeCB) (
516-
ReorderBuffer*rb,
510+
typedefvoid (*ReorderBufferStreamChangeCB) (ReorderBuffer*rb,
517511
ReorderBufferTXN*txn,
518512
Relationrelation,
519513
ReorderBufferChange*change);
520514

521515
/* stream message callback signature */
522-
typedefvoid (*ReorderBufferStreamMessageCB) (
523-
ReorderBuffer*rb,
516+
typedefvoid (*ReorderBufferStreamMessageCB) (ReorderBuffer*rb,
524517
ReorderBufferTXN*txn,
525518
XLogRecPtrmessage_lsn,
526519
booltransactional,
527520
constchar*prefix,Sizesz,
528521
constchar*message);
529522

530523
/* stream truncate callback signature */
531-
typedefvoid (*ReorderBufferStreamTruncateCB) (
532-
ReorderBuffer*rb,
524+
typedefvoid (*ReorderBufferStreamTruncateCB) (ReorderBuffer*rb,
533525
ReorderBufferTXN*txn,
534526
intnrelations,
535527
Relationrelations[],
536528
ReorderBufferChange*change);
537529

538530
/* update progress txn callback signature */
539-
typedefvoid (*ReorderBufferUpdateProgressTxnCB) (
540-
ReorderBuffer*rb,
531+
typedefvoid (*ReorderBufferUpdateProgressTxnCB) (ReorderBuffer*rb,
541532
ReorderBufferTXN*txn,
542533
XLogRecPtrlsn);
543534

0 commit comments

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