Skip to content

Check the predicate of HasContainer can't be null #16

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

Merged
Linary merged 1 commit into from
Aug 22, 2018
Merged

Check the predicate of HasContainer can't be null #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/TraversalUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,9 @@ public static ConditionQuery fillConditionQuery(
public static Condition convHas2Condition(HasContainer has,
HugeType type,
HugeGraph graph) {
BiPredicate<?, ?> bp = has.getPredicate().getBiPredicate();
P<?> p = has.getPredicate();
E.checkArgument(p != null, "The predicate of has(%s) is null", has);
BiPredicate<?, ?> bp = p.getBiPredicate();
Condition condition;
if (keyForContainsKeyOrValue(has.getKey())) {
condition = convContains2Relation(graph, has);
Expand All @@ -198,13 +200,13 @@ public static Condition convHas2Condition(HasContainer has,
condition = convRelationType2Relation(graph, type, has);
} else if (bp instanceof Contains) {
condition = convIn2Relation(graph, has);
} else if (has.getPredicate() instanceof AndP) {
} else if (p instanceof AndP) {
condition = convAnd(graph, type, has);
} else if (has.getPredicate() instanceof OrP) {
} else if (p instanceof OrP) {
condition = convOr(graph, type, has);
} else {
// TODO: deal with other Predicate
throw newUnsupportedPredicate(has.getPredicate());
throw newUnsupportedPredicate(p);
}
return condition;
}
Expand Down