Skip to content

Commit

Permalink
revise error messages.
Browse files Browse the repository at this point in the history
  • Loading branch information
xtcyclist committed Dec 23, 2022
1 parent f26eb88 commit 2f4f9be
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions src/graph/executor/query/FilterExecutor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,10 @@ StatusOr<DataSet> FilterExecutor::handleJob(size_t begin, size_t end, Iterator *
for (; iter->valid() && begin++ < end; iter->next()) {
auto val = condition->eval(ctx(iter));
if (val.isBadNull() || (!val.empty() && !val.isImplicitBool() && !val.isNull())) {
return Status::Error("Failed to evaluate condition: %s. %s",
return Status::Error("Failed to evaluate condition: %s. %s%s",
condition->toString().c_str(),
"For boolean conditions, please write <condition> == <true/false>.");
"For boolean conditions, please write in their full forms like",
" <condition> == <true/false> or <condition> IS NULL.");
}
if (!(val.empty() || val.isNull() || (val.isImplicitBool() && !val.implicitBool()))) {
// TODO: Maybe we can move.
Expand Down Expand Up @@ -98,9 +99,10 @@ Status FilterExecutor::handleSingleJobFilter() {
while (iter->valid()) {
auto val = condition->eval(ctx(iter));
if (val.isBadNull() || (!val.empty() && !val.isImplicitBool() && !val.isNull())) {
return Status::Error("Failed to evaluate condition: %s. %s",
return Status::Error("Failed to evaluate condition: %s. %s%s",
condition->toString().c_str(),
"For boolean conditions, please write <condition> == <true/false>.");
"For boolean conditions, please write in their full forms like",
" <condition> == <true/false> or <condition> IS NULL.");
}
if (val.empty() || val.isNull() || (val.isImplicitBool() && !val.implicitBool())) {
if (UNLIKELY(filter->needStableFilter())) {
Expand All @@ -123,9 +125,10 @@ Status FilterExecutor::handleSingleJobFilter() {
for (; iter->valid(); iter->next()) {
auto val = condition->eval(ctx(iter));
if (val.isBadNull() || (!val.empty() && !val.isImplicitBool() && !val.isNull())) {
return Status::Error("Failed to evaluate condition: %s. %s",
return Status::Error("Failed to evaluate condition: %s. %s%s",
condition->toString().c_str(),
"For boolean conditions, please write <condition> == <true/false>.");
"For boolean conditions, please write in their full forms like",
" <condition> == <true/false> or <condition> IS NULL.");
}
if (val.isImplicitBool() && val.implicitBool()) {
Row row;
Expand Down

0 comments on commit 2f4f9be

Please sign in to comment.