Repository: cassandra Updated Branches: refs/heads/trunk 9bb3776c2 -> 1cd818c6b
Get rid of redundant cfs arg in ABSC#cloneToHeap() Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1cd818c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1cd818c6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1cd818c6 Branch: refs/heads/trunk Commit: 1cd818c6b4b36e1b4c55e52bb7d4bcc2af1dc322 Parents: 9bb3776 Author: Aleksey Yeschenko <[email protected]> Authored: Thu Mar 27 16:02:23 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu Mar 27 16:02:23 2014 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java | 4 ++-- src/java/org/apache/cassandra/db/Memtable.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1cd818c6/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java b/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java index 4a83901..ba8f278 100644 --- a/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java +++ b/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java @@ -86,7 +86,7 @@ public class ArrayBackedSortedColumns extends ColumnFamily this.isSorted = original.isSorted; } - public static ColumnFamily cloneToHeap(ColumnFamily value, ColumnFamilyStore cfs) + public static ColumnFamily cloneToHeap(ColumnFamily value) { if (value.getColumnCount() == 0) return value; @@ -95,7 +95,7 @@ public class ArrayBackedSortedColumns extends ColumnFamily int i = 0; for (Cell cell : value) cells[i++] = cell.localCopy(HeapAllocator.instance); - ColumnFamily r = new ArrayBackedSortedColumns(cfs.metadata, value.isInsertReversed(), cells, i, i); + ColumnFamily r = new ArrayBackedSortedColumns(value.metadata, value.isInsertReversed(), cells, i, i); r.delete(value); return r; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/1cd818c6/src/java/org/apache/cassandra/db/Memtable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java index 91dcf2d..415e3bc 100644 --- a/src/java/org/apache/cassandra/db/Memtable.java +++ b/src/java/org/apache/cassandra/db/Memtable.java @@ -259,7 +259,7 @@ public class Memtable { DecoratedKey key = (DecoratedKey) entry.getKey(); key = new DecoratedKey(key.token, HeapAllocator.instance.clone(key.key)); - ColumnFamily columns = ArrayBackedSortedColumns.cloneToHeap(entry.getValue(), cfs); + ColumnFamily columns = ArrayBackedSortedColumns.cloneToHeap(entry.getValue()); entry = new AbstractMap.SimpleImmutableEntry<>(key, columns); } // Store the reference to the current entry so that remove() can update the current size.
