[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

[aleksey]

Merge branch 'cassandra-2.1' into trunk

Conflicts:
        src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
        test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2b4cd105
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2b4cd105
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2b4cd105

Branch: refs/heads/trunk
Commit: 2b4cd105e8854543e1962888a2cb2fe9fccc4d17
Parents: 39108df 06cd494
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Thu Jan 22 03:22:34 2015 +0300
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Thu Jan 22 03:22:34 2015 +0300

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../cassandra/db/ArrayBackedSortedColumns.java  |  96 +++++++++++++++--
 .../apache/cassandra/db/AtomicBTreeColumns.java |   5 +
 .../org/apache/cassandra/db/ColumnFamily.java   |   6 ++
 .../apache/cassandra/db/ColumnFamilyStore.java  |   7 +-
 .../cassandra/utils/BatchRemoveIterator.java    |  32 ++++++
 .../db/ArrayBackedSortedColumnsTest.java        | 103 ++++++++++++++++++-
 7 files changed, 238 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b4cd105/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b4cd105/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
index e5a731c,64752e3..9574d09
--- a/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
+++ b/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
@@@ -32,8 -27,8 +27,9 @@@ import org.apache.cassandra.config.CFMe
  import org.apache.cassandra.db.composites.CellName;
  import org.apache.cassandra.db.composites.Composite;
  import org.apache.cassandra.db.filter.ColumnSlice;
+ import org.apache.cassandra.utils.BatchRemoveIterator;
  import org.apache.cassandra.utils.memory.AbstractAllocator;
 +import org.apache.cassandra.utils.SearchIterator;
  
  /**
   * A ColumnFamily backed by an array.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b4cd105/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b4cd105/src/java/org/apache/cassandra/db/ColumnFamily.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b4cd105/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b4cd105/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java
index 46fe812,18851d4..0fdabe9
--- a/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java
+++ b/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java
@@@ -27,33 -25,19 +27,36 @@@ import org.junit.Test
  
  import static org.junit.Assert.*;
  
+ import com.google.common.collect.Sets;
+ 
  import org.apache.cassandra.SchemaLoader;
  import org.apache.cassandra.config.CFMetaData;
 +import org.apache.cassandra.config.KSMetaData;
  import org.apache.cassandra.config.Schema;
- import org.apache.cassandra.exceptions.ConfigurationException;
- import org.apache.cassandra.locator.SimpleStrategy;
- import org.apache.cassandra.utils.ByteBufferUtil;
  import org.apache.cassandra.db.composites.*;
  import org.apache.cassandra.db.filter.ColumnSlice;
  import org.apache.cassandra.db.marshal.Int32Type;
 -import org.apache.cassandra.utils.BatchRemoveIterator;
++import org.apache.cassandra.exceptions.ConfigurationException;
++import org.apache.cassandra.locator.SimpleStrategy;
+ import org.apache.cassandra.utils.ByteBufferUtil;
 +import org.apache.cassandra.utils.SearchIterator;
++import org.apache.cassandra.utils.BatchRemoveIterator;
  
 -public class ArrayBackedSortedColumnsTest extends SchemaLoader
 +public class ArrayBackedSortedColumnsTest
  {
 +    private static final String KEYSPACE1 = "ArrayBackedSortedColumnsTest";
 +    private static final String CF_STANDARD1 = "Standard1";
 +
 +    @BeforeClass
 +    public static void defineSchema() throws ConfigurationException
 +    {
 +        SchemaLoader.prepareServer();
 +        SchemaLoader.createKeyspace(KEYSPACE1,
 +                                    SimpleStrategy.class,
 +                                    KSMetaData.optsWithRF(1),
 +                                    SchemaLoader.standardCFMD(KEYSPACE1, 
CF_STANDARD1));
 +    }
 +
      @Test
      public void testAdd()
      {