We'll move the members "LEX_CSTRING user" and "LEX_CSTRING host" and associated methods from LEX_USER to a separate structure:
struct AUTHID
|
{
|
LEX_CSTRING user, host;
|
void init() { memset(this, 0, sizeof(*this)); }
|
void copy(MEM_ROOT *root, const LEX_CSTRING *usr, const LEX_CSTRING *host);
|
bool is_role() const { return user.str[0] && !host.str[0]; }
|
void set_lex_string(LEX_CSTRING *l, char *buf)
|
{
|
if (is_role())
|
*l= user;
|
else
|
{
|
l->str= buf;
|
l->length= strxmov(buf, user.str, "@", host.str, NullS) - buf;
|
}
|
}
|
};
|
and derive LEX_USER from it:
struct LEX_USER: public AUTHID
|
{
|
LEX_CSTRING plugin, auth;
|
LEX_CSTRING pwtext, pwhash;
|
void reset_auth()
|
{
|
pwtext.length= pwhash.length= plugin.length= auth.length= 0;
|
pwtext.str= pwhash.str= 0;
|
plugin.str= auth.str= "";
|
}
|
};
|
This will allow to declare (variables and members) and pass user and host as a single structure.
Deriving LEX_USER from the new structure AUTHID will minimize code changes.
{"report":{"fcp":662.7999999523163,"ttfb":160.40000009536743,"pageVisibility":"visible","entityId":62161,"key":"jira.project.issue.view-issue","isInitial":true,"threshold":1000,"elementTimings":{},"userDeviceMemory":8,"userDeviceProcessors":64,"apdex":1,"journeyId":"a44e11fb-91a8-4894-be0d-107320157bd8","navigationType":0,"readyForUser":739.9000000953674,"redirectCount":0,"resourceLoadedEnd":833.1000001430511,"resourceLoadedStart":165.90000009536743,"resourceTiming":[{"duration":7.299999952316284,"initiatorType":"link","name":"https://jira.mariadb.org/s/2c21342762a6a02add1c328bed317ffd-CDN/lu2bu7/820016/12ta74/0a8bac35585be7fc6c9cc5a0464cd4cf/_/download/contextbatch/css/_super/batch.css","startTime":165.90000009536743,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":165.90000009536743,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":173.20000004768372,"responseStart":0,"secureConnectionStart":0},{"duration":7.3999998569488525,"initiatorType":"link","name":"https://jira.mariadb.org/s/7ebd35e77e471bc30ff0eba799ebc151-CDN/lu2bu7/820016/12ta74/8679b4946efa1a0bb029a3a22206fb5d/_/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":166.10000014305115,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":166.10000014305115,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":173.5,"responseStart":0,"secureConnectionStart":0},{"duration":63.200000047683716,"initiatorType":"script","name":"https://jira.mariadb.org/s/fbf975c0cce4b1abf04784eeae9ba1f4-CDN/lu2bu7/820016/12ta74/0a8bac35585be7fc6c9cc5a0464cd4cf/_/download/contextbatch/js/_super/batch.js?locale=en","startTime":166.20000004768372,"connectEnd":166.20000004768372,"connectStart":166.20000004768372,"domainLookupEnd":166.20000004768372,"domainLookupStart":166.20000004768372,"fetchStart":166.20000004768372,"redirectEnd":0,"redirectStart":0,"requestStart":166.20000004768372,"responseEnd":229.40000009536743,"responseStart":229.40000009536743,"secureConnectionStart":166.20000004768372},{"duration":176.29999995231628,"initiatorType":"script","name":"https://jira.mariadb.org/s/099b33461394b8015fc36c0a4b96e19f-CDN/lu2bu7/820016/12ta74/8679b4946efa1a0bb029a3a22206fb5d/_/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":166.40000009536743,"connectEnd":166.40000009536743,"connectStart":166.40000009536743,"domainLookupEnd":166.40000009536743,"domainLookupStart":166.40000009536743,"fetchStart":166.40000009536743,"redirectEnd":0,"redirectStart":0,"requestStart":166.40000009536743,"responseEnd":342.7000000476837,"responseStart":342.7000000476837,"secureConnectionStart":166.40000009536743},{"duration":180.60000014305115,"initiatorType":"script","name":"https://jira.mariadb.org/s/94c15bff32baef80f4096a08aceae8bc-CDN/lu2bu7/820016/12ta74/c92c0caa9a024ae85b0ebdbed7fb4bd7/_/download/contextbatch/js/atl.global,-_super/batch.js?locale=en","startTime":166.5,"connectEnd":166.5,"connectStart":166.5,"domainLookupEnd":166.5,"domainLookupStart":166.5,"fetchStart":166.5,"redirectEnd":0,"redirectStart":0,"requestStart":166.5,"responseEnd":347.10000014305115,"responseStart":347.10000014305115,"secureConnectionStart":166.5},{"duration":181,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bu7/820016/12ta74/1.0/_/download/batch/jira.webresources:calendar-en/jira.webresources:calendar-en.js","startTime":166.60000014305115,"connectEnd":166.60000014305115,"connectStart":166.60000014305115,"domainLookupEnd":166.60000014305115,"domainLookupStart":166.60000014305115,"fetchStart":166.60000014305115,"redirectEnd":0,"redirectStart":0,"requestStart":166.60000014305115,"responseEnd":347.60000014305115,"responseStart":347.60000014305115,"secureConnectionStart":166.60000014305115},{"duration":181.29999995231628,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bu7/820016/12ta74/1.0/_/download/batch/jira.webresources:calendar-localisation-moment/jira.webresources:calendar-localisation-moment.js","startTime":166.70000004768372,"connectEnd":166.70000004768372,"connectStart":166.70000004768372,"domainLookupEnd":166.70000004768372,"domainLookupStart":166.70000004768372,"fetchStart":166.70000004768372,"redirectEnd":0,"redirectStart":0,"requestStart":166.70000004768372,"responseEnd":348,"responseStart":348,"secureConnectionStart":166.70000004768372},{"duration":181.70000004768372,"initiatorType":"link","name":"https://jira.mariadb.org/s/b04b06a02d1959df322d9cded3aeecc1-CDN/lu2bu7/820016/12ta74/a2ff6aa845ffc9a1d22fe23d9ee791fc/_/download/contextbatch/css/jira.global.look-and-feel,-_super/batch.css","startTime":166.90000009536743,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":166.90000009536743,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":348.60000014305115,"responseStart":0,"secureConnectionStart":0},{"duration":181.5,"initiatorType":"script","name":"https://jira.mariadb.org/rest/api/1.0/shortcuts/820016/47140b6e0a9bc2e4913da06536125810/shortcuts.js?context=issuenavigation&context=issueaction","startTime":167,"connectEnd":167,"connectStart":167,"domainLookupEnd":167,"domainLookupStart":167,"fetchStart":167,"redirectEnd":0,"redirectStart":0,"requestStart":167,"responseEnd":348.5,"responseStart":348.5,"secureConnectionStart":167},{"duration":181.89999985694885,"initiatorType":"link","name":"https://jira.mariadb.org/s/3ac36323ba5e4eb0af2aa7ac7211b4bb-CDN/lu2bu7/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":167.10000014305115,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":167.10000014305115,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":349,"responseStart":0,"secureConnectionStart":0},{"duration":181.90000009536743,"initiatorType":"script","name":"https://jira.mariadb.org/s/3339d87fa2538a859872f2df449bf8d0-CDN/lu2bu7/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":167.29999995231628,"connectEnd":167.29999995231628,"connectStart":167.29999995231628,"domainLookupEnd":167.29999995231628,"domainLookupStart":167.29999995231628,"fetchStart":167.29999995231628,"redirectEnd":0,"redirectStart":0,"requestStart":167.29999995231628,"responseEnd":349.2000000476837,"responseStart":349.2000000476837,"secureConnectionStart":167.29999995231628},{"duration":494.10000014305115,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bu7/820016/12ta74/1.0/_/download/batch/jira.webresources:bigpipe-js/jira.webresources:bigpipe-js.js","startTime":167.79999995231628,"connectEnd":167.79999995231628,"connectStart":167.79999995231628,"domainLookupEnd":167.79999995231628,"domainLookupStart":167.79999995231628,"fetchStart":167.79999995231628,"redirectEnd":0,"redirectStart":0,"requestStart":167.79999995231628,"responseEnd":661.9000000953674,"responseStart":661.9000000953674,"secureConnectionStart":167.79999995231628},{"duration":503.7999999523163,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bu7/820016/12ta74/1.0/_/download/batch/jira.webresources:bigpipe-init/jira.webresources:bigpipe-init.js","startTime":167.90000009536743,"connectEnd":167.90000009536743,"connectStart":167.90000009536743,"domainLookupEnd":167.90000009536743,"domainLookupStart":167.90000009536743,"fetchStart":167.90000009536743,"redirectEnd":0,"redirectStart":0,"requestStart":167.90000009536743,"responseEnd":671.7000000476837,"responseStart":671.7000000476837,"secureConnectionStart":167.90000009536743},{"duration":276.40000009536743,"initiatorType":"xmlhttprequest","name":"https://jira.mariadb.org/rest/webResources/1.0/resources","startTime":385.7999999523163,"connectEnd":385.7999999523163,"connectStart":385.7999999523163,"domainLookupEnd":385.7999999523163,"domainLookupStart":385.7999999523163,"fetchStart":385.7999999523163,"redirectEnd":0,"redirectStart":0,"requestStart":385.7999999523163,"responseEnd":662.2000000476837,"responseStart":662.2000000476837,"secureConnectionStart":385.7999999523163},{"duration":17.800000190734863,"initiatorType":"script","name":"https://www.google-analytics.com/analytics.js","startTime":655.7999999523163,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":655.7999999523163,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":673.6000001430511,"responseStart":0,"secureConnectionStart":0},{"duration":34.40000009536743,"initiatorType":"link","name":"https://jira.mariadb.org/s/d5715adaadd168a9002b108b2b039b50-CDN/lu2bu7/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":777.2999999523163,"connectEnd":0,"connectStart":0,"domainLookupEnd":0,"domainLookupStart":0,"fetchStart":777.2999999523163,"redirectEnd":0,"redirectStart":0,"requestStart":0,"responseEnd":811.7000000476837,"responseStart":0,"secureConnectionStart":0},{"duration":34,"initiatorType":"script","name":"https://jira.mariadb.org/s/d41d8cd98f00b204e9800998ecf8427e-CDN/lu2bu7/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":778.1000001430511,"connectEnd":778.1000001430511,"connectStart":778.1000001430511,"domainLookupEnd":778.1000001430511,"domainLookupStart":778.1000001430511,"fetchStart":778.1000001430511,"redirectEnd":0,"redirectStart":0,"requestStart":778.1000001430511,"responseEnd":812.1000001430511,"responseStart":812.1000001430511,"secureConnectionStart":778.1000001430511},{"duration":54.5,"initiatorType":"script","name":"https://jira.mariadb.org/s/f51ef5507eea4c158f257c66c93b2a3f-CDN/lu2bu7/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":778.6000001430511,"connectEnd":778.6000001430511,"connectStart":778.6000001430511,"domainLookupEnd":778.6000001430511,"domainLookupStart":778.6000001430511,"fetchStart":778.6000001430511,"redirectEnd":0,"redirectStart":0,"requestStart":778.6000001430511,"responseEnd":833.1000001430511,"responseStart":833.1000001430511,"secureConnectionStart":778.6000001430511}],"fetchStart":0,"domainLookupStart":0,"domainLookupEnd":0,"connectStart":0,"connectEnd":0,"requestStart":29,"responseStart":161,"responseEnd":163,"domLoading":164,"domInteractive":872,"domContentLoadedEventStart":872,"domContentLoadedEventEnd":924,"domComplete":1008,"loadEventStart":1008,"loadEventEnd":1009,"userAgent":"Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; ClaudeBot/1.0; +claudebot@anthropic.com)","marks":[{"name":"bigPipe.sidebar-id.start","time":835.1000001430511},{"name":"bigPipe.sidebar-id.end","time":835.9000000953674},{"name":"bigPipe.activity-panel-pipe-id.start","time":836.1000001430511},{"name":"bigPipe.activity-panel-pipe-id.end","time":837},{"name":"activityTabFullyLoaded","time":939.2000000476837}],"measures":[],"correlationId":"1712f1d490687","effectiveType":"4g","downlink":10,"rtt":0,"serverDuration":76,"dbReadsTimeInMs":10,"dbConnsTimeInMs":18,"applicationHash":"9d11dbea5f4be3d4cc21f03a88dd11d8c8687422","experiments":[]}}
Pushed into bb-10.2-ext