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
Transition
Time In Source Status
Execution Times
Open
Closed
1d 15m
1
{"report":{"fcp":915.5,"ttfb":237.70000004768372,"pageVisibility":"visible","entityId":80481,"key":"jira.project.issue.view-issue","isInitial":true,"threshold":1000,"elementTimings":{},"userDeviceMemory":8,"userDeviceProcessors":64,"apdex":0.5,"journeyId":"1e9da545-408b-4e9b-9d81-d9f36a0fe5b2","navigationType":0,"readyForUser":1000.9000000953674,"redirectCount":0,"resourceLoadedEnd":869.1000001430511,"resourceLoadedStart":243.10000014305115,"resourceTiming":[{"duration":193,"initiatorType":"link","name":"https://jira.mariadb.org/s/2c21342762a6a02add1c328bed317ffd-CDN/lu2cib/820016/12ta74/0a8bac35585be7fc6c9cc5a0464cd4cf/_/download/contextbatch/css/_super/batch.css","startTime":243.10000014305115,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":243.10000014305115,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":436.10000014305115,"responseStart":0,"secureConnectionStart":0},{"duration":193.19999980926514,"initiatorType":"link","name":"https://jira.mariadb.org/s/7ebd35e77e471bc30ff0eba799ebc151-CDN/lu2cib/820016/12ta74/2bf333562ca6724060a9d5f1535471f6/_/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":243.30000019073486,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":243.30000019073486,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":436.5,"responseStart":0,"secureConnectionStart":0},{"duration":201.90000009536743,"initiatorType":"script","name":"https://jira.mariadb.org/s/0917945aaa57108d00c5076fea35e069-CDN/lu2cib/820016/12ta74/0a8bac35585be7fc6c9cc5a0464cd4cf/_/download/contextbatch/js/_super/batch.js?locale=en","startTime":243.5,"connectEnd":243.5,"connectStart":243.5,"domainLookupEnd":243.5,"domainLookupStart":243.5,"fetchStart":243.5,"redirectEnd":0,"redirectStart":0,"requestStart":243.5,"responseEnd":445.40000009536743,"responseStart":445.40000009536743,"secureConnectionStart":243.5},{"duration":237.70000004768372,"initiatorType":"script","name":"https://jira.mariadb.org/s/2d8175ec2fa4c816e8023260bd8c1786-CDN/lu2cib/820016/12ta74/2bf333562ca6724060a9d5f1535471f6/_/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":243.70000004768372,"connectEnd":243.70000004768372,"connectStart":243.70000004768372,"domainLookupEnd":243.70000004768372,"domainLookupStart":243.70000004768372,"fetchStart":243.70000004768372,"redirectEnd":0,"redirectStart":0,"requestStart":243.70000004768372,"responseEnd":481.40000009536743,"responseStart":481.40000009536743,"secureConnectionStart":243.70000004768372},{"duration":241.5,"initiatorType":"script","name":"https://jira.mariadb.org/s/a9324d6758d385eb45c462685ad88f1d-CDN/lu2cib/820016/12ta74/c92c0caa9a024ae85b0ebdbed7fb4bd7/_/download/contextbatch/js/atl.global,-_super/batch.js?locale=en","startTime":243.90000009536743,"connectEnd":243.90000009536743,"connectStart":243.90000009536743,"domainLookupEnd":243.90000009536743,"domainLookupStart":243.90000009536743,"fetchStart":243.90000009536743,"redirectEnd":0,"redirectStart":0,"requestStart":243.90000009536743,"responseEnd":485.40000009536743,"responseStart":485.40000009536743,"secureConnectionStart":243.90000009536743},{"duration":241.90000009536743,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2cib/820016/12ta74/1.0/_/download/batch/jira.webresources:calendar-en/jira.webresources:calendar-en.js","startTime":244.20000004768372,"connectEnd":244.20000004768372,"connectStart":244.20000004768372,"domainLookupEnd":244.20000004768372,"domainLookupStart":244.20000004768372,"fetchStart":244.20000004768372,"redirectEnd":0,"redirectStart":0,"requestStart":244.20000004768372,"responseEnd":486.10000014305115,"responseStart":486.10000014305115,"secureConnectionStart":244.20000004768372},{"duration":242.09999990463257,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2cib/820016/12ta74/1.0/_/download/batch/jira.webresources:calendar-localisation-moment/jira.webresources:calendar-localisation-moment.js","startTime":244.30000019073486,"connectEnd":244.30000019073486,"connectStart":244.30000019073486,"domainLookupEnd":244.30000019073486,"domainLookupStart":244.30000019073486,"fetchStart":244.30000019073486,"redirectEnd":0,"redirectStart":0,"requestStart":244.30000019073486,"responseEnd":486.40000009536743,"responseStart":486.40000009536743,"secureConnectionStart":244.30000019073486},{"duration":345.30000019073486,"initiatorType":"link","name":"https://jira.mariadb.org/s/b04b06a02d1959df322d9cded3aeecc1-CDN/lu2cib/820016/12ta74/a2ff6aa845ffc9a1d22fe23d9ee791fc/_/download/contextbatch/css/jira.global.look-and-feel,-_super/batch.css","startTime":244.5,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":244.5,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":589.8000001907349,"responseStart":0,"secureConnectionStart":0},{"duration":242.10000014305115,"initiatorType":"script","name":"https://jira.mariadb.org/rest/api/1.0/shortcuts/820016/47140b6e0a9bc2e4913da06536125810/shortcuts.js?context=issuenavigation&context=issueaction","startTime":244.70000004768372,"connectEnd":244.70000004768372,"connectStart":244.70000004768372,"domainLookupEnd":244.70000004768372,"domainLookupStart":244.70000004768372,"fetchStart":244.70000004768372,"redirectEnd":0,"redirectStart":0,"requestStart":244.70000004768372,"responseEnd":486.80000019073486,"responseStart":486.80000019073486,"secureConnectionStart":244.70000004768372},{"duration":345.09999990463257,"initiatorType":"link","name":"https://jira.mariadb.org/s/3ac36323ba5e4eb0af2aa7ac7211b4bb-CDN/lu2cib/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":244.90000009536743,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":244.90000009536743,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":590,"responseStart":0,"secureConnectionStart":0},{"duration":242.29999995231628,"initiatorType":"script","name":"https://jira.mariadb.org/s/5d5e8fe91fbc506585e83ea3b62ccc4b-CDN/lu2cib/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":245.10000014305115,"connectEnd":245.10000014305115,"connectStart":245.10000014305115,"domainLookupEnd":245.10000014305115,"domainLookupStart":245.10000014305115,"fetchStart":245.10000014305115,"redirectEnd":0,"redirectStart":0,"requestStart":245.10000014305115,"responseEnd":487.40000009536743,"responseStart":487.40000009536743,"secureConnectionStart":245.10000014305115},{"duration":406.7999999523163,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2cib/820016/12ta74/1.0/_/download/batch/jira.webresources:bigpipe-js/jira.webresources:bigpipe-js.js","startTime":245.90000009536743,"connectEnd":245.90000009536743,"connectStart":245.90000009536743,"domainLookupEnd":245.90000009536743,"domainLookupStart":245.90000009536743,"fetchStart":245.90000009536743,"redirectEnd":0,"redirectStart":0,"requestStart":245.90000009536743,"responseEnd":652.7000000476837,"responseStart":652.7000000476837,"secureConnectionStart":245.90000009536743},{"duration":464.7000000476837,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2cib/820016/12ta74/1.0/_/download/batch/jira.webresources:bigpipe-init/jira.webresources:bigpipe-init.js","startTime":246,"connectEnd":246,"connectStart":246,"domainLookupEnd":246,"domainLookupStart":246,"fetchStart":246,"redirectEnd":0,"redirectStart":0,"requestStart":246,"responseEnd":710.7000000476837,"responseStart":710.7000000476837,"secureConnectionStart":246},{"duration":55,"initiatorType":"xmlhttprequest","name":"https://jira.mariadb.org/rest/webResources/1.0/resources","startTime":601.9000000953674,"connectEnd":601.9000000953674,"connectStart":601.9000000953674,"domainLookupEnd":601.9000000953674,"domainLookupStart":601.9000000953674,"fetchStart":601.9000000953674,"redirectEnd":0,"redirectStart":0,"requestStart":601.9000000953674,"responseEnd":656.9000000953674,"responseStart":656.9000000953674,"secureConnectionStart":601.9000000953674},{"duration":205.20000004768372,"initiatorType":"link","name":"https://jira.mariadb.org/s/d5715adaadd168a9002b108b2b039b50-CDN/lu2cib/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":663.9000000953674,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":663.9000000953674,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":869.1000001430511,"responseStart":0,"secureConnectionStart":0},{"duration":442.40000009536743,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2cib/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":664.7000000476837,"connectEnd":664.7000000476837,"connectStart":664.7000000476837,"domainLookupEnd":664.7000000476837,"domainLookupStart":664.7000000476837,"fetchStart":664.7000000476837,"redirectEnd":0,"redirectStart":0,"requestStart":664.7000000476837,"responseEnd":1107.1000001430511,"responseStart":1107.1000001430511,"secureConnectionStart":664.7000000476837},{"duration":447,"initiatorType":"script","name":"https://jira.mariadb.org/s/097ae97cb8fbec7d6ea4bbb1f26955b9-CDN/lu2cib/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":665.2000000476837,"connectEnd":665.2000000476837,"connectStart":665.2000000476837,"domainLookupEnd":665.2000000476837,"domainLookupStart":665.2000000476837,"fetchStart":665.2000000476837,"redirectEnd":0,"redirectStart":0,"requestStart":665.2000000476837,"responseEnd":1112.2000000476837,"responseStart":1112.2000000476837,"secureConnectionStart":665.2000000476837}],"fetchStart":0,"domainLookupStart":0,"domainLookupEnd":0,"connectStart":0,"connectEnd":0,"requestStart":73,"responseStart":237,"responseEnd":240,"domLoading":240,"domInteractive":1096,"domContentLoadedEventStart":1096,"domContentLoadedEventEnd":1146,"domComplete":1489,"loadEventStart":1489,"loadEventEnd":1489,"userAgent":"Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; ClaudeBot/1.0; +claudebot@anthropic.com)","marks":[{"name":"bigPipe.sidebar-id.start","time":1077.6000001430511},{"name":"bigPipe.sidebar-id.end","time":1078.4000000953674},{"name":"bigPipe.activity-panel-pipe-id.start","time":1078.5},{"name":"bigPipe.activity-panel-pipe-id.end","time":1079.3000001907349},{"name":"activityTabFullyLoaded","time":1165.8000001907349}],"measures":[],"correlationId":"cbe22faab08cb1","effectiveType":"4g","downlink":10,"rtt":0,"serverDuration":99,"dbReadsTimeInMs":13,"dbConnsTimeInMs":20,"applicationHash":"9d11dbea5f4be3d4cc21f03a88dd11d8c8687422","experiments":[]}}