opendev/gerrit
Code Issues Proposed changes

Merge "ChangeQueryBuilder: Make the any predicate use only for Elasticsearch" into stable-3.0

Browse Source
This commit is contained in:
Dave Borowitz
2019-05-22 17:07:39 +00:00
committed by Gerrit Code Review
parent ba794d215b c4c0c94c59
commit 8635525de4
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java
View File

@@ -784,20 +784,15 @@ public class ChangeQueryBuilder extends QueryBuilder<ChangeData, ChangeQueryBuil
return new RegexDirectoryPredicate(directory);
}
DirectoryPredicate rootPredicate = new DirectoryPredicate(directory);
if (isRootAndRecursive(directory)) {
RegexDirectoryPredicate recursivePredicate = new RegexDirectoryPredicate("^.*");
return Predicate.or(rootPredicate, recursivePredicate);
if (IndexModule.getIndexType(cfg).equals(IndexType.ELASTICSEARCH)
&& (directory.isEmpty() || directory.equals("/"))) {
return Predicate.any();
}
return rootPredicate;
return new DirectoryPredicate(directory);
}
throw new QueryParseException("'directory' operator is not supported by change index version");
}
private static boolean isRootAndRecursive(String directory) {
return directory.isEmpty() || directory.equals("/");
}
@Operator
public Predicate<ChangeData> label(String name)
throws QueryParseException, IOException, ConfigInvalidException {