-
Task
-
-
Major
-
Resolution:
Fixed
-
-
-
There is a duplicate code in sql_yacc.yy and sql_yacc_ora.yy related to ROW variable defintion:
row_field_name:
|
ident // or ident_directly_assignable
|
{
|
if (unlikely(check_string_char_length(&$1, 0, NAME_CHAR_LEN,
|
system_charset_info, 1)))
|
my_yyabort_error((ER_TOO_LONG_IDENT, MYF(0), $1.str));
|
if (unlikely(!($$= new (thd->mem_root) Spvar_definition())))
|
MYSQL_YYABORT;
|
Lex->init_last_field($$, &$1, thd->variables.collation_database);
|
}
|
;
|
|
row_field_definition_list:
|
row_field_definition
|
{
|
if (unlikely(!($$= new (thd->mem_root) Row_definition_list())) ||
|
unlikely($$->push_back($1, thd->mem_root)))
|
MYSQL_YYABORT;
|
}
|
| row_field_definition_list ',' row_field_definition
|
{
|
uint unused;
|
if (unlikely($1->find_row_field_by_name(&$3->field_name, &unused)))
|
my_yyabort_error((ER_DUP_FIELDNAME, MYF(0), $3->field_name.str));
|
$$= $1;
|
if (unlikely($$->push_back($3, thd->mem_root)))
|
MYSQL_YYABORT;
|
}
|
;
|
There is a difference though:
- in sql_yacc.yy row_field_name is defined as ident
- in sql_yacc_ora.yy row_field_name is defined as ident_directly_assignable
In order to join the two *.yy files easier, let's move the C++ code into new Row_definition_list methods and simplify the grammar as follows:
row_field_name:
|
ident // or ident_directly_assignable
|
{
|
if (!($$= Lex->row_field_name(thd, $1)))
|
MYSQL_YYABORT;
|
}
|
;
|
|
row_field_definition_list:
|
row_field_definition
|
{
|
if (!($$= Row_definition_list::make(thd->mem_root, $1)))
|
MYSQL_YYABORT;
|
}
|
| row_field_definition_list ',' row_field_definition
|
{
|
if (($$= $1)->append_uniq(thd->mem_root, $3))
|
MYSQL_YYABORT;
|
}
|
;
|
- blocks
-
MDEV-12518
Unify sql_yacc.yy and sql_yacc_ora.yy
-
-
Closed
There are no comments yet on this issue.
{"report":{"fcp":1961,"ttfb":1137.9000005722046,"pageVisibility":"visible","entityId":76138,"key":"jira.project.issue.view-issue","isInitial":true,"threshold":1000,"elementTimings":{},"userDeviceMemory":8,"userDeviceProcessors":64,"apdex":0.5,"journeyId":"4177218a-a2fb-47c4-855a-ec3c20f41f69","navigationType":0,"readyForUser":2070.699999809265,"redirectCount":0,"resourceLoadedEnd":1851.3000001907349,"resourceLoadedStart":1146.6999998092651,"resourceTiming":[{"duration":233.10000038146973,"initiatorType":"link","name":"https://jira.mariadb.org/s/2c21342762a6a02add1c328bed317ffd-CDN/lu2bv2/820016/12ta74/0a8bac35585be7fc6c9cc5a0464cd4cf/_/download/contextbatch/css/_super/batch.css","startTime":1146.6999998092651,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":1146.6999998092651,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":1379.8000001907349,"responseStart":0,"secureConnectionStart":0},{"duration":233.10000038146973,"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":1147,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":1147,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":1380.1000003814697,"responseStart":0,"secureConnectionStart":0},{"duration":400.3999996185303,"initiatorType":"script","name":"https://jira.mariadb.org/s/e9b27a47da5fb0f74a35acd57e9847fb-CDN/lu2bv2/820016/12ta74/0a8bac35585be7fc6c9cc5a0464cd4cf/_/download/contextbatch/js/_super/batch.js?locale=en","startTime":1147.3000001907349,"connectEnd":1383.3000001907349,"connectStart":1383.3000001907349,"domainLookupEnd":1383.3000001907349,"domainLookupStart":1383.3000001907349,"fetchStart":1147.3000001907349,"redirectEnd":0,"redirectStart":0,"requestStart":1385,"responseEnd":1547.6999998092651,"responseStart":1397.9000005722046,"secureConnectionStart":1383.3000001907349},{"duration":538,"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":1147.9000005722046,"connectEnd":1147.9000005722046,"connectStart":1147.9000005722046,"domainLookupEnd":1147.9000005722046,"domainLookupStart":1147.9000005722046,"fetchStart":1147.9000005722046,"redirectEnd":0,"redirectStart":0,"requestStart":1385.6999998092651,"responseEnd":1685.9000005722046,"responseStart":1401.1000003814697,"secureConnectionStart":1147.9000005722046},{"duration":270.0999994277954,"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":1148.1000003814697,"connectEnd":1148.1000003814697,"connectStart":1148.1000003814697,"domainLookupEnd":1148.1000003814697,"domainLookupStart":1148.1000003814697,"fetchStart":1148.1000003814697,"redirectEnd":0,"redirectStart":0,"requestStart":1392.3000001907349,"responseEnd":1418.1999998092651,"responseStart":1415.4000005722046,"secureConnectionStart":1148.1000003814697},{"duration":271.30000019073486,"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":1148.3000001907349,"connectEnd":1148.3000001907349,"connectStart":1148.3000001907349,"domainLookupEnd":1148.3000001907349,"domainLookupStart":1148.3000001907349,"fetchStart":1148.3000001907349,"redirectEnd":0,"redirectStart":0,"requestStart":1392.6000003814697,"responseEnd":1419.6000003814697,"responseStart":1417.1000003814697,"secureConnectionStart":1148.3000001907349},{"duration":271,"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":1148.5,"connectEnd":1148.5,"connectStart":1148.5,"domainLookupEnd":1148.5,"domainLookupStart":1148.5,"fetchStart":1148.5,"redirectEnd":0,"redirectStart":0,"requestStart":1392.8000001907349,"responseEnd":1419.5,"responseStart":1416.5,"secureConnectionStart":1148.5},{"duration":242.80000019073486,"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":1148.6000003814697,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":1148.6000003814697,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":1391.4000005722046,"responseStart":0,"secureConnectionStart":0},{"duration":294.30000019073486,"initiatorType":"script","name":"https://jira.mariadb.org/rest/api/1.0/shortcuts/820016/47140b6e0a9bc2e4913da06536125810/shortcuts.js?context=issuenavigation&context=issueaction","startTime":1148.6999998092651,"connectEnd":1148.6999998092651,"connectStart":1148.6999998092651,"domainLookupEnd":1148.6999998092651,"domainLookupStart":1148.6999998092651,"fetchStart":1148.6999998092651,"redirectEnd":0,"redirectStart":0,"requestStart":1393.6000003814697,"responseEnd":1443,"responseStart":1441,"secureConnectionStart":1148.6999998092651},{"duration":243.39999961853027,"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":1148.9000005722046,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":1148.9000005722046,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":1392.3000001907349,"responseStart":0,"secureConnectionStart":0},{"duration":271.80000019073486,"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":1149.1000003814697,"connectEnd":1149.1000003814697,"connectStart":1149.1000003814697,"domainLookupEnd":1149.1000003814697,"domainLookupStart":1149.1000003814697,"fetchStart":1149.1000003814697,"redirectEnd":0,"redirectStart":0,"requestStart":1393.6999998092651,"responseEnd":1420.9000005722046,"responseStart":1418.5,"secureConnectionStart":1149.1000003814697},{"duration":528.3999996185303,"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":1151.3000001907349,"connectEnd":1151.3000001907349,"connectStart":1151.3000001907349,"domainLookupEnd":1151.3000001907349,"domainLookupStart":1151.3000001907349,"fetchStart":1151.3000001907349,"redirectEnd":0,"redirectStart":0,"requestStart":1599.8000001907349,"responseEnd":1679.6999998092651,"responseStart":1678.1999998092651,"secureConnectionStart":1151.3000001907349},{"duration":699.8999996185303,"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":1151.4000005722046,"connectEnd":1151.4000005722046,"connectStart":1151.4000005722046,"domainLookupEnd":1151.4000005722046,"domainLookupStart":1151.4000005722046,"fetchStart":1151.4000005722046,"redirectEnd":0,"redirectStart":0,"requestStart":1835.9000005722046,"responseEnd":1851.3000001907349,"responseStart":1850.6000003814697,"secureConnectionStart":1151.4000005722046},{"duration":183.29999923706055,"initiatorType":"xmlhttprequest","name":"https://jira.mariadb.org/rest/webResources/1.0/resources","startTime":1693.9000005722046,"connectEnd":1693.9000005722046,"connectStart":1693.9000005722046,"domainLookupEnd":1693.9000005722046,"domainLookupStart":1693.9000005722046,"fetchStart":1693.9000005722046,"redirectEnd":0,"redirectStart":0,"requestStart":1843.1999998092651,"responseEnd":1877.1999998092651,"responseStart":1876.4000005722046,"secureConnectionStart":1693.9000005722046},{"duration":157,"initiatorType":"xmlhttprequest","name":"https://jira.mariadb.org/rest/webResources/1.0/resources","startTime":1908.4000005722046,"connectEnd":1908.4000005722046,"connectStart":1908.4000005722046,"domainLookupEnd":1908.4000005722046,"domainLookupStart":1908.4000005722046,"fetchStart":1908.4000005722046,"redirectEnd":0,"redirectStart":0,"requestStart":2033.3000001907349,"responseEnd":2065.4000005722046,"responseStart":2064.6000003814697,"secureConnectionStart":1908.4000005722046},{"duration":212.89999961853027,"initiatorType":"script","name":"https://www.google-analytics.com/analytics.js","startTime":1954.3000001907349,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":1954.3000001907349,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":2167.199999809265,"responseStart":0,"secureConnectionStart":0}],"fetchStart":0,"domainLookupStart":0,"domainLookupEnd":0,"connectStart":0,"connectEnd":0,"requestStart":925,"responseStart":1138,"responseEnd":1149,"domLoading":1141,"domInteractive":2173,"domContentLoadedEventStart":2173,"domContentLoadedEventEnd":2228,"domComplete":2638,"loadEventStart":2638,"loadEventEnd":2639,"userAgent":"Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; ClaudeBot/1.0; +claudebot@anthropic.com)","marks":[{"name":"bigPipe.sidebar-id.start","time":2156.199999809265},{"name":"bigPipe.sidebar-id.end","time":2157},{"name":"bigPipe.activity-panel-pipe-id.start","time":2157.1000003814697},{"name":"bigPipe.activity-panel-pipe-id.end","time":2157.6000003814697},{"name":"activityTabFullyLoaded","time":2236.1000003814697}],"measures":[],"correlationId":"563449cef38ec1","effectiveType":"4g","downlink":10,"rtt":0,"serverDuration":137,"dbReadsTimeInMs":11,"dbConnsTimeInMs":19,"applicationHash":"9d11dbea5f4be3d4cc21f03a88dd11d8c8687422","experiments":[]}}