rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pre-beta2 mechanical code beautification. 

Run pgindent and pgperltidy.  It seems we're still some ways
away from all committers doing this automatically.  Now that
we have a buildfarm animal that will whine about poorly-indented
code, we'll try to keep the tree more tidy.

Discussion: https://postgr.es/m/3156045.1687208823@sss.pgh.pa.us
This commit is contained in:
Tom Lane 2023-06-20 09:50:43 -04:00
parent 877bf52cff
commit b334612b8a
11 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/executor/execUtils.c
View File

@ -1354,8 +1354,8 @@ ExecGetExtraUpdatedCols(ResultRelInfo *relinfo, EState *estate)
Bitmapset *
ExecGetAllUpdatedCols(ResultRelInfo *relinfo, EState *estate)
{
Bitmapset *ret;
MemoryContext oldcxt;
Bitmapset *ret;
MemoryContext oldcxt;
oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(estate));

10
src/backend/libpq/hba.c
View File

@ -2693,9 +2693,8 @@ load_hba(void)
if (!ok)
{
/*
* File contained one or more errors, so bail out.
* MemoryContextDelete is enough to clean up everything, including
* regexes.
* File contained one or more errors, so bail out. MemoryContextDelete
* is enough to clean up everything, including regexes.
*/
MemoryContextDelete(hbacxt);
return false;
@ -3057,9 +3056,8 @@ load_ident(void)
if (!ok)
{
/*
* File contained one or more errors, so bail out.
* MemoryContextDelete is enough to clean up everything, including
* regexes.
* File contained one or more errors, so bail out. MemoryContextDelete
* is enough to clean up everything, including regexes.
*/
MemoryContextDelete(ident_context);
return false;

8
src/backend/replication/logical/tablesync.c
View File

@ -1253,7 +1253,7 @@ LogicalRepSyncTableStart(XLogRecPtr *origin_startpos)
WalRcvExecResult *res;
char originname[NAMEDATALEN];
RepOriginId originid;
UserContext ucxt;
UserContext ucxt;
bool must_use_password;
bool run_as_owner;
@ -1437,8 +1437,8 @@ LogicalRepSyncTableStart(XLogRecPtr *origin_startpos)
}
/*
* Make sure that the copy command runs as the table owner, unless
* the user has opted out of that behaviour.
* Make sure that the copy command runs as the table owner, unless the
* user has opted out of that behaviour.
*/
run_as_owner = MySubscription->runasowner;
if (!run_as_owner)
@ -1482,7 +1482,7 @@ LogicalRepSyncTableStart(XLogRecPtr *origin_startpos)
res->err)));
walrcv_clear_result(res);
if(!run_as_owner)
if (!run_as_owner)
RestoreUserContext(&ucxt);
table_close(rel, NoLock);

5
src/backend/storage/file/fd.c
View File

@ -415,7 +415,7 @@ pg_fsync(int fd)
int
pg_fsync_no_writethrough(int fd)
{
int rc;
int rc;
if (!enableFsync)
return 0;
@ -456,7 +456,7 @@ pg_fsync_writethrough(int fd)
int
pg_fdatasync(int fd)
{
int rc;
int rc;
if (!enableFsync)
return 0;
@ -500,6 +500,7 @@ pg_flush_data(int fd, off_t offset, off_t nbytes)
return;
retry:
/*
* sync_file_range(SYNC_FILE_RANGE_WRITE), currently linux specific,
* tells the OS that writeback for the specified blocks should be

6
src/backend/storage/ipc/standby.c
View File

@ -1197,9 +1197,9 @@ standby_redo(XLogReaderState *record)
/*
* The startup process currently has no convenient way to schedule
* stats to be reported. XLOG_RUNNING_XACTS records issued at a
* regular cadence, making this a convenient location to report
* stats. While these records aren't generated with wal_level=minimal,
* stats also cannot be accessed during WAL replay.
* regular cadence, making this a convenient location to report stats.
* While these records aren't generated with wal_level=minimal, stats
* also cannot be accessed during WAL replay.
*/
pgstat_report_stat(true);
}

8
src/backend/storage/smgr/md.c
View File

@ -564,10 +564,10 @@ mdzeroextend(SMgrRelation reln, ForkNumber forknum,
Assert(segstartblock + numblocks <= RELSEG_SIZE);
/*
* If available and useful, use posix_fallocate() (via FileFallocate())
* to extend the relation. That's often more efficient than using
* write(), as it commonly won't cause the kernel to allocate page
* cache space for the extended pages.
* If available and useful, use posix_fallocate() (via
* FileFallocate()) to extend the relation. That's often more
* efficient than using write(), as it commonly won't cause the kernel
* to allocate page cache space for the extended pages.
*
* However, we don't use FileFallocate() for small extensions, as it
* defeats delayed allocation on some filesystems. Not clear where

2
src/backend/utils/adt/pgstatfuncs.c
View File

@ -601,7 +601,7 @@ pg_stat_get_activity(PG_FUNCTION_ARGS)
values[26] = CStringGetTextDatum(beentry->st_gssstatus->gss_princ);
values[27] = BoolGetDatum(beentry->st_gssstatus->gss_enc); /* GSS Encryption in use */
values[28] = BoolGetDatum(beentry->st_gssstatus->gss_delegation); /* GSS credentials
* delegated */
* delegated */
}
else
{

8
src/bin/initdb/t/001_initdb.pl
View File

@ -113,10 +113,12 @@ if ($ENV{with_icu} eq 'yes')
command_like(
[
'initdb', '--no-sync', '-A', 'trust',
'initdb', '--no-sync',
'-A', 'trust',
'--locale-provider=icu', '--locale=und',
'--lc-collate=C', '--lc-ctype=C', '--lc-messages=C',
'--lc-numeric=C', '--lc-monetary=C', '--lc-time=C',
'--lc-collate=C', '--lc-ctype=C',
'--lc-messages=C', '--lc-numeric=C',
'--lc-monetary=C', '--lc-time=C',
"$tempdir/data4"
],
qr/^\s+ICU locale:\s+und\n/ms,

12
src/bin/scripts/t/020_createdb.pl
View File

@ -89,12 +89,14 @@ if ($ENV{with_icu} eq 'yes')
$node2->command_ok(
[
'createdb', '-T', 'template0', '--locale-provider', 'icu',
'--locale', 'en', '--lc-collate', 'C', '--lc-ctype', 'C',
'foobar57'
'createdb', '-T',
'template0', '--locale-provider',
'icu', '--locale',
'en', '--lc-collate',
'C', '--lc-ctype',
'C', 'foobar57'
],
'create database with locale as ICU locale'
);
'create database with locale as ICU locale');
}
else
{

2
src/include/utils/backend_status.h
View File

@ -77,7 +77,7 @@ typedef struct PgBackendGSSStatus
char gss_princ[NAMEDATALEN]; /* GSSAPI Principal used to auth */
bool gss_auth; /* If GSSAPI authentication was used */
bool gss_enc; /* If encryption is being used */
bool gss_delegation; /* If credentials delegated */
bool gss_delegation; /* If credentials delegated */
} PgBackendGSSStatus;

11
src/test/subscription/t/033_run_as_table_owner.pl
View File

@ -196,7 +196,7 @@ expect_replication("alice.unpartitioned", 3, 7, 13,
# Remove the subscrition and truncate the table for the initial data sync
# tests.
$node_subscriber->safe_psql(
'postgres', qq(
'postgres', qq(
DROP SUBSCRIPTION admin_sub;
TRUNCATE alice.unpartitioned;
));
@ -204,7 +204,7 @@ TRUNCATE alice.unpartitioned;
# Create a new subscription "admin_sub" owned by regress_admin2. It's
# disabled so that we revoke superuser privilege after creation.
$node_subscriber->safe_psql(
'postgres', qq(
'postgres', qq(
SET SESSION AUTHORIZATION regress_admin2;
CREATE SUBSCRIPTION admin_sub CONNECTION '$publisher_connstr' PUBLICATION alice
WITH (run_as_owner = false, password_required = false, copy_data = true, enabled = false);
@ -214,16 +214,15 @@ WITH (run_as_owner = false, password_required = false, copy_data = true, enabled
# ability to SET ROLE. Then enable the subscription "admin_sub".
revoke_superuser("regress_admin2");
$node_subscriber->safe_psql(
'postgres', qq(
'postgres', qq(
GRANT regress_alice TO regress_admin2 WITH INHERIT FALSE, SET TRUE;
ALTER SUBSCRIPTION admin_sub ENABLE;
));
# Because the initial data sync is working as the table owner, all
# data should be copied.
$node_subscriber->wait_for_subscription_sync($node_publisher,
'admin_sub');
$node_subscriber->wait_for_subscription_sync($node_publisher, 'admin_sub');
expect_replication("alice.unpartitioned", 3, 7, 13,
"table owner can do the initial data copy");
"table owner can do the initial data copy");
done_testing();