Commitdf4c3cb

committed

Add parse_analyze_withcb()

This extracts code from pg_analyze_and_rewrite_withcb() into aseparate function that mirrors the existingparse_analyze_fixedparams() and parse_analyze_varparams().Reviewed-by: Nathan Bossart <bossartn@amazon.com>Discussion:https://www.postgresql.org/message-id/flat/c67ce276-52b4-0239-dc0e-39875bf81840@enterprisedb.com

1 parentddf590b commitdf4c3cbCopy full SHA for df4c3cb

File tree

+45

-20

lines changed

+45

-20

lines changed

Lines changed: 38 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,44 @@ parse_analyze_varparams(RawStmt parseTree, const char sourceText,`
`181`	`181`	`returnquery;`
`182`	`182`	`}`
`183`	`183`
	`184`	`+/*`
	`185`	`+ * parse_analyze_withcb`
	`186`	`+ *`
	`187`	`+ * This variant is used when the caller supplies their own parser callback to`
	`188`	`+ * resolve parameters and possibly other things.`
	`189`	`+ */`
	`190`	`+Query*`
	`191`	`+parse_analyze_withcb(RawStmtparseTree,constcharsourceText,`
	`192`	`+ParserSetupHookparserSetup,`
	`193`	`+void*parserSetupArg,`
	`194`	`+QueryEnvironment*queryEnv)`
	`195`	`+{`
	`196`	`+ParseState*pstate=make_parsestate(NULL);`
	`197`	`+Query*query;`
	`198`	`+JumbleState*jstate=NULL;`
	`199`	`+`
	`200`	`+Assert(sourceText!=NULL);/* required as of 8.4 */`
	`201`	`+`
	`202`	`+pstate->p_sourcetext=sourceText;`
	`203`	`+pstate->p_queryEnv=queryEnv;`
	`204`	`+(*parserSetup) (pstate,parserSetupArg);`
	`205`	`+`
	`206`	`+query=transformTopLevelStmt(pstate,parseTree);`
	`207`	`+`
	`208`	`+if (IsQueryIdEnabled())`
	`209`	`+jstate=JumbleQuery(query,sourceText);`
	`210`	`+`
	`211`	`+if (post_parse_analyze_hook)`
	`212`	`+(*post_parse_analyze_hook) (pstate,query,jstate);`
	`213`	`+`
	`214`	`+free_parsestate(pstate);`
	`215`	`+`
	`216`	`+pgstat_report_query_id(query->queryId, false);`
	`217`	`+`
	`218`	`+returnquery;`
	`219`	`+}`
	`220`	`+`
	`221`	`+`
`184`	`222`	`/*`
`185`	`223`	`* parse_sub_analyze`
`186`	`224`	`*Entry point for recursively analyzing a sub-statement.`

Lines changed: 2 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -736,12 +736,8 @@ pg_analyze_and_rewrite_withcb(RawStmt *parsetree,`
`736`	`736`	`void*parserSetupArg,`
`737`	`737`	`QueryEnvironment*queryEnv)`
`738`	`738`	`{`
`739`		`-ParseState*pstate;`
`740`	`739`	`Query*query;`
`741`	`740`	`List*querytree_list;`
`742`		`-JumbleState*jstate=NULL;`
`743`		`-`
`744`		`-Assert(query_string!=NULL);/* required as of 8.4 */`
`745`	`741`
`746`	`742`	`TRACE_POSTGRESQL_QUERY_REWRITE_START(query_string);`
`747`	`743`
`@@ -751,22 +747,8 @@ pg_analyze_and_rewrite_withcb(RawStmt *parsetree,`
`751`	`747`	`if (log_parser_stats)`
`752`	`748`	`ResetUsage();`
`753`	`749`
`754`		`-pstate=make_parsestate(NULL);`
`755`		`-pstate->p_sourcetext=query_string;`
`756`		`-pstate->p_queryEnv=queryEnv;`
`757`		`-(*parserSetup) (pstate,parserSetupArg);`
`758`		`-`
`759`		`-query=transformTopLevelStmt(pstate,parsetree);`
`760`		`-`
`761`		`-if (IsQueryIdEnabled())`
`762`		`-jstate=JumbleQuery(query,query_string);`
`763`		`-`
`764`		`-if (post_parse_analyze_hook)`
`765`		`-(*post_parse_analyze_hook) (pstate,query,jstate);`
`766`		`-`
`767`		`-free_parsestate(pstate);`
`768`		`-`
`769`		`-pgstat_report_query_id(query->queryId, false);`
	`750`	`+query=parse_analyze_withcb(parsetree,query_string,parserSetup,parserSetupArg,`
	`751`	`+queryEnv);`
`770`	`752`
`771`	`753`	`if (log_parser_stats)`
`772`	`754`	`ShowUsage("PARSE ANALYSIS STATISTICS");`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`#ifndefANALYZE_H`
`15`	`15`	`#defineANALYZE_H`
`16`	`16`
	`17`	`+#include"nodes/params.h"`
`17`	`18`	`#include"parser/parse_node.h"`
`18`	`19`	`#include"utils/queryjumble.h"`
`19`	`20`
`@@ -28,6 +29,10 @@ extern Query parse_analyze_fixedparams(RawStmt parseTree, const char *sourceTe`
`28`	`29`	`constOidparamTypes,intnumParams,QueryEnvironmentqueryEnv);`
`29`	`30`	`externQueryparse_analyze_varparams(RawStmtparseTree,constchar*sourceText,`
`30`	`31`	`Oid*paramTypes,intnumParams,QueryEnvironment*queryEnv);`
	`32`	`+externQueryparse_analyze_withcb(RawStmtparseTree,constchar*sourceText,`
	`33`	`+ParserSetupHookparserSetup,`
	`34`	`+void*parserSetupArg,`
	`35`	`+QueryEnvironment*queryEnv);`
`31`	`36`
`32`	`37`	`externQueryparse_sub_analyze(NodeparseTree,ParseState*parentParseState,`
`33`	`38`	`CommonTableExpr*parentCTE,`

Comments

(0)