From 9547ae95e831ed422d970f27b8d48da568e50ee2 Mon Sep 17 00:00:00 2001
From: Jonathan Ellis <jbellis@apache.org>
Date: Wed, 2 Sep 2009 15:32:09 +0000
Subject: [PATCH] merge 810540 (clru removal) from trunk (committed in wrong
 order. oops)

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.4@810570 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                   |   1 -
 conf/storage-conf.xml                         |  11 -
 lib/clhm-20090629.jar                         | Bin 24477 -> 0 bytes
 lib/licenses/clhm-20090629.jar.LICENSE        | 202 ------------------
 .../cassandra/config/DatabaseDescriptor.java  |  19 --
 .../apache/cassandra/db/BinaryMemtable.java   |   2 +-
 .../cassandra/db/ColumnFamilyStore.java       |   4 +-
 .../org/apache/cassandra/db/Memtable.java     |   2 +-
 .../apache/cassandra/io/SSTableReader.java    |  32 +--
 .../apache/cassandra/io/SSTableWriter.java    |  10 +-
 .../org/apache/cassandra/io/SSTableTest.java  |   4 +-
 11 files changed, 13 insertions(+), 274 deletions(-)
 delete mode 100644 lib/clhm-20090629.jar
 delete mode 100644 lib/licenses/clhm-20090629.jar.LICENSE

diff --git a/CHANGES.txt b/CHANGES.txt
index 49c917e58f..537aafb2d4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,7 +6,6 @@
  * Scan all sstables for all queries to avoid situations where
    different types of operation on the same ColumnFamily could
    disagree on what data was present
- * Configurable LRU cache for key lookups
  * Snapshot support via JMX
  * BinaryMemtable support for bulk load via hadoop; see
    https://github.com/lenn0x/Cassandra-Hadoop-BMT/tree
diff --git a/conf/storage-conf.xml b/conf/storage-conf.xml
index bff347ee5d..a411bc2ab7 100644
--- a/conf/storage-conf.xml
+++ b/conf/storage-conf.xml
@@ -42,17 +42,6 @@
   -->
   <Keyspaces>
     <Keyspace Name="Keyspace1">
-      <!--
-       ~ The fraction of keys per sstable whose locations we keep in
-       ~ memory in "mostly LRU" order.  (JUST the key locations, NOT any
-       ~ column values.)
-
-       ~ The amount of memory used by the default setting of 0.01 is
-       ~ comparable to the amount used by the internal per-sstable key
-       ~ index. Consider increasing this if you have fewer, wider rows.
-       ~ Set to 0 to disable entirely.
-      -->
-      <KeysCachedFraction>0.01</KeysCachedFraction>
       <!-- 
        ~ The CompareWith attribute tells Cassandra how to sort the columns
        ~ for slicing operations.  The default is BytesType, which is a
diff --git a/lib/clhm-20090629.jar b/lib/clhm-20090629.jar
deleted file mode 100644
index 1b8b6b1afd211647d6b12dac02bd3967e559c91f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 24477
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
EFDYSuFaQ7m

diff --git a/lib/licenses/clhm-20090629.jar.LICENSE b/lib/licenses/clhm-20090629.jar.LICENSE
deleted file mode 100644
index 7a4a3ea242..0000000000
--- a/lib/licenses/clhm-20090629.jar.LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
\ No newline at end of file
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 7aa6c454a0..915938fe99 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -89,7 +89,6 @@ public class DatabaseDescriptor
     private static String d_columnValue_      = "COLUMN_VALUE";
     private static String d_columnTimestamp_  = "COLUMN_TIMESTAMP";
 
-    private static Map<String, Double> tableKeysCachedFractions_;
     /*
      * A map from table names to the set of column families for the table and the
      * corresponding meta data for that column family.
@@ -401,7 +400,6 @@ public class DatabaseDescriptor
                 CommitLog.setSegmentSize(Integer.parseInt(value) * 1024 * 1024);
 
             tableToCFMetaDataMap_ = new HashMap<String, Map<String, CFMetaData>>();
-            tableKeysCachedFractions_ = new HashMap<String, Double>();
 
             /* See which replica placement strategy to use */
             String replicaPlacementStrategyClassName = xmlUtils.getNodeValue("/Storage/ReplicaPlacementStrategy");
@@ -438,17 +436,6 @@ public class DatabaseDescriptor
                 tables_.add(tName);
                 tableToCFMetaDataMap_.put(tName, new HashMap<String, CFMetaData>());
 
-                String xqlCacheSize = "/Storage/Keyspaces/Keyspace[@Name='" + tName + "']/KeysCachedFraction";
-                value = xmlUtils.getNodeValue(xqlCacheSize);
-                if (value == null)
-                {
-                    tableKeysCachedFractions_.put(tName, 0.01);
-                }
-                else
-                {
-                    tableKeysCachedFractions_.put(tName, Double.valueOf(value));
-                }
-
                 String xqlTable = "/Storage/Keyspaces/Keyspace[@Name='" + tName + "']/";
                 NodeList columnFamilies = xmlUtils.getRequestedNodeList(xqlTable + "ColumnFamily");
 
@@ -573,7 +560,6 @@ public class DatabaseDescriptor
             data.subcolumnComparator = new BytesType();
             systemMetadata.put(HintedHandOffManager.HINTS_CF, data);
             tableToCFMetaDataMap_.put(Table.SYSTEM_TABLE, systemMetadata);
-            tableKeysCachedFractions_.put(Table.SYSTEM_TABLE, 0.01);
 
             /* make sure we have a directory for each table */
             createTableDirectories();
@@ -964,11 +950,6 @@ public class DatabaseDescriptor
         return tableToCFMetaDataMap_;
     }
 
-    public static double getKeysCachedFraction(String tableName)
-    {
-        return tableKeysCachedFractions_.get(tableName);
-    }
-
     private static class ConfigurationException extends Exception
     {
         public ConfigurationException(String message)
diff --git a/src/java/org/apache/cassandra/db/BinaryMemtable.java b/src/java/org/apache/cassandra/db/BinaryMemtable.java
index 4530e8b28b..9cc98f7fbc 100644
--- a/src/java/org/apache/cassandra/db/BinaryMemtable.java
+++ b/src/java/org/apache/cassandra/db/BinaryMemtable.java
@@ -175,7 +175,7 @@ public class BinaryMemtable
                 writer.append(key, bytes);
             }
         }
-        cfStore.storeLocation(writer.closeAndOpenReader(DatabaseDescriptor.getKeysCachedFraction(table_)));
+        cfStore.storeLocation(writer.closeAndOpenReader());
         columnFamilies_.clear();       
     }
 }
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index d0f7c20afe..dbc80ac2b3 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -1009,7 +1009,7 @@ public final class ColumnFamilyStore implements ColumnFamilyStoreMBean
 
         if (rangeWriter != null)
         {
-            rangeWriter.closeAndOpenReader(DatabaseDescriptor.getKeysCachedFraction(table_));
+            rangeWriter.closeAndOpenReader();
             if (fileList != null)
             {
                 //Retain order. The -Data.db file needs to be last because 
@@ -1160,7 +1160,7 @@ public final class ColumnFamilyStore implements ColumnFamilyStoreMBean
         if (writer != null)
         {
             // TODO if all the keys were the same nothing will be done here
-            ssTable = writer.closeAndOpenReader(DatabaseDescriptor.getKeysCachedFraction(table_));
+            ssTable = writer.closeAndOpenReader();
             newfile = writer.getFilename();
         }
         sstableLock_.writeLock().lock();
diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java
index b7f9488d3c..7b105d153f 100644
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@ -212,7 +212,7 @@ public class Memtable implements Comparable<Memtable>
                 writer.append(partitioner.decorateKey(key), buffer);
             }
         }
-        SSTableReader ssTable = writer.closeAndOpenReader(DatabaseDescriptor.getKeysCachedFraction(table_));
+        SSTableReader ssTable = writer.closeAndOpenReader();
         cfStore.onMemtableFlush(cLogCtx);
         cfStore.storeLocation(ssTable);
         buffer.close();
diff --git a/src/java/org/apache/cassandra/io/SSTableReader.java b/src/java/org/apache/cassandra/io/SSTableReader.java
index 98ea724b5c..b1dee43521 100644
--- a/src/java/org/apache/cassandra/io/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/SSTableReader.java
@@ -31,7 +31,6 @@ import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.ColumnFamily;
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.cliffc.high_scale_lib.NonBlockingHashMap;
-import com.reardencommerce.kernel.collections.shared.evictable.ConcurrentLinkedHashMap;
 
 public class SSTableReader extends SSTable
 {
@@ -83,10 +82,10 @@ public class SSTableReader extends SSTable
 
     public static synchronized SSTableReader open(String dataFileName) throws IOException
     {
-        return open(dataFileName, StorageService.getPartitioner(), DatabaseDescriptor.getKeysCachedFraction(parseTableName(dataFileName)));
+        return open(dataFileName, StorageService.getPartitioner());
     }
     
-    public static synchronized SSTableReader open(String dataFileName, IPartitioner partitioner, double cacheFraction) throws IOException
+    public static synchronized SSTableReader open(String dataFileName, IPartitioner partitioner) throws IOException
     {
         SSTableReader sstable = openedFiles.get(dataFileName);
         if (sstable == null)
@@ -97,10 +96,6 @@ public class SSTableReader extends SSTable
             long start = System.currentTimeMillis();
             sstable.loadIndexFile();
             sstable.loadBloomFilter();
-            if (cacheFraction > 0)
-            {
-                sstable.keyCache = createKeyCache((int)((sstable.getIndexPositions().size() + 1) * INDEX_INTERVAL * cacheFraction));
-            }
             if (logger.isDebugEnabled())
                 logger.debug("INDEX LOAD TIME for "  + dataFileName + ": " + (System.currentTimeMillis() - start) + " ms.");
 
@@ -116,20 +111,11 @@ public class SSTableReader extends SSTable
         return sstable;
     }
 
-    public static ConcurrentLinkedHashMap<String, Long> createKeyCache(int size)
-    {
-        return ConcurrentLinkedHashMap.create(ConcurrentLinkedHashMap.EvictionPolicy.SECOND_CHANCE, size);
-    }
-
-
-    private ConcurrentLinkedHashMap<String, Long> keyCache;
-
-    SSTableReader(String filename, IPartitioner partitioner, List<KeyPosition> indexPositions, BloomFilter bloomFilter, ConcurrentLinkedHashMap<String, Long> keyCache)
+    SSTableReader(String filename, IPartitioner partitioner, List<KeyPosition> indexPositions, BloomFilter bloomFilter)
     {
         super(filename, partitioner);
         this.indexPositions = indexPositions;
         this.bf = bloomFilter;
-        this.keyCache = keyCache;
         synchronized (SSTableReader.this)
         {
             openedFiles.put(filename, this);
@@ -202,14 +188,6 @@ public class SSTableReader extends SSTable
     {
         if (!bf.isPresent(decoratedKey))
             return -1;
-        if (keyCache != null)
-        {
-            Long cachedPosition = keyCache.get(decoratedKey);
-            if (cachedPosition != null)
-            {
-                return cachedPosition;
-            }
-        }
         long start = getIndexScanPosition(decoratedKey, partitioner);
         if (start < 0)
         {
@@ -237,8 +215,6 @@ public class SSTableReader extends SSTable
                 int v = partitioner.getDecoratedKeyComparator().compare(indexDecoratedKey, decoratedKey);
                 if (v == 0)
                 {
-                    if (keyCache != null)
-                        keyCache.put(decoratedKey, position);
                     return position;
                 }
                 if (v > 0)
@@ -307,7 +283,7 @@ public class SSTableReader extends SSTable
         openedFiles.clear();
         for (SSTableReader sstable : sstables)
         {
-            SSTableReader.open(sstable.path, sstable.partitioner, 0.01);
+            SSTableReader.open(sstable.path, sstable.partitioner);
         }
     }
 
diff --git a/src/java/org/apache/cassandra/io/SSTableWriter.java b/src/java/org/apache/cassandra/io/SSTableWriter.java
index 3ca3782f82..11cfffc763 100644
--- a/src/java/org/apache/cassandra/io/SSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/SSTableWriter.java
@@ -34,7 +34,6 @@ import org.apache.cassandra.dht.IPartitioner;
 import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.utils.BloomFilter;
 import org.apache.cassandra.config.DatabaseDescriptor;
-import com.reardencommerce.kernel.collections.shared.evictable.ConcurrentLinkedHashMap;
 
 public class SSTableWriter extends SSTable
 {
@@ -115,7 +114,7 @@ public class SSTableWriter extends SSTable
     /**
      * Renames temporary SSTable files to valid data, index, and bloom filter files
      */
-    public SSTableReader closeAndOpenReader(double cacheFraction) throws IOException
+    public SSTableReader closeAndOpenReader() throws IOException
     {
         // bloom filter
         FileOutputStream fos = new FileOutputStream(filterFilename());
@@ -136,10 +135,7 @@ public class SSTableWriter extends SSTable
         rename(filterFilename());
         path = rename(path); // important to do this last since index & filter file names are derived from it
 
-        ConcurrentLinkedHashMap<String,Long> keyCache = cacheFraction > 0
-                                                        ? SSTableReader.createKeyCache((int) (cacheFraction * keysWritten))
-                                                        : null;
-        return new SSTableReader(path, partitioner, indexPositions, bf, keyCache);
+        return new SSTableReader(path, partitioner, indexPositions, bf);
     }
 
     static String rename(String tmpFilename)
@@ -154,7 +150,7 @@ public class SSTableWriter extends SSTable
         SSTableWriter.rename(indexFilename(dataFileName));
         SSTableWriter.rename(filterFilename(dataFileName));
         dataFileName = SSTableWriter.rename(dataFileName);
-        return SSTableReader.open(dataFileName, StorageService.getPartitioner(), DatabaseDescriptor.getKeysCachedFraction(parseTableName(dataFileName)));
+        return SSTableReader.open(dataFileName, StorageService.getPartitioner());
     }
 
 }
diff --git a/test/unit/org/apache/cassandra/io/SSTableTest.java b/test/unit/org/apache/cassandra/io/SSTableTest.java
index d27078e622..aa2d665e7e 100644
--- a/test/unit/org/apache/cassandra/io/SSTableTest.java
+++ b/test/unit/org/apache/cassandra/io/SSTableTest.java
@@ -41,7 +41,7 @@ public class SSTableTest extends CleanupHelper
 
         String key = Integer.toString(1);
         writer.append(key, bytes);
-        SSTableReader ssTable = writer.closeAndOpenReader(0.01);
+        SSTableReader ssTable = writer.closeAndOpenReader();
 
         // verify
         verifySingle(ssTable, bytes, key);
@@ -81,7 +81,7 @@ public class SSTableTest extends CleanupHelper
         {
             writer.append(key, map.get(key));
         }
-        SSTableReader ssTable = writer.closeAndOpenReader(0.01);
+        SSTableReader ssTable = writer.closeAndOpenReader();
 
         // verify
         verifyMany(ssTable, map);