From 4e118470569debef5d5069ad1b616f88c42d898b Mon Sep 17 00:00:00 2001 From: Alexander Pyhalov Date: Wed, 9 Sep 2026 10:44:52 +0300 Subject: [PATCH] Preserve all differently parameterized paths --- src/backend/optimizer/util/pathnode.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c index 2ba31765ca5..9bc44a210e5 100644 --- a/src/backend/optimizer/util/pathnode.c +++ b/src/backend/optimizer/util/pathnode.c @@ -519,16 +519,14 @@ add_path(RelOptInfo *parent_rel, Path *new_path) PATH_REQ_OUTER(old_path)); if (keyscmp == PATHKEYS_BETTER1) { - if ((outercmp == BMS_EQUAL || - outercmp == BMS_SUBSET1) && + if (outercmp == BMS_EQUAL && new_path->rows <= old_path->rows && new_path->parallel_safe >= old_path->parallel_safe) remove_old = true; /* new dominates old */ } else if (keyscmp == PATHKEYS_BETTER2) { - if ((outercmp == BMS_EQUAL || - outercmp == BMS_SUBSET2) && + if (outercmp == BMS_EQUAL && new_path->rows >= old_path->rows && new_path->parallel_safe <= old_path->parallel_safe) accept_new = false; /* old dominates new */ @@ -570,14 +568,6 @@ add_path(RelOptInfo *parent_rel, Path *new_path) accept_new = false; /* old equals or * dominates new */ } - else if (outercmp == BMS_SUBSET1 && - new_path->rows <= old_path->rows && - new_path->parallel_safe >= old_path->parallel_safe) - remove_old = true; /* new dominates old */ - else if (outercmp == BMS_SUBSET2 && - new_path->rows >= old_path->rows && - new_path->parallel_safe <= old_path->parallel_safe) - accept_new = false; /* old dominates new */ /* else different parameterizations, keep both */ } break; @@ -586,8 +576,7 @@ add_path(RelOptInfo *parent_rel, Path *new_path) { outercmp = bms_subset_compare(PATH_REQ_OUTER(new_path), PATH_REQ_OUTER(old_path)); - if ((outercmp == BMS_EQUAL || - outercmp == BMS_SUBSET1) && + if (outercmp == BMS_EQUAL && new_path->rows <= old_path->rows && new_path->parallel_safe >= old_path->parallel_safe) remove_old = true; /* new dominates old */ @@ -598,8 +587,7 @@ add_path(RelOptInfo *parent_rel, Path *new_path) { outercmp = bms_subset_compare(PATH_REQ_OUTER(new_path), PATH_REQ_OUTER(old_path)); - if ((outercmp == BMS_EQUAL || - outercmp == BMS_SUBSET2) && + if (outercmp == BMS_EQUAL && new_path->rows >= old_path->rows && new_path->parallel_safe <= old_path->parallel_safe) accept_new = false; /* old dominates new */ -- 2.43.0