Author: jbellis Date: Fri Oct 8 04:59:58 2010 New Revision: 1005712 URL: http://svn.apache.org/viewvc?rev=1005712&view=rev Log: r/m redundant Memtable.partitioner. patch by jbellis
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java Modified: cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=1005712&r1=1005711&r2=1005712&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Fri Oct 8 04:59:58 2010 @@ -160,7 +160,7 @@ public class ColumnFamilyStore implement this.maxCompactionThreshold = metadata.maxCompactionThreshold; this.partitioner = partitioner; fileIndexGenerator.set(generation); - memtable = new Memtable(this, this.partitioner); + memtable = new Memtable(this); binaryMemtable = new AtomicReference<BinaryMemtable>(new BinaryMemtable(this)); if (logger.isDebugEnabled()) @@ -578,7 +578,7 @@ public class ColumnFamilyStore implement for (ColumnFamilyStore cfs : icc) { submitFlush(cfs.memtable, latch); - cfs.memtable = new Memtable(cfs, cfs.partitioner); + cfs.memtable = new Memtable(cfs); } // when all the memtables have been written, including for indexes, mark the flush in the commitlog header. Modified: cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java?rev=1005712&r1=1005711&r2=1005712&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java Fri Oct 8 04:59:58 2010 @@ -55,14 +55,12 @@ public class Memtable implements Compara private final long creationTime; private final ConcurrentNavigableMap<DecoratedKey, ColumnFamily> columnFamilies = new ConcurrentSkipListMap<DecoratedKey, ColumnFamily>(); - private final IPartitioner partitioner; public final ColumnFamilyStore cfs; - public Memtable(ColumnFamilyStore cfs, IPartitioner partitioner) + public Memtable(ColumnFamilyStore cfs) { this.cfs = cfs; - this.partitioner = partitioner; creationTime = System.currentTimeMillis(); } @@ -148,7 +146,7 @@ public class Memtable implements Compara private SSTableReader writeSortedContents() throws IOException { logger.info("Writing " + this); - SSTableWriter writer = new SSTableWriter(cfs.getFlushPath(), columnFamilies.size(), cfs.metadata, partitioner); + SSTableWriter writer = new SSTableWriter(cfs.getFlushPath(), columnFamilies.size(), cfs.metadata, cfs.partitioner); for (Map.Entry<DecoratedKey, ColumnFamily> entry : columnFamilies.entrySet()) writer.append(entry.getKey(), entry.getValue());