Skip to content

fix bug hasLabel() failed if having more than 1 label #51

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
Sep 20, 2018
Merged

fix bug hasLabel() failed if having more than 1 label #51

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
61 changes: 43 additions & 18 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 @@ -199,7 +199,7 @@ public static Condition convHas2Condition(HasContainer has,
} else if (bp instanceof RelationType) {
condition = convRelationType2Relation(graph, type, has);
} else if (bp instanceof Contains) {
condition = convIn2Relation(graph, has);
condition = convIn2Relation(graph, type, has);
} else if (p instanceof AndP) {
condition = convAnd(graph, type, has);
} else if (p instanceof OrP) {
Expand Down Expand Up @@ -286,17 +286,7 @@ private static Relation convCompare2SyspropRelation(HugeGraph graph,
assert bp instanceof Compare;

HugeKeys key = string2HugeKey(has.getKey());
Object value = has.getValue();

if (key == HugeKeys.LABEL && !(value instanceof Id)) {
value = SchemaLabel.getLabelId(graph, type, value);
} else if (key == HugeKeys.ID && !(value instanceof Id)) {
if (type.isVertex()) {
value = HugeVertex.getIdValue(value);
} else {
value = HugeEdge.getIdValue(value);
}
}
Object value = convSysValueIfNeeded(graph, type, key, has.getValue());

switch ((Compare) bp) {
case eq:
Expand Down Expand Up @@ -360,29 +350,39 @@ private static Condition convRelationType2Relation(HugeGraph graph,
}

public static Condition convIn2Relation(HugeGraph graph,
HugeType type,
HasContainer has) {
BiPredicate<?, ?> bp = has.getPredicate().getBiPredicate();
assert bp instanceof Contains;
List<?> value = (List<?>) has.getValue();
List<?> values = (List<?>) has.getValue();

try {
HugeKeys key = string2HugeKey(has.getKey());
String originKey = has.getKey();
if (values.size() > 1) {
E.checkArgument(!originKey.equals(T.key) &&
!originKey.equals(T.value),
"Not support hasKey() or hasValue() with " +
"multiple values");
}
HugeKeys key = string2HugeKey(originKey);
values = convSysListValueIfNeeded(graph, type, key, values);


switch ((Contains) bp) {
case within:
return Condition.in(key, value);
return Condition.in(key, values);
case without:
return Condition.nin(key, value);
return Condition.nin(key, values);
}
} catch (IllegalArgumentException e) {
String key = has.getKey();
PropertyKey pkey = graph.propertyKey(key);

switch ((Contains) bp) {
case within:
return Condition.in(pkey.id(), value);
return Condition.in(pkey.id(), values);
case without:
return Condition.nin(pkey.id(), value);
return Condition.nin(pkey.id(), values);
}
}

Expand Down Expand Up @@ -479,6 +479,31 @@ private static void convPredicateValue(HugeGraph graph, HasContainer has) {
}
}

private static Object convSysValueIfNeeded(HugeGraph graph,HugeType type,
HugeKeys key, Object value) {
if (key == HugeKeys.LABEL && !(value instanceof Id)) {
value = SchemaLabel.getLabelId(graph, type, value);
} else if (key == HugeKeys.ID && !(value instanceof Id)) {
if (type.isVertex()) {
value = HugeVertex.getIdValue(value);
} else {
value = HugeEdge.getIdValue(value);
}
}
return value;
}

private static List<?> convSysListValueIfNeeded(HugeGraph graph,
HugeType type,
HugeKeys key,
List<?> values) {
List<Object> newValues = new ArrayList<>(values.size());
for (Object value : values) {
newValues.add(convSysValueIfNeeded(graph, type, key, value));
}
return newValues;
}

public static Iterator<Edge> filterResult(Vertex vertex,
Directions dir,
Iterator<Edge> edges) {
Expand Down