cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject [2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Tue, 06 May 2014 03:46:49 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: ac63e180a50071bed398c82713452ccfe5c4237d
Parents: f0575f1 4791d98
Author: Dave Brosius <dbrosius@mebigfatguy.com>
Authored: Mon May 5 23:45:53 2014 -0400
Committer: Dave Brosius <dbrosius@mebigfatguy.com>
Committed: Mon May 5 23:45:53 2014 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/BatchlogManager.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac63e180/src/java/org/apache/cassandra/db/BatchlogManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/BatchlogManager.java
index de51c8d,b92c217..3ffc7a7
--- a/src/java/org/apache/cassandra/db/BatchlogManager.java
+++ b/src/java/org/apache/cassandra/db/BatchlogManager.java
@@@ -271,14 -278,14 +271,14 @@@ public class BatchlogManager implement
          if (ttl <= 0)
              return; // this batchlog entry has 'expired'
  
+         List<InetAddress> liveEndpoints = new ArrayList<>();
+         List<InetAddress> hintEndpoints = new ArrayList<>();
+         
 -        for (RowMutation mutation : mutations)
 +        for (Mutation mutation : mutations)
          {
-             List<InetAddress> liveEndpoints = new ArrayList<>();
-             List<InetAddress> hintEndpoints = new ArrayList<>();
- 
              String ks = mutation.getKeyspaceName();
              Token tk = StorageService.getPartitioner().getToken(mutation.key());
 -            int mutationSize = (int) RowMutation.serializer.serializedSize(mutation, version);
 +            int mutationSize = (int) Mutation.serializer.serializedSize(mutation, version);
  
              for (InetAddress endpoint : Iterables.concat(StorageService.instance.getNaturalEndpoints(ks,
tk),
                                                           StorageService.instance.getTokenMetadata().pendingEndpointsFor(tk,
ks)))


Mime
View raw message