Skip to content

support P.textcontains() for rest-api query #1312

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
zhoney merged 1 commit into from
Jan 5, 2021
Merged

support P.textcontains() for rest-api query #1312

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions hugegraph-core/src/main/java/com/baidu/hugegraph/backend/query/Condition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,10 @@ public static Relation textContainsAny(Id key, Set<String> words) {
return new UserpropRelation(key, RelationType.TEXT_CONTAINS_ANY, words);
}

public static Condition contains(Id key, Object value) {
return new UserpropRelation(key, RelationType.CONTAINS, value);
}

/**
* Condition defines
*/
Expand Down
4 changes: 3 additions & 1 deletion hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphIndexTransaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
import com.baidu.hugegraph.type.define.Action;
import com.baidu.hugegraph.type.define.HugeKeys;
import com.baidu.hugegraph.type.define.IndexType;
import com.baidu.hugegraph.type.define.SchemaStatus;
import com.baidu.hugegraph.util.CollectionUtil;
import com.baidu.hugegraph.util.E;
import com.baidu.hugegraph.util.InsertionOrderUtil;
Expand Down Expand Up @@ -1347,6 +1346,9 @@ private static NoIndexException noIndexException(HugeGraph graph,
if (query.hasNeqCondition()) {
mismatched.add("not-equal");
}
if (mismatched.isEmpty()) {
mismatched.add(query.relations().toString());
}
return new NoIndexException("Don't accept query based on properties " +
"%s that are not indexed in %s, " +
"may not match %s condition",
Expand Down
2 changes: 1 addition & 1 deletion hugegraph-core/src/main/java/com/baidu/hugegraph/traversal/optimize/ConditionP.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ private ConditionP(final BiPredicate<Object, Object> predicate,
super(predicate, value);
}

public static ConditionP textContains(String value) {
public static ConditionP textContains(Object value) {
return new ConditionP(RelationType.TEXT_CONTAINS, value);
}

Expand Down
8 changes: 8 additions & 0 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 @@ -806,6 +806,8 @@ public static P<Object> parsePredicate(String predicate) {
return P.outside(params[0], params[1]);
case "within":
return P.within(predicateArgs(value));
case "textcontains":
return ConditionP.textContains(predicateArg(value));
case "contains":
// Just for inner use case like auth filter
return ConditionP.contains(predicateArg(value));
Expand Down Expand Up @@ -868,6 +870,12 @@ public static Condition parsePredicate(PropertyKey pk, String predicate) {
validValues.add(validPropertyValue(v, pk));
}
return Condition.in(pk.id(), validValues);
case "textcontains":
validValue = validPropertyValue(value, pk);
return Condition.textContains(pk.id(), (String) validValue);
case "contains":
validValue = validPropertyValue(value, pk);
return Condition.contains(pk.id(), validValue);
default:
throw new NotSupportException("predicate '%s'", method);
}
Expand Down