Merge branch 'stable-2.15'
* stable-2.15: DataSourceProvider: Validate connection Set version to 2.14.12-SNAPSHOT Set version to 2.14.11 Upgrade elasticsearch-rest-client to 6.3.2 StalenessChecker: URLDecode project name before checking staleness AbstractQueryChangesTest: Add a test with project name that requires URL encoding Upgrade Dropwizard Metrics to 4.0.3 Upgrade JGit to 4.7.2.201807261330-r Fix typos in documentation of 'List Files' REST API element Perform fonts preloads in "anonymous" cross-origin mode Change-Id: I65d53e9a001d2ce7445ccd639d97b5bad084e97c
This commit is contained in:
@@ -21,6 +21,7 @@ import com.google.common.collect.ImmutableSet;
|
||||
import com.google.common.collect.Sets;
|
||||
import com.google.common.primitives.Ints;
|
||||
import com.google.gerrit.extensions.restapi.DeprecatedIdentifierException;
|
||||
import com.google.gerrit.extensions.restapi.Url;
|
||||
import com.google.gerrit.index.IndexConfig;
|
||||
import com.google.gerrit.metrics.Counter1;
|
||||
import com.google.gerrit.metrics.Description;
|
||||
@@ -235,7 +236,7 @@ public class ChangeFinder {
|
||||
InternalChangeQuery query = queryProvider.get().noFields();
|
||||
List<ChangeData> r = query.byLegacyChangeId(id);
|
||||
if (r.size() == 1) {
|
||||
changeIdProjectCache.put(id, r.get(0).project().get());
|
||||
changeIdProjectCache.put(id, Url.encode(r.get(0).project().get()));
|
||||
}
|
||||
return asChangeNotes(r);
|
||||
}
|
||||
|
||||
@@ -30,6 +30,7 @@ import com.google.common.collect.Sets;
|
||||
import com.google.common.collect.Streams;
|
||||
import com.google.common.flogger.FluentLogger;
|
||||
import com.google.gerrit.common.Nullable;
|
||||
import com.google.gerrit.extensions.restapi.Url;
|
||||
import com.google.gerrit.index.IndexConfig;
|
||||
import com.google.gerrit.index.RefState;
|
||||
import com.google.gerrit.reviewdb.client.Change;
|
||||
@@ -176,7 +177,8 @@ public class StalenessChecker {
|
||||
String s = new String(b, UTF_8);
|
||||
List<String> parts = Splitter.on(':').splitToList(s);
|
||||
RefStatePattern.check(parts.size() == 2, s);
|
||||
result.put(new Project.NameKey(parts.get(0)), RefStatePattern.create(parts.get(1)));
|
||||
result.put(
|
||||
new Project.NameKey(Url.decode(parts.get(0))), RefStatePattern.create(parts.get(1)));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -141,6 +141,8 @@ public class DataSourceProvider implements Provider<DataSource>, LifecycleListen
|
||||
long evictIdleTimeMs = 1000L * 60;
|
||||
ds.setMinEvictableIdleTimeMillis(evictIdleTimeMs);
|
||||
ds.setTimeBetweenEvictionRunsMillis(evictIdleTimeMs / 2);
|
||||
ds.setTestOnBorrow(true);
|
||||
ds.setTestOnReturn(true);
|
||||
ds.setValidationQuery(dst.getValidationQuery());
|
||||
ds.setValidationQueryTimeout(5);
|
||||
exportPoolMetrics(ds);
|
||||
|
||||
Reference in New Issue
Block a user