diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/backup/basebackup_incremental.c | 8 | ||||
| -rw-r--r-- | src/backend/utils/adt/pg_locale.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/cache/relcache.c | 3 |
3 files changed, 7 insertions, 8 deletions
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; |