Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/net/IncomingTcpConnection.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9873960f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9873960f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9873960f
Branch: refs/heads/trunk
Commit: 9873960f3b0d6ba6330f7f6a05102c267c5ef615
Parents: 071b5f8 e70f4f8
Author: Aleksey Yeschenko <[email protected]>
Authored: Tue Oct 7 18:43:41 2014 +0300
Committer: Aleksey Yeschenko <[email protected]>
Committed: Tue Oct 7 18:43:41 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
.../cassandra/net/IncomingTcpConnection.java | 21 ++++++++++----------
.../apache/cassandra/net/MessagingService.java | 2 +-
.../cassandra/net/OutboundTcpConnection.java | 7 +++++--
4 files changed, 20 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9873960f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6a87f64,188f951..824fae6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,67 -1,8 +1,71 @@@
-2.0.11:
+2.1.1
+ * Fix some Thrift slice deletions and updates of COMPACT STORAGE
+ tables with some clustering columns omitted (CASSANDRA-7990)
+ * Fix filtering for CONTAINS on sets (CASSANDRA-8033)
+ * Properly track added size (CASSANDRA-7239)
+ * Allow compilation in java 8 (CASSANDRA-7208)
+ * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013)
+ * Release references to overlapping sstables during compaction
(CASSANDRA-7819)
+ * Send notification when opening compaction results early (CASSANDRA-8034)
+ * Make native server start block until properly bound (CASSANDRA-7885)
+ * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
+ * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
+ * Make sstablerepairedset take a list of files (CASSANDRA-7995)
+ * (cqlsh) Tab completeion for indexes on map keys (CASSANDRA-7972)
+ * (cqlsh) Fix UDT field selection in select clause (CASSANDRA-7891)
+ * Fix resource leak in event of corrupt sstable
+ * (cqlsh) Add command line option for cqlshrc file path (CASSANDRA-7131)
+ * Provide visibility into prepared statements churn (CASSANDRA-7921,
CASSANDRA-7930)
+ * Invalidate prepared statements when their keyspace or table is
+ dropped (CASSANDRA-7566)
+ * cassandra-stress: fix support for NetworkTopologyStrategy (CASSANDRA-7945)
+ * Fix saving caches when a table is dropped (CASSANDRA-7784)
+ * Add better error checking of new stress profile (CASSANDRA-7716)
+ * Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom
(CASSANDRA-7934)
+ * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
+ * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
+ * GCInspector more closely tracks GC; cassandra-stress and nodetool report
it (CASSANDRA-7916)
+ * nodetool won't output bogus ownership info without a keyspace
(CASSANDRA-7173)
+ * Add human readable option to nodetool commands (CASSANDRA-5433)
+ * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
+ * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
+ * (cqlsh) tab-completion for triggers (CASSANDRA-7824)
+ * (cqlsh) Support for query paging (CASSANDRA-7514)
+ * (cqlsh) Show progress of COPY operations (CASSANDRA-7789)
+ * Add syntax to remove multiple elements from a map (CASSANDRA-6599)
+ * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
+ * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
+ * (cqlsh) Display the current logged-in user (CASSANDRA-7785)
+ * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815)
+ * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE
+ output (CASSANDRA-7659)
+ * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
+ * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405)
+ * Support list index operations with conditions (CASSANDRA-7499)
+ * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)
+ * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
+ * (cqlsh) Error when tracing query (CASSANDRA-7613)
+ * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
+ * SSTableExport uses correct validator to create string representation of
partition
+ keys (CASSANDRA-7498)
+ * Avoid NPEs when receiving type changes for an unknown keyspace
(CASSANDRA-7689)
+ * Add support for custom 2i validation (CASSANDRA-7575)
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Add listen_interface and rpc_interface options (CASSANDRA-7417)
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+ * Configurable client timeout for cqlsh (CASSANDRA-7516)
+ * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+ * Make repair -pr work with -local (CASSANDRA-7450)
+ * Fix error in sstableloader with -cph > 1 (CASSANDRA-8007)
+ * Fix snapshot repair error on indexed tables (CASSANDRA-8020)
+ * Do not exit nodetool repair when receiving JMX NOTIF_LOST (CASSANDRA-7909)
+Merged from 2.0:
+ * Don't reset nodes' versions when closing IncomingTcpConnections
+ (CASSANDRA-7734)
+ * Record the real messaging version in all cases in OutboundTcpConnection
+ (CASSANDRA-8057)
* SSL does not work in cassandra-cli (CASSANDRA-7899)
* Fix potential exception when using ReversedType in DynamicCompositeType
(CASSANDRA-7898)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9873960f/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index 1059ce7,3296cfd..ee44493
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@@ -74,12 -68,10 +74,12 @@@ public class IncomingTcpConnection exte
{
try
{
- if (version < MessagingService.VERSION_12)
- throw new UnsupportedOperationException("Unable to read
obsolete message version " + version + "; the earliest version supported is
1.2.0");
+ if (version < MessagingService.VERSION_20)
+ throw new UnsupportedOperationException(String.format("Unable
to read obsolete message version %s; "
+ + "The
earliest version supported is 2.0.0",
+
version));
- handleModernVersion();
+ receiveMessages();
}
catch (EOFException e)
{
@@@ -113,16 -109,7 +117,18 @@@
if (compressed)
{
logger.debug("Upgrading incoming connection to be compressed");
- in = new DataInputStream(new
SnappyInputStream(socket.getInputStream()));
+ if (version < MessagingService.VERSION_21)
++ {
+ in = new DataInputStream(new
SnappyInputStream(socket.getInputStream()));
++ }
+ else
+ {
+ LZ4FastDecompressor decompressor =
LZ4Factory.fastestInstance().fastDecompressor();
+ Checksum checksum =
XXHashFactory.fastestInstance().newStreamingHash32(OutboundTcpConnection.LZ4_HASH_SEED).asChecksum();
+ in = new DataInputStream(new
LZ4BlockInputStream(socket.getInputStream(),
+ decompressor,
+ checksum));
+ }
}
else
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9873960f/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/net/MessagingService.java
index 10cee8d,d2e65d8..c6b0098
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@@ -800,13 -791,13 +800,13 @@@ public final class MessagingService imp
public void resetVersion(InetAddress endpoint)
{
- logger.debug("Reseting version for {}", endpoint);
+ logger.debug("Resetting version for {}", endpoint);
Integer removed = versions.remove(endpoint);
- if (removed != null && removed <= VERSION_20)
- refreshAllNodesAtLeast20();
+ if (removed != null && removed <= VERSION_21)
+ refreshAllNodesAtLeast21();
}
- private void refreshAllNodesAtLeast20()
+ private void refreshAllNodesAtLeast21()
{
for (Integer version: versions.values())
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9873960f/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
