v1-0002-Simplify-callers-of-truncate_query_log.patch
text/x-patch
Filename: v1-0002-Simplify-callers-of-truncate_query_log.patch
Type: text/x-patch
Part: 1
Message:
Re: Truncate logs by max_log_size
Patch
Same data as JSON:
GET /api/v1/attachments/:id/patch
the parsed metadata as JSON — format, series position, per-file stats; never the diff bytes.
API reference →
Format: format-patch
Series: patch v1-0002
Subject: Simplify callers of truncate_query_log()
| File | + | − |
|---|---|---|
| src/backend/tcop/postgres.c | 6 | 24 |
From 7110f93844d22f92ee664c2e5ba2d959ce7180bf Mon Sep 17 00:00:00 2001
From: Jim Jones <jim.jones@uni-muenster.de>
Date: Wed, 8 Jul 2026 18:31:27 +0200
Subject: [PATCH v1 2/2] Simplify callers of truncate_query_log()
truncate_query_log() already returns NULL when query logging is disabled
or when no truncation is needed. Callers therefore do not need to check
log_statement_max_length before invoking it.
Remove the redundant checks and rely on truncate_query_log() to decide
whether a truncated copy should be returned. This is purely a code
cleanup with no behavioral change.
Author: Jim Jones <jim.jones@uni-muenster.de>
---
src/backend/tcop/postgres.c | 30 ++++++------------------------
1 file changed, 6 insertions(+), 24 deletions(-)
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index b0947fd7298..61d28728ce1 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -1085,10 +1085,7 @@ exec_simple_query(const char *query_string)
/* Log immediately if dictated by log_statement */
if (check_log_statement(parsetree_list))
{
- char *truncated_stmt = NULL;
-
- if (log_statement_max_length >= 0)
- truncated_stmt = truncate_query_log(query_string);
+ char *truncated_stmt = truncate_query_log(query_string);
ereport(LOG,
(errmsg("statement: %s",
@@ -1392,10 +1389,7 @@ exec_simple_query(const char *query_string)
break;
case 2:
{
- char *truncated_stmt = NULL;
-
- if (log_statement_max_length >= 0)
- truncated_stmt = truncate_query_log(query_string);
+ char *truncated_stmt = truncate_query_log(query_string);
ereport(LOG,
(errmsg("duration: %s ms statement: %s",
@@ -1638,10 +1632,7 @@ exec_parse_message(const char *query_string, /* string to execute */
break;
case 2:
{
- char *truncated_stmt = NULL;
-
- if (log_statement_max_length >= 0)
- truncated_stmt = truncate_query_log(query_string);
+ char *truncated_stmt = truncate_query_log(query_string);
ereport(LOG,
(errmsg("duration: %s ms parse %s: %s",
@@ -2125,10 +2116,7 @@ exec_bind_message(StringInfo input_message)
break;
case 2:
{
- char *truncated_stmt = NULL;
-
- if (log_statement_max_length >= 0)
- truncated_stmt = truncate_query_log(psrc->query_string);
+ char *truncated_stmt = truncate_query_log(psrc->query_string);
ereport(LOG,
(errmsg("duration: %s ms bind %s%s%s: %s",
@@ -2282,10 +2270,7 @@ exec_execute_message(const char *portal_name, long max_rows)
/* Log immediately if dictated by log_statement */
if (check_log_statement(portal->stmts))
{
- char *truncated_source = NULL;
-
- if (log_statement_max_length >= 0)
- truncated_source = truncate_query_log(sourceText);
+ char *truncated_source = truncate_query_log(sourceText);
ereport(LOG,
(errmsg("%s %s%s%s: %s",
@@ -2414,10 +2399,7 @@ exec_execute_message(const char *portal_name, long max_rows)
break;
case 2:
{
- char *truncated_source = NULL;
-
- if (log_statement_max_length >= 0)
- truncated_source = truncate_query_log(sourceText);
+ char *truncated_source = truncate_query_log(sourceText);
ereport(LOG,
(errmsg("duration: %s ms %s %s%s%s: %s",
--
2.25.1