Type:
Task
Priority:
Major
Resolution:
Fixed
In some cases the code in *.yy files related to expression parsed in their own LEX is hard to modify: reset_lex() and its correspoding restore_lex() reside in different grammar rules or different LEX methods.
In order to simplify this (and later join sql_yacc.yy and sql_yacc_ora.yy easier), let's add a class representing an expression (Item) pointer and its LEX (that was used to parse this expression).
Additionally, let's
Move a few methods from LEX to sp_expr_lex
Add a new sp_expr_lex method sp_repeat_loop_finalize()
Add a new sp_expr_lex method sp_if_expr()
The tentative class structure is:
class sp_expr_lex: public sp_lex_local
{
Item *m_item; // The expression
public :
sp_expr_lex(THD *thd, LEX *oldlex)
:sp_lex_local(thd, oldlex),
m_item(NULL)
{ }
void set_item(Item *item)
{
m_item= item;
}
Item *get_item() const
{
return m_item;
}
// The following methods are to be moved from LEX
bool sp_continue_when_statement(THD *thd);
bool sp_continue_when_statement(THD *thd, const LEX_CSTRING *label_name);
int case_stmt_action_expr();
int case_stmt_action_when( bool simple);
bool sp_while_loop_expression(THD *thd)
{
return LEX::sp_while_loop_expression(thd, get_item());
}
// The following methods are new, to simpify the code in *.yy:
bool sp_repeat_loop_finalize(THD *thd);
bool sp_if_expr(THD *thd);
};
The new rule that creates sp_expr_lex (i.e. LEX+Item) will look like this:
expr_lex:
{
DBUG_ASSERT(Lex->sphead);
if (unlikely(!($<expr_lex>$= new (thd->mem_root)
sp_expr_lex(thd, thd->lex))))
MYSQL_YYABORT;
Lex->sphead->reset_lex(thd, $<expr_lex>$);
}
expr
{
$$= $<expr_lex>1;
$$->sp_lex_in_use= true ;
$$->set_item($2);
if ($$->sphead->restore_lex(thd))
MYSQL_YYABORT;
}
;
After these changes, it will be much easier to move grammar rules, because reset_lex() and its corresponding restore_lex() will reside inside the same rule expr_lex . A lot of restore_lex() calls will be gone.
blocks
MDEV-12518
Unify sql_yacc.yy and sql_yacc_ora.yy
Closed
{"report":{"fcp":987.6000000089407,"ttfb":338,"pageVisibility":"visible","entityId":80481,"key":"jira.project.issue.view-issue","isInitial":true,"threshold":1000,"elementTimings":{},"userDeviceMemory":8,"userDeviceProcessors":64,"apdex":0.5,"journeyId":"89aeca94-f88b-4f30-84ec-da4cc3c43bef","navigationType":0,"readyForUser":1064,"redirectCount":0,"resourceLoadedEnd":1321.7000000029802,"resourceLoadedStart":346.70000000298023,"resourceTiming":[{"duration":135.5,"initiatorType":"link","name":"https://jira.mariadb.org/s/2c21342762a6a02add1c328bed317ffd-CDN/lu2bv2/820016/12ta74/0a8bac35585be7fc6c9cc5a0464cd4cf/_/download/contextbatch/css/_super/batch.css","startTime":346.70000000298023,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":346.70000000298023,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":482.20000000298023,"responseStart":0,"secureConnectionStart":0},{"duration":135.59999999403954,"initiatorType":"link","name":"https://jira.mariadb.org/s/7ebd35e77e471bc30ff0eba799ebc151-CDN/lu2bv2/820016/12ta74/2380add21a9a1006587582385952de73/_/download/contextbatch/css/jira.browse.project,project.issue.navigator,jira.view.issue,jira.general,jira.global,atl.general,-_super/batch.css?agile_global_admin_condition=true&jag=true&jira.create.linked.issue=true&slack-enabled=true","startTime":346.90000000596046,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":346.90000000596046,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":482.5,"responseStart":0,"secureConnectionStart":0},{"duration":179.3999999910593,"initiatorType":"script","name":"https://jira.mariadb.org/s/e9b27a47da5fb0f74a35acd57e9847fb-CDN/lu2bv2/820016/12ta74/0a8bac35585be7fc6c9cc5a0464cd4cf/_/download/contextbatch/js/_super/batch.js?locale=en","startTime":347.1000000089407,"connectEnd":347.1000000089407,"connectStart":347.1000000089407,"domainLookupEnd":347.1000000089407,"domainLookupStart":347.1000000089407,"fetchStart":347.1000000089407,"redirectEnd":0,"redirectStart":0,"requestStart":347.1000000089407,"responseEnd":526.5,"responseStart":526.5,"secureConnectionStart":347.1000000089407},{"duration":233.1000000089407,"initiatorType":"script","name":"https://jira.mariadb.org/s/c32eb0da7ad9831253f8397e6cc26afd-CDN/lu2bv2/820016/12ta74/2380add21a9a1006587582385952de73/_/download/contextbatch/js/jira.browse.project,project.issue.navigator,jira.view.issue,jira.general,jira.global,atl.general,-_super/batch.js?agile_global_admin_condition=true&jag=true&jira.create.linked.issue=true&locale=en&slack-enabled=true","startTime":347.29999999701977,"connectEnd":347.29999999701977,"connectStart":347.29999999701977,"domainLookupEnd":347.29999999701977,"domainLookupStart":347.29999999701977,"fetchStart":347.29999999701977,"redirectEnd":0,"redirectStart":0,"requestStart":347.29999999701977,"responseEnd":580.4000000059605,"responseStart":580.4000000059605,"secureConnectionStart":347.29999999701977},{"duration":236.59999999403954,"initiatorType":"script","name":"https://jira.mariadb.org/s/bc0bcb146314416123c992714ee00ff7-CDN/lu2bv2/820016/12ta74/c92c0caa9a024ae85b0ebdbed7fb4bd7/_/download/contextbatch/js/atl.global,-_super/batch.js?locale=en","startTime":347.6000000089407,"connectEnd":347.6000000089407,"connectStart":347.6000000089407,"domainLookupEnd":347.6000000089407,"domainLookupStart":347.6000000089407,"fetchStart":347.6000000089407,"redirectEnd":0,"redirectStart":0,"requestStart":347.6000000089407,"responseEnd":584.2000000029802,"responseStart":584.2000000029802,"secureConnectionStart":347.6000000089407},{"duration":237.29999999701977,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bv2/820016/12ta74/1.0/_/download/batch/jira.webresources:calendar-en/jira.webresources:calendar-en.js","startTime":347.70000000298023,"connectEnd":347.70000000298023,"connectStart":347.70000000298023,"domainLookupEnd":347.70000000298023,"domainLookupStart":347.70000000298023,"fetchStart":347.70000000298023,"redirectEnd":0,"redirectStart":0,"requestStart":347.70000000298023,"responseEnd":585,"responseStart":585,"secureConnectionStart":347.70000000298023},{"duration":238,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bv2/820016/12ta74/1.0/_/download/batch/jira.webresources:calendar-localisation-moment/jira.webresources:calendar-localisation-moment.js","startTime":347.79999999701977,"connectEnd":347.79999999701977,"connectStart":347.79999999701977,"domainLookupEnd":347.79999999701977,"domainLookupStart":347.79999999701977,"fetchStart":347.79999999701977,"redirectEnd":0,"redirectStart":0,"requestStart":347.79999999701977,"responseEnd":585.7999999970198,"responseStart":585.7999999970198,"secureConnectionStart":347.79999999701977},{"duration":317.90000000596046,"initiatorType":"link","name":"https://jira.mariadb.org/s/b04b06a02d1959df322d9cded3aeecc1-CDN/lu2bv2/820016/12ta74/a2ff6aa845ffc9a1d22fe23d9ee791fc/_/download/contextbatch/css/jira.global.look-and-feel,-_super/batch.css","startTime":348,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":348,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":665.9000000059605,"responseStart":0,"secureConnectionStart":0},{"duration":238.59999999403954,"initiatorType":"script","name":"https://jira.mariadb.org/rest/api/1.0/shortcuts/820016/47140b6e0a9bc2e4913da06536125810/shortcuts.js?context=issuenavigation&context=issueaction","startTime":348.1000000089407,"connectEnd":348.1000000089407,"connectStart":348.1000000089407,"domainLookupEnd":348.1000000089407,"domainLookupStart":348.1000000089407,"fetchStart":348.1000000089407,"redirectEnd":0,"redirectStart":0,"requestStart":348.1000000089407,"responseEnd":586.7000000029802,"responseStart":586.7000000029802,"secureConnectionStart":348.1000000089407},{"duration":317.59999999403954,"initiatorType":"link","name":"https://jira.mariadb.org/s/3ac36323ba5e4eb0af2aa7ac7211b4bb-CDN/lu2bv2/820016/12ta74/d176f0986478cc64f24226b3d20c140d/_/download/contextbatch/css/com.atlassian.jira.projects.sidebar.init,-_super,-project.issue.navigator,-jira.view.issue/batch.css?jira.create.linked.issue=true","startTime":348.40000000596046,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":348.40000000596046,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":666,"responseStart":0,"secureConnectionStart":0},{"duration":239.40000000596046,"initiatorType":"script","name":"https://jira.mariadb.org/s/719848dd97ebe0663199f49a3936487a-CDN/lu2bv2/820016/12ta74/d176f0986478cc64f24226b3d20c140d/_/download/contextbatch/js/com.atlassian.jira.projects.sidebar.init,-_super,-project.issue.navigator,-jira.view.issue/batch.js?jira.create.linked.issue=true&locale=en","startTime":348.5,"connectEnd":348.5,"connectStart":348.5,"domainLookupEnd":348.5,"domainLookupStart":348.5,"fetchStart":348.5,"redirectEnd":0,"redirectStart":0,"requestStart":348.5,"responseEnd":587.9000000059605,"responseStart":587.9000000059605,"secureConnectionStart":348.5},{"duration":448.70000000298023,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bv2/820016/12ta74/1.0/_/download/batch/jira.webresources:bigpipe-js/jira.webresources:bigpipe-js.js","startTime":349.40000000596046,"connectEnd":349.40000000596046,"connectStart":349.40000000596046,"domainLookupEnd":349.40000000596046,"domainLookupStart":349.40000000596046,"fetchStart":349.40000000596046,"redirectEnd":0,"redirectStart":0,"requestStart":349.40000000596046,"responseEnd":798.1000000089407,"responseStart":798.1000000089407,"secureConnectionStart":349.40000000596046},{"duration":968.6000000089407,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bv2/820016/12ta74/1.0/_/download/batch/jira.webresources:bigpipe-init/jira.webresources:bigpipe-init.js","startTime":349.5,"connectEnd":349.5,"connectStart":349.5,"domainLookupEnd":349.5,"domainLookupStart":349.5,"fetchStart":349.5,"redirectEnd":0,"redirectStart":0,"requestStart":349.5,"responseEnd":1318.1000000089407,"responseStart":1318.1000000089407,"secureConnectionStart":349.5},{"duration":124.6000000089407,"initiatorType":"xmlhttprequest","name":"https://jira.mariadb.org/rest/webResources/1.0/resources","startTime":677.5,"connectEnd":677.5,"connectStart":677.5,"domainLookupEnd":677.5,"domainLookupStart":677.5,"fetchStart":677.5,"redirectEnd":0,"redirectStart":0,"requestStart":677.5,"responseEnd":802.1000000089407,"responseStart":802.1000000089407,"secureConnectionStart":677.5},{"duration":374.5,"initiatorType":"link","name":"https://jira.mariadb.org/s/d5715adaadd168a9002b108b2b039b50-CDN/lu2bv2/820016/12ta74/be4b45e9cec53099498fa61c8b7acba4/_/download/contextbatch/css/jira.project.sidebar,-_super,-project.issue.navigator,-jira.general,-jira.browse.project,-jira.view.issue,-jira.global,-atl.general,-com.atlassian.jira.projects.sidebar.init/batch.css?agile_global_admin_condition=true&jag=true&jira.create.linked.issue=true&slack-enabled=true","startTime":944.7999999970198,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":944.7999999970198,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":1319.2999999970198,"responseStart":0,"secureConnectionStart":0},{"duration":373.79999999701977,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bv2/820016/12ta74/e65b778d185daf5aee24936755b43da6/_/download/contextbatch/js/browser-metrics-plugin.contrib,-_super,-project.issue.navigator,-jira.view.issue,-atl.general/batch.js?agile_global_admin_condition=true&jag=true&jira.create.linked.issue=true&slack-enabled=true","startTime":945.7000000029802,"connectEnd":945.7000000029802,"connectStart":945.7000000029802,"domainLookupEnd":945.7000000029802,"domainLookupStart":945.7000000029802,"fetchStart":945.7000000029802,"redirectEnd":0,"redirectStart":0,"requestStart":945.7000000029802,"responseEnd":1319.5,"responseStart":1319.5,"secureConnectionStart":945.7000000029802},{"duration":375.59999999403954,"initiatorType":"script","name":"https://jira.mariadb.org/s/53a43b6764f587426c7bb9a150184c00-CDN/lu2bv2/820016/12ta74/be4b45e9cec53099498fa61c8b7acba4/_/download/contextbatch/js/jira.project.sidebar,-_super,-project.issue.navigator,-jira.general,-jira.browse.project,-jira.view.issue,-jira.global,-atl.general,-com.atlassian.jira.projects.sidebar.init/batch.js?agile_global_admin_condition=true&jag=true&jira.create.linked.issue=true&locale=en&slack-enabled=true","startTime":946.1000000089407,"connectEnd":946.1000000089407,"connectStart":946.1000000089407,"domainLookupEnd":946.1000000089407,"domainLookupStart":946.1000000089407,"fetchStart":946.1000000089407,"redirectEnd":0,"redirectStart":0,"requestStart":946.1000000089407,"responseEnd":1321.7000000029802,"responseStart":1321.7000000029802,"secureConnectionStart":946.1000000089407}],"fetchStart":0,"domainLookupStart":0,"domainLookupEnd":0,"connectStart":0,"connectEnd":0,"requestStart":174,"responseStart":338,"responseEnd":342,"domLoading":344,"domInteractive":1342,"domContentLoadedEventStart":1342,"domContentLoadedEventEnd":1382,"domComplete":2107,"loadEventStart":2108,"loadEventEnd":2109,"userAgent":"Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; ClaudeBot/1.0; +claudebot@anthropic.com)","marks":[{"name":"bigPipe.sidebar-id.start","time":1325.1000000089407},{"name":"bigPipe.sidebar-id.end","time":1325.9000000059605},{"name":"bigPipe.activity-panel-pipe-id.start","time":1326.1000000089407},{"name":"bigPipe.activity-panel-pipe-id.end","time":1328.4000000059605},{"name":"activityTabFullyLoaded","time":1391.9000000059605}],"measures":[],"correlationId":"3ff8fe296e57b6","effectiveType":"4g","downlink":10,"rtt":0,"serverDuration":102,"dbReadsTimeInMs":12,"dbConnsTimeInMs":21,"applicationHash":"9d11dbea5f4be3d4cc21f03a88dd11d8c8687422","experiments":[]}}