cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xe...@apache.org
Subject [4/4] git commit: Merge branch 'cassandra-2.1' into trunk
Date Tue, 25 Mar 2014 21:45:46 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/f31f6895
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f31f6895
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f31f6895

Branch: refs/heads/trunk
Commit: f31f68957211793f8f29334a577b1f8288e1c830
Parents: a562394 3bb87d1
Author: Pavel Yaskevich <xedin@apache.org>
Authored: Tue Mar 25 14:45:28 2014 -0700
Committer: Pavel Yaskevich <xedin@apache.org>
Committed: Tue Mar 25 14:45:28 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 conf/cassandra.yaml                             |   6 +
 .../org/apache/cassandra/config/Config.java     |  13 +-
 .../cassandra/config/DatabaseDescriptor.java    |  68 ++++--
 .../apache/cassandra/cql3/ColumnCondition.java  |   1 -
 .../cassandra/db/ArrayBackedSortedColumns.java  |  34 ++-
 .../cassandra/db/CollationController.java       |  46 +++-
 .../apache/cassandra/db/ColumnFamilyStore.java  |  87 +++++--
 .../cassandra/db/ColumnFamilyStoreMBean.java    |   2 +-
 src/java/org/apache/cassandra/db/Memtable.java  |  72 +++---
 .../apache/cassandra/db/RowIteratorFactory.java |  10 +-
 .../db/commitlog/CommitLogSegment.java          |   3 +-
 .../db/composites/BoundedComposite.java         |   2 +-
 .../cassandra/db/composites/Composite.java      |   2 +-
 .../cassandra/db/composites/Composites.java     |   2 +-
 .../db/composites/CompoundComposite.java        |   2 +-
 .../db/composites/CompoundSparseCellName.java   |   2 +-
 .../composites/CompoundSparseCellNameType.java  |   2 +-
 .../db/composites/SimpleComposite.java          |   2 +-
 .../db/composites/SimpleSparseCellName.java     |   2 +-
 .../SimpleSparseInternedCellName.java           |   2 +-
 .../apache/cassandra/db/filter/ColumnSlice.java |   2 +-
 .../apache/cassandra/db/filter/QueryFilter.java |  31 ++-
 .../AbstractSimplePerColumnSecondaryIndex.java  |  21 +-
 .../cassandra/db/index/SecondaryIndex.java      |  23 +-
 .../db/index/composites/CompositesIndex.java    |  18 +-
 .../db/index/composites/CompositesSearcher.java |  37 ++-
 .../cassandra/db/index/keys/KeysSearcher.java   |  18 +-
 .../cassandra/io/sstable/SSTableWriter.java     |  10 +
 .../org/apache/cassandra/io/util/FileUtils.java |  51 ++--
 .../cassandra/metrics/ColumnFamilyMetrics.java  |  33 ++-
 .../apache/cassandra/utils/ByteBufferUtil.java  |   2 +-
 .../utils/memory/AbstractAllocator.java         |  23 +-
 .../utils/memory/ContextAllocator.java          |  20 +-
 .../apache/cassandra/utils/memory/HeapPool.java |  38 ++-
 .../utils/memory/HeapPoolAllocator.java         |  47 ----
 .../utils/memory/HeapSlabAllocator.java         | 204 ----------------
 .../cassandra/utils/memory/HeapSlabPool.java    |  34 ---
 .../org/apache/cassandra/utils/memory/Pool.java | 232 +++++++++++--------
 .../cassandra/utils/memory/PoolAllocator.java   | 223 +++++++++++-------
 .../utils/memory/PoolCleanerThread.java         |   4 +-
 .../cassandra/utils/memory/SlabAllocator.java   | 223 ++++++++++++++++++
 .../apache/cassandra/utils/memory/SlabPool.java |  41 ++++
 test/conf/cassandra.yaml                        |   1 +
 .../cassandra/db/CollationControllerTest.java   |  13 +-
 .../apache/cassandra/db/RangeTombstoneTest.java |  32 ++-
 .../db/SecondaryIndexCellSizeTest.java          |  13 +-
 .../db/context/CounterContextTest.java          |  25 +-
 .../db/index/PerRowSecondaryIndexTest.java      |  14 +-
 49 files changed, 1047 insertions(+), 747 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f31f6895/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f31f6895/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
index d8d3b60,e9fc746..21fd590
--- a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
+++ b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
@@@ -42,13 -51,13 +51,14 @@@ import org.apache.cassandra.db.marshal.
  import org.apache.cassandra.exceptions.ConfigurationException;
  import org.apache.cassandra.io.sstable.SSTableReader;
  import org.apache.cassandra.utils.ByteBufferUtil;
+ import org.apache.cassandra.utils.concurrent.OpOrder;
+ import org.apache.cassandra.utils.memory.PoolAllocator;
  
+ import static org.apache.cassandra.Util.dk;
  import static org.junit.Assert.assertEquals;
 +import static org.junit.Assert.assertFalse;
  import static org.junit.Assert.assertTrue;
  
- import static org.apache.cassandra.Util.dk;
- 
  public class RangeTombstoneTest extends SchemaLoader
  {
      private static final String KSNAME = "Keyspace1";


Mime
View raw message