cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Date Tue, 19 Jul 2016 10:07:22 GMT
Merge branch 'cassandra-3.9' into trunk

* cassandra-3.9:
  Fix problem with undeleteable rows on upgrade to new sstable format.


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

Branch: refs/heads/trunk
Commit: d314b60576c7a55fd24c141262ef3383b7118dba
Parents: 249a155 d4ced24
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Jul 19 12:04:33 2016 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Jul 19 12:04:33 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |   3 +-
 .../org/apache/cassandra/db/LegacyLayout.java   |  19 +++-
 .../cassandra/db/compaction/Scrubber.java       |  50 +++++++++--
 .../io/sstable/SSTableIdentityIterator.java     |   9 +-
 .../lb-1-big-CompressionInfo.db                 | Bin 0 -> 43 bytes
 .../cf_with_duplicates_2_0/lb-1-big-Data.db     | Bin 0 -> 84 bytes
 .../lb-1-big-Digest.adler32                     |   1 +
 .../cf_with_duplicates_2_0/lb-1-big-Filter.db   | Bin 0 -> 16 bytes
 .../cf_with_duplicates_2_0/lb-1-big-Index.db    | Bin 0 -> 18 bytes
 .../lb-1-big-Statistics.db                      | Bin 0 -> 4474 bytes
 .../cf_with_duplicates_2_0/lb-1-big-Summary.db  | Bin 0 -> 84 bytes
 .../cf_with_duplicates_2_0/lb-1-big-TOC.txt     |   8 ++
 .../mb-3-big-CompressionInfo.db                 | Bin 0 -> 51 bytes
 .../cf_with_duplicates_3_0/mb-3-big-Data.db     | Bin 0 -> 72 bytes
 .../mb-3-big-Digest.crc32                       |   1 +
 .../cf_with_duplicates_3_0/mb-3-big-Filter.db   | Bin 0 -> 16 bytes
 .../cf_with_duplicates_3_0/mb-3-big-Index.db    | Bin 0 -> 8 bytes
 .../mb-3-big-Statistics.db                      | Bin 0 -> 4664 bytes
 .../cf_with_duplicates_3_0/mb-3-big-Summary.db  | Bin 0 -> 56 bytes
 .../cf_with_duplicates_3_0/mb-3-big-TOC.txt     |   8 ++
 .../unit/org/apache/cassandra/db/ScrubTest.java |  87 ++++++++++++++++++-
 21 files changed, 174 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d314b605/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c974467,780ea96..7d30aa4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,6 +1,21 @@@
 +3.10
 + * Support json/yaml output in nodetool tpstats (CASSANDRA-12035)
 + * Expose metrics for successful/failed authentication attempts (CASSANDRA-10635)
 + * Prepend snapshot name with "truncated" or "dropped" when a snapshot
 +   is taken before truncating or dropping a table (CASSANDRA-12178)
 + * Optimize RestrictionSet (CASSANDRA-12153)
 + * cqlsh does not automatically downgrade CQL version (CASSANDRA-12150)
 + * Omit (de)serialization of state variable in UDAs (CASSANDRA-9613)
 + * Create a system table to expose prepared statements (CASSANDRA-8831)
 + * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970)
 + * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580)
 + * Add supplied username to authentication error messages (CASSANDRA-12076)
 + * Remove pre-startup check for open JMX port (CASSANDRA-12074)
 +
 +
  3.9
- 
+ Merged from 3.0:
+  * Fix problem with undeleteable rows on upgrade to new sstable format (CASSANDRA-12144)
  
  3.8
   * Fix hdr logging for single operation workloads (CASSANDRA-12145)


Mime
View raw message