From 6455445730d5f238ef777e3b696f381b1b7c5f5d Mon Sep 17 00:00:00 2001 From: Michael McCandless Date: Thu, 24 Oct 2013 00:04:45 +0000 Subject: [PATCH] LUCENE-5303: clear cache before each test git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1535215 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/lucene/facet/search/OrdinalsCache.java | 7 ++++++- .../org/apache/lucene/facet/search/OrdinalsCacheTest.java | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lucene/facet/src/java/org/apache/lucene/facet/search/OrdinalsCache.java b/lucene/facet/src/java/org/apache/lucene/facet/search/OrdinalsCache.java index 3dd5d401e1d..8b423fbc3da 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/search/OrdinalsCache.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/search/OrdinalsCache.java @@ -100,7 +100,7 @@ public class OrdinalsCache { // reference. When it's no longer referenced, the entire inner map can be // evicted. private static final Map> ordsCache = new WeakHashMap>(); - + /** * Returns the {@link CachedOrds} relevant to the given * {@link AtomicReaderContext}, or {@code null} if there is no @@ -141,4 +141,9 @@ public class OrdinalsCache { } return size; } + + /** Clears all entries from the cache. */ + public synchronized static void clear() { + ordsCache.clear(); + } } diff --git a/lucene/facet/src/test/org/apache/lucene/facet/search/OrdinalsCacheTest.java b/lucene/facet/src/test/org/apache/lucene/facet/search/OrdinalsCacheTest.java index 80a2537dd8d..1473debb470 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/search/OrdinalsCacheTest.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/search/OrdinalsCacheTest.java @@ -72,7 +72,9 @@ public class OrdinalsCacheTest extends FacetTestCase { } }; } - + + OrdinalsCache.clear(); + long ramBytesUsed = 0; for (Thread t : threads) { t.start();