cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [5/5] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Date Wed, 10 Aug 2016 16:13:53 GMT
Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: d32a745b278b7e190ab7f4bc486c578f9ae33bc5
Parents: 89a9279 c3e636c
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Wed Aug 10 11:12:45 2016 -0500
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Wed Aug 10 11:12:45 2016 -0500

----------------------------------------------------------------------
 CHANGES.txt                                             |  2 ++
 src/java/org/apache/cassandra/net/MessageOut.java       |  2 +-
 src/java/org/apache/cassandra/net/MessagingService.java | 10 ++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d32a745b/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d32a745b/src/java/org/apache/cassandra/net/MessageOut.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d32a745b/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/net/MessagingService.java
index b1f88ee,3302357..243bf0c
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@@ -151,10 -151,18 +151,20 @@@ public final class MessagingService imp
          UNUSED_4,
          UNUSED_5,
          ;
+ 
+         // This is to support a "late" choice of the verb based on the messaging service
version.
+         // See CASSANDRA-12249 for more details.
+         public static Verb convertForMessagingServiceVersion(Verb verb, int version)
+         {
+             if (verb == PAGED_RANGE && version >= VERSION_30)
+                 return RANGE_SLICE;
+ 
+             return verb;
+         }
      }
  
 +    public static final Verb[] verbValues = Verb.values();
 +
      public static final EnumMap<MessagingService.Verb, Stage> verbStages = new EnumMap<MessagingService.Verb,
Stage>(MessagingService.Verb.class)
      {{
          put(Verb.MUTATION, Stage.MUTATION);


Mime
View raw message