cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [8/9] git commit: merge from 1.2
Date Mon, 30 Sep 2013 18:54:04 GMT
merge from 1.2


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

Branch: refs/heads/trunk
Commit: 65b1e36c7853694275721c6bac1e705e61ee79ef
Parents: 705e8d5 672131d
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon Sep 30 13:53:43 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Sep 30 13:53:43 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../apache/cassandra/locator/TokenMetadata.java | 109 ++++++++++++++-----
 2 files changed, 85 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/65b1e36c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 33268dd,6a695e1..465c718
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,5 +1,17 @@@
 -1.2.11
 +2.0.2
 + * Track and persist sstable read activity (CASSANDRA-5515)
 + * Fixes for speculative retry (CASSANDRA-5932)
 + * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
 + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
 + * Fix insertion of collections with CAS (CASSANDRA-6069)
 + * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
 + * Track clients' remote addresses in ClientState (CASSANDRA-6070)
 + * Create snapshot dir if it does not exist when migrating
 +   leveled manifest (CASSANDRA-6093)
 + * make sequential nodetool repair the default (CASSANDRA-5950)
 + * Add more hooks for compaction strategy implementations (CASSANDRA-6111)
 +Merged from 1.2:
+  * lock access to TM.endpointToHostIdMap (CASSANDRA-6103)
   * Allow estimated memtable size to exceed slab allocator size (CASSANDRA-6078)
   * Start MeteredFlusher earlier to prevent OOM during CL replay (CASSANDRA-6087)
   * Avoid sending Truncate command to fat clients (CASSANDRA-6088)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/65b1e36c/src/java/org/apache/cassandra/locator/TokenMetadata.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/locator/TokenMetadata.java
index 2ede042,ac9a1d0..addd662
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@@ -945,11 -1006,9 +1006,9 @@@ public class TokenMetadat
      /**
       * @deprecated retained for benefit of old tests
       */
 -    public Collection<InetAddress> getWriteEndpoints(Token token, String table, Collection<InetAddress>
naturalEndpoints)
 +    public Collection<InetAddress> getWriteEndpoints(Token token, String keyspaceName,
Collection<InetAddress> naturalEndpoints)
      {
-         ArrayList<InetAddress> endpoints = new ArrayList<InetAddress>();
-         Iterables.addAll(endpoints, Iterables.concat(naturalEndpoints, pendingEndpointsFor(token,
keyspaceName)));
-         return endpoints;
 -        return ImmutableList.copyOf(Iterables.concat(naturalEndpoints, pendingEndpointsFor(token,
table)));
++        return ImmutableList.copyOf(Iterables.concat(naturalEndpoints, pendingEndpointsFor(token,
keyspaceName)));
      }
  
      /** @return an endpoint to token multimap representation of tokenToEndpointMap (a copy)
*/


Mime
View raw message