On 2022-Jul-18, Richard Guo wrote:
> BTW, not related to this patch, the new lines for parallel_aware check
> in setrefs.c are very wide. How about wrap them to keep consistent with
> arounding codes?
Not untrue! Something like this, you mean? Fixed the nearby typo while
at it.
--
Álvaro Herrera Breisgau, Deutschland — https://www.EnterpriseDB.com/
>From 985ffec3086fc01585cb784a58ddb8975f832350 Mon Sep 17 00:00:00 2001
From: Alvaro Herrera <alvhe...@alvh.no-ip.org>
Date: Mon, 18 Jul 2022 16:40:01 +0200
Subject: [PATCH] Wrap overly long lines
---
src/backend/optimizer/plan/setrefs.c | 29 ++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index 9cef92cab2..707c1016c2 100644
--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@@ -1637,14 +1637,16 @@ set_append_references(PlannerInfo *root,
* See if it's safe to get rid of the Append entirely. For this to be
* safe, there must be only one child plan and that child plan's parallel
* awareness must match that of the Append's. The reason for the latter
- * is that the if the Append is parallel aware and the child is not then
- * the calling plan may execute the non-parallel aware child multiple
- * times.
+ * is that if the Append is parallel aware and the child is not, then the
+ * calling plan may execute the non-parallel aware child multiple times.
*/
- if (list_length(aplan->appendplans) == 1 &&
- ((Plan *) linitial(aplan->appendplans))->parallel_aware == aplan->plan.parallel_aware)
- return clean_up_removed_plan_level((Plan *) aplan,
- (Plan *) linitial(aplan->appendplans));
+ if (list_length(aplan->appendplans) == 1)
+ {
+ Plan *p = (Plan *) linitial(aplan->appendplans);
+
+ if (p->parallel_aware == aplan->plan.parallel_aware)
+ return clean_up_removed_plan_level((Plan *) aplan, p);
+ }
/*
* Otherwise, clean up the Append as needed. It's okay to do this after
@@ -1709,14 +1711,17 @@ set_mergeappend_references(PlannerInfo *root,
* See if it's safe to get rid of the MergeAppend entirely. For this to
* be safe, there must be only one child plan and that child plan's
* parallel awareness must match that of the MergeAppend's. The reason
- * for the latter is that the if the MergeAppend is parallel aware and the
+ * for the latter is that if the MergeAppend is parallel aware and the
* child is not then the calling plan may execute the non-parallel aware
* child multiple times.
*/
- if (list_length(mplan->mergeplans) == 1 &&
- ((Plan *) linitial(mplan->mergeplans))->parallel_aware == mplan->plan.parallel_aware)
- return clean_up_removed_plan_level((Plan *) mplan,
- (Plan *) linitial(mplan->mergeplans));
+ if (list_length(mplan->mergeplans) == 1)
+ {
+ Plan *p = (Plan *) linitial(mplan->mergeplans);
+
+ if (p->parallel_aware == mplan->plan.parallel_aware)
+ return clean_up_removed_plan_level((Plan *) mplan, p);
+ }
/*
* Otherwise, clean up the MergeAppend as needed. It's okay to do this
--
2.30.2
