database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-07 19:06:32 +03:00
Code Activity

Tidyup WARNING ereports in subscriptioncmds.c

Browse Source 
A couple of ereports were making use of StringInfos as temporary storage
for the portions of the WARNING message.  One was doing this to avoid
having 2 separate ereports.  This was all fairly unnecessary and
resulted in more code rather than less code.

Refactor out the additional StringInfos and make
check_publications_origin_tables() use 2 ereports.

In passing, adjust pubnames to become a stack-allocated StringInfoData to
avoid having to palloc the temporary StringInfoData.  This follows on
from the efforts made in 6d0eba662.

Author: Mats Kindahl <mats.kindahl@gmail.com>
Reviewed-by: David Rowley <dgrowleyml@gmail.com>
Reviewed-by: Amit Kapila <amit.kapila16@gmail.com>
Reviewed-by: Álvaro Herrera <alvherre@kurilemu.de>
Discussion: https://postgr.es/m/0b381b02-cab9-41f9-a900-ad6c8d26c1fc%40gmail.com
This commit is contained in:
David Rowley
2025-11-07 09:50:02 +13:00
parent a2b02293bc
commit 448b6a4173
1 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/backend/commands/subscriptioncmds.c
View File

@@ -2599,33 +2599,30 @@ check_publications_origin_tables(WalReceiverConn *wrconn, List *publications,
*/ */
if (publist) if (publist)
{ {
StringInfo pubnames = makeStringInfo(); StringInfoData pubnames;
StringInfo err_msg = makeStringInfo();
StringInfo err_hint = makeStringInfo();
/* Prepare the list of publication(s) for warning message. */ /* Prepare the list of publication(s) for warning message. */
GetPublicationsStr(publist, pubnames, false); initStringInfo(&pubnames);
GetPublicationsStr(publist, &pubnames, false);
if (check_table_sync) if (check_table_sync)
{ ereport(WARNING,
appendStringInfo(err_msg, _("subscription \"%s\" requested copy_data with origin = NONE but might copy data that had a different origin"), errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
subname); errmsg("subscription \"%s\" requested copy_data with origin = NONE but might copy data that had a different origin",
appendStringInfoString(err_hint, _("Verify that initial data copied from the publisher tables did not come from other origins.")); subname),
} errdetail_plural("The subscription subscribes to a publication (%s) that contains tables that are written to by other subscriptions.",
"The subscription subscribes to publications (%s) that contain tables that are written to by other subscriptions.",
list_length(publist), pubnames.data),
errhint("Verify that initial data copied from the publisher tables did not come from other origins."));
else else
{ ereport(WARNING,
appendStringInfo(err_msg, _("subscription \"%s\" enabled retain_dead_tuples but might not reliably detect conflicts for changes from different origins"), errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
subname); errmsg("subscription \"%s\" enabled retain_dead_tuples but might not reliably detect conflicts for changes from different origins",
appendStringInfoString(err_hint, _("Consider using origin = NONE or disabling retain_dead_tuples.")); subname),
} errdetail_plural("The subscription subscribes to a publication (%s) that contains tables that are written to by other subscriptions.",
"The subscription subscribes to publications (%s) that contain tables that are written to by other subscriptions.",
ereport(WARNING, list_length(publist), pubnames.data),
errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), errhint("Consider using origin = NONE or disabling retain_dead_tuples."));
errmsg_internal("%s", err_msg->data),
errdetail_plural("The subscription subscribes to a publication (%s) that contains tables that are written to by other subscriptions.",
"The subscription subscribes to publications (%s) that contain tables that are written to by other subscriptions.",
list_length(publist), pubnames->data),
errhint_internal("%s", err_hint->data));
} }
ExecDropSingleTupleTableSlot(slot); ExecDropSingleTupleTableSlot(slot);
@@ -2716,24 +2713,20 @@ check_publications_origin_sequences(WalReceiverConn *wrconn, List *publications,
*/ */
if (publist) if (publist)
{ {
StringInfo pubnames = makeStringInfo(); StringInfoData pubnames;
StringInfo err_msg = makeStringInfo();
StringInfo err_hint = makeStringInfo();
/* Prepare the list of publication(s) for warning message. */ /* Prepare the list of publication(s) for warning message. */
GetPublicationsStr(publist, pubnames, false); initStringInfo(&pubnames);
GetPublicationsStr(publist, &pubnames, false);
appendStringInfo(err_msg, _("subscription \"%s\" requested copy_data with origin = NONE but might copy data that had a different origin"),
subname);
appendStringInfoString(err_hint, _("Verify that initial data copied from the publisher sequences did not come from other origins."));
ereport(WARNING, ereport(WARNING,
errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
errmsg_internal("%s", err_msg->data), errmsg("subscription \"%s\" requested copy_data with origin = NONE but might copy data that had a different origin",
subname),
errdetail_plural("The subscription subscribes to a publication (%s) that contains sequences that are written to by other subscriptions.", errdetail_plural("The subscription subscribes to a publication (%s) that contains sequences that are written to by other subscriptions.",
"The subscription subscribes to publications (%s) that contain sequences that are written to by other subscriptions.", "The subscription subscribes to publications (%s) that contain sequences that are written to by other subscriptions.",
list_length(publist), pubnames->data), list_length(publist), pubnames.data),
errhint_internal("%s", err_hint->data)); errhint("Verify that initial data copied from the publisher sequences did not come from other origins."));
} }
ExecDropSingleTupleTableSlot(slot); ExecDropSingleTupleTableSlot(slot);