[PATCH]Refactor and unify expression construction functions in makefuncs.c
Hackorum builds and tests every patch posted to the lists, not only commitfest submissions. This is Hackorum's own CI rather than the PostgreSQL project's, and it is still under testing - please report anything that looks wrong.
You can run a PostgreSQL built from this patch straight from Docker, with no checkout and no build:
docker run --rm -p 5432:5432 ghcr.io/hackorum-dev/postgres-patch:t139803psql -h localhost -U postgresBuilt from patchset v1 (message #1), September 20, 2026 at 01:29 PM.
Every patchset is also pushed to a branch of our PostgreSQL fork, so you can check out the same tree CI built. Without a PostgreSQL checkout:
git clone --branch t139803_1 https://github.com/hackorum-dev/postgres.gitIn a checkout you already have, add the fork once:
git remote add hackorum https://github.com/hackorum-dev/postgres.gitthen, for this patchset and every later one:
git fetch hackorum t139803_1 && git checkout t139803_1Patchset v1 (message #1) is on t139803_1
Hi， Hackers
`
While reviewing commit cf6723 (Make transformAExprIn() return a flattened bool expression directly),
I found several near-duplicate function implementations in makefuncs.c that can be refactored to
simplify and clean up the codebase.
`
This patch performs a set of minor, low-impact clean-up refactors to unify internal expression construction logic:
- make_andclause() / make_orclause() / make_notclause(): Rework these functions to directly call makeBoolExpr(),
aligning their implementation style with the existing makeAndExpr() / makeOrExpr() / makeNotExpr() logic in gram.y.
This eliminates redundant duplicate code for boolean clause construction.
- makeSimpleA_Expr() --> makeA_Expr(): Remove the trivial wrapper function and use the core makeA_Expr() directly to
simplify expression building logic.
- makeDefElemExtended() --> makeDefElem(): Remove the extended wrapper and adopt standard makeDefElem() uniformly for
definition element construction.
`
All changes are pure code cleanup with zero functional change.
The patch has minimal code intrusion, only optimizing internal function call chains without altering runtime behavior.
`
Test cases are added for every refactored function to guarantee correctness and prevent regression:
- make_andclause() --> makeBoolExpr(): SELECT * FROM t1 WHERE id = 1 AND id = 3;
- make_orclause() --> makeBoolExpr(): SELECT * FROM t1 WHERE id = 1 OR id = 3;
- make_notclause() --> makeBoolExpr(): SELECT * FROM t1 WHERE id NOT IN (1);
- makeSimpleA_Expr() --> makeA_Expr(): SELECT oid::integer+1 FROM pg_class WHERE oid::integer+1 < 100;
- makeDefElemExtended() --> makeDefElem():
CREATE SERVER myserver FOREIGN DATA WRAPPER postgres_fdw OPTIONS (host 'foo', dbname 'foodb', port '5432');
ALTER SERVER myserver OPTIONS (DROP port);
`
All newly added tests pass successfully, verifying that the refactoring is safe, consistent and introduces no behavioral changes.
Thanks,
--
ZizhuanLiu (X-MAN)
44973863@qq.com
"=?utf-8?B?Wml6aHVhbkxpdSBYLU1BTg==?=" <44973863@qq.com> writes:
This patch performs a set of minor, low-impact clean-up refactors to unify internal expression construction logic:
TBH, I don't think this is worth the trouble.
regards, tom lane
>From: Tom Lane <tgl@sss.pgh.pa.us>
>Date: 2026-06-01 11:56
>To: ZizhuanLiu X-MAN <44973863@qq.com>
>Cc: pgsql-hackers <pgsql-hackers@lists.postgresql.org>
>Subject: Re: [PATCH]Refactor and unify expression construction functions in makefuncs.c
>
>
> "=?utf-8?B?Wml6aHVhbkxpdSBYLU1BTg==?="?<44973863@qq.com>?writes:
>>?This?patch?performs?a?set?of?minor,?low-impact?clean-up?refactors?to?unify?internal?expression?construction?logic:
>
>TBH, I don't think this is worth the trouble.
>
> regards, tom lane
Thanks, you're right. Let's drop this idea for now.
`
regards,
--
ZizhuanLiu (X-MAN)
44973863@qq.com