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't
seem useful.

Like commits c9d297751959, c4f113e8fef9.
This commit is contained in:
Álvaro Herrera 2024-11-26 17:10:07 +01:00 committed by Zsolt Parragi
parent 76e8ee2a07
commit 4be19e2c9b
8 changed files with 30 additions and 53 deletions

View File

@ -110,12 +110,9 @@ typedef struct BloomOptions
* FreeBlockNumberArray - array of block numbers sized so that metadata fill * FreeBlockNumberArray - array of block numbers sized so that metadata fill
* all space in metapage. * all space in metapage.
*/ */
typedef BlockNumber FreeBlockNumberArray[ typedef BlockNumber FreeBlockNumberArray[MAXALIGN_DOWN(BLCKSZ - SizeOfPageHeaderData - MAXALIGN(sizeof(BloomPageOpaqueData))
MAXALIGN_DOWN( - MAXALIGN(sizeof(uint16) * 2 + sizeof(uint32) + sizeof(BloomOptions)))
BLCKSZ - SizeOfPageHeaderData - MAXALIGN(sizeof(BloomPageOpaqueData)) / sizeof(BlockNumber)];
- MAXALIGN(sizeof(uint16) * 2 + sizeof(uint32) + sizeof(BloomOptions))
) / sizeof(BlockNumber)
];
/* Metadata of bloom index */ /* Metadata of bloom index */
typedef struct BloomMetaPageData typedef struct BloomMetaPageData

View File

@ -207,8 +207,8 @@ AppendIncrementalManifestData(IncrementalBackupInfo *ib, const char *data,
* time for an incremental parse. We'll do all but the last MIN_CHUNK * time for an incremental parse. We'll do all but the last MIN_CHUNK
* so that we have enough left for the final piece. * so that we have enough left for the final piece.
*/ */
json_parse_manifest_incremental_chunk( json_parse_manifest_incremental_chunk(ib->inc_state, ib->buf.data,
ib->inc_state, ib->buf.data, ib->buf.len - MIN_CHUNK, false); ib->buf.len - MIN_CHUNK, false);
/* now remove what we just parsed */ /* now remove what we just parsed */
memmove(ib->buf.data, ib->buf.data + (ib->buf.len - MIN_CHUNK), memmove(ib->buf.data, ib->buf.data + (ib->buf.len - MIN_CHUNK),
MIN_CHUNK + 1); MIN_CHUNK + 1);
@ -234,8 +234,8 @@ FinalizeIncrementalManifest(IncrementalBackupInfo *ib)
oldcontext = MemoryContextSwitchTo(ib->mcxt); oldcontext = MemoryContextSwitchTo(ib->mcxt);
/* Parse the last chunk of the manifest */ /* Parse the last chunk of the manifest */
json_parse_manifest_incremental_chunk( json_parse_manifest_incremental_chunk(ib->inc_state, ib->buf.data,
ib->inc_state, ib->buf.data, ib->buf.len, true); ib->buf.len, true);
/* Done with the buffer, so release memory. */ /* Done with the buffer, so release memory. */
pfree(ib->buf.data); pfree(ib->buf.data);

View File

@ -431,8 +431,7 @@ CheckMyDatabase(const char *name, bool am_superuser, bool override_allow_connect
builtin_validate_locale(dbform->encoding, datlocale); builtin_validate_locale(dbform->encoding, datlocale);
default_locale.info.builtin.locale = MemoryContextStrdup( default_locale.info.builtin.locale = MemoryContextStrdup(TopMemoryContext, datlocale);
TopMemoryContext, datlocale);
} }
else if (dbform->datlocprovider == COLLPROVIDER_ICU) else if (dbform->datlocprovider == COLLPROVIDER_ICU)
{ {

View File

@ -204,8 +204,7 @@ load_backup_manifest(char *backup_directory)
(long long int) statbuf.st_size); (long long int) statbuf.st_size);
} }
bytes_left -= rc; bytes_left -= rc;
json_parse_manifest_incremental_chunk( json_parse_manifest_incremental_chunk(inc_state, buffer, rc, bytes_left == 0);
inc_state, buffer, rc, bytes_left == 0);
} }
/* Release the incremental state memory */ /* Release the incremental state memory */

View File

@ -182,9 +182,8 @@ json_parse_manifest_incremental_shutdown(JsonManifestParseIncrementalState *incs
*/ */
void void
json_parse_manifest_incremental_chunk( json_parse_manifest_incremental_chunk(JsonManifestParseIncrementalState *incstate,
JsonManifestParseIncrementalState *incstate, const char *chunk, size_t size, const char *chunk, size_t size, bool is_last)
bool is_last)
{ {
JsonParseErrorType res, JsonParseErrorType res,
expected; expected;

View File

@ -74,22 +74,14 @@ icu_test()
bool prop_hex_digit = pg_u_prop_hex_digit(code); bool prop_hex_digit = pg_u_prop_hex_digit(code);
bool prop_join_control = pg_u_prop_join_control(code); bool prop_join_control = pg_u_prop_join_control(code);
bool icu_prop_alphabetic = u_hasBinaryProperty( bool icu_prop_alphabetic = u_hasBinaryProperty(code, UCHAR_ALPHABETIC);
code, UCHAR_ALPHABETIC); bool icu_prop_lowercase = u_hasBinaryProperty(code, UCHAR_LOWERCASE);
bool icu_prop_lowercase = u_hasBinaryProperty( bool icu_prop_uppercase = u_hasBinaryProperty(code, UCHAR_UPPERCASE);
code, UCHAR_LOWERCASE); bool icu_prop_cased = u_hasBinaryProperty(code, UCHAR_CASED);
bool icu_prop_uppercase = u_hasBinaryProperty( bool icu_prop_case_ignorable = u_hasBinaryProperty(code, UCHAR_CASE_IGNORABLE);
code, UCHAR_UPPERCASE); bool icu_prop_white_space = u_hasBinaryProperty(code, UCHAR_WHITE_SPACE);
bool icu_prop_cased = u_hasBinaryProperty( bool icu_prop_hex_digit = u_hasBinaryProperty(code, UCHAR_HEX_DIGIT);
code, UCHAR_CASED); bool icu_prop_join_control = u_hasBinaryProperty(code, UCHAR_JOIN_CONTROL);
bool icu_prop_case_ignorable = u_hasBinaryProperty(
code, UCHAR_CASE_IGNORABLE);
bool icu_prop_white_space = u_hasBinaryProperty(
code, UCHAR_WHITE_SPACE);
bool icu_prop_hex_digit = u_hasBinaryProperty(
code, UCHAR_HEX_DIGIT);
bool icu_prop_join_control = u_hasBinaryProperty(
code, UCHAR_JOIN_CONTROL);
/* /*
* Compare with ICU for character classes using: * Compare with ICU for character classes using:

View File

@ -50,8 +50,8 @@ struct JsonManifestParseContext
extern void json_parse_manifest(JsonManifestParseContext *context, extern void json_parse_manifest(JsonManifestParseContext *context,
const char *buffer, size_t size); const char *buffer, size_t size);
extern JsonManifestParseIncrementalState *json_parse_manifest_incremental_init(JsonManifestParseContext *context); extern JsonManifestParseIncrementalState *json_parse_manifest_incremental_init(JsonManifestParseContext *context);
extern void json_parse_manifest_incremental_chunk( extern void json_parse_manifest_incremental_chunk(JsonManifestParseIncrementalState *incstate,
JsonManifestParseIncrementalState *incstate, const char *chunk, size_t size, const char *chunk, size_t size,
bool is_last); bool is_last);
extern void json_parse_manifest_incremental_shutdown(JsonManifestParseIncrementalState *incstate); extern void json_parse_manifest_incremental_shutdown(JsonManifestParseIncrementalState *incstate);

View File

@ -478,45 +478,38 @@ typedef void (*ReorderBufferRollbackPreparedCB) (ReorderBuffer *rb,
TimestampTz prepare_time); TimestampTz prepare_time);
/* start streaming transaction callback signature */ /* start streaming transaction callback signature */
typedef void (*ReorderBufferStreamStartCB) ( typedef void (*ReorderBufferStreamStartCB) (ReorderBuffer *rb,
ReorderBuffer *rb,
ReorderBufferTXN *txn, ReorderBufferTXN *txn,
XLogRecPtr first_lsn); XLogRecPtr first_lsn);
/* stop streaming transaction callback signature */ /* stop streaming transaction callback signature */
typedef void (*ReorderBufferStreamStopCB) ( typedef void (*ReorderBufferStreamStopCB) (ReorderBuffer *rb,
ReorderBuffer *rb,
ReorderBufferTXN *txn, ReorderBufferTXN *txn,
XLogRecPtr last_lsn); XLogRecPtr last_lsn);
/* discard streamed transaction callback signature */ /* discard streamed transaction callback signature */
typedef void (*ReorderBufferStreamAbortCB) ( typedef void (*ReorderBufferStreamAbortCB) (ReorderBuffer *rb,
ReorderBuffer *rb,
ReorderBufferTXN *txn, ReorderBufferTXN *txn,
XLogRecPtr abort_lsn); XLogRecPtr abort_lsn);
/* prepare streamed transaction callback signature */ /* prepare streamed transaction callback signature */
typedef void (*ReorderBufferStreamPrepareCB) ( typedef void (*ReorderBufferStreamPrepareCB) (ReorderBuffer *rb,
ReorderBuffer *rb,
ReorderBufferTXN *txn, ReorderBufferTXN *txn,
XLogRecPtr prepare_lsn); XLogRecPtr prepare_lsn);
/* commit streamed transaction callback signature */ /* commit streamed transaction callback signature */
typedef void (*ReorderBufferStreamCommitCB) ( typedef void (*ReorderBufferStreamCommitCB) (ReorderBuffer *rb,
ReorderBuffer *rb,
ReorderBufferTXN *txn, ReorderBufferTXN *txn,
XLogRecPtr commit_lsn); XLogRecPtr commit_lsn);
/* stream change callback signature */ /* stream change callback signature */
typedef void (*ReorderBufferStreamChangeCB) ( typedef void (*ReorderBufferStreamChangeCB) (ReorderBuffer *rb,
ReorderBuffer *rb,
ReorderBufferTXN *txn, ReorderBufferTXN *txn,
Relation relation, Relation relation,
ReorderBufferChange *change); ReorderBufferChange *change);
/* stream message callback signature */ /* stream message callback signature */
typedef void (*ReorderBufferStreamMessageCB) ( typedef void (*ReorderBufferStreamMessageCB) (ReorderBuffer *rb,
ReorderBuffer *rb,
ReorderBufferTXN *txn, ReorderBufferTXN *txn,
XLogRecPtr message_lsn, XLogRecPtr message_lsn,
bool transactional, bool transactional,
@ -524,16 +517,14 @@ typedef void (*ReorderBufferStreamMessageCB) (
const char *message); const char *message);
/* stream truncate callback signature */ /* stream truncate callback signature */
typedef void (*ReorderBufferStreamTruncateCB) ( typedef void (*ReorderBufferStreamTruncateCB) (ReorderBuffer *rb,
ReorderBuffer *rb,
ReorderBufferTXN *txn, ReorderBufferTXN *txn,
int nrelations, int nrelations,
Relation relations[], Relation relations[],
ReorderBufferChange *change); ReorderBufferChange *change);
/* update progress txn callback signature */ /* update progress txn callback signature */
typedef void (*ReorderBufferUpdateProgressTxnCB) ( typedef void (*ReorderBufferUpdateProgressTxnCB) (ReorderBuffer *rb,
ReorderBuffer *rb,
ReorderBufferTXN *txn, ReorderBufferTXN *txn,
XLogRecPtr lsn); XLogRecPtr lsn);