Skip to content

[Bug] Fix show load like match#6314

Merged
yangzhg merged 2 commits intoapache:masterfrom
DinoZhang:fix-load-like
Jul 30, 2021
Merged

[Bug] Fix show load like match#6314
yangzhg merged 2 commits intoapache:masterfrom
DinoZhang:fix-load-like

Conversation

@DinoZhang
Copy link
Contributor

Proposed changes

Matching should use patterns instead of contains

Types of changes

What types of changes does your code introduce to Doris?
Put an x in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation Update (if none of the other choices apply)
  • Code refactor (Modify the code structure, format the code, etc...)
  • Optimization. Including functional usability improvements and performance improvements.
  • Dependency. Such as changes related to third-party components.
  • Other.

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.

  • I have created an issue on (Fix show load like match error #6313) and described the bug/feature there in detail
  • Compiling and unit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works
  • If these changes need document changes, I have updated the document
  • Any dependent changes have been merged

Further comments

If this is a relatively large or complex change, kick off the discussion at dev@doris.apache.org by explaining why you chose the solution you did and what alternatives you considered, etc...

@morningman
Copy link
Contributor

This is a historical issue, because the previous like operation did not implement wildcards. If you change this way, all online operations using the previous method will fail.
Unless we can implement a compatible solution, such as automatically adding % symbols.
eg:
auto convert like 'abc' to like "%abc%"

@DinoZhang
Copy link
Contributor Author

For historical tasks, the % symbol has been automatically added.

if (entry.getKey().contains(stmt.getLabel())) {
String label = stmt.getLabel();
// Compatible with historical issues
if (!label.contains("%")) {
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be done in analyze() of CancelLoadStmt.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

} else if (ddlStmt instanceof CancelLoadStmt) {
boolean isAccurateMatch = ((CancelLoadStmt) ddlStmt).isAccurateMatch();
String label = ((CancelLoadStmt) ddlStmt).getLabel();
if (!isAccurateMatch && label != null) {
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be done in analyze() of CancelLoadStmt.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

boolean isAccurateMatch = showStmt.isAccurateMatch();
String label = showStmt.getLabelValue();
if (!isAccurateMatch && label != null) {
if (!label.contains("%")) {
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be done in analyze() of ShowLoadStmt.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

} else {
for (Map.Entry<String, List<LoadJob>> entry : labelToLoadJobs.entrySet()) {
if (entry.getKey().contains(labelValue)) {
PatternMatcher matcher = PatternMatcher.createMysqlPattern(labelValue, CaseSensibility.LABEL.getCaseSensibility());
Copy link
Contributor

Choose a reason for hiding this comment

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

PatternMatcher.createMysqlPattern can be put outside the for loop.
Same suggestion to other PatternMatcher.createMysqlPattern.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

+1

Copy link
Contributor

@morningman morningman left a comment

Choose a reason for hiding this comment

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

LGTM

@github-actions
Copy link
Contributor

PR approved by at least one committer and no changes requested.

@github-actions github-actions bot added approved Indicates a PR has been approved by one committer. reviewed labels Jul 28, 2021
@github-actions
Copy link
Contributor

PR approved by anyone and no changes requested.

@yangzhg yangzhg merged commit 14db74f into apache:master Jul 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by one committer. area/easy-to-use kind/improvement reviewed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

show load like match error

3 participants