Improve wording of subscription refresh debug messages

petere · petere · commit ad2ca3cba6e1 · 2017-08-07T09:40:12.000-04:00
Reported-by: Yugo Nagata &lt;nagata@sraoss.co.jp&gt;
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
@@ -573,9 +573,8 @@ AlterSubscription_refresh(Subscription *sub, bool copy_data)
 									copy_data ? SUBREL_STATE_INIT : SUBREL_STATE_READY,
 									InvalidXLogRecPtr, false);
 			ereport(DEBUG1,
-					(errmsg("added subscription for table %s.%s",
-							quote_identifier(rv->schemaname),
-							quote_identifier(rv->relname))));
+					(errmsg("table \"%s.%s\" added to subscription \"%s\"",
+							rv->schemaname, rv->relname, sub->name)));
 		}
 	}
 
@@ -593,17 +592,15 @@ AlterSubscription_refresh(Subscription *sub, bool copy_data)
 		if (!bsearch(&relid, pubrel_local_oids,
 					 list_length(pubrel_names), sizeof(Oid), oid_cmp))
 		{
-			char	   *namespace;
-
 			RemoveSubscriptionRel(sub->oid, relid);
 
 			logicalrep_worker_stop_at_commit(sub->oid, relid);
 
-			namespace = get_namespace_name(get_rel_namespace(relid));
 			ereport(DEBUG1,
-					(errmsg("removed subscription for table %s.%s",
-							quote_identifier(namespace),
-							quote_identifier(get_rel_name(relid)))));
+					(errmsg("table \"%s.%s\" removed from subscription \"%s\"",
+							get_namespace_name(get_rel_namespace(relid)),
+							get_rel_name(relid),
+							sub->name)));
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -573,9 +573,8 @@ AlterSubscription_refresh(Subscription *sub, bool copy_data)`
`573`	`573`	`copy_data ? SUBREL_STATE_INIT : SUBREL_STATE_READY,`
`574`	`574`	`InvalidXLogRecPtr, false);`
`575`	`575`	`ereport(DEBUG1,`
`576`		`- (errmsg("added subscription for table %s.%s",`
`577`		`- quote_identifier(rv->schemaname),`
`578`		`- quote_identifier(rv->relname))));`
	`576`	`+ (errmsg("table \"%s.%s\" added to subscription \"%s\"",`
	`577`	`+ rv->schemaname, rv->relname, sub->name)));`
`579`	`578`	`}`
`580`	`579`	`}`
`581`	`580`
`@@ -593,17 +592,15 @@ AlterSubscription_refresh(Subscription *sub, bool copy_data)`
`593`	`592`	`if (!bsearch(&relid, pubrel_local_oids,`
`594`	`593`	`list_length(pubrel_names), sizeof(Oid), oid_cmp))`
`595`	`594`	`{`
`596`		`- char *namespace;`
`597`		`-`
`598`	`595`	`RemoveSubscriptionRel(sub->oid, relid);`
`599`	`596`
`600`	`597`	`logicalrep_worker_stop_at_commit(sub->oid, relid);`
`601`	`598`
`602`		`- namespace = get_namespace_name(get_rel_namespace(relid));`
`603`	`599`	`ereport(DEBUG1,`
`604`		`- (errmsg("removed subscription for table %s.%s",`
`605`		`- quote_identifier(namespace),`
`606`		`- quote_identifier(get_rel_name(relid)))));`
	`600`	`+ (errmsg("table \"%s.%s\" removed from subscription \"%s\"",`
	`601`	`+ get_namespace_name(get_rel_namespace(relid)),`
	`602`	`+ get_rel_name(relid),`
	`603`	`+ sub->name)));`
`607`	`604`	`}`
`608`	`605`	`}`
`609`	`606`	`}`