This is an automated email from the ASF dual-hosted git repository. tuhaihe pushed a commit to branch REL_2_STABLE in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit bf53b5d45bcef240cacd78c28d2b597b38a9c962 Author: reshke <[email protected]> AuthorDate: Mon Sep 21 13:53:39 2026 +0300 Backport fixup: wrap consider_join_pushdown block in joinpath.c in #ifdef NOT_USED --- src/backend/optimizer/path/joinpath.c | 3 +++ src/test/regress/expected/rowtypes.out | 29 +++++++++++++++-------------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c index 5defbdd3613..82678b8a522 100644 --- a/src/backend/optimizer/path/joinpath.c +++ b/src/backend/optimizer/path/joinpath.c @@ -367,6 +367,7 @@ add_paths_to_join_relation(PlannerInfo *root, hash_inner_and_outer(root, joinrel, outerrel, innerrel, jointype, &extra); +#ifdef NOT_USED /* * createplan.c does not currently support handling of pseudoconstant * clauses assigned to joins pushed down by extensions; check if the @@ -379,6 +380,8 @@ add_paths_to_join_relation(PlannerInfo *root, consider_join_pushdown = !has_pseudoconstant_clauses(root, restrictlist); +#endif + /* * 5. If inner and outer relations are foreign tables (or joins) belonging * to the same server and assigned to the same user to check access diff --git a/src/test/regress/expected/rowtypes.out b/src/test/regress/expected/rowtypes.out index 2c85583cce0..dd93e7c8ca7 100644 --- a/src/test/regress/expected/rowtypes.out +++ b/src/test/regress/expected/rowtypes.out @@ -1243,22 +1243,23 @@ with cte(c) as materialized (select row(1, 2)), select * from cte2 as t where (select * from (select c as c1) s where (select (c1).f1 > 0)) is not null; - QUERY PLAN --------------------------------------------- - CTE Scan on cte - Output: cte.c - Filter: ((SubPlan 3) IS NOT NULL) - CTE cte - -> Result - Output: '(1,2)'::record - SubPlan 3 + QUERY PLAN +------------------------------------------ + Subquery Scan on t + Output: t.c + Filter: ((SubPlan 2) IS NOT NULL) + -> Shared Scan (share slice:id 0:0) + Output: share0_ref1."row" + -> Result + Output: ROW(1, 2) + SubPlan 2 -> Result - Output: cte.c - One-Time Filter: $2 - InitPlan 2 (returns $2) + Output: t.c + One-Time Filter: $1 + InitPlan 1 (returns $1) -> Result - Output: ((cte.c).f1 > 0) -(13 rows) + Output: ((t.c).f1 > 0) +GP_IGNORE:(16 rows) with cte(c) as materialized (select row(1, 2)), cte2(c) as (select * from cte) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
