From ab392a6ee7db31fe7a4cf8093e7308057cd47493 Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Wed, 2 Sep 2009 15:04:16 +0000 Subject: [PATCH] remove buggy concurrentlinkedhashmap library and lru cache. too late in 0.4 to try to debug the library -- will revisit for 0.5. patch by jbellis; reviewed by Chris Goffinet for CASSANDRA-405 git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@810540 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 @@ --> - - 0.01