Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPCC-31630 StatsScopeId::setScopeText not working for SSToperation scope type #18547

Merged
merged 1 commit into from
Apr 18, 2024
Merged

HPCC-31630 StatsScopeId::setScopeText not working for SSToperation scope type #18547

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 25 additions & 30 deletions system/jlib/jstats.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1633,6 +1633,26 @@ void StatsScopeId::setId(StatisticScopeType _scopeType, unsigned _id, unsigned _

bool StatsScopeId::setScopeText(const char * text, const char * * _next)
{
auto setScope = [&](StatisticScopeType _scopeType, const char *text, const char * *next)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor: This would more conventionally be a private member function.

{
if (!*text)
return false;
scopeType = _scopeType;
const char * endScopeNamePtr = strchr(text, ':');
if (endScopeNamePtr)
{
name.set(text, endScopeNamePtr-text);
if (next)
* next = endScopeNamePtr;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

trivial whitespace: space between * and next.

}
else
{
name.set(text);
if (next)
*next = text + strlen(text);
}
return true;
};
char * * next = (char * *)_next;
switch (*text)
{
Expand Down Expand Up @@ -1683,21 +1703,11 @@ bool StatsScopeId::setScopeText(const char * text, const char * * _next)
break;
case FunctionScopePrefix[0]:
if (MATCHES_CONST_PREFIX(text, FunctionScopePrefix))
{
setFunctionId(text+ strlen(FunctionScopePrefix));
if (_next)
*_next = text + strlen(text);
return true;
}
return setScope(SSTfunction, text+strlen(FunctionScopePrefix), _next);
break;
case FileScopePrefix[0]:
if (MATCHES_CONST_PREFIX(text, FileScopePrefix))
{
setFileId(text+strlen(FileScopePrefix));
if (_next)
*_next = text + strlen(text);
return true;
}
return setScope(SSTfile, text+strlen(FileScopePrefix), _next);
break;
case WorkflowScopePrefix[0]:
if (MATCHES_CONST_PREFIX(text, WorkflowScopePrefix) && isdigit(text[strlen(WorkflowScopePrefix)]))
Expand Down Expand Up @@ -1727,30 +1737,15 @@ bool StatsScopeId::setScopeText(const char * text, const char * * _next)
break;
case DFUWorkunitScopePrefix[0]:
if (MATCHES_CONST_PREFIX(text, DFUWorkunitScopePrefix))
{
setDfuWorkunitId(text+ strlen(DFUWorkunitScopePrefix));
if (_next)
*_next = text + strlen(text);
return true;
}
return setScope(SSTdfuworkunit, text+strlen(DFUWorkunitScopePrefix), _next);
break;
case SectionScopePrefix[0]:
if (MATCHES_CONST_PREFIX(text, SectionScopePrefix))
{
setSectionId(text+strlen(SectionScopePrefix));
if (_next)
*_next = text + strlen(text);
return true;
}
return setScope(SSTsection, text+strlen(SectionScopePrefix), _next);
break;
case OperationScopePrefix[0]:
if (MATCHES_CONST_PREFIX(text, OperationScopePrefix))
{
setOperationId(text+strlen(OperationScopePrefix));
if (_next)
*_next = text + strlen(text);
return true;
}
return setScope(SSToperation, text+strlen(OperationScopePrefix), _next);
break;
case '\0':
setId(SSTglobal, 0);
Expand Down
Loading