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.

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

Fix label tag expression toString function #5008

Merged
merged 12 commits into from
Dec 14, 2022

Conversation

yixinglu
Copy link
Contributor

@yixinglu yixinglu commented Dec 6, 2022

What type of PR is this?

  • bug
  • feature
  • enhancement

What problem(s) does this PR solve?

Issue(s) number:

Description:

It's confusing for the following expression string, we should not delete the leading character for all expression.

-.n1.player.age

How do you solve it?

keep the $ character for the $-/$$/$^ expressions.

In addition, more tests for PushFilterDownHashInnerJoinRule introduced in #4956

Special notes for your reviewer, ex. impact of this fix, design document, etc:

Checklist:

Tests:

  • Unit test(positive and negative cases)
  • Function test
  • Performance test
  • N/A

Affects:

  • Documentation affected (Please add the label if documentation needs to be modified.)
  • Incompatibility (If it breaks the compatibility, please describe it and add the label.)
  • If it's needed to cherry-pick (If cherry-pick to some branches is required, please label the destination version(s).)
  • Performance impacted: Consumes more CPU/Memory

Release notes:

Please confirm whether to be reflected in release notes and how to describe:

ex. Fixed the bug .....

@yixinglu yixinglu added the ready-for-testing PR: ready for the CI test label Dec 6, 2022
jievince
jievince previously approved these changes Dec 6, 2022
Aiee
Aiee previously approved these changes Dec 7, 2022
@Sophie-Xie
Copy link
Contributor

@yixinglu plz fix the error of format.

@yixinglu yixinglu force-pushed the fix-label-tag-expr-tostring branch 2 times, most recently from 3cfa598 to eb5bbf8 Compare December 8, 2022 03:56
@yixinglu yixinglu force-pushed the fix-label-tag-expr-tostring branch from eb5bbf8 to c0fa68f Compare December 8, 2022 05:50
Comment on lines +96 to 100
LOG(ERROR) << "Error found in optimization stage for query: " << rctx->query()
<< ", error: " << status.message();
return Status::Error(
"There are some errors found in optimizer, "
"please contact to the admin to learn more details");
Copy link
Contributor

Choose a reason for hiding this comment

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

The error message on line 100 is not appropriate, it does not prevent the error message from being passed to the user, and it is more confusing than the original error message.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Actually, I am not sure what's the better way to handle the optimizer errors. I need to open an issue about this and research how to do that in other db.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

labelStr += ".";
}
if (!sym_.empty()) {
labelStr += sym_ + ".";
Copy link
Contributor

@czpmango czpmango Dec 9, 2022

Choose a reason for hiding this comment

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

Better to use :

Copy link
Contributor Author

Choose a reason for hiding this comment

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

like the following format?

$-:player.age
$$:player.name
v:player.name

@codecov-commenter
Copy link

Codecov Report

Base: 77.24% // Head: 77.23% // Decreases project coverage by -0.01% ⚠️

Coverage data is based on head (807d9f6) compared to base (cc0ce34).
Patch coverage: 88.88% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #5008      +/-   ##
==========================================
- Coverage   77.24%   77.23%   -0.02%     
==========================================
  Files        1105     1105              
  Lines       82054    82081      +27     
==========================================
+ Hits        63383    63392       +9     
- Misses      18671    18689      +18     
Impacted Files Coverage Δ
src/graph/optimizer/Optimizer.h 100.00% <ø> (ø)
src/graph/service/QueryInstance.cpp 79.45% <0.00%> (-1.24%) ⬇️
src/graph/validator/MatchValidator.cpp 89.51% <75.00%> (-0.08%) ⬇️
src/graph/optimizer/Optimizer.cpp 91.20% <95.00%> (-0.84%) ⬇️
src/common/expression/PropertyExpression.cpp 92.41% <100.00%> (+0.44%) ⬆️
src/meta/processors/parts/GetSpaceProcessor.cpp 61.29% <0.00%> (-19.36%) ⬇️
src/common/thread/GenericWorker.h 80.76% <0.00%> (-3.85%) ⬇️
src/kvstore/raftex/Host.cpp 71.70% <0.00%> (-2.58%) ⬇️
src/graph/executor/StorageAccessExecutor.h 55.81% <0.00%> (-2.33%) ⬇️
src/meta/processors/parts/ListHostsProcessor.cpp 69.52% <0.00%> (-2.15%) ⬇️
... and 32 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@yixinglu yixinglu merged commit 285ee34 into vesoft-inc:master Dec 14, 2022
@yixinglu yixinglu deleted the fix-label-tag-expr-tostring branch December 14, 2022 06:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-for-testing PR: ready for the CI test
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants