database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-01-26 09:41:40 +03:00
Code Activity

pg_recvlogical: remove unnecessary OutputFsync() return value checks.

Browse Source 
Commit 1e2fddfa33 changed OutputFsync() so that it always returns true.
However, pg_recvlogical.c still contained checks of its boolean return
value, which are now redundant.

This commit removes those checks and changes the type of return value of
OutputFsync() to void, simplifying the code.

Suggested-by: Yilin Zhang <jiezhilove@126.com>
Author: Fujii Masao <masao.fujii@gmail.com>
Reviewed-by: Mircea Cadariu <cadariu.mircea@gmail.com>
Reviewed-by: Chao Li <li.evan.chao@gmail.com>
Discussion: https://postgr.es/m/CAHGQGwFeTymZQ7RLvMU6WuDGar8bUQCazg=VOfA-9GeBkg-FzA@mail.gmail.com
This commit is contained in:
Fujii Masao
2026-01-16 12:37:05 +09:00
parent d89b1d8175
commit b98cc4a14e
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/bin/pg_basebackup/pg_recvlogical.c
View File

@@ -184,7 +184,7 @@ disconnect_atexit(void)
PQfinish(conn);
}
static bool
static void
OutputFsync(TimestampTz now)
{
output_last_fsync = now;
@@ -199,21 +199,19 @@ OutputFsync(TimestampTz now)
startpos = output_fsync_lsn;
if (fsync_interval <= 0)
return true;
return;
if (!output_needs_fsync)
return true;
return;
output_needs_fsync = false;
/* can only fsync if it's a regular file */
if (!output_isfile)
return true;
return;
if (fsync(outfd) != 0)
pg_fatal("could not fsync file \"%s\": %m", outfile);
return true;
}
/*
@@ -312,10 +310,7 @@ StreamLogicalLog(void)
if (outfd != -1 &&
feTimestampDifferenceExceeds(output_last_fsync, now,
fsync_interval))
{
if (!OutputFsync(now))
goto error;
}
OutputFsync(now);
if (standby_message_timeout > 0 &&
feTimestampDifferenceExceeds(last_status, now,
@@ -332,8 +327,7 @@ StreamLogicalLog(void)
if (outfd != -1 && output_reopen && strcmp(outfile, "-") != 0)
{
now = feGetCurrentTimestamp();
if (!OutputFsync(now))
goto error;
OutputFsync(now);
close(outfd);
outfd = -1;
}
@@ -652,9 +646,7 @@ StreamLogicalLog(void)
{
TimestampTz t = feGetCurrentTimestamp();
/* no need to jump to error on failure here, we're finishing anyway */
OutputFsync(t);
if (close(outfd) != 0)
pg_log_error("could not close file \"%s\": %m", outfile);
}
@@ -1063,8 +1055,7 @@ static bool
flushAndSendFeedback(PGconn *conn, TimestampTz *now)
{
/* flush data to disk, so that we send a recent flush pointer */
if (!OutputFsync(*now))
return false;
OutputFsync(*now);
*now = feGetCurrentTimestamp();
if (!sendFeedback(conn, *now, true, false))
return false;