diff options
| author | Tom Lane | 2022-11-13 15:22:45 +0000 |
|---|---|---|
| committer | Tom Lane | 2022-11-13 15:22:45 +0000 |
| commit | 5e1f3b9ebf6e51f2c60abe9aba969c28a3b0f6c6 (patch) | |
| tree | d12f6c444f7ca89fe26e69695884412d79703b01 /src/include | |
| parent | 9c7eb9d85a5687d4f9624c40ee3a508d8c7de35a (diff) | |
Make Bitmapsets be valid Nodes.
Add a NodeTag field to struct Bitmapset. This is free because of
alignment considerations on 64-bit hardware. While it adds some
space on 32-bit machines, we aren't optimizing for that case anymore.
The advantage is that data structures such as Lists of Bitmapsets
are now first-class objects to the Node infrastructure, and don't
require special-case code to handle.
This patch includes removal of one such special case, in indxpath.c:
bms_equal_any() can now be replaced by list_member(). There may be
more existing code that could be simplified, but I didn't look very
hard. We also get to drop the read_write_ignore annotations on a
couple of RelOptInfo fields.
The outfuncs/readfuncs support is arranged so that nothing changes
in the string representation of a Bitmapset field; therefore, this
doesn't need a catversion bump.
Amit Langote and Tom Lane
Discussion: https://postgr.es/m/109089.1668197158@sss.pgh.pa.us
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/nodes/bitmapset.h | 5 | ||||
| -rw-r--r-- | src/include/nodes/meson.build | 1 | ||||
| -rw-r--r-- | src/include/nodes/pathnodes.h | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/include/nodes/bitmapset.h b/src/include/nodes/bitmapset.h index 75b5ce1a8e4..27922816581 100644 --- a/src/include/nodes/bitmapset.h +++ b/src/include/nodes/bitmapset.h @@ -20,6 +20,8 @@ #ifndef BITMAPSET_H #define BITMAPSET_H +#include "nodes/nodes.h" + /* * Forward decl to save including pg_list.h */ @@ -48,6 +50,9 @@ typedef int32 signedbitmapword; /* must be the matching signed type */ typedef struct Bitmapset { + pg_node_attr(custom_copy_equal, special_read_write) + + NodeTag type; int nwords; /* number of words in array */ bitmapword words[FLEXIBLE_ARRAY_MEMBER]; /* really [nwords] */ } Bitmapset; diff --git a/src/include/nodes/meson.build b/src/include/nodes/meson.build index b7df232081f..e63881086ee 100644 --- a/src/include/nodes/meson.build +++ b/src/include/nodes/meson.build @@ -13,6 +13,7 @@ node_support_input_i = [ 'commands/trigger.h', 'executor/tuptable.h', 'foreign/fdwapi.h', + 'nodes/bitmapset.h', 'nodes/extensible.h', 'nodes/lockoptions.h', 'nodes/replnodes.h', diff --git a/src/include/nodes/pathnodes.h b/src/include/nodes/pathnodes.h index 09342d128d5..a544b313d36 100644 --- a/src/include/nodes/pathnodes.h +++ b/src/include/nodes/pathnodes.h @@ -911,13 +911,11 @@ typedef struct RelOptInfo /* * cache space for remembering if we have proven this relation unique - * - * can't print unique_for_rels/non_unique_for_rels; BMSes aren't Nodes */ /* known unique for these other relid set(s) */ - List *unique_for_rels pg_node_attr(read_write_ignore); + List *unique_for_rels; /* known not unique for these set(s) */ - List *non_unique_for_rels pg_node_attr(read_write_ignore); + List *non_unique_for_rels; /* * used by various scans and joins: |