git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Fix setrefs.c code for Result Cache nodes

author David Rowley <drowley@postgresql.org>

2021年5月25日 00:50:22 +0000 (12:50 +1200)

committer David Rowley <drowley@postgresql.org>

2021年5月25日 00:50:22 +0000 (12:50 +1200)

Result Cache, added in 9eacee2e6 neglected to properly adjust the plan
references in setrefs.c. This could lead to the following error during
EXPLAIN:

ERROR: cannot decompile join alias var in plan tree

Fix that.

Bug: 17030
Reported-by: Hans Buschmann
Discussion: https://postgr.es/m/17030-5844aecae42fe223@postgresql.org

src/backend/optimizer/plan/setrefs.c patch | blob | blame | history

src/test/regress/expected/join.out patch | blob | blame | history

diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c

index 9f40ed77e64646b94aa6fab03e0bbb3dde622417..61ccfd300b3708b88b248da90c733cd000626c81 100644 (file)

--- a/src/backend/optimizer/plan/setrefs.c

+++ b/src/backend/optimizer/plan/setrefs.c

@@ -756,6 +756,12 @@ set_plan_refs(PlannerInfo *root, Plan *plan, int rtoffset)

{

ResultCache *rcplan = (ResultCache *) plan;

+ /*

+ * Result Cache does not evaluate its targetlist. It just

+ * uses the same targetlist from its outer subnode.

+ */

+ set_dummy_tlist_references(plan, rtoffset);

rcplan->param_exprs = fix_scan_list(root, rcplan->param_exprs,

rtoffset,

NUM_EXEC_TLIST(plan));

diff --git a/src/test/regress/expected/join.out b/src/test/regress/expected/join.out

index 86fd3907c538eb65b142e5dae2c4349a313af6fa..fec0325e73e58015335fbd73e02308409ed71a91 100644 (file)

--- a/src/test/regress/expected/join.out

+++ b/src/test/regress/expected/join.out

@@ -4216,8 +4216,8 @@ where t1.f1 = ss.f1;

QUERY PLAN

--------------------------------------------------

Nested Loop

- Output: t1.f1, i8.q1, i8.q2, q1, f1

- Join Filter: (t1.f1 = f1)

+ Output: t1.f1, i8.q1, i8.q2, (i8.q1), t2.f1

+ Join Filter: (t1.f1 = t2.f1)

-> Nested Loop Left Join

Output: t1.f1, i8.q1, i8.q2

-> Seq Scan on public.text_tbl t1

@@ -4228,7 +4228,7 @@ where t1.f1 = ss.f1;

Output: i8.q1, i8.q2

Filter: (i8.q2 = 123)

-> Result Cache

- Output: q1, f1

+ Output: (i8.q1), t2.f1

Cache Key: i8.q1

-> Limit

Output: (i8.q1), t2.f1

@@ -4255,13 +4255,13 @@ select * from

lateral (select i8.q1, t2.f1 from text_tbl t2 limit 1) as ss1,

lateral (select ss1.* from text_tbl t3 limit 1) as ss2

where t1.f1 = ss2.f1;

- QUERY PLAN

---------------------------------------------------------

+ QUERY PLAN

+-------------------------------------------------------------------

Nested Loop

- Output: t1.f1, i8.q1, i8.q2, q1, f1, q1, f1

- Join Filter: (t1.f1 = f1)

+ Output: t1.f1, i8.q1, i8.q2, (i8.q1), t2.f1, ((i8.q1)), (t2.f1)

+ Join Filter: (t1.f1 = (t2.f1))

-> Nested Loop

- Output: t1.f1, i8.q1, i8.q2, q1, f1

+ Output: t1.f1, i8.q1, i8.q2, (i8.q1), t2.f1

-> Nested Loop Left Join

Output: t1.f1, i8.q1, i8.q2

-> Seq Scan on public.text_tbl t1

@@ -4272,19 +4272,19 @@ where t1.f1 = ss2.f1;

Output: i8.q1, i8.q2

Filter: (i8.q2 = 123)

-> Result Cache

- Output: q1, f1

+ Output: (i8.q1), t2.f1

Cache Key: i8.q1

-> Limit

Output: (i8.q1), t2.f1

-> Seq Scan on public.text_tbl t2

Output: i8.q1, t2.f1

-> Result Cache

- Output: q1, f1

- Cache Key: q1, f1

+ Output: ((i8.q1)), (t2.f1)

+ Cache Key: (i8.q1), t2.f1

-> Limit

- Output: (q1), (f1)

+ Output: ((i8.q1)), (t2.f1)

-> Seq Scan on public.text_tbl t3

- Output: q1, f1

+ Output: (i8.q1), t2.f1

(28 rows)

select * from

This is the main PostgreSQL git repository.

RSS Atom