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

Jump to bottom

fix invalid filter in GetProp make storage crashed #4568

Merged
merged 2 commits into from
Aug 23, 2022
Merged

fix invalid filter in GetProp make storage crashed #4568

merged 2 commits into from
Aug 23, 2022

Conversation

critical27
Copy link
Contributor

@critical27 critical27 commented Aug 22, 2022 •
edited
Loading

What type of PR is this?

  • bug
  • feature
  • enhancement

What problem(s) does this PR solve?

Issue(s) number:

https://github.com/vesoft-inc/nebula-ent/issues/1165
#4565

Description:

Invalid filter will make storage crash, this only happens in enterprise version with additional filter push down rule.

How do you solve it?

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 .....

@critical27 critical27 added ready-for-testing PR: ready for the CI test ready for review labels Aug 22, 2022
@critical27 critical27 mentioned this pull request Aug 22, 2022
Closed
11 tasks
wenhaocs
wenhaocs approved these changes Aug 22, 2022
View reviewed changes
Copy link
Contributor

@wenhaocs wenhaocs left a comment

Choose a reason for hiding this comment

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

LGTM

@Sophie-Xie Sophie-Xie merged commit 7f185c9 into vesoft-inc:master Aug 23, 2022
@critical27 critical27 deleted the fix branch August 23, 2022 01:55
czpmango
czpmango reviewed Aug 23, 2022
View reviewed changes
src/storage/exec/QueryUtils.h
@@ -73,6 +73,9 @@ class QueryUtils final {

if (nullType == NullType::UNKNOWN_PROP) {
VLOG(1) << "Fail to read prop " << propName;
if (!field) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Why not just return null outside the if block？

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is null here~ NullType::UNKNOWN_PROP

Copy link
Contributor

Choose a reason for hiding this comment

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

IMO, NullType::UNKNOWN_PROP is not necessary, which can lead to more problems due to graphd's unreasonable handling of runtime errors.
For example, filter operator execution will throw a runtime error if UNKNOWN_PROP is fed to it.

nebula/src/graph/executor/query/FilterExecutor.cpp

Lines 67 to 69 in 7f185c9

if (val.isBadNull() || (!val.empty() && !val.isImplicitBool() && !val.isNull())) {
return Status::Error("Wrong type result, the type should be NULL, EMPTY, BOOL");
}

@critical27 critical27 mentioned this pull request Aug 23, 2022
Closed
11 tasks
@Sophie-Xie Sophie-Xie added the affects/v3.2 PR/issue: this bug affects v3.2.x version. label Aug 23, 2022
@wey-gu wey-gu mentioned this pull request Aug 27, 2022
Closed
Sophie-Xie pushed a commit that referenced this pull request Aug 30, 2022
@critical27 @wenhaocs @Sophie-Xie
fix invalid filter in GetProp make storage crashed (#4568)
cea5e54 
Co-authored-by: haowen <19355821+wenhaocs@users.noreply.github.com>
Sophie-Xie pushed a commit that referenced this pull request Sep 7, 2022
@critical27 @wenhaocs @Sophie-Xie
fix invalid filter in GetProp make storage crashed (#4568)
53dc8cc 
Co-authored-by: haowen <19355821+wenhaocs@users.noreply.github.com>
Sophie-Xie added a commit that referenced this pull request Sep 13, 2022
@Sophie-Xie @czpmango
@nevermore3 @liwenhui-soul @critical27 @wenhaocs @xtcyclist @jievince @Shylock-Hg @Qiaolin-Yu
Cherry pick 3.2.1 (#4626)
bb2e684 
* fix lookup (#4552)

fix

Co-authored-by: jimingquan <mingquan.ji@vesoft.com>
Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* fix split brain in raft (#4479)

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* fix invalid filter in GetProp make storage crashed (#4568)

Co-authored-by: haowen <19355821+wenhaocs@users.noreply.github.com>

* fix scan vertex/edge do not handle ttl (#4578)

* fix scan vertex/edge do not handle ttl

* use ErrorCode to unify community version and end version

* Fix #1212. Return FoldConstantExprVisitor, if status_ already failed due to found syantax errors. (#4607)

Co-authored-by: jie.wang <38901892+jievince@users.noreply.github.com>

* Avoid fatal when expression illegal. (#4618)

* Fix concurrent exception related to multi-match statement (#4605)

* fix filter executor

* Fix concurrency exception of multi-match statements

fix iterator

fix

small delete

small delete

skip iterator type handle for concurrency

small delete

fix scan edges

small delete

small delete

fix

small delete

small change

small change

fix ut

small fix

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* Prune properties(#4523)

* fix conflict

* extract attribute from properties function (#4604)

* extract attribute from properties function

* fix error

* fix subscript error

* add test case

* process scanEdges

* fix test error

* add unwind & check vidType when executing not validate (#4456)

* Update AppendVerticesExecutor.cpp

fix conflict

* Update AppendVerticesExecutor.cpp

* Replace obsolete RocksDB API (#4395)

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* Update PrunePropertiesRule.feature

* remove useless dc (#4533)

* Update PrunePropertiesRule.feature

* fix test error

Co-authored-by: kyle.cao <kyle.cao@vesoft.com>
Co-authored-by: jimingquan <mingquan.ji@vesoft.com>
Co-authored-by: liwenhui-soul <38217397+liwenhui-soul@users.noreply.github.com>
Co-authored-by: Doodle <13706157+critical27@users.noreply.github.com>
Co-authored-by: haowen <19355821+wenhaocs@users.noreply.github.com>
Co-authored-by: Cheng Xuntao <7731943+xtcyclist@users.noreply.github.com>
Co-authored-by: jie.wang <38901892+jievince@users.noreply.github.com>
Co-authored-by: shylock <33566796+Shylock-Hg@users.noreply.github.com>
Co-authored-by: Qiaolin Yu <90088090+Qiaolin-Yu@users.noreply.github.com>
@Sophie-Xie Sophie-Xie added cherry-pick-v3.2 PR: need cherry-pick to this version and removed affects/v3.2 PR/issue: this bug affects v3.2.x version. labels Sep 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@czpmango czpmango czpmango left review comments

@SuperYoko SuperYoko SuperYoko approved these changes

@panda-sheep panda-sheep panda-sheep approved these changes

@wenhaocs wenhaocs wenhaocs approved these changes

@cangfengzhs cangfengzhs Awaiting requested review from cangfengzhs

@liwenhui-soul liwenhui-soul Awaiting requested review from liwenhui-soul

@jievince jievince Awaiting requested review from jievince

@pengweisong pengweisong Awaiting requested review from pengweisong

Assignees
No one assigned
Labels
cherry-pick-v3.2 PR: need cherry-pick to this version ready for review ready-for-testing PR: ready for the CI test
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@critical27 @wenhaocs @czpmango @panda-sheep @SuperYoko @Sophie-Xie