Andrew Dunstan <and...@dunslane.net> writes:
> On 2024-05-07 Tu 06:05, Richard Guo wrote:
>> +1 to have build farm coverage of REALLOCATE_BITMAPSETS. This flag
>> seems quite useful.
> I have added it to the CPPFLAGS on prion.
... and as expected, prion fell over.
I find that Richard's proposed fix makes the core regression tests
pass, but we still fail check-world. So I'm afraid we need something
more aggressive, like the attached which makes make_restrictinfo
copy all its input bitmapsets. Without that, we still have sharing
of bitmapsets across different RestrictInfos, which seems pretty
scary given what we now see about the effects of 00b41463c. This
seems annoyingly expensive, but maybe there's little choice?
Given this, we could remove ad-hoc bms_copy calls from the callers
of make_restrictinfo, distribute_quals_to_rels, etc. I didn't go
looking for possible wins of that sort; there's unlikely to be a
lot of them.
regards, tom lane
diff --git a/src/backend/optimizer/util/restrictinfo.c b/src/backend/optimizer/util/restrictinfo.c
index 0b406e9334..e81861bc8b 100644
--- a/src/backend/optimizer/util/restrictinfo.c
+++ b/src/backend/optimizer/util/restrictinfo.c
@@ -132,8 +132,8 @@ make_restrictinfo_internal(PlannerInfo *root,
restrictinfo->is_clone = is_clone;
restrictinfo->can_join = false; /* may get set below */
restrictinfo->security_level = security_level;
- restrictinfo->incompatible_relids = incompatible_relids;
- restrictinfo->outer_relids = outer_relids;
+ restrictinfo->incompatible_relids = bms_copy(incompatible_relids);
+ restrictinfo->outer_relids = bms_copy(outer_relids);
/*
* If it's potentially delayable by lower-level security quals, figure out
@@ -191,7 +191,7 @@ make_restrictinfo_internal(PlannerInfo *root,
/* required_relids defaults to clause_relids */
if (required_relids != NULL)
- restrictinfo->required_relids = required_relids;
+ restrictinfo->required_relids = bms_copy(required_relids);
else
restrictinfo->required_relids = restrictinfo->clause_relids;
