Skip to content

RI-4162, RI-4159, RI-4101, Profile/Explain plugin bug fixes #1719

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

Merged
merged 1 commit into from
Feb 13, 2023
Merged

RI-4162, RI-4159, RI-4101, Profile/Explain plugin bug fixes #1719

Show file tree
Hide file tree
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
8 changes: 2 additions & 6 deletions redisinsight/ui/src/packages/ri-explain/src/Explain.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,9 +435,9 @@ function ExplainDraw({data, type, module, profilingTime}: {data: any, type: Core
</div>
{ profilingTime &&
(
module === ModuleType.Search ?
module === ModuleType.Search &&
(
<div style={{ width: infoWidth }} className="ProfileInfo ProfileTimeInfo">
<div className="ProfileInfo ProfileTimeInfo">
{
Object.keys(profilingTime).map(key => (
<div className="Item">
Expand All @@ -448,10 +448,6 @@ function ExplainDraw({data, type, module, profilingTime}: {data: any, type: Core
}
</div>
)
:
type === CoreType.Profile && (
<div style={{ width: infoWidth }} className="ProfileInfo ProfileTimeMini">Total execution time: {profilingTime['Total Execution Time']} ms</div>
)
)}
</div>
</div>
Expand Down
14 changes: 9 additions & 5 deletions redisinsight/ui/src/packages/ri-explain/src/parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,19 +538,23 @@ class Parser {

assertToken(TokenType.IDENTIFIER, this.CurrentToken?.T)

let identifier = this.CurrentToken.Data
let identifiers: string[] = []

this.nextToken()
while (this.CurrentToken?.T == TokenType.IDENTIFIER) {
identifiers.push(this.CurrentToken.Data)

assertToken(TokenType.NEW_LINE, this.CurrentToken?.T)
this.nextToken()

this.nextToken()
assertToken(TokenType.NEW_LINE, this.CurrentToken?.T)

this.nextToken()
}

assertToken(TokenType.RBRACE, this.CurrentToken?.T)

this.nextToken()

return new Expr(identifier, EntityType.TAG, tagData)
return new Expr(identifiers.join(", "), EntityType.TAG, tagData)

}

Expand Down
1 change: 1 addition & 0 deletions redisinsight/ui/src/packages/ri-explain/src/styles/styles.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ body {

position: absolute;
bottom: 0px;
width: 100%;
}

.ProfileTimeInfo {
Expand Down