cassandra-commits mailing list archives

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

* cassandra-3.0:
  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/d4ced245
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4ced245
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4ced245

Branch: refs/heads/cassandra-3.9
Commit: d4ced245350d5745cc98d20ac2304fcafc628a32
Parents: 9659a38 c481e8d
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Jul 19 12:03:08 2016 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Jul 19 12:03:08 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 |  88 ++++++++++++++++++-
 21 files changed, 174 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4ced245/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ce58153,f205e0b..780ea96
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,5 +1,36 @@@
 -3.0.9
 +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)
 + * Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073)
 + * Increase size of flushExecutor thread pool (CASSANDRA-12071)
 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in SP.sendMessagesToNonlocalDC
(CASSANDRA-11950)
 + * Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
 + * Improve details in compaction log message (CASSANDRA-12080)
 + * Allow unset values in CQLSSTableWriter (CASSANDRA-11911)
 + * Chunk cache to request compressor-compatible buffers if pool space is exhausted (CASSANDRA-11993)
 + * Remove DatabaseDescriptor dependencies from SequentialWriter (CASSANDRA-11579)
 + * Move skip_stop_words filter before stemming (CASSANDRA-12078)
 + * Support seek() in EncryptedFileSegmentInputStream (CASSANDRA-11957)
 + * SSTable tools mishandling LocalPartitioner (CASSANDRA-12002)
 + * When SEPWorker assigned work, set thread name to match pool (CASSANDRA-11966)
 + * Add cross-DC latency metrics (CASSANDRA-11596)
 + * Allow terms in selection clause (CASSANDRA-10783)
 + * Add bind variables to trace (CASSANDRA-11719)
 + * Switch counter shards' clock to timestamps (CASSANDRA-9811)
 + * Introduce HdrHistogram and response/service/wait separation to stress tool (CASSANDRA-11853)
 + * entry-weighers in QueryProcessor should respect partitionKeyBindIndexes field (CASSANDRA-11718)
 + * Support older ant versions (CASSANDRA-11807)
 + * Estimate compressed on disk size when deciding if sstable size limit reached (CASSANDRA-11623)
 + * cassandra-stress profiles should support case sensitive schemas (CASSANDRA-11546)
 + * Remove DatabaseDescriptor dependency from FileUtils (CASSANDRA-11578)
 + * Faster streaming (CASSANDRA-9766)
 + * Add prepared query parameter to trace for "Execute CQL3 prepared query" session (CASSANDRA-11425)
 + * Add repaired percentage metric (CASSANDRA-11503)
 + * Add Change-Data-Capture (CASSANDRA-8844)
 +Merged from 3.0:
   * Fix paging logic for deleted partitions with static columns (CASSANDRA-12107)
   * Wait until the message is being send to decide which serializer must be used (CASSANDRA-11393)
   * Fix migration of static thrift column names with non-text comparators (CASSANDRA-12147)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4ced245/src/java/org/apache/cassandra/db/compaction/Scrubber.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4ced245/test/unit/org/apache/cassandra/db/ScrubTest.java
----------------------------------------------------------------------


Mime
View raw message