pgsql: Eliminate code duplication in replace_rte_variables callbacks

From: Richard Guo <rguo(at)postgresql(dot)org>
To: pgsql-committers(at)lists(dot)postgresql(dot)org
Subject: pgsql: Eliminate code duplication in replace_rte_variables callbacks
Date: 2025-02-25 07:12:35
Message-ID: E1tmp7K-000ZsP-2k@gemulon.postgresql.org
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-committers

Eliminate code duplication in replace_rte_variables callbacks

The callback functions ReplaceVarsFromTargetList_callback and
pullup_replace_vars_callback are both used to replace Vars in an
expression tree that reference a particular RTE with items from a
targetlist, and they both need to expand whole-tuple references and
deal with OLD/NEW RETURNING list Vars. As a result, currently there
is significant code duplication between these two functions.

This patch introduces a new function, ReplaceVarFromTargetList, to
perform the replacement and calls it from both callback functions,
thereby eliminating code duplication.

Author: Dean Rasheed <dean(dot)a(dot)rasheed(at)gmail(dot)com>
Author: Richard Guo <guofenglinux(at)gmail(dot)com>
Reviewed-by: Jian He <jian(dot)universality(at)gmail(dot)com>
Discussion: https://postgr.es/m/CAEZATCWhr=FM4X5kCPvVs-g2XEk+ceLsNtBK_zZMkqFn9vUjsw@mail.gmail.com

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/363a6e8c6fcf9f3e19fe673ae02554645974a388

Modified Files
--------------
src/backend/optimizer/prep/prepjointree.c | 141 +++++-------------------------
src/backend/rewrite/rewriteManip.c | 88 ++++++++++++++-----
src/include/rewrite/rewriteManip.h | 9 +-
3 files changed, 96 insertions(+), 142 deletions(-)

Browse pgsql-committers by date

  From Date Subject
Next Message Peter Eisentraut 2025-02-25 13:28:07 pgsql: Remove obsolete Python version check
Previous Message Michael Paquier 2025-02-25 07:05:53 pgsql: Fix untranslatable string concatenation in pg_upgrade