opendev/gerrit
Code Issues Proposed changes

ChangeUtil: Minor optimization to findChanges for change numbers

Browse Source 
Don't bother with a regex, just use Ints.tryParse. Maintain existing
behavior of skipping this codepath for numbers like 01234.

Change-Id: I95cfdcd6171470e123c4e7046744072ea31a1399
This commit is contained in:
Dave Borowitz
2015-12-08 10:19:01 -05:00
parent d5a84fad7f
commit 1a4a0f4b5a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
View File

@@ -19,6 +19,7 @@ import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Ordering; import com.google.common.collect.Ordering;
import com.google.common.primitives.Ints;
import com.google.gerrit.common.TimeUtil; import com.google.gerrit.common.TimeUtil;
import com.google.gerrit.extensions.restapi.ResourceConflictException; import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.extensions.restapi.RestApiException;
@@ -439,10 +440,13 @@ public class ChangeUtil {
public List<ChangeControl> findChanges(String id, CurrentUser user) public List<ChangeControl> findChanges(String id, CurrentUser user)
throws OrmException { throws OrmException {
// Try legacy id // Try legacy id
if (id.matches("^[1-9][0-9]*$")) { if (!id.isEmpty() && id.charAt(0) != '0') {
Integer n = Ints.tryParse(id);
try { try {
return ImmutableList.of( if (n != null) {
changeControlFactory.controlFor(Change.Id.parse(id), user)); return ImmutableList.of(
changeControlFactory.controlFor(new Change.Id(n), user));
}
} catch (NoSuchChangeException e) { } catch (NoSuchChangeException e) {
return Collections.emptyList(); return Collections.emptyList();
} }