aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--contrib/bloom/bloom.h9
-rw-r--r--src/backend/backup/basebackup_incremental.c8
-rw-r--r--src/backend/utils/adt/pg_locale.c4
-rw-r--r--src/backend/utils/cache/relcache.c3
-rw-r--r--src/bin/pg_combinebackup/load_manifest.c3
-rw-r--r--src/common/parse_manifest.c5
-rw-r--r--src/common/unicode/category_test.c24
-rw-r--r--src/include/common/parse_manifest.h4
-rw-r--r--src/include/replication/reorderbuffer.h27
9 files changed, 32 insertions, 55 deletions
diff --git a/contrib/bloom/bloom.h b/contrib/bloom/bloom.h
index fba3ba77711..83c81e640f9 100644
--- a/contrib/bloom/bloom.h
+++ b/contrib/bloom/bloom.h
@@ -110,12 +110,9 @@ typedef struct BloomOptions
* FreeBlockNumberArray - array of block numbers sized so that metadata fill
* all space in metapage.
*/
-typedef BlockNumber FreeBlockNumberArray[
- MAXALIGN_DOWN(
- BLCKSZ - SizeOfPageHeaderData - MAXALIGN(sizeof(BloomPageOpaqueData))
- - MAXALIGN(sizeof(uint16) * 2 + sizeof(uint32) + sizeof(BloomOptions))
- ) / sizeof(BlockNumber)
-];
+typedef BlockNumber FreeBlockNumberArray[MAXALIGN_DOWN(BLCKSZ - SizeOfPageHeaderData - MAXALIGN(sizeof(BloomPageOpaqueData))
+ - MAXALIGN(sizeof(uint16) * 2 + sizeof(uint32) + sizeof(BloomOptions)))
+ / sizeof(BlockNumber)];
/* Metadata of bloom index */
typedef struct BloomMetaPageData
diff --git a/src/backend/backup/basebackup_incremental.c b/src/backend/backup/basebackup_incremental.c
index 275615877eb..87cc1b96cbc 100644
--- a/src/backend/backup/basebackup_incremental.c
+++ b/src/backend/backup/basebackup_incremental.c
@@ -205,8 +205,8 @@ AppendIncrementalManifestData(IncrementalBackupInfo *ib, const char *data,
* time for an incremental parse. We'll do all but the last MIN_CHUNK
* so that we have enough left for the final piece.
*/
- json_parse_manifest_incremental_chunk(
- ib->inc_state, ib->buf.data, ib->buf.len - MIN_CHUNK, false);
+ json_parse_manifest_incremental_chunk(ib->inc_state, ib->buf.data,
+ ib->buf.len - MIN_CHUNK, false);
/* now remove what we just parsed */
memmove(ib->buf.data, ib->buf.data + (ib->buf.len - MIN_CHUNK),
MIN_CHUNK + 1);
@@ -232,8 +232,8 @@ FinalizeIncrementalManifest(IncrementalBackupInfo *ib)
oldcontext = MemoryContextSwitchTo(ib->mcxt);
/* Parse the last chunk of the manifest */
- json_parse_manifest_incremental_chunk(
- ib->inc_state, ib->buf.data, ib->buf.len, true);
+ json_parse_manifest_incremental_chunk(ib->inc_state, ib->buf.data,
+ ib->buf.len, true);
/* Done with the buffer, so release memory. */
pfree(ib->buf.data);
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
index d4e89663ec1..06cc42c1f04 100644
--- a/src/backend/utils/adt/pg_locale.c
+++ b/src/backend/utils/adt/pg_locale.c
@@ -1374,8 +1374,8 @@ init_database_collation(void)
default_locale.collate_is_c = true;
default_locale.ctype_is_c = (strcmp(datlocale, "C") == 0);
- default_locale.info.builtin.locale = MemoryContextStrdup(
- TopMemoryContext, datlocale);
+ default_locale.info.builtin.locale = MemoryContextStrdup(TopMemoryContext,
+ datlocale);
}
else if (dbform->datlocprovider == COLLPROVIDER_ICU)
{
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 342467fd186..72cd808df70 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -5643,8 +5643,7 @@ RelationGetExclusionInfo(Relation indexRelation,
/* We want the exclusion constraint owning the index */
if ((conform->contype != CONSTRAINT_EXCLUSION &&
- !(conform->conperiod && (
- conform->contype == CONSTRAINT_PRIMARY
+ !(conform->conperiod && (conform->contype == CONSTRAINT_PRIMARY
|| conform->contype == CONSTRAINT_UNIQUE))) ||
conform->conindid != RelationGetRelid(indexRelation))
continue;
diff --git a/src/bin/pg_combinebackup/load_manifest.c b/src/bin/pg_combinebackup/load_manifest.c
index 3a3ad6c2474..54adb5a41d2 100644
--- a/src/bin/pg_combinebackup/load_manifest.c
+++ b/src/bin/pg_combinebackup/load_manifest.c
@@ -204,8 +204,7 @@ load_backup_manifest(char *backup_directory)
(long long int) statbuf.st_size);
}
bytes_left -= rc;
- json_parse_manifest_incremental_chunk(
- inc_state, buffer, rc, bytes_left == 0);
+ json_parse_manifest_incremental_chunk(inc_state, buffer, rc, bytes_left == 0);
}
/* Release the incremental state memory */
diff --git a/src/common/parse_manifest.c b/src/common/parse_manifest.c
index ad2d0fd808f..a3896eaebe2 100644
--- a/src/common/parse_manifest.c
+++ b/src/common/parse_manifest.c
@@ -182,9 +182,8 @@ json_parse_manifest_incremental_shutdown(JsonManifestParseIncrementalState *incs
*/
void
-json_parse_manifest_incremental_chunk(
- JsonManifestParseIncrementalState *incstate, const char *chunk, size_t size,
- bool is_last)
+json_parse_manifest_incremental_chunk(JsonManifestParseIncrementalState *incstate,
+ const char *chunk, size_t size, bool is_last)
{
JsonParseErrorType res,
expected;
diff --git a/src/common/unicode/category_test.c b/src/common/unicode/category_test.c
index e823044d63a..ba6aa7be574 100644
--- a/src/common/unicode/category_test.c
+++ b/src/common/unicode/category_test.c
@@ -74,22 +74,14 @@ icu_test()
bool prop_hex_digit = pg_u_prop_hex_digit(code);
bool prop_join_control = pg_u_prop_join_control(code);
- bool icu_prop_alphabetic = u_hasBinaryProperty(
- code, UCHAR_ALPHABETIC);
- bool icu_prop_lowercase = u_hasBinaryProperty(
- code, UCHAR_LOWERCASE);
- bool icu_prop_uppercase = u_hasBinaryProperty(
- code, UCHAR_UPPERCASE);
- bool icu_prop_cased = u_hasBinaryProperty(
- code, UCHAR_CASED);
- 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);
+ bool icu_prop_alphabetic = u_hasBinaryProperty(code, UCHAR_ALPHABETIC);
+ bool icu_prop_lowercase = u_hasBinaryProperty(code, UCHAR_LOWERCASE);
+ bool icu_prop_uppercase = u_hasBinaryProperty(code, UCHAR_UPPERCASE);
+ bool icu_prop_cased = u_hasBinaryProperty(code, UCHAR_CASED);
+ 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:
diff --git a/src/include/common/parse_manifest.h b/src/include/common/parse_manifest.h
index 1b8bc447e44..607db25a3a6 100644
--- a/src/include/common/parse_manifest.h
+++ b/src/include/common/parse_manifest.h
@@ -50,8 +50,8 @@ struct JsonManifestParseContext
extern void json_parse_manifest(JsonManifestParseContext *context,
const char *buffer, size_t size);
extern JsonManifestParseIncrementalState *json_parse_manifest_incremental_init(JsonManifestParseContext *context);
-extern void json_parse_manifest_incremental_chunk(
- JsonManifestParseIncrementalState *incstate, const char *chunk, size_t size,
+extern void json_parse_manifest_incremental_chunk(JsonManifestParseIncrementalState *incstate,
+ const char *chunk, size_t size,
bool is_last);
extern void json_parse_manifest_incremental_shutdown(JsonManifestParseIncrementalState *incstate);
diff --git a/src/include/replication/reorderbuffer.h b/src/include/replication/reorderbuffer.h
index 6ad5a8cb9c5..ecc2bd32978 100644
--- a/src/include/replication/reorderbuffer.h
+++ b/src/include/replication/reorderbuffer.h
@@ -482,45 +482,38 @@ typedef void (*ReorderBufferRollbackPreparedCB) (ReorderBuffer *rb,
TimestampTz prepare_time);
/* start streaming transaction callback signature */
-typedef void (*ReorderBufferStreamStartCB) (
- ReorderBuffer *rb,
+typedef void (*ReorderBufferStreamStartCB) (ReorderBuffer *rb,
ReorderBufferTXN *txn,
XLogRecPtr first_lsn);
/* stop streaming transaction callback signature */
-typedef void (*ReorderBufferStreamStopCB) (
- ReorderBuffer *rb,
+typedef void (*ReorderBufferStreamStopCB) (ReorderBuffer *rb,
ReorderBufferTXN *txn,
XLogRecPtr last_lsn);
/* discard streamed transaction callback signature */
-typedef void (*ReorderBufferStreamAbortCB) (
- ReorderBuffer *rb,
+typedef void (*ReorderBufferStreamAbortCB) (ReorderBuffer *rb,
ReorderBufferTXN *txn,
XLogRecPtr abort_lsn);
/* prepare streamed transaction callback signature */
-typedef void (*ReorderBufferStreamPrepareCB) (
- ReorderBuffer *rb,
+typedef void (*ReorderBufferStreamPrepareCB) (ReorderBuffer *rb,
ReorderBufferTXN *txn,
XLogRecPtr prepare_lsn);
/* commit streamed transaction callback signature */
-typedef void (*ReorderBufferStreamCommitCB) (
- ReorderBuffer *rb,
+typedef void (*ReorderBufferStreamCommitCB) (ReorderBuffer *rb,
ReorderBufferTXN *txn,
XLogRecPtr commit_lsn);
/* stream change callback signature */
-typedef void (*ReorderBufferStreamChangeCB) (
- ReorderBuffer *rb,
+typedef void (*ReorderBufferStreamChangeCB) (ReorderBuffer *rb,
ReorderBufferTXN *txn,
Relation relation,
ReorderBufferChange *change);
/* stream message callback signature */
-typedef void (*ReorderBufferStreamMessageCB) (
- ReorderBuffer *rb,
+typedef void (*ReorderBufferStreamMessageCB) (ReorderBuffer *rb,
ReorderBufferTXN *txn,
XLogRecPtr message_lsn,
bool transactional,
@@ -528,16 +521,14 @@ typedef void (*ReorderBufferStreamMessageCB) (
const char *message);
/* stream truncate callback signature */
-typedef void (*ReorderBufferStreamTruncateCB) (
- ReorderBuffer *rb,
+typedef void (*ReorderBufferStreamTruncateCB) (ReorderBuffer *rb,
ReorderBufferTXN *txn,
int nrelations,
Relation relations[],
ReorderBufferChange *change);
/* update progress txn callback signature */
-typedef void (*ReorderBufferUpdateProgressTxnCB) (
- ReorderBuffer *rb,
+typedef void (*ReorderBufferUpdateProgressTxnCB) (ReorderBuffer *rb,
ReorderBufferTXN *txn,
XLogRecPtr lsn);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-19 16:45:42 +0000