cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Mon, 13 Oct 2014 17:12:16 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/27fdf421
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27fdf421
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27fdf421

Branch: refs/heads/trunk
Commit: 27fdf4211a3a8eb01367209d3d7121f40e044718
Parents: 9333f86 dee15a8
Author: Yuki Morishita <yukim@apache.org>
Authored: Mon Oct 13 12:11:40 2014 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Mon Oct 13 12:11:40 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../apache/cassandra/db/AtomicBTreeColumns.java | 138 ++++++++++++++++---
 src/java/org/apache/cassandra/db/Memtable.java  |  10 +-
 .../cassandra/utils/concurrent/Locks.java       |  37 +++++
 4 files changed, 166 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/27fdf421/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
index 0572c4a,7b5e8a8..7a98cb9
--- a/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
+++ b/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
@@@ -35,10 -36,9 +36,11 @@@ 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.Locks;
  import org.apache.cassandra.utils.concurrent.OpOrder;
  import org.apache.cassandra.utils.memory.HeapAllocator;
  import org.apache.cassandra.utils.memory.MemtableAllocator;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/27fdf421/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------


Mime
View raw message