opendev/gerrit
Code Issues Proposed changes

Add reviewer/group to label query

Browse Source 
Adding ability to specify a user or group by:

* Adding a ',' after the label name followed by a reviewer id
  or 'user=' and the user id.
  e.g., label:CodeReview=1,jsmith
        label.CodeReview=1,user=jsmith

* Adding a ',' after the category name followed by a group id
  or 'group=' and the group id.
  e.g., label:CodeReview=1,android_bait
        label:CodeReview=1,group=android_bait

The user specific label query is backed by the label field in Lucene.
The filtering on the group is done only after results have been
retrieved from Lucene and thus it is more expensive.

Change-Id: I39a1000712743a6ed238e70d45c0ccc1eec50031
This commit is contained in:
Craig Chapel
2013-02-13 10:14:08 -07:00
committed by Edwin Kempin
parent 9bc6cef519
commit 9c6e5376e6
6 changed files with 224 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeField.java
View File

@@ -17,8 +17,9 @@ package com.google.gerrit.server.index;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.gerrit.reviewdb.client.PatchSetApproval;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.PatchSetApproval;
import com.google.gerrit.reviewdb.client.TrackingId;
import com.google.gerrit.server.ChangeUtil;
import com.google.gerrit.server.query.change.ChangeData;
@@ -45,7 +46,7 @@ import java.util.Set;
*/
public class ChangeField {
/** Increment whenever making schema changes. */
public static final int SCHEMA_VERSION = 10;
public static final int SCHEMA_VERSION = 11;
/** Legacy change ID. */
public static final FieldDef<ChangeData, Integer> LEGACY_ID =
@@ -210,18 +211,27 @@ public class ChangeField {
@Override
public Iterable<String> get(ChangeData input, FillArgs args)
throws OrmException {
Set<String> allApprovals = Sets.newHashSet();
Set<String> distinctApprovals = Sets.newHashSet();
for (PatchSetApproval a : input.currentApprovals(args.db)) {
if (a.getValue() != 0) {
allApprovals.add(formatLabel(a.getLabel(), a.getValue(),
a.getAccountId()));
distinctApprovals.add(formatLabel(a.getLabel(), a.getValue()));
}
}
return distinctApprovals;
allApprovals.addAll(distinctApprovals);
return allApprovals;
}
};
public static String formatLabel(String label, int value) {
return label.toLowerCase() + (value >= 0 ? "+" : "") + value;
return formatLabel(label, value, null);
}
public static String formatLabel(String label, int value, Account.Id accountId) {
return label.toLowerCase() + (value >= 0 ? "+" : "") + value
+ (accountId != null ? "," + accountId.get() : "");
}
public static final ImmutableMap<String, FieldDef<ChangeData, ?>> ALL;