cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-1.2' into trunk
Date Thu, 14 Mar 2013 00:11:10 GMT
Updated Branches:
  refs/heads/trunk fd1f5fd08 -> 346ac0c64


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: 346ac0c64a85c459f7ec368a8024595ee2b4909b
Parents: fd1f5fd 8eca4ad
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Thu Mar 14 03:10:55 2013 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Thu Mar 14 03:10:55 2013 +0300

----------------------------------------------------------------------
 .../cassandra/db/MigrationRequestVerbHandler.java  |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/346ac0c6/src/java/org/apache/cassandra/db/MigrationRequestVerbHandler.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/MigrationRequestVerbHandler.java
index e3152ad,1992c01..5a6625f
--- a/src/java/org/apache/cassandra/db/MigrationRequestVerbHandler.java
+++ b/src/java/org/apache/cassandra/db/MigrationRequestVerbHandler.java
@@@ -36,11 -37,19 +37,19 @@@ public class MigrationRequestVerbHandle
  {
      private static final Logger logger = LoggerFactory.getLogger(MigrationRequestVerbHandler.class);
  
 -    public void doVerb(MessageIn message, String id)
 +    public void doVerb(MessageIn message, int id)
      {
          logger.debug("Received migration request from {}.", message.from);
+ 
+         if (message.version < MessagingService.VERSION_12)
+             logger.debug("Returning empty response to the migration request from {} (version
< 1.2).", message.from);
+ 
+         Collection<RowMutation> schema = message.version < MessagingService.VERSION_12
+                                          ? Collections.EMPTY_SET
+                                          : SystemTable.serializeSchema();
+ 
          MessageOut<Collection<RowMutation>> response = new MessageOut<Collection<RowMutation>>(MessagingService.Verb.INTERNAL_RESPONSE,
-                                                                                        
       SystemTable.serializeSchema(),
+                                                                                        
       schema,
                                                                                         
       MigrationManager.MigrationsSerializer.instance);
          MessagingService.instance().sendReply(response, id, message.from);
      }


Mime
View raw message