From cb2e7907186c570138f5b0f47fc3ea506eaff641 Mon Sep 17 00:00:00 2001 From: "Chao Li (Evan)" Date: Fri, 17 Jul 2026 17:18:32 +0800 Subject: [PATCH v2] Fix parsing of underscores in pg_plan_advice occurrence numbers The pg_plan_advice scanner recognizes underscores as digit separators, but used strtoint() to convert occurrence numbers. Consequently, advice such as SEQ_SCAN(x#1_0) failed to parse. Use pg_strtoint32_safe(), as the core scanner does, and add regression coverage. Author: Chao Li --- contrib/pg_plan_advice/expected/syntax.out | 9 +++++++++ contrib/pg_plan_advice/pgpa_scanner.l | 17 ++++++++++++----- contrib/pg_plan_advice/sql/syntax.sql | 2 ++ 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/contrib/pg_plan_advice/expected/syntax.out b/contrib/pg_plan_advice/expected/syntax.out index c61fd73a385..8e7a7d721c1 100644 --- a/contrib/pg_plan_advice/expected/syntax.out +++ b/contrib/pg_plan_advice/expected/syntax.out @@ -65,6 +65,15 @@ EXPLAIN (COSTS OFF) SELECT 1; SEQ_SCAN(x#2) /* not matched */ (3 rows) +SET pg_plan_advice.advice = 'SEQ_SCAN(x#1_0)'; +EXPLAIN (COSTS OFF) SELECT 1; + QUERY PLAN +------------------------------------ + Result + Supplied Plan Advice: + SEQ_SCAN(x#10) /* not matched */ +(3 rows) + SET pg_plan_advice.advice = 'SEQ_SCAN (x/y)'; EXPLAIN (COSTS OFF) SELECT 1; QUERY PLAN diff --git a/contrib/pg_plan_advice/pgpa_scanner.l b/contrib/pg_plan_advice/pgpa_scanner.l index e6d60f57e1e..15d67cd4896 100644 --- a/contrib/pg_plan_advice/pgpa_scanner.l +++ b/contrib/pg_plan_advice/pgpa_scanner.l @@ -8,9 +8,9 @@ */ #include "postgres.h" -#include "common/string.h" #include "nodes/miscnodes.h" #include "parser/scansup.h" +#include "utils/builtins.h" #include "pgpa_ast.h" #include "pgpa_parser.h" @@ -82,6 +82,7 @@ identifier {ident_start}{ident_cont}* decdigit [0-9] decinteger {decdigit}(_?{decdigit})* +integer_junk {decinteger}{identifier} space [ \t\n\r\f\v] whitespace {space}+ @@ -136,16 +137,22 @@ xcinside [^*/]+ } {decinteger} { - char *endptr; + ErrorSaveContext escontext = {T_ErrorSaveContext}; - errno = 0; - yylval->integer = strtoint(yytext, &endptr, 10); - if (*endptr != '\0' || errno == ERANGE) + yylval->integer = pg_strtoint32_safe(yytext, + (Node *) &escontext); + if (escontext.error_occurred) pgpa_yyerror(result, parse_error_msg_p, yyscanner, "integer out of range"); return TOK_INTEGER; } +{integer_junk} { + BEGIN(INITIAL); + pgpa_yyerror(result, parse_error_msg_p, yyscanner, + "trailing junk after numeric literal"); + } + {xcstart} { BEGIN(xc); } diff --git a/contrib/pg_plan_advice/sql/syntax.sql b/contrib/pg_plan_advice/sql/syntax.sql index 3f94b5f8bf3..461ae6feb20 100644 --- a/contrib/pg_plan_advice/sql/syntax.sql +++ b/contrib/pg_plan_advice/sql/syntax.sql @@ -19,6 +19,8 @@ SET pg_plan_advice.advice = 'seq_scan(x@y)'; EXPLAIN (COSTS OFF) SELECT 1; SET pg_plan_advice.advice = 'SEQ_scan(x#2)'; EXPLAIN (COSTS OFF) SELECT 1; +SET pg_plan_advice.advice = 'SEQ_SCAN(x#1_0)'; +EXPLAIN (COSTS OFF) SELECT 1; SET pg_plan_advice.advice = 'SEQ_SCAN (x/y)'; EXPLAIN (COSTS OFF) SELECT 1; SET pg_plan_advice.advice = ' SEQ_SCAN ( x / y . z ) '; -- 2.39.3 (Apple Git-146)