cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasobr...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Date Mon, 12 Dec 2016 18:32:25 GMT
Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 5364310bf819971bc4605f92d4787636d7f839da
Parents: 9c0fa05 07f990b
Author: Jason Brown <jasedbrown@gmail.com>
Authored: Mon Dec 12 10:30:50 2016 -0800
Committer: Jason Brown <jasedbrown@gmail.com>
Committed: Mon Dec 12 10:31:48 2016 -0800

----------------------------------------------------------------------
 CHANGES.txt                                                  | 1 +
 src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5364310b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6e57ea7,ed0fc14..5d93b8a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 +4.0
 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422)
 +
 +
  3.12
+  * Log message size in trace message in OutboundTcpConnection (CASSANDRA-13028)
   * Add timeUnit Days for cassandra-stress (CASSANDRA-13029)
   * Add mutation size and batch metrics (CASSANDRA-12649)
   * Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5364310b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index c32154e,683aed2..ceb0fa0
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@@ -335,8 -340,13 +340,9 @@@ public class OutboundTcpConnection exte
  
      private void writeInternal(MessageOut message, int id, long timestamp) throws IOException
      {
+         //If you add/remove fields before the message don't forget to update PROTOCOL_MAGIC_ID_TIMESTAMP_SIZE
          out.writeInt(MessagingService.PROTOCOL_MAGIC);
 -
 -        if (targetVersion < MessagingService.VERSION_20)
 -            out.writeUTF(String.valueOf(id));
 -        else
 -            out.writeInt(id);
 +        out.writeInt(id);
  
          // int cast cuts off the high-order half of the timestamp, which we can assume remains
          // the same between now and when the recipient reconstructs it.


Mime
View raw message