cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Date Mon, 16 Jun 2014 20:12:50 GMT
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 5bd5e25fbbb490acd047adf495f75ae1ca49cf0f
Parents: 45afe1d a14a01c
Author: Jake Luciani <jake@apache.org>
Authored: Mon Jun 16 16:12:27 2014 -0400
Committer: Jake Luciani <jake@apache.org>
Committed: Mon Jun 16 16:12:27 2014 -0400

----------------------------------------------------------------------
 CHANGES.txt                                     |   2 +-
 .../cql3/statements/BatchStatement.java         |  17 ++-
 .../apache/cassandra/db/AtomicBTreeColumns.java |   8 +-
 .../org/apache/cassandra/db/DeletionInfo.java   |  12 ++
 .../apache/cassandra/db/RangeTombstoneList.java |  21 +++
 test/conf/cassandra.yaml                        |   2 +
 .../org/apache/cassandra/cql3/DeleteTest.java   | 148 +++++++++++++++++++
 7 files changed, 201 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bd5e25f/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
index 4eb4940,0e38784..58734e8
--- a/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
+++ b/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
@@@ -35,11 -35,10 +35,12 @@@ import org.apache.cassandra.db.composit
  import org.apache.cassandra.db.composites.Composite;
  import org.apache.cassandra.db.filter.ColumnSlice;
  import org.apache.cassandra.utils.ObjectSizes;
 +import org.apache.cassandra.utils.SearchIterator;
  import org.apache.cassandra.utils.btree.BTree;
 +import org.apache.cassandra.utils.btree.BTreeSearchIterator;
  import org.apache.cassandra.utils.btree.UpdateFunction;
  import org.apache.cassandra.utils.concurrent.OpOrder;
+ import org.apache.cassandra.utils.memory.HeapAllocator;
  import org.apache.cassandra.utils.memory.MemtableAllocator;
  
  import static org.apache.cassandra.db.index.SecondaryIndexManager.Updater;


Mime
View raw message