cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Sat, 19 Sep 2015 10:49:50 GMT
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: fe15e6c3c4a8bbfedf04b43cc104a1e91ddd8e16
Parents: be8b9f2 e25453b
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Sat Sep 19 11:47:50 2015 +0100
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Sat Sep 19 11:47:50 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 NEWS.txt                                        |   2 +
 bin/cqlsh.py                                    |   2 +-
 ...ore-3.0.0-alpha3-b6aa814-SNAPSHOT-shaded.jar | Bin 2217119 -> 0 bytes
 ...ore-3.0.0-alpha3-f9b7e7c-SNAPSHOT-shaded.jar | Bin 0 -> 2282233 bytes
 ...iver-internal-only-3.0.0a2.post0-03085e6.zip | Bin 230830 -> 0 bytes
 ...iver-internal-only-3.0.0a2.post0-379b6f2.zip | Bin 0 -> 230837 bytes
 .../org/apache/cassandra/config/CFMetaData.java |   9 +-
 .../cql3/statements/TableAttributes.java        |  26 ++++++
 .../apache/cassandra/db/ColumnFamilyStore.java  |  61 ++++++++------
 .../compress/CompressedRandomAccessReader.java  |  10 ++-
 .../cassandra/io/compress/LZ4Compressor.java    |   2 +-
 .../io/sstable/format/SSTableReader.java        |  17 ++--
 .../cassandra/io/util/IChecksummedFile.java     |  27 ++++++
 .../cassandra/io/util/ICompressedFile.java      |   3 +-
 .../apache/cassandra/io/util/SegmentedFile.java |  15 +++-
 .../cassandra/schema/CompressionParams.java     |  78 +++++------------
 .../cassandra/schema/LegacySchemaMigrator.java  |   8 +-
 .../apache/cassandra/schema/SchemaKeyspace.java |   4 +
 .../apache/cassandra/schema/TableParams.java    |  24 +++++-
 .../compress/CompressedInputStream.java         |   7 +-
 .../compress/CompressedStreamReader.java        |   3 +-
 .../apache/cassandra/utils/DefaultInteger.java  |  51 -----------
 .../apache/cassandra/utils/DefaultValue.java    |  51 +++++++++++
 .../miscellaneous/CrcCheckChanceTest.java       |  84 ++++++++++++-------
 .../compression/CompressedInputStreamTest.java  |   3 +-
 26 files changed, 308 insertions(+), 180 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe15e6c3/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 537eeeb,e55fd0a..6c3ac84
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 +3.2
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0.0-rc1
+  * Move crc_check_chance out of compression options (CASSANDRA-9839)
   * Fix descending iteration past end of BTreeSearchIterator (CASSANDRA-10301)
   * Transfer hints to a different node on decommission (CASSANDRA-10198)
   * Check partition keys for CAS operations during stmt validation (CASSANDRA-10338)

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


Mime
View raw message