You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2013/10/24 02:06:28 UTC
svn commit: r1535216 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/facet/
lucene/facet/src/java/org/apache/lucene/facet/search/OrdinalsCache.java
lucene/facet/src/test/org/apache/lucene/facet/search/OrdinalsCacheTest.java
Author: mikemccand
Date: Thu Oct 24 00:06:28 2013
New Revision: 1535216
URL: http://svn.apache.org/r1535216
Log:
LUCENE-5303: clear cache before each test
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/facet/ (props changed)
lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/OrdinalsCache.java
lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/search/OrdinalsCacheTest.java
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/OrdinalsCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/OrdinalsCache.java?rev=1535216&r1=1535215&r2=1535216&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/OrdinalsCache.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/java/org/apache/lucene/facet/search/OrdinalsCache.java Thu Oct 24 00:06:28 2013
@@ -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<Object,Map<String,CachedOrds>> ordsCache = new WeakHashMap<Object,Map<String,CachedOrds>>();
-
+
/**
* 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();
+ }
}
Modified: lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/search/OrdinalsCacheTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/search/OrdinalsCacheTest.java?rev=1535216&r1=1535215&r2=1535216&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/search/OrdinalsCacheTest.java (original)
+++ lucene/dev/branches/branch_4x/lucene/facet/src/test/org/apache/lucene/facet/search/OrdinalsCacheTest.java Thu Oct 24 00:06:28 2013
@@ -72,7 +72,9 @@ public class OrdinalsCacheTest extends F
}
};
}
-
+
+ OrdinalsCache.clear();
+
long ramBytesUsed = 0;
for (Thread t : threads) {
t.start();