cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Fri, 12 Feb 2016 17:33:42 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: efbcd15d642008866f82d89f881b703c011dce19
Parents: f3b7599 1b201e9
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Fri Feb 12 17:29:15 2016 +0000
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Fri Feb 12 17:31:21 2016 +0000

----------------------------------------------------------------------
 CHANGES.txt                                                 | 5 ++++-
 src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java | 6 ++++--
 src/java/org/apache/cassandra/locator/TokenMetadata.java    | 7 +++----
 3 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/efbcd15d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 15012b1,49bc581..a7669bb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -15,8 -5,9 +15,11 @@@ Merged from 2.2
   * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733)
   * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
   * Fix SELECT on tuple relations for mixed ASC/DESC clustering order (CASSANDRA-7281)
++ * Use cloned TokenMetadata in size estimates to avoid race against membership check
++   (CASSANDRA-10736)
   * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
-  * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-10010)
+  * Fix paging on DISTINCT queries repeats result when first row in partition changes
+    (CASSANDRA-10010)
  Merged from 2.1:
   * Properly release sstable ref when doing offline scrub (CASSANDRA-10697)
   * Improve nodetool status performance for large cluster (CASSANDRA-7238)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/efbcd15d/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/efbcd15d/src/java/org/apache/cassandra/locator/TokenMetadata.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/locator/TokenMetadata.java
index f6e9cf7,de16fda..97c5f10
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@@ -26,8 -26,8 +26,9 @@@ import java.util.concurrent.atomic.Atom
  import java.util.concurrent.locks.ReadWriteLock;
  import java.util.concurrent.locks.ReentrantReadWriteLock;
  
 +import com.google.common.annotations.VisibleForTesting;
  import com.google.common.collect.*;
+ import org.apache.commons.lang3.StringUtils;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  


Mime
View raw message