-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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 go without yield return errror result #2012
Conversation
Codecov Report
@@ Coverage Diff @@
## master #2012 +/- ##
==========================================
- Coverage 86.90% 86.74% -0.16%
==========================================
Files 636 641 +5
Lines 59819 60938 +1119
==========================================
+ Hits 51984 52859 +875
- Misses 7835 8079 +244
Continue to review full report at Codecov.
|
@@ -519,8 +519,7 @@ kvstore::ResultCode QueryBaseProcessor<REQ, RESP>::collectEdgeProps( | |||
lastRank = rank; | |||
lastDstId = dstId; | |||
std::unique_ptr<RowReader> reader; | |||
if (!onlyStructure |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't do that. You could check as this way:
if ((!onlyStructure || retTTL.has_value()) && !val.empty())
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As you said, I have a confusion:
if ((!onlyStructure || retTTL.has_value()) && !val.empty())
is satisfied, but ! onlyStructure
is false
.
data ttl has not expired and if (exp_ != nullptr)
is satisfied.
This will enter the if (exp_! = Nullptr)
statement. I don't know if the filter has any effect?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If onlyStructure is false, it means there are some props in value needed to return.
So we need to read the value.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Got, thx
ci test failed, not related to the modification of this pr |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well done.
The failed UT has nothing to do with this modification. |
* Upgrade rocksdb to 6.7.3 (#1948) Co-authored-by: heng <heng.chen@vesoft.com> Co-authored-by: yaphet <darion.wang@vesoft.com> * Detect OS type and exit if not built in Linux (#1951) * Detect OS type and exit if not built in Linux Signed-off-by: JaySon-Huang <jayson.hjs@gmail.com> * Disable for FreeBSD Signed-off-by: JaySon-Huang <jayson.hjs@gmail.com> * [doc] user-permission-mng (#1929) * alter user & change psw * built in roles * cbs comments * fix comments * update table * addenable_authorize doc * [doc] ttl doc modification (#1939) * ttl doc modification * fix comments * yt comments * silver days comments * timestamp update * Let action not fail fast. (#1909) * Let action not fail fast. * Disable the ci will product artifact. * Remove removePrefix interface in kvstore (#1953) Co-authored-by: heng <heng.chen@vesoft.com> Co-authored-by: yaphet <darion.wang@vesoft.com> * using admin client in MetaServiceHandler (#1864) * [doc] fix typo (#1954) * [doc]show statements (#1924) * [doc]customized dir (#1906) * Fixed a bug caused by not filtering the versions of edges (#1962) * Fixed a bug caused by not filtering the versions of edges when executing "go from vid over *". * address CPWstatic's comment. * Modify the listEdges interface and add parameters to directly return all latest versions of edges. * address laura's comment. Co-authored-by: dutor <440396+dutor@users.noreply.github.com> * [doc]modify job manger doc (#1957) * modify job manger doc * add flush Co-authored-by: dutor <440396+dutor@users.noreply.github.com> * Fix delete verticse (#1970) * Fix the read performance issue after delete range with rocksdb-5.15.10 (#1973) * Fix the read performace issue after delete range with rocksdb-5.15.10 * Fix the move issue * fix the move issue * Rebase and address bright-starry-sky's comments Co-authored-by: heng <heng.chen@vesoft.com> * Remove the LOG(FATAL) when encounting the unknown log type (#1978) * 1,Improve customer friendliness; 2, fixed typo error (#1980) * upgrade spark download address (#1981) Co-authored-by: dutor <440396+dutor@users.noreply.github.com> * fix-typo-in-doc (#1976) Co-authored-by: dutor <440396+dutor@users.noreply.github.com> * modify commands in build doc (#1969) Co-authored-by: dutor <440396+dutor@users.noreply.github.com> * modify log level (#1945) Co-authored-by: dangleptr <37216992+dangleptr@users.noreply.github.com> Co-authored-by: dutor <440396+dutor@users.noreply.github.com> * use bloom filter, add event listener to collect stats of compaction, improve update rocksdb options (#1959) * open bloom filter in default conf, add event listener to collect stats of compaction * imporve update rocksdb configs * fix ut error Co-authored-by: yaphet <darion.wang@vesoft.com> * Update the interface atomicOp to support empty string (#2002) Co-authored-by: heng <heng.chen@vesoft.com> Co-authored-by: Doodle <13706157+critical27@users.noreply.github.com> * update to rc4 (#1968) Co-authored-by: dutor <440396+dutor@users.noreply.github.com> * Fixed if you execute "go from xx over *", and when there is no edge under a space, (#1983) an unreasonable error message is returned (SpaceId `xxx 'is nonexistent) Co-authored-by: dutor <440396+dutor@users.noreply.github.com> * [doc]pr-commit-msg (#1993) * pr-commit-msg * add examples Co-authored-by: dutor <440396+dutor@users.noreply.github.com> * doc:modify ttl query (#2006) Co-authored-by: dutor <440396+dutor@users.noreply.github.com> * Let merge coverage report faster by fastcov instead of lcov. (#1943) Co-authored-by: dutor <440396+dutor@users.noreply.github.com> * Auto check keyword (#1922) * Supports the detection keyword, name_label supports string * add tests * address Shylock's comment * modify to add reserved keyword Co-authored-by: dutor <440396+dutor@users.noreply.github.com> * Fix coredump for update if encountering bad format row (#2024) Co-authored-by: heng <heng.chen@vesoft.com> Co-authored-by: bright-starry-sky <56461666+bright-starry-sky@users.noreply.github.com> * fixed loop depend problem for compile link (#1995) * fixed loop depend problem * fixed error for clang9 and gcc9 * Addressed laura-ding's comment * Check all reader is null or not before using it (#2029) * fix go without yield return errror result (#2012) * fix go without yield return errror result * fix format * address dangleptr's comment * address issue change TTL_DURATION not negative * add onlyStructure is true test case Co-authored-by: bright-starry-sky <56461666+bright-starry-sky@users.noreply.github.com> * fixed bug for delete vertex without edge (#2001) * When deleting a vertex, if the edge does not exist, then we should continue to delete the vertex instead of reporting an error. * added the testcase for delete vertex without edge. * add alias for lookup (#2000) * fix bug 1990/1991 (#2007) * 1. meta client sub mit job only to leader 2. sort jobs in desc id order * now show jobs return in desc order, adjust UT Co-authored-by: dangleptr <37216992+dangleptr@users.noreply.github.com> * upload package to oss (#1972) * upload oss * update * Remove redundant * address @yixinlu's comment Co-authored-by: dutor <440396+dutor@users.noreply.github.com> Co-authored-by: dangleptr <37216992+dangleptr@users.noreply.github.com> Co-authored-by: heng <heng.chen@vesoft.com> Co-authored-by: yaphet <darion.wang@vesoft.com> Co-authored-by: JaySon <jayson.hjs@gmail.com> Co-authored-by: Amber Zhang <42762957+Amber1990Zhang@users.noreply.github.com> Co-authored-by: Shylock Hg <33566796+Shylock-Hg@users.noreply.github.com> Co-authored-by: Simon Liu <331435+monadbobo@users.noreply.github.com> Co-authored-by: dutor <440396+dutor@users.noreply.github.com> Co-authored-by: bright-starry-sky <56461666+bright-starry-sky@users.noreply.github.com> Co-authored-by: Liuxue-Yang <50105172+Liuxue-Yang@users.noreply.github.com> Co-authored-by: laura-ding <48548375+laura-ding@users.noreply.github.com> Co-authored-by: Doodle <13706157+critical27@users.noreply.github.com> Co-authored-by: panda-sheep <59197347+panda-sheep@users.noreply.github.com> Co-authored-by: liuyu85cn <52276794+liuyu85cn@users.noreply.github.com>
* fix go without yield return errror result * fix format * address dangleptr's comment * address issue change TTL_DURATION not negative * add onlyStructure is true test case Co-authored-by: bright-starry-sky <56461666+bright-starry-sky@users.noreply.github.com>
* add tck of fetch-prop * add error info Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com> Co-authored-by: canon <87342612+caton-hpg@users.noreply.github.com> Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>
fix issue #2008
and #2019 change TTL_DURATION to zero or positive integer