You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/03/27 02:53:57 UTC
git commit: retainAll is no longer needed now that supercolumns are
gone
Updated Branches:
refs/heads/trunk f4b87e696 -> 17d40b726
retainAll is no longer needed now that supercolumns are gone
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17d40b72
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17d40b72
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17d40b72
Branch: refs/heads/trunk
Commit: 17d40b726097a2d9a57ad24ab92a3d8ce1131a6a
Parents: f4b87e6
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Mar 26 20:53:52 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Mar 26 20:53:52 2013 -0500
----------------------------------------------------------------------
.../db/AbstractThreadUnsafeSortedColumns.java | 36 ---------------
.../apache/cassandra/db/AtomicSortedColumns.java | 12 -----
.../org/apache/cassandra/db/ISortedColumns.java | 1 -
3 files changed, 0 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/17d40b72/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 b40c2e2..3782dd2 100644
--- a/src/java/org/apache/cassandra/db/AbstractThreadUnsafeSortedColumns.java
+++ b/src/java/org/apache/cassandra/db/AbstractThreadUnsafeSortedColumns.java
@@ -17,10 +17,6 @@
*/
package org.apache.cassandra.db;
-import java.util.Iterator;
-
-import org.apache.cassandra.db.marshal.AbstractType;
-
public abstract class AbstractThreadUnsafeSortedColumns implements ISortedColumns
{
private DeletionInfo deletionInfo;
@@ -50,38 +46,6 @@ public abstract class AbstractThreadUnsafeSortedColumns implements ISortedColumn
deletionInfo = deletionInfo.purge(gcBefore);
}
- public void retainAll(ISortedColumns columns)
- {
- Iterator<Column> iter = iterator();
- Iterator<Column> toRetain = columns.iterator();
- Column current = iter.hasNext() ? iter.next() : null;
- Column retain = toRetain.hasNext() ? toRetain.next() : null;
- AbstractType<?> comparator = getComparator();
- while (current != null && retain != null)
- {
- int c = comparator.compare(current.name(), retain.name());
- if (c == 0)
- {
- current = iter.hasNext() ? iter.next() : null;
- retain = toRetain.hasNext() ? toRetain.next() : null;
- }
- else if (c < 0)
- {
- iter.remove();
- current = iter.hasNext() ? iter.next() : null;
- }
- else // c > 0
- {
- retain = toRetain.hasNext() ? toRetain.next() : null;
- }
- }
- while (current != null)
- {
- iter.remove();
- current = iter.hasNext() ? iter.next() : null;
- }
- }
-
public boolean isEmpty()
{
return size() == 0;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/17d40b72/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 4a7b659..a199b49 100644
--- a/src/java/org/apache/cassandra/db/AtomicSortedColumns.java
+++ b/src/java/org/apache/cassandra/db/AtomicSortedColumns.java
@@ -130,18 +130,6 @@ public class AtomicSortedColumns implements ISortedColumns
}
}
- public void retainAll(ISortedColumns columns)
- {
- Holder current, modified;
- do
- {
- current = ref.get();
- modified = current.cloneMe();
- modified.retainAll(columns);
- }
- while (!ref.compareAndSet(current, modified));
- }
-
public void addColumn(Column column, Allocator allocator)
{
Holder current, modified;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/17d40b72/src/java/org/apache/cassandra/db/ISortedColumns.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ISortedColumns.java b/src/java/org/apache/cassandra/db/ISortedColumns.java
index 7214eb1..f9ab2bf 100644
--- a/src/java/org/apache/cassandra/db/ISortedColumns.java
+++ b/src/java/org/apache/cassandra/db/ISortedColumns.java
@@ -54,7 +54,6 @@ public interface ISortedColumns extends Iterable<Column>
public void delete(DeletionInfo info);
public void maybeResetDeletionTimes(int gcBefore);
- public void retainAll(ISortedColumns columns);
/**
* Adds a column to this column map.