From 78612c5c80d57b297ef93e992874b571e9bf0f75 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Tue, 9 Sep 2014 16:43:41 +0900 Subject: [PATCH] Fix Assertion failure caused by nested OR at extraction Commit f343a88 has added some logic in extract_or_clause to extract OR subclauses, while the index path code in planner is wrongly assuming that subclauses cannot be OR clauses themselves. Per report from Benjamin Smith --- src/backend/optimizer/path/indxpath.c | 1 - src/test/regress/expected/join.out | 21 +++++++++++++++++++++ src/test/regress/sql/join.sql | 3 +++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c index 42dcb11..88bf946 100644 --- a/src/backend/optimizer/path/indxpath.c +++ b/src/backend/optimizer/path/indxpath.c @@ -1210,7 +1210,6 @@ generate_bitmap_or_paths(PlannerInfo *root, RelOptInfo *rel, List *orargs; Assert(IsA(orarg, RestrictInfo)); - Assert(!restriction_is_or_clause((RestrictInfo *) orarg)); orargs = list_make1(orarg); indlist = build_paths_for_OR(root, rel, diff --git a/src/test/regress/expected/join.out b/src/test/regress/expected/join.out index 1cb1c51..5079ba0 100644 --- a/src/test/regress/expected/join.out +++ b/src/test/regress/expected/join.out @@ -2827,6 +2827,27 @@ select * from tenk1 a join tenk1 b on Index Cond: (unique2 = 3) (12 rows) +explain (costs off) +select * from tenk1 a join tenk1 b on + a.unique1 = 1 or ((a.unique1 = 2 or a.unique1 = 3) and b.ten = 4); + QUERY PLAN +-------------------------------------------------------------------------------------------- + Nested Loop + Join Filter: ((a.unique1 = 1) OR (((a.unique1 = 2) OR (a.unique1 = 3)) AND (b.ten = 4))) + -> Seq Scan on tenk1 b + -> Materialize + -> Bitmap Heap Scan on tenk1 a + Recheck Cond: ((unique1 = 1) OR ((unique1 = 2) OR (unique1 = 3))) + -> BitmapOr + -> Bitmap Index Scan on tenk1_unique1 + Index Cond: (unique1 = 1) + -> BitmapOr + -> Bitmap Index Scan on tenk1_unique1 + Index Cond: (unique1 = 2) + -> Bitmap Index Scan on tenk1_unique1 + Index Cond: (unique1 = 3) +(14 rows) + -- -- test placement of movable quals in a parameterized join tree -- diff --git a/src/test/regress/sql/join.sql b/src/test/regress/sql/join.sql index fa3e068..c170b09 100644 --- a/src/test/regress/sql/join.sql +++ b/src/test/regress/sql/join.sql @@ -774,6 +774,9 @@ select * from tenk1 a join tenk1 b on explain (costs off) select * from tenk1 a join tenk1 b on (a.unique1 = 1 and b.unique1 = 2) or (a.unique2 = 3 and b.ten = 4); +explain (costs off) +select * from tenk1 a join tenk1 b on + a.unique1 = 1 or ((a.unique1 = 2 or a.unique1 = 3) and b.ten = 4); -- -- test placement of movable quals in a parameterized join tree -- 2.1.0