Updated Branches: refs/heads/trunk 255db5006 -> f4b87e696
cleanup Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4b87e69 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4b87e69 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4b87e69 Branch: refs/heads/trunk Commit: f4b87e69621a90515b2945bdb1fc4a3de33259ae Parents: 255db50 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Mar 26 18:15:46 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Mar 26 20:48:46 2013 -0500 ---------------------------------------------------------------------- .../db/AbstractThreadUnsafeSortedColumns.java | 5 ----- .../apache/cassandra/db/AtomicSortedColumns.java | 7 ------- src/java/org/apache/cassandra/db/RowMutation.java | 6 ------ .../cassandra/db/ThreadSafeSortedColumns.java | 1 - 4 files changed, 0 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4b87e69/src/java/org/apache/cassandra/db/AbstractThreadUnsafeSortedColumns.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/AbstractThreadUnsafeSortedColumns.java b/src/java/org/apache/cassandra/db/AbstractThreadUnsafeSortedColumns.java index aa153e1..b40c2e2 100644 --- a/src/java/org/apache/cassandra/db/AbstractThreadUnsafeSortedColumns.java +++ b/src/java/org/apache/cassandra/db/AbstractThreadUnsafeSortedColumns.java @@ -86,9 +86,4 @@ public abstract class AbstractThreadUnsafeSortedColumns implements ISortedColumn { return size() == 0; } - - public int getEstimatedColumnCount() - { - return size(); - } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4b87e69/src/java/org/apache/cassandra/db/AtomicSortedColumns.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/AtomicSortedColumns.java b/src/java/org/apache/cassandra/db/AtomicSortedColumns.java index fbfcd75..4a7b659 100644 --- a/src/java/org/apache/cassandra/db/AtomicSortedColumns.java +++ b/src/java/org/apache/cassandra/db/AtomicSortedColumns.java @@ -44,8 +44,6 @@ import org.apache.cassandra.utils.Allocator; * WARNING: removing element through getSortedColumns().iterator() is *not* * isolated of other operations and could actually be fully ignored in the * face of a concurrent. Don't use it unless in a non-concurrent context. - * - * TODO: check the snaptree license make it ok to use */ public class AtomicSortedColumns implements ISortedColumns { @@ -263,11 +261,6 @@ public class AtomicSortedColumns implements ISortedColumns return ref.get().map.size(); } - public int getEstimatedColumnCount() - { - return size(); - } - public boolean isEmpty() { return ref.get().map.isEmpty(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4b87e69/src/java/org/apache/cassandra/db/RowMutation.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/RowMutation.java b/src/java/org/apache/cassandra/db/RowMutation.java index f850d28..e90e15e 100644 --- a/src/java/org/apache/cassandra/db/RowMutation.java +++ b/src/java/org/apache/cassandra/db/RowMutation.java @@ -26,17 +26,11 @@ import java.util.*; import org.apache.commons.lang.StringUtils; import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.config.Schema; -import org.apache.cassandra.db.marshal.UUIDType; import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.net.MessageOut; import org.apache.cassandra.net.MessagingService; -import org.apache.cassandra.thrift.ColumnOrSuperColumn; -import org.apache.cassandra.thrift.Deletion; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.utils.UUIDGen; // TODO convert this to a Builder pattern instead of encouraging RM.add directly, // which is less-efficient since we have to keep a mutable HashMap around http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4b87e69/src/java/org/apache/cassandra/db/ThreadSafeSortedColumns.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ThreadSafeSortedColumns.java b/src/java/org/apache/cassandra/db/ThreadSafeSortedColumns.java index 776e543..b535521 100644 --- a/src/java/org/apache/cassandra/db/ThreadSafeSortedColumns.java +++ b/src/java/org/apache/cassandra/db/ThreadSafeSortedColumns.java @@ -119,7 +119,6 @@ public class ThreadSafeSortedColumns extends AbstractThreadUnsafeSortedColumns i addAllWithSizeDelta(cm, allocator, transformation, null); } - @Override public long addAllWithSizeDelta(ISortedColumns cm, Allocator allocator, Function<Column, Column> transformation, SecondaryIndexManager.Updater indexer) { delete(cm.getDeletionInfo());
