database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-22 12:22:45 +03:00
Code Activity

Make Bitmapsets be valid Nodes.

Browse Source 
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
This commit is contained in:
Tom Lane
2022-11-13 10:22:45 -05:00
parent 9c7eb9d85a
commit 5e1f3b9ebf
12 changed files with 68 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/backend/nodes/read.c
View File

@@ -22,6 +22,7 @@
#include <ctype.h>
#include "common/string.h"
#include "nodes/bitmapset.h"
#include "nodes/pg_list.h"
#include "nodes/readfuncs.h"
#include "nodes/value.h"
@@ -347,6 +348,7 @@ nodeRead(const char *token, int tok_len)
* Could be an integer list: (i int int ...)
* or an OID list: (o int int ...)
* or an XID list: (x int int ...)
* or a bitmapset: (b int int ...)
* or a list of nodes/values: (node node ...)
*----------
*/
@@ -372,6 +374,7 @@ nodeRead(const char *token, int tok_len)
tok_len, token);
l = lappend_int(l, val);
}
result = (Node *) l;
}
else if (tok_len == 1 && token[0] == 'o')
{
@@ -392,6 +395,7 @@ nodeRead(const char *token, int tok_len)
tok_len, token);
l = lappend_oid(l, val);
}
result = (Node *) l;
}
else if (tok_len == 1 && token[0] == 'x')
{
@@ -412,6 +416,30 @@ nodeRead(const char *token, int tok_len)
tok_len, token);
l = lappend_xid(l, val);
}
result = (Node *) l;
}
else if (tok_len == 1 && token[0] == 'b')
{
/* Bitmapset -- see also _readBitmapset() */
Bitmapset *bms = NULL;
for (;;)
{
int val;
char *endptr;
token = pg_strtok(&tok_len);
if (token == NULL)
elog(ERROR, "unterminated Bitmapset structure");
if (tok_len == 1 && token[0] == ')')
break;
val = (int) strtol(token, &endptr, 10);
if (endptr != token + tok_len)
elog(ERROR, "unrecognized integer: \"%.*s\"",
tok_len, token);
bms = bms_add_member(bms, val);
}
result = (Node *) bms;
}
else
{
@@ -426,8 +454,8 @@ nodeRead(const char *token, int tok_len)
if (token == NULL)
elog(ERROR, "unterminated List structure");
}
result = (Node *) l;
}
result = (Node *) l;
break;
}
case RIGHT_PAREN: