opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.0'

Browse Source 
* stable-3.0:
  Upgrade buildifier to 0.22.0
  ChangeQueryBuilder: Fix root directory case for Elasticsearch

Change-Id: I7807f2d963802698f924e137079d1f69c7103027
This commit is contained in:
David Pursehouse
2019-05-13 11:16:26 +02:00
parent f1f3c66de6 08593105e2
commit 51fc918336
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/dev-crafting-changes.txt
View File

@@ -110,7 +110,7 @@ To format Java source code, Gerrit uses the
link:https://github.com/google/google-java-format[`google-java-format`] link:https://github.com/google/google-java-format[`google-java-format`]
tool (version 1.7), and to format Bazel BUILD, WORKSPACE and .bzl files the tool (version 1.7), and to format Bazel BUILD, WORKSPACE and .bzl files the
link:https://github.com/bazelbuild/buildtools/tree/master/buildifier[`buildifier`] link:https://github.com/bazelbuild/buildtools/tree/master/buildifier[`buildifier`]
tool (version 0.20.0). tool (version 0.22.0).
These tools automatically apply format according to the style guides; this These tools automatically apply format according to the style guides; this
streamlines code review by reducing the need for time-consuming, tedious, streamlines code review by reducing the need for time-consuming, tedious,
and contentious discussions about trivial issues like whitespace. and contentious discussions about trivial issues like whitespace.

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

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