mirror of
https://github.com/postgres/postgres.git
synced 2025-07-30 11:03:19 +03:00
cube: pure parser and reentrant scanner
Use the flex %option reentrant and the bison option %pure-parser to make the generated scanner and parser pure, reentrant, and thread-safe. Make the generated scanner use palloc() etc. instead of malloc() etc. Previously, we only used palloc() for the buffer, but flex would still use malloc() for its internal structures. As a result, there could be some small memory leaks in case of uncaught errors. (We do catch normal syntax errors as soft errors.) Now, all the memory is under palloc() control, so there are no more such issues. Simplify flex scan buffer management: Instead of constructing the buffer from pieces and then using yy_scan_buffer(), we can just use yy_scan_string(), which does the same thing internally. (Actually, we use yy_scan_bytes() here because we already have the length.) The previous code was necessary because we allocated the buffer with palloc() and the rest of the state was handled by malloc(). But this is no longer the case; everything is under palloc() now. (We could even get rid of the yylex_destroy() call and just let the memory context cleanup handle everything. But for now, we preserve the existing behavior.) Reviewed-by: Heikki Linnakangas <hlinnaka@iki.fi> Reviewed-by: Andreas Karlsson <andreas@proxel.se> Discussion: https://www.postgresql.org/message-id/flat/eb6faeac-2a8a-4b69-9189-c33c520e5b7b@eisentraut.org
This commit is contained in:
@ -59,14 +59,21 @@ typedef struct NDBOX
|
||||
#define CubeKNNDistanceEuclid 17 /* <-> */
|
||||
#define CubeKNNDistanceChebyshev 18 /* <=> */
|
||||
|
||||
/* for cubescan.l and cubeparse.y */
|
||||
/* All grammar constructs return strings */
|
||||
#define YYSTYPE char *
|
||||
typedef void *yyscan_t;
|
||||
|
||||
/* in cubescan.l */
|
||||
extern int cube_yylex(void);
|
||||
extern int cube_yylex(YYSTYPE *yylval_param, yyscan_t yyscanner);
|
||||
extern void cube_yyerror(NDBOX **result, Size scanbuflen,
|
||||
struct Node *escontext,
|
||||
yyscan_t yyscanner,
|
||||
const char *message);
|
||||
extern void cube_scanner_init(const char *str, Size *scanbuflen);
|
||||
extern void cube_scanner_finish(void);
|
||||
extern void cube_scanner_init(const char *str, Size *scanbuflen, yyscan_t *yyscannerp);
|
||||
extern void cube_scanner_finish(yyscan_t yyscanner);
|
||||
|
||||
/* in cubeparse.y */
|
||||
extern int cube_yyparse(NDBOX **result, Size scanbuflen,
|
||||
struct Node *escontext);
|
||||
struct Node *escontext,
|
||||
yyscan_t yyscanner);
|
||||
|
Reference in New Issue
Block a user