You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jz...@apache.org on 2018/05/01 22:30:07 UTC
[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9418f80
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9418f80
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9418f80
Branch: refs/heads/trunk
Commit: e9418f808c03b82837a1ab7627abe08057c1388f
Parents: 2fe4b9d 783bbb3
Author: Jay Zhuang <ja...@yahoo.com>
Authored: Tue May 1 15:16:05 2018 -0700
Committer: Jay Zhuang <ja...@yahoo.com>
Committed: Tue May 1 15:18:26 2018 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../io/compress/CompressedSequentialWriter.java | 17 ++-
.../CompressedSequentialWriterReopenTest.java | 148 +++++++++++++++++++
.../CompressedSequentialWriterTest.java | 6 +
4 files changed, 170 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9418f80/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 33c81d1,443c298..2545e83
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -264,11 -31,13 +264,12 @@@ Merged from 3.0
* Fully utilise specified compaction threads (CASSANDRA-14210)
* Pre-create deletion log records to finish compactions quicker (CASSANDRA-12763)
Merged from 2.2:
+ * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
* Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411)
* Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)
- * Backport circleci yaml (CASSANDRA-14240)
+ * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
Merged from 2.1:
* Check checksum before decompressing data (CASSANDRA-14284)
- * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt (CASSANDRA-14183)
3.11.2
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9418f80/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
index 8955d4f,5694616..c35ecc8
--- a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
@@@ -165,13 -155,13 +165,13 @@@ public class CompressedSequentialWrite
chunkCount++;
// write out the compressed data
- compressed.flip();
- channel.write(compressed);
+ toWrite.flip();
+ channel.write(toWrite);
// write corresponding checksum
- compressed.rewind();
- crcMetadata.appendDirect(compressed, true);
+ toWrite.rewind();
+ crcMetadata.appendDirect(toWrite, true);
- lastFlushOffset += compressedLength + 4;
+ lastFlushOffset = uncompressedSize;
}
catch (IOException e)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9418f80/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org