Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a696ab33 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a696ab33 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a696ab33 Branch: refs/heads/cassandra-3.11 Commit: a696ab33ba17672efa125ae137458c1abcf9c116 Parents: 74fdfe0 f0f9cf2 Author: Robert Stupp <sn...@snazy.de> Authored: Thu Feb 9 20:38:17 2017 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Thu Feb 9 20:38:17 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 2 +- lib/licenses/netty-all-4.0.23.Final.txt | 202 ------------------- lib/licenses/netty-all-4.0.44.Final.txt | 202 +++++++++++++++++++ lib/netty-all-4.0.23.Final.jar | Bin 1779991 -> 0 bytes lib/netty-all-4.0.44.Final.jar | Bin 0 -> 2342652 bytes .../org/apache/cassandra/transport/Message.java | 12 +- 7 files changed, 212 insertions(+), 207 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a696ab33/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 1f638da,c8419ab..d8c1625 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -49,47 -12,6 +49,48 @@@ Merged from 2.2 * cqlsh: fix DESC TYPES errors (CASSANDRA-12914) * Fix leak on skipped SSTables in sstableupgrade (CASSANDRA-12899) * Avoid blocking gossip during pending range calculation (CASSANDRA-12281) +Merged from 2.1: ++ * Upgrade netty version to fix memory leak with client encryption (CASSANDRA-13114) + * cqlsh copy-from: sort user type fields in csv (CASSANDRA-12959) + + + +3.0.10 + * Disallow offheap_buffers memtable allocation (CASSANDRA-11039) + * Fix CommitLogSegmentManagerTest (CASSANDRA-12283) + * Pass root cause to CorruptBlockException when uncompression failed (CASSANDRA-12889) + * Fix partition count log during compaction (CASSANDRA-12184) + * Batch with multiple conditional updates for the same partition causes AssertionError (CASSANDRA-12867) + * Make AbstractReplicationStrategy extendable from outside its package (CASSANDRA-12788) + * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854) + * Don't tell users to turn off consistent rangemovements during rebuild. (CASSANDRA-12296) + * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689) + * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801) + * Include SSTable filename in compacting large row message (CASSANDRA-12384) + * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330) + * Fix ViewTest.testCompaction (CASSANDRA-12789) + * Improve avg aggregate functions (CASSANDRA-12417) + * Preserve quoted reserved keyword column names in MV creation (CASSANDRA-11803) + * nodetool stopdaemon errors out (CASSANDRA-12646) + * Split materialized view mutations on build to prevent OOM (CASSANDRA-12268) + * mx4j does not work in 3.0.8 (CASSANDRA-12274) + * Abort cqlsh copy-from in case of no answer after prolonged period of time (CASSANDRA-12740) + * Avoid sstable corrupt exception due to dropped static column (CASSANDRA-12582) + * Make stress use client mode to avoid checking commit log size on startup (CASSANDRA-12478) + * Fix exceptions with new vnode allocation (CASSANDRA-12715) + * Unify drain and shutdown processes (CASSANDRA-12509) + * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706) + * Fix failure in LogTransactionTest (CASSANDRA-12632) + * Fix potentially incomplete non-frozen UDT values when querying with the + full primary key specified (CASSANDRA-12605) + * Skip writing MV mutations to commitlog on mutation.applyUnsafe() (CASSANDRA-11670) + * Establish consistent distinction between non-existing partition and NULL value for LWTs on static columns (CASSANDRA-12060) + * Extend ColumnIdentifier.internedInstances key to include the type that generated the byte buffer (CASSANDRA-12516) + * Backport CASSANDRA-10756 (race condition in NativeTransportService shutdown) (CASSANDRA-12472) + * If CF has no clustering columns, any row cache is full partition cache (CASSANDRA-12499) + * Correct log message for statistics of offheap memtable flush (CASSANDRA-12776) + * Explicitly set locale for string validation (CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545) +Merged from 2.2: * Fix purgeability of tombstones with max timestamp (CASSANDRA-12792) * Fail repair if participant dies during sync or anticompaction (CASSANDRA-12901) * cqlsh COPY: unprotected pk values before converting them if not using prepared statements (CASSANDRA-12863) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a696ab33/build.xml ---------------------------------------------------------------------- diff --cc build.xml index 476cd14,94e4723..a182f45 --- a/build.xml +++ b/build.xml @@@ -399,14 -407,16 +399,14 @@@ <dependency groupId="com.addthis.metrics" artifactId="reporter-config3" version="3.0.0" /> <dependency groupId="org.mindrot" artifactId="jbcrypt" version="0.3m" /> <dependency groupId="io.airlift" artifactId="airline" version="0.6" /> - <dependency groupId="io.netty" artifactId="netty-all" version="4.0.23.Final" /> + <dependency groupId="io.netty" artifactId="netty-all" version="4.0.44.Final" /> <dependency groupId="com.google.code.findbugs" artifactId="jsr305" version="2.0.2" /> <dependency groupId="com.clearspring.analytics" artifactId="stream" version="2.5.2" /> - <!-- TODO CASSANDRA-9543 - <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="2.1.5" classifier="shaded" /> - --> + <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="3.0.1" classifier="shaded" /> <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj" version="4.4.2" /> - <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core" version="0.3.4" /> - <dependency groupId="net.sf.supercsv" artifactId="super-csv" version="2.1.0" /> - <dependency groupId="net.ju-n.compile-command-annotations" artifactId="compile-command-annotations" version="1.2.0" /> + <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core" version="0.4.3" /> + <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core-j8" version="0.4.3" /> + <dependency groupId="net.ju-n.compile-command-annotations" artifactId="compile-command-annotations" version="1.2.0" /> <dependency groupId="org.fusesource" artifactId="sigar" version="1.6.4"> <exclusion groupId="log4j" artifactId="log4j"/> </dependency> http://git-wip-us.apache.org/repos/asf/cassandra/blob/a696ab33/src/java/org/apache/cassandra/transport/Message.java ----------------------------------------------------------------------