cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bened...@apache.org
Subject [7/7] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Date Sun, 17 May 2015 12:51:09 GMT
Merge branch 'cassandra-2.2' into trunk

Conflicts:
	CHANGES.txt


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

Branch: refs/heads/trunk
Commit: 75a34879bb4aa01a6a65858c303f2a058af512a4
Parents: c2a1cd4 8704006
Author: Benedict Elliott Smith <benedict@apache.org>
Authored: Sun May 17 13:50:44 2015 +0100
Committer: Benedict Elliott Smith <benedict@apache.org>
Committed: Sun May 17 13:50:44 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 src/java/org/apache/cassandra/db/Memtable.java  |  14 +-
 .../db/compaction/CompactionManager.java        |  24 +-
 .../cassandra/db/compaction/CompactionTask.java |  31 +--
 .../cassandra/db/compaction/Scrubber.java       |  21 +-
 .../cassandra/db/compaction/Upgrader.java       |  11 +-
 .../writers/CompactionAwareWriter.java          |  42 +++-
 .../writers/DefaultCompactionWriter.java        |  18 +-
 .../writers/MajorLeveledCompactionWriter.java   |  28 +--
 .../writers/MaxSSTableSizeWriter.java           |  16 +-
 .../SplittingSizeTieredCompactionWriter.java    |  17 +-
 .../io/compress/CompressedSequentialWriter.java |  59 ++---
 .../io/compress/CompressionMetadata.java        | 131 +++++-----
 .../cassandra/io/sstable/IndexSummary.java      |  11 +-
 .../io/sstable/IndexSummaryBuilder.java         |  13 +-
 .../apache/cassandra/io/sstable/SSTable.java    |   2 +-
 .../cassandra/io/sstable/SSTableRewriter.java   | 250 +++++++++----------
 .../io/sstable/SSTableSimpleUnsortedWriter.java |  56 +++--
 .../io/sstable/SSTableSimpleWriter.java         |   9 +-
 .../io/sstable/format/SSTableReader.java        |  13 +-
 .../io/sstable/format/SSTableWriter.java        | 137 +++++++---
 .../io/sstable/format/big/BigTableWriter.java   | 248 +++++++++---------
 .../io/util/BufferedPoolingSegmentedFile.java   |   3 +-
 .../io/util/BufferedSegmentedFile.java          |   3 +-
 .../io/util/ChecksummedSequentialWriter.java    |  38 ++-
 .../io/util/CompressedPoolingSegmentedFile.java |   4 +-
 .../io/util/CompressedSegmentedFile.java        |   9 +-
 .../org/apache/cassandra/io/util/FileUtils.java |  39 ++-
 .../cassandra/io/util/MmappedSegmentedFile.java |   3 +-
 .../apache/cassandra/io/util/SafeMemory.java    |   5 +
 .../cassandra/io/util/SafeMemoryWriter.java     |   5 +
 .../apache/cassandra/io/util/SegmentedFile.java |  23 +-
 .../cassandra/io/util/SequentialWriter.java     | 116 ++++++---
 .../cassandra/streaming/StreamReceiveTask.java  |   2 +-
 .../apache/cassandra/tools/SSTableImport.java   |  97 +++----
 .../cassandra/utils/AlwaysPresentFilter.java    |   5 +
 .../org/apache/cassandra/utils/Throwables.java  |   5 +
 .../apache/cassandra/utils/concurrent/Ref.java  |  28 ++-
 .../apache/cassandra/utils/concurrent/Refs.java |  11 +-
 .../utils/concurrent/SharedCloseable.java       |   1 +
 .../utils/concurrent/SharedCloseableImpl.java   |   5 +
 .../utils/concurrent/Transactional.java         | 198 +++++++++++++++
 .../unit/org/apache/cassandra/db/ScrubTest.java |   2 +-
 .../db/compaction/AntiCompactionTest.java       |  11 +-
 .../db/compaction/CompactionsTest.java          |  31 +--
 .../cassandra/io/RandomAccessReaderTest.java    |   8 +-
 .../CompressedRandomAccessReaderTest.java       |  15 +-
 .../CompressedSequentialWriterTest.java         | 136 ++++++++--
 .../io/sstable/BigTableWriterTest.java          | 130 ++++++++++
 .../io/sstable/SSTableRewriterTest.java         | 154 +++++-------
 .../cassandra/io/sstable/SSTableUtils.java      |   2 +-
 .../io/util/BufferedRandomAccessFileTest.java   |  28 +--
 .../util/ChecksummedSequentialWriterTest.java   |  92 +++++++
 .../cassandra/io/util/DataOutputTest.java       |   1 +
 .../cassandra/io/util/SequentialWriterTest.java | 117 +++++++++
 .../compress/CompressedInputStreamTest.java     |   2 +-
 .../cassandra/tools/SSTableExportTest.java      |  16 +-
 .../concurrent/AbstractTransactionalTest.java   | 136 ++++++++++
 58 files changed, 1731 insertions(+), 902 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/75a34879/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2350e62,9f14fba..2f75ac2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,4 -1,5 +1,5 @@@
 -2.2.0-beta1
 +2.2
+  * Introduce Transactional API for internal state changes (CASSANDRA-8984)
   * Add a flag in cassandra.yaml to enable UDFs (CASSANDRA-9404)
   * Better support of null for UDF (CASSANDRA-8374)
   * Use ecj instead of javassist for UDFs (CASSANDRA-8241)


Mime
View raw message