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

Commitb0e5728

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 parentf3834c1 commitb0e5728

File tree

8 files changed

+30
-53
lines changed

8 files changed

+30
-53
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
@@ -207,8 +207,8 @@ AppendIncrementalManifestData(IncrementalBackupInfo *ib, const char *data,
207207
* time for an incremental parse. We'll do all but the last MIN_CHUNK
208208
* so that we have enough left for the final piece.
209209
*/
210-
json_parse_manifest_incremental_chunk(
211-
ib->inc_state,ib->buf.data,ib->buf.len-MIN_CHUNK, false);
210+
json_parse_manifest_incremental_chunk(ib->inc_state,ib->buf.data,
211+
ib->buf.len-MIN_CHUNK, false);
212212
/* now remove what we just parsed */
213213
memmove(ib->buf.data,ib->buf.data+ (ib->buf.len-MIN_CHUNK),
214214
MIN_CHUNK+1);
@@ -234,8 +234,8 @@ FinalizeIncrementalManifest(IncrementalBackupInfo *ib)
234234
oldcontext=MemoryContextSwitchTo(ib->mcxt);
235235

236236
/* Parse the last chunk of the manifest */
237-
json_parse_manifest_incremental_chunk(
238-
ib->inc_state,ib->buf.data,ib->buf.len, true);
237+
json_parse_manifest_incremental_chunk(ib->inc_state,ib->buf.data,
238+
ib->buf.len, true);
239239

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

‎src/backend/utils/init/postinit.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,8 +431,7 @@ CheckMyDatabase(const char *name, bool am_superuser, bool override_allow_connect
431431

432432
builtin_validate_locale(dbform->encoding,datlocale);
433433

434-
default_locale.info.builtin.locale=MemoryContextStrdup(
435-
TopMemoryContext,datlocale);
434+
default_locale.info.builtin.locale=MemoryContextStrdup(TopMemoryContext,datlocale);
436435
}
437436
elseif (dbform->datlocprovider==COLLPROVIDER_ICU)
438437
{

‎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
@@ -478,62 +478,53 @@ typedef void (*ReorderBufferRollbackPreparedCB) (ReorderBuffer *rb,
478478
TimestampTzprepare_time);
479479

480480
/* start streaming transaction callback signature */
481-
typedefvoid (*ReorderBufferStreamStartCB) (
482-
ReorderBuffer*rb,
481+
typedefvoid (*ReorderBufferStreamStartCB) (ReorderBuffer*rb,
483482
ReorderBufferTXN*txn,
484483
XLogRecPtrfirst_lsn);
485484

486485
/* stop streaming transaction callback signature */
487-
typedefvoid (*ReorderBufferStreamStopCB) (
488-
ReorderBuffer*rb,
486+
typedefvoid (*ReorderBufferStreamStopCB) (ReorderBuffer*rb,
489487
ReorderBufferTXN*txn,
490488
XLogRecPtrlast_lsn);
491489

492490
/* discard streamed transaction callback signature */
493-
typedefvoid (*ReorderBufferStreamAbortCB) (
494-
ReorderBuffer*rb,
491+
typedefvoid (*ReorderBufferStreamAbortCB) (ReorderBuffer*rb,
495492
ReorderBufferTXN*txn,
496493
XLogRecPtrabort_lsn);
497494

498495
/* prepare streamed transaction callback signature */
499-
typedefvoid (*ReorderBufferStreamPrepareCB) (
500-
ReorderBuffer*rb,
496+
typedefvoid (*ReorderBufferStreamPrepareCB) (ReorderBuffer*rb,
501497
ReorderBufferTXN*txn,
502498
XLogRecPtrprepare_lsn);
503499

504500
/* commit streamed transaction callback signature */
505-
typedefvoid (*ReorderBufferStreamCommitCB) (
506-
ReorderBuffer*rb,
501+
typedefvoid (*ReorderBufferStreamCommitCB) (ReorderBuffer*rb,
507502
ReorderBufferTXN*txn,
508503
XLogRecPtrcommit_lsn);
509504

510505
/* stream change callback signature */
511-
typedefvoid (*ReorderBufferStreamChangeCB) (
512-
ReorderBuffer*rb,
506+
typedefvoid (*ReorderBufferStreamChangeCB) (ReorderBuffer*rb,
513507
ReorderBufferTXN*txn,
514508
Relationrelation,
515509
ReorderBufferChange*change);
516510

517511
/* stream message callback signature */
518-
typedefvoid (*ReorderBufferStreamMessageCB) (
519-
ReorderBuffer*rb,
512+
typedefvoid (*ReorderBufferStreamMessageCB) (ReorderBuffer*rb,
520513
ReorderBufferTXN*txn,
521514
XLogRecPtrmessage_lsn,
522515
booltransactional,
523516
constchar*prefix,Sizesz,
524517
constchar*message);
525518

526519
/* stream truncate callback signature */
527-
typedefvoid (*ReorderBufferStreamTruncateCB) (
528-
ReorderBuffer*rb,
520+
typedefvoid (*ReorderBufferStreamTruncateCB) (ReorderBuffer*rb,
529521
ReorderBufferTXN*txn,
530522
intnrelations,
531523
Relationrelations[],
532524
ReorderBufferChange*change);
533525

534526
/* update progress txn callback signature */
535-
typedefvoid (*ReorderBufferUpdateProgressTxnCB) (
536-
ReorderBuffer*rb,
527+
typedefvoid (*ReorderBufferUpdateProgressTxnCB) (ReorderBuffer*rb,
537528
ReorderBufferTXN*txn,
538529
XLogRecPtrlsn);
539530

0 commit comments

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