Skip to content
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

AllFilter with OR, bug fix #757

Merged
merged 7 commits into from
Jan 2, 2024
Merged

AllFilter with OR, bug fix #757

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b73ffa9
bug fix
Yuqi-Du Jan 2, 2024
5b09f17
Merge branch 'main' into all_operator_bug_fix
Yuqi-Du Jan 2, 2024
9b70826
fix comments
Yuqi-Du Jan 2, 2024
b68887b
Merge remote-tracking branch 'origin/main' into all_operator_bug_fix
Yuqi-Du Jan 2, 2024
4caa3cb
Merge branch 'all_operator_bug_fix' of github.com:stargate/jsonapi in…
Yuqi-Du Jan 2, 2024
d51eac4
fix comments
Yuqi-Du Jan 2, 2024
deb41b5
format
Yuqi-Du Jan 2, 2024
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
30 changes: 26 additions & 4 deletions src/main/java/io/stargate/sgv2/jsonapi/service/operation/model/impl/DBFilterBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,11 +593,11 @@ boolean canAddField() {
}

/** Filter for document where all values exists for an array */
public static class AllFilter extends SetFilterBase<String> {
private final Object arrayValue;
public static class AllFilter extends DBFilterBase {
private final List<Object> arrayValue;

public AllFilter(DocValueHasher hasher, String path, Object arrayValue) {
super("array_contains", path, getHashValue(hasher, path, arrayValue), Operator.CONTAINS);
public AllFilter(String path, List<Object> arrayValue) {
super(path);
this.arrayValue = arrayValue;
}

Expand All @@ -610,8 +610,30 @@ JsonNode asJson(JsonNodeFactory nodeFactory) {
boolean canAddField() {
return false;
}

public List<BuiltCondition> getAll() {
List<Object> values = arrayValue;
Yuqi-Du marked this conversation as resolved.
Show resolved Hide resolved
final ArrayList<BuiltCondition> result = new ArrayList<>();
for (Object value : values) {
result.add(
BuiltCondition.of(
DATA_CONTAINS,
Predicate.CONTAINS,
new JsonTerm(getHashValue(new DocValueHasher(), getPath(), value))));
}
return result;
}

@Override
public BuiltCondition get() {
throw new UnsupportedOperationException("For $all filter we always use getALL() method");
}
}

// public static class InFilter extends DBFilterBase {
// private final List<Object> arrayValue;
// protected final InFilter.Operator operator;

/** Filter for document where array has specified number of elements */
public static class SizeFilter extends MapFilterBase<Integer> {
public SizeFilter(String path, Integer size) {
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/io/stargate/sgv2/jsonapi/service/operation/model/impl/ExpressionBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,12 @@ private static Expression<BuiltCondition> buildExpressionRecursive(
// second for loop, is to iterate all subComparisonExpression
for (ComparisonExpression comparisonExpression : logicalExpression.comparisonExpressions) {
for (DBFilterBase dbFilter : comparisonExpression.getDbFilters()) {
if (dbFilter instanceof DBFilterBase.InFilter inFilter) {
if (dbFilter instanceof DBFilterBase.AllFilter allFilter) {
List<BuiltCondition> allFilterConditions = allFilter.getAll();
List<Variable<BuiltCondition>> allFilterVariables =
allFilterConditions.stream().map(Variable::of).toList();
conditionExpressions.add(ExpressionUtils.andOf(allFilterVariables));
} else if (dbFilter instanceof DBFilterBase.InFilter inFilter) {
if (inFilter.operator.equals(DBFilterBase.InFilter.Operator.IN)) {
hasInFilterThisLevel = true;
} else if (inFilter.operator.equals(DBFilterBase.InFilter.Operator.NIN)) {
Expand Down Expand Up @@ -174,7 +179,6 @@ private static Expression<BuiltCondition> buildExpressionRecursive(
.get()));
return ExpressionUtils.buildExpression(
conditionExpressions, logicalExpression.getLogicalRelation().getOperator());
// return null;
}

// current logicalExpression is empty (implies sub-logicalExpression and
Expand Down
8 changes: 2 additions & 6 deletions ...java/io/stargate/sgv2/jsonapi/service/resolver/model/impl/matcher/FilterableResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,12 +291,8 @@ public static List<DBFilterBase> findDynamic(CaptureExpression captureExpression
}

if (captureExpression.marker() == ALL_GROUP) {
final DocValueHasher docValueHasher = new DocValueHasher();
List<Object> objects = (List<Object>) filterOperation.operand().value();
for (Object arrayValue : objects) {
filters.add(
new DBFilterBase.AllFilter(docValueHasher, captureExpression.path(), arrayValue));
}
List<Object> arrayValue = (List<Object>) filterOperation.operand().value();
filters.add(new DBFilterBase.AllFilter(captureExpression.path(), arrayValue));
}

if (captureExpression.marker() == SIZE_GROUP) {
Expand Down
31 changes: 7 additions & 24 deletions src/test/java/io/stargate/sgv2/jsonapi/service/operation/model/impl/FindOperationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,15 +1090,9 @@ public void findWithAllFilter() throws Exception {

LogicalExpression implicitAnd = LogicalExpression.and();
implicitAnd.comparisonExpressions.add(new ComparisonExpression(null, null, null));
implicitAnd.comparisonExpressions.add(new ComparisonExpression(null, null, null));

List<DBFilterBase> filters1 =
List.of(new DBFilterBase.AllFilter(new DocValueHasher(), "tags", "tag1"));
List.of(new DBFilterBase.AllFilter("tags", List.of("tag1", "tag2")));
implicitAnd.comparisonExpressions.get(0).setDBFilters(filters1);
List<DBFilterBase> filters2 =
List.of(new DBFilterBase.AllFilter(new DocValueHasher(), "tags", "tag2"));
implicitAnd.comparisonExpressions.get(1).setDBFilters(filters2);

FindOperation operation =
FindOperation.unsortedSingle(
COMMAND_CONTEXT,
Expand Down Expand Up @@ -2396,15 +2390,9 @@ public void expressionSort() {
for (int i = 0; i < 20; i++) {
LogicalExpression implicitAnd1 = LogicalExpression.and();
implicitAnd1.comparisonExpressions.add(new ComparisonExpression(null, null, null));
implicitAnd1.comparisonExpressions.add(new ComparisonExpression(null, null, null));

List<DBFilterBase> filters1_1 =
List.of(new DBFilterBase.AllFilter(new DocValueHasher(), "tags", "tag1"));
implicitAnd1.comparisonExpressions.get(0).setDBFilters(filters1_1);
List<DBFilterBase> filters1_2 =
List.of(new DBFilterBase.AllFilter(new DocValueHasher(), "tags", "tag2"));
implicitAnd1.comparisonExpressions.get(1).setDBFilters(filters1_2);

List<DBFilterBase> filters1 =
List.of(new DBFilterBase.AllFilter("tags", List.of("tag1", "tag2")));
implicitAnd1.comparisonExpressions.get(0).setDBFilters(filters1);
FindOperation operation1 =
FindOperation.unsortedSingle(
COMMAND_CONTEXT,
Expand All @@ -2418,14 +2406,9 @@ public void expressionSort() {

LogicalExpression implicitAnd2 = LogicalExpression.and();
implicitAnd2.comparisonExpressions.add(new ComparisonExpression(null, null, null));
implicitAnd2.comparisonExpressions.add(new ComparisonExpression(null, null, null));

List<DBFilterBase> filters2_1 =
List.of(new DBFilterBase.AllFilter(new DocValueHasher(), "tags", "tag1"));
implicitAnd2.comparisonExpressions.get(0).setDBFilters(filters2_1);
List<DBFilterBase> filters2_2 =
List.of(new DBFilterBase.AllFilter(new DocValueHasher(), "tags", "tag2"));
implicitAnd2.comparisonExpressions.get(1).setDBFilters(filters2_2);
List<DBFilterBase> filters2 =
List.of(new DBFilterBase.AllFilter("tags", List.of("tag1", "tag2")));
implicitAnd2.comparisonExpressions.get(0).setDBFilters(filters2);

FindOperation operation2 =
FindOperation.unsortedSingle(
Expand Down