svn commit: r1237443 - in /lucene/dev/branches/lucene2858/lucene/src: java/org/apache/lucene/index/SlowCompositeReaderWrapper.java test/org/apache/lucene/util/TestFieldCacheSanityChecker.java

[us...@apache.org]

Author: uschindler
Date: Sun Jan 29 20:00:00 2012
New Revision: 1237443

URL: http://svn.apache.org/viewvc?rev=1237443&view=rev
Log:
LUCENE-2858: Make Slow* use the inner cache key

Modified:
    lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java
    lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java

Modified: lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java?rev=1237443&r1=1237442&r2=1237443&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java Sun Jan 29 20:00:00 2012
@@ -149,6 +149,16 @@ public final class SlowCompositeReaderWr
   }
 
   @Override
+  public Object getCoreCacheKey() {
+    return in.getCoreCacheKey();
+  }
+
+  @Override
+  public Object getCombinedCoreAndDeletesKey() {
+    return in.getCombinedCoreAndDeletesKey();
+  }
+
+  @Override
   protected void doClose() throws IOException {
     // nocommit: as this is a wrapper, should we really close the delegate?
     in.close();

Modified: lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java?rev=1237443&r1=1237442&r2=1237443&view=diff
==============================================================================
--- lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java (original)
+++ lucene/dev/branches/lucene2858/lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java Sun Jan 29 20:00:00 2012
@@ -36,6 +36,7 @@ public class TestFieldCacheSanityChecker
   protected AtomicIndexReader readerA;
   protected AtomicIndexReader readerB;
   protected AtomicIndexReader readerX;
+  protected AtomicIndexReader readerAclone;
   protected Directory dirA, dirB;
   private static final int NUM_DOCS = 1000;
 
@@ -70,6 +71,9 @@ public class TestFieldCacheSanityChecker
     }
     wA.close();
     wB.close();
+    DirectoryReader rA = DirectoryReader.open(dirA);
+    readerA = SlowCompositeReaderWrapper.wrap(rA);
+    readerAclone = SlowCompositeReaderWrapper.wrap(rA);
     readerA = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dirA));
     readerB = SlowCompositeReaderWrapper.wrap(DirectoryReader.open(dirB));
     readerX = SlowCompositeReaderWrapper.wrap(new MultiReader(readerA, readerB));
@@ -78,6 +82,7 @@ public class TestFieldCacheSanityChecker
   @Override
   public void tearDown() throws Exception {
     readerA.close();
+    readerAclone.close();
     readerB.close();
     readerX.close();
     dirA.close();
@@ -91,6 +96,7 @@ public class TestFieldCacheSanityChecker
 
     cache.getDoubles(readerA, "theDouble", false);
     cache.getDoubles(readerA, "theDouble", FieldCache.DEFAULT_DOUBLE_PARSER, false);
+    cache.getDoubles(readerAclone, "theDouble", FieldCache.DEFAULT_DOUBLE_PARSER, false);
     cache.getDoubles(readerB, "theDouble", FieldCache.DEFAULT_DOUBLE_PARSER, false);
 
     cache.getInts(readerX, "theInt", false);