diff options
author | Adithya Chakilam <achakila@codeaurora.org> | 2021-11-18 06:28:04 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-11-18 06:28:04 +0000 |
commit | e297d8448253ba56dde391a44803a5e1fbf1e3f6 (patch) | |
tree | b2fe41b81b7f816490cae4ef4a8ea05dfd68e5ea | |
parent | 682b67981ad2671fa7a1e3d4048edb6ba5a19e06 (diff) | |
parent | 646e873fff5fd96f2d4048113aaa9a29c6ba886c (diff) |
Merge "Display cache stats after reindex operation" into stable-3.2
11 files changed, 299 insertions, 220 deletions
diff --git a/java/com/google/gerrit/pgm/Reindex.java b/java/com/google/gerrit/pgm/Reindex.java index 30f6d4d7e7..8eaf3b3094 100644 --- a/java/com/google/gerrit/pgm/Reindex.java +++ b/java/com/google/gerrit/pgm/Reindex.java @@ -17,10 +17,12 @@ package com.google.gerrit.pgm; import static java.util.Objects.requireNonNull; import static java.util.stream.Collectors.toSet; +import com.google.common.cache.Cache; import com.google.common.collect.Sets; import com.google.gerrit.common.Die; import com.google.gerrit.elasticsearch.ElasticIndexModule; import com.google.gerrit.extensions.config.FactoryModule; +import com.google.gerrit.extensions.registration.DynamicMap; import com.google.gerrit.index.Index; import com.google.gerrit.index.IndexDefinition; import com.google.gerrit.index.IndexType; @@ -29,6 +31,8 @@ import com.google.gerrit.lifecycle.LifecycleManager; import com.google.gerrit.lucene.LuceneIndexModule; import com.google.gerrit.pgm.util.BatchProgramModule; import com.google.gerrit.pgm.util.SiteProgram; +import com.google.gerrit.server.cache.CacheDisplay; +import com.google.gerrit.server.cache.CacheInfo; import com.google.gerrit.server.change.ChangeResource; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.index.IndexModule; @@ -40,6 +44,8 @@ import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Module; +import java.io.StringWriter; +import java.io.Writer; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -48,6 +54,8 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.util.io.NullOutputStream; import org.kohsuke.args4j.Option; @@ -78,6 +86,7 @@ public class Reindex extends SiteProgram { private Config globalConfig; @Inject private Collection<IndexDefinition<?, ?, ?>> indexDefs; + @Inject private DynamicMap<Cache<?, ?>> cacheMap; @Override public int run() throws Exception { @@ -210,6 +219,20 @@ public class Reindex extends SiteProgram { System.out.format( "Index %s in version %d is %sready\n", def.getName(), index.getSchema().getVersion(), result.success() ? "" : "NOT "); + + try (Writer sw = new StringWriter()) { + sw.write(String.format("Cache Statistics at the end of reindexing %s\n", def.getName())); + new CacheDisplay( + sw, + StreamSupport.stream(cacheMap.spliterator(), false) + .map(e -> new CacheInfo(e.getExportName(), e.get())) + .collect(Collectors.toList())) + .displayCaches(); + System.out.print(sw.toString()); + } catch (Exception e) { + System.out.format("Error displaying the cache statistics\n" + e.getMessage()); + } + return result.success(); } } diff --git a/java/com/google/gerrit/pgm/util/BatchProgramModule.java b/java/com/google/gerrit/pgm/util/BatchProgramModule.java index a831b8e1aa..dd7685994d 100644 --- a/java/com/google/gerrit/pgm/util/BatchProgramModule.java +++ b/java/com/google/gerrit/pgm/util/BatchProgramModule.java @@ -112,7 +112,7 @@ public class BatchProgramModule extends FactoryModule { // We're just running through each change // once, so don't worry about cache removal. bind(new TypeLiteral<DynamicSet<CacheRemovalListener>>() {}).toInstance(DynamicSet.emptySet()); - bind(new TypeLiteral<DynamicMap<Cache<?, ?>>>() {}).toInstance(DynamicMap.emptyMap()); + DynamicMap.mapOf(binder(), new TypeLiteral<Cache<?, ?>>() {}); bind(new TypeLiteral<List<CommentLinkInfo>>() {}) .toProvider(CommentLinkProvider.class) .in(SINGLETON); diff --git a/java/com/google/gerrit/server/cache/CacheDisplay.java b/java/com/google/gerrit/server/cache/CacheDisplay.java new file mode 100644 index 0000000000..60f5186e8b --- /dev/null +++ b/java/com/google/gerrit/server/cache/CacheDisplay.java @@ -0,0 +1,129 @@ +// Copyright (C) 2021 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.gerrit.server.cache; + +import com.google.common.base.Strings; +import java.io.IOException; +import java.io.Writer; +import java.util.Collection; + +public class CacheDisplay { + + private final Writer stdout; + private final int nw; + private final Collection<CacheInfo> caches; + + public CacheDisplay(Writer stdout, int nw, Collection<CacheInfo> caches) { + this.stdout = stdout; + this.nw = nw; + this.caches = caches; + } + + public CacheDisplay(Writer stdout, Collection<CacheInfo> caches) { + this(stdout, 30, caches); + } + + public void displayCaches() throws IOException { + stdout.write( + String.format( // + "%1s %-" + nw + "s|%-21s| %-5s |%-9s|\n" // + , + "" // + , + "Name" // + , + "Entries" // + , + "AvgGet" // + , + "Hit Ratio" // + )); + stdout.write( + String.format( // + "%1s %-" + nw + "s|%6s %6s %7s| %-5s |%-4s %-4s|\n" // + , + "" // + , + "" // + , + "Mem" // + , + "Disk" // + , + "Space" // + , + "" // + , + "Mem" // + , + "Disk" // + )); + stdout.write("--"); + for (int i = 0; i < nw; i++) { + stdout.write('-'); + } + stdout.write("+---------------------+---------+---------+\n"); + printMemoryCoreCaches(caches); + printMemoryPluginCaches(caches); + printDiskCaches(caches); + stdout.write('\n'); + } + + private void printMemoryCoreCaches(Collection<CacheInfo> caches) throws IOException { + for (CacheInfo cache : caches) { + if (!cache.name.contains("-") && CacheInfo.CacheType.MEM.equals(cache.type)) { + printCache(cache); + } + } + } + + private void printMemoryPluginCaches(Collection<CacheInfo> caches) throws IOException { + for (CacheInfo cache : caches) { + if (cache.name.contains("-") && CacheInfo.CacheType.MEM.equals(cache.type)) { + printCache(cache); + } + } + } + + private void printDiskCaches(Collection<CacheInfo> caches) throws IOException { + for (CacheInfo cache : caches) { + if (CacheInfo.CacheType.DISK.equals(cache.type)) { + printCache(cache); + } + } + } + + private void printCache(CacheInfo cache) throws IOException { + stdout.write( + String.format( + "%1s %-" + nw + "s|%6s %6s %7s| %7s |%4s %4s|\n", + CacheInfo.CacheType.DISK.equals(cache.type) ? "D" : "", + cache.name, + nullToEmpty(cache.entries.mem), + nullToEmpty(cache.entries.disk), + Strings.nullToEmpty(cache.entries.space), + Strings.nullToEmpty(cache.averageGet), + formatAsPercent(cache.hitRatio.mem), + formatAsPercent(cache.hitRatio.disk))); + } + + private static String nullToEmpty(Long l) { + return l != null ? String.valueOf(l) : ""; + } + + private static String formatAsPercent(Integer i) { + return i != null ? i + "%" : ""; + } +} diff --git a/java/com/google/gerrit/server/cache/CacheInfo.java b/java/com/google/gerrit/server/cache/CacheInfo.java new file mode 100644 index 0000000000..d6eb065339 --- /dev/null +++ b/java/com/google/gerrit/server/cache/CacheInfo.java @@ -0,0 +1,133 @@ +// Copyright (C) 2021 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.gerrit.server.cache; + +import com.google.common.cache.Cache; +import com.google.common.cache.CacheStats; + +public class CacheInfo { + + public String name; + public CacheType type; + public EntriesInfo entries; + public String averageGet; + public HitRatioInfo hitRatio; + + public CacheInfo(Cache<?, ?> cache) { + this(null, cache); + } + + public CacheInfo(String name, Cache<?, ?> cache) { + this.name = name; + + CacheStats stat = cache.stats(); + + entries = new EntriesInfo(); + entries.setMem(cache.size()); + + averageGet = duration(stat.averageLoadPenalty()); + + hitRatio = new HitRatioInfo(); + hitRatio.setMem(stat.hitCount(), stat.requestCount()); + + if (cache instanceof PersistentCache) { + type = CacheType.DISK; + PersistentCache.DiskStats diskStats = ((PersistentCache) cache).diskStats(); + entries.setDisk(diskStats.size()); + entries.setSpace(diskStats.space()); + hitRatio.setDisk(diskStats.hitCount(), diskStats.requestCount()); + } else { + type = CacheType.MEM; + } + } + + private static String duration(double ns) { + if (ns < 0.5) { + return null; + } + String suffix = "ns"; + if (ns >= 1000.0) { + ns /= 1000.0; + suffix = "us"; + } + if (ns >= 1000.0) { + ns /= 1000.0; + suffix = "ms"; + } + if (ns >= 1000.0) { + ns /= 1000.0; + suffix = "s"; + } + return String.format("%4.1f%s", ns, suffix).trim(); + } + + public static class EntriesInfo { + public Long mem; + public Long disk; + public String space; + + public void setMem(long mem) { + this.mem = mem != 0 ? mem : null; + } + + public void setDisk(long disk) { + this.disk = disk != 0 ? disk : null; + } + + public void setSpace(double value) { + space = bytes(value); + } + + private static String bytes(double value) { + value /= 1024; + String suffix = "k"; + + if (value > 1024) { + value /= 1024; + suffix = "m"; + } + if (value > 1024) { + value /= 1024; + suffix = "g"; + } + return String.format("%1$6.2f%2$s", value, suffix).trim(); + } + } + + public static class HitRatioInfo { + public Integer mem; + public Integer disk; + + public void setMem(long value, long total) { + mem = percent(value, total); + } + + public void setDisk(long value, long total) { + disk = percent(value, total); + } + + private static Integer percent(long value, long total) { + if (total <= 0) { + return null; + } + return (int) ((100 * value) / total); + } + } + + public enum CacheType { + MEM, + DISK + } +} diff --git a/java/com/google/gerrit/server/restapi/config/GetCache.java b/java/com/google/gerrit/server/restapi/config/GetCache.java index 93600ea582..5dd3d3dc48 100644 --- a/java/com/google/gerrit/server/restapi/config/GetCache.java +++ b/java/com/google/gerrit/server/restapi/config/GetCache.java @@ -16,6 +16,7 @@ package com.google.gerrit.server.restapi.config; import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestReadView; +import com.google.gerrit.server.cache.CacheInfo; import com.google.gerrit.server.config.CacheResource; import com.google.inject.Singleton; @@ -23,7 +24,7 @@ import com.google.inject.Singleton; public class GetCache implements RestReadView<CacheResource> { @Override - public Response<ListCaches.CacheInfo> apply(CacheResource rsrc) { - return Response.ok(new ListCaches.CacheInfo(rsrc.getName(), rsrc.getCache())); + public Response<CacheInfo> apply(CacheResource rsrc) { + return Response.ok(new CacheInfo(rsrc.getName(), rsrc.getCache())); } } diff --git a/java/com/google/gerrit/server/restapi/config/ListCaches.java b/java/com/google/gerrit/server/restapi/config/ListCaches.java index ccafbe89b1..ffc65c92da 100644 --- a/java/com/google/gerrit/server/restapi/config/ListCaches.java +++ b/java/com/google/gerrit/server/restapi/config/ListCaches.java @@ -22,7 +22,6 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.stream.Collectors.joining; import com.google.common.cache.Cache; -import com.google.common.cache.CacheStats; import com.google.common.collect.Streams; import com.google.gerrit.extensions.annotations.RequiresAnyCapability; import com.google.gerrit.extensions.registration.DynamicMap; @@ -30,7 +29,7 @@ import com.google.gerrit.extensions.registration.Extension; import com.google.gerrit.extensions.restapi.BinaryResult; import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestReadView; -import com.google.gerrit.server.cache.PersistentCache; +import com.google.gerrit.server.cache.CacheInfo; import com.google.gerrit.server.config.ConfigResource; import com.google.inject.Inject; import java.util.Map; @@ -87,118 +86,4 @@ public class ListCaches implements RestReadView<ConfigResource> { } return Response.ok(cacheNames.collect(toImmutableList())); } - - public enum CacheType { - MEM, - DISK - } - - public static class CacheInfo { - public String name; - public CacheType type; - public EntriesInfo entries; - public String averageGet; - public HitRatioInfo hitRatio; - - public CacheInfo(Cache<?, ?> cache) { - this(null, cache); - } - - public CacheInfo(String name, Cache<?, ?> cache) { - this.name = name; - - CacheStats stat = cache.stats(); - - entries = new EntriesInfo(); - entries.setMem(cache.size()); - - averageGet = duration(stat.averageLoadPenalty()); - - hitRatio = new HitRatioInfo(); - hitRatio.setMem(stat.hitCount(), stat.requestCount()); - - if (cache instanceof PersistentCache) { - type = CacheType.DISK; - PersistentCache.DiskStats diskStats = ((PersistentCache) cache).diskStats(); - entries.setDisk(diskStats.size()); - entries.setSpace(diskStats.space()); - hitRatio.setDisk(diskStats.hitCount(), diskStats.requestCount()); - } else { - type = CacheType.MEM; - } - } - - private static String duration(double ns) { - if (ns < 0.5) { - return null; - } - String suffix = "ns"; - if (ns >= 1000.0) { - ns /= 1000.0; - suffix = "us"; - } - if (ns >= 1000.0) { - ns /= 1000.0; - suffix = "ms"; - } - if (ns >= 1000.0) { - ns /= 1000.0; - suffix = "s"; - } - return String.format("%4.1f%s", ns, suffix).trim(); - } - } - - public static class EntriesInfo { - public Long mem; - public Long disk; - public String space; - - public void setMem(long mem) { - this.mem = mem != 0 ? mem : null; - } - - public void setDisk(long disk) { - this.disk = disk != 0 ? disk : null; - } - - public void setSpace(double value) { - space = bytes(value); - } - - private static String bytes(double value) { - value /= 1024; - String suffix = "k"; - - if (value > 1024) { - value /= 1024; - suffix = "m"; - } - if (value > 1024) { - value /= 1024; - suffix = "g"; - } - return String.format("%1$6.2f%2$s", value, suffix).trim(); - } - } - - public static class HitRatioInfo { - public Integer mem; - public Integer disk; - - public void setMem(long value, long total) { - mem = percent(value, total); - } - - public void setDisk(long value, long total) { - disk = percent(value, total); - } - - private static Integer percent(long value, long total) { - if (total <= 0) { - return null; - } - return (int) ((100 * value) / total); - } - } } diff --git a/java/com/google/gerrit/sshd/commands/ShowCaches.java b/java/com/google/gerrit/sshd/commands/ShowCaches.java index ba84179085..219ceaab2d 100644 --- a/java/com/google/gerrit/sshd/commands/ShowCaches.java +++ b/java/com/google/gerrit/sshd/commands/ShowCaches.java @@ -24,6 +24,8 @@ import com.google.gerrit.extensions.annotations.RequiresAnyCapability; import com.google.gerrit.extensions.events.LifecycleListener; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.server.CurrentUser; +import com.google.gerrit.server.cache.CacheDisplay; +import com.google.gerrit.server.cache.CacheInfo; import com.google.gerrit.server.config.ConfigResource; import com.google.gerrit.server.permissions.GlobalPermission; import com.google.gerrit.server.permissions.PermissionBackend; @@ -35,8 +37,6 @@ import com.google.gerrit.server.restapi.config.GetSummary.SummaryInfo; import com.google.gerrit.server.restapi.config.GetSummary.TaskSummaryInfo; import com.google.gerrit.server.restapi.config.GetSummary.ThreadSummaryInfo; import com.google.gerrit.server.restapi.config.ListCaches; -import com.google.gerrit.server.restapi.config.ListCaches.CacheInfo; -import com.google.gerrit.server.restapi.config.ListCaches.CacheType; import com.google.gerrit.server.util.time.TimeUtil; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; @@ -123,52 +123,8 @@ final class ShowCaches extends SshCommand { stdout.format("%-25s %-20s uptime %16s\n", "", "", uptime(now.getTime() - serverStarted)); stdout.print('\n'); - stdout.print( - String.format( // - "%1s %-" + nw + "s|%-21s| %-5s |%-9s|\n" // - , - "" // - , - "Name" // - , - "Entries" // - , - "AvgGet" // - , - "Hit Ratio" // - )); - stdout.print( - String.format( // - "%1s %-" + nw + "s|%6s %6s %7s| %-5s |%-4s %-4s|\n" // - , - "" // - , - "" // - , - "Mem" // - , - "Disk" // - , - "Space" // - , - "" // - , - "Mem" // - , - "Disk" // - )); - stdout.print("--"); - for (int i = 0; i < nw; i++) { - stdout.print('-'); - } - stdout.print("+---------------------+---------+---------+\n"); - try { - Collection<CacheInfo> caches = getCaches(); - printMemoryCoreCaches(caches); - printMemoryPluginCaches(caches); - printDiskCaches(caches); - stdout.print('\n'); + new CacheDisplay(stdout, nw, getCaches()).displayCaches(); boolean showJvm; try { @@ -209,52 +165,6 @@ final class ShowCaches extends SshCommand { return caches.values(); } - private void printMemoryCoreCaches(Collection<CacheInfo> caches) { - for (CacheInfo cache : caches) { - if (!cache.name.contains("-") && CacheType.MEM.equals(cache.type)) { - printCache(cache); - } - } - } - - private void printMemoryPluginCaches(Collection<CacheInfo> caches) { - for (CacheInfo cache : caches) { - if (cache.name.contains("-") && CacheType.MEM.equals(cache.type)) { - printCache(cache); - } - } - } - - private void printDiskCaches(Collection<CacheInfo> caches) { - for (CacheInfo cache : caches) { - if (CacheType.DISK.equals(cache.type)) { - printCache(cache); - } - } - } - - private void printCache(CacheInfo cache) { - stdout.print( - String.format( - "%1s %-" + nw + "s|%6s %6s %7s| %7s |%4s %4s|\n", - CacheType.DISK.equals(cache.type) ? "D" : "", - cache.name, - nullToEmpty(cache.entries.mem), - nullToEmpty(cache.entries.disk), - Strings.nullToEmpty(cache.entries.space), - Strings.nullToEmpty(cache.averageGet), - formatAsPercent(cache.hitRatio.mem), - formatAsPercent(cache.hitRatio.disk))); - } - - private static String nullToEmpty(Long l) { - return l != null ? String.valueOf(l) : ""; - } - - private static String formatAsPercent(Integer i) { - return i != null ? String.valueOf(i) + "%" : ""; - } - private void memSummary(MemSummaryInfo memSummary) { stdout.format( "Mem: %s total = %s used + %s free + %s buffers\n", diff --git a/javatests/com/google/gerrit/acceptance/rest/config/CacheOperationsIT.java b/javatests/com/google/gerrit/acceptance/rest/config/CacheOperationsIT.java index daeb032a82..e4b4e4ad96 100644 --- a/javatests/com/google/gerrit/acceptance/rest/config/CacheOperationsIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/config/CacheOperationsIT.java @@ -25,7 +25,7 @@ import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.server.restapi.config.ListCaches.CacheInfo; +import com.google.gerrit.server.cache.CacheInfo; import com.google.gerrit.server.restapi.config.PostCaches; import com.google.inject.Inject; import java.util.Arrays; diff --git a/javatests/com/google/gerrit/acceptance/rest/config/FlushCacheIT.java b/javatests/com/google/gerrit/acceptance/rest/config/FlushCacheIT.java index a161ec4eb7..164f683f22 100644 --- a/javatests/com/google/gerrit/acceptance/rest/config/FlushCacheIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/config/FlushCacheIT.java @@ -23,7 +23,7 @@ import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.acceptance.testsuite.project.ProjectOperations; import com.google.gerrit.common.data.GlobalCapability; -import com.google.gerrit.server.restapi.config.ListCaches.CacheInfo; +import com.google.gerrit.server.cache.CacheInfo; import com.google.inject.Inject; import org.junit.Test; diff --git a/javatests/com/google/gerrit/acceptance/rest/config/GetCacheIT.java b/javatests/com/google/gerrit/acceptance/rest/config/GetCacheIT.java index 247d63b797..8765360423 100644 --- a/javatests/com/google/gerrit/acceptance/rest/config/GetCacheIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/config/GetCacheIT.java @@ -18,8 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.RestResponse; -import com.google.gerrit.server.restapi.config.ListCaches.CacheInfo; -import com.google.gerrit.server.restapi.config.ListCaches.CacheType; +import com.google.gerrit.server.cache.CacheInfo; import org.junit.Test; public class GetCacheIT extends AbstractDaemonTest { @@ -31,7 +30,7 @@ public class GetCacheIT extends AbstractDaemonTest { CacheInfo result = newGson().fromJson(r.getReader(), CacheInfo.class); assertThat(result.name).isEqualTo("accounts"); - assertThat(result.type).isEqualTo(CacheType.MEM); + assertThat(result.type).isEqualTo(CacheInfo.CacheType.MEM); assertThat(result.entries.mem).isAtLeast(1L); assertThat(result.averageGet).isNotNull(); assertThat(result.averageGet).endsWith("s"); diff --git a/javatests/com/google/gerrit/acceptance/rest/config/ListCachesIT.java b/javatests/com/google/gerrit/acceptance/rest/config/ListCachesIT.java index 8baeffc4aa..be21436864 100644 --- a/javatests/com/google/gerrit/acceptance/rest/config/ListCachesIT.java +++ b/javatests/com/google/gerrit/acceptance/rest/config/ListCachesIT.java @@ -21,8 +21,7 @@ import com.google.common.collect.Ordering; import com.google.common.io.BaseEncoding; import com.google.gerrit.acceptance.AbstractDaemonTest; import com.google.gerrit.acceptance.RestResponse; -import com.google.gerrit.server.restapi.config.ListCaches.CacheInfo; -import com.google.gerrit.server.restapi.config.ListCaches.CacheType; +import com.google.gerrit.server.cache.CacheInfo; import com.google.gson.reflect.TypeToken; import java.util.Arrays; import java.util.List; @@ -40,7 +39,7 @@ public class ListCachesIT extends AbstractDaemonTest { assertThat(result).containsKey("accounts"); CacheInfo accountsCacheInfo = result.get("accounts"); - assertThat(accountsCacheInfo.type).isEqualTo(CacheType.MEM); + assertThat(accountsCacheInfo.type).isEqualTo(CacheInfo.CacheType.MEM); assertThat(accountsCacheInfo.entries.mem).isAtLeast(1L); assertThat(accountsCacheInfo.averageGet).isNotNull(); assertThat(accountsCacheInfo.averageGet).endsWith("s"); |