You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/02/22 15:15:57 UTC
[1/6] git commit: fix CME in SessionInfo updateProgress affecting
netstats patch by Josh McKenzie; reviewed by Tyler Hobbs for CASSANDRA-6577
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 50e544f28 -> 468cc72fa
refs/heads/cassandra-2.1 0508a155e -> a53d531ae
refs/heads/trunk febd6e159 -> c5dd98663
fix CME in SessionInfo updateProgress affecting netstats
patch by Josh McKenzie; reviewed by Tyler Hobbs for CASSANDRA-6577
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/468cc72f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/468cc72f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/468cc72f
Branch: refs/heads/cassandra-2.0
Commit: 468cc72face6593effe542ab45b48e99b436f79a
Parents: 50e544f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Feb 22 08:15:32 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Feb 22 08:15:40 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/streaming/SessionInfo.java | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/468cc72f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b25ff47..bfcb6a4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.6
+ * fix CME in SessionInfo updateProgress affecting netstats (CASSANDRA-6577)
* Allow repairing between specific replicas (CASSANDRA-6440)
* Allow per-dc enabling of hints (CASSANDRA-6157)
* Add compatibility for Hadoop 0.2.x (CASSANDRA-5201)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/468cc72f/src/java/org/apache/cassandra/streaming/SessionInfo.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/SessionInfo.java b/src/java/org/apache/cassandra/streaming/SessionInfo.java
index 9532041..b722ecf 100644
--- a/src/java/org/apache/cassandra/streaming/SessionInfo.java
+++ b/src/java/org/apache/cassandra/streaming/SessionInfo.java
@@ -20,8 +20,8 @@ package org.apache.cassandra.streaming;
import java.io.Serializable;
import java.net.InetAddress;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableSet;
@@ -51,8 +51,8 @@ public final class SessionInfo implements Serializable
this.peer = peer;
this.receivingSummaries = ImmutableSet.copyOf(receivingSummaries);
this.sendingSummaries = ImmutableSet.copyOf(sendingSummaries);
- this.receivingFiles = new HashMap<>();
- this.sendingFiles = new HashMap<>();
+ this.receivingFiles = new ConcurrentHashMap<>();
+ this.sendingFiles = new ConcurrentHashMap<>();
this.state = state;
}
@@ -66,7 +66,7 @@ public final class SessionInfo implements Serializable
*
* @param newProgress new progress info
*/
- public synchronized void updateProgress(ProgressInfo newProgress)
+ public void updateProgress(ProgressInfo newProgress)
{
assert peer.equals(newProgress.peer);
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5dd9866
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5dd9866
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5dd9866
Branch: refs/heads/trunk
Commit: c5dd986638b11749143912e407128db60e82e4f6
Parents: febd6e1 a53d531
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Feb 22 08:15:53 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Feb 22 08:15:53 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/streaming/SessionInfo.java | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5dd9866/CHANGES.txt
----------------------------------------------------------------------
[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by jb...@apache.org.
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/a53d531a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a53d531a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a53d531a
Branch: refs/heads/trunk
Commit: a53d531aee288c3a78d33d93d9340af210a97cab
Parents: 0508a15 468cc72
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Feb 22 08:15:46 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Feb 22 08:15:46 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/streaming/SessionInfo.java | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a53d531a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 67d5a0d,bfcb6a4..2b07926
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,48 -1,5 +1,49 @@@
+2.1.0-beta2
+ * Fix ABTC NPE (CASSANDRA-6692)
+ * Allow nodetool to use a file or prompt for password (CASSANDRA-6660)
+ * Fix AIOOBE when concurrently accessing ABSC (CASSANDRA-6742)
+
+
+2.1.0-beta1
+ * Add flush directory distinct from compaction directories (CASSANDRA-6357)
+ * Require JNA by default (CASSANDRA-6575)
+ * add listsnapshots command to nodetool (CASSANDRA-5742)
+ * Introduce AtomicBTreeColumns (CASSANDRA-6271, 6692)
+ * Multithreaded commitlog (CASSANDRA-3578)
+ * allocate fixed index summary memory pool and resample cold index summaries
+ to use less memory (CASSANDRA-5519)
+ * Removed multithreaded compaction (CASSANDRA-6142)
+ * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
+ * change logging from log4j to logback (CASSANDRA-5883)
+ * switch to LZ4 compression for internode communication (CASSANDRA-5887)
+ * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
+ * Remove 1.2 network compatibility code (CASSANDRA-5960)
+ * Remove leveled json manifest migration code (CASSANDRA-5996)
+ * Remove CFDefinition (CASSANDRA-6253)
+ * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278)
+ * User-defined types for CQL3 (CASSANDRA-5590)
+ * Use of o.a.c.metrics in nodetool (CASSANDRA-5871, 6406)
+ * Batch read from OTC's queue and cleanup (CASSANDRA-1632)
+ * Secondary index support for collections (CASSANDRA-4511, 6383)
+ * SSTable metadata(Stats.db) format change (CASSANDRA-6356)
+ * Push composites support in the storage engine
+ (CASSANDRA-5417, CASSANDRA-6520)
+ * Add snapshot space used to cfstats (CASSANDRA-6231)
+ * Add cardinality estimator for key count estimation (CASSANDRA-5906)
+ * CF id is changed to be non-deterministic. Data dir/key cache are created
+ uniquely for CF id (CASSANDRA-5202)
+ * New counters implementation (CASSANDRA-6504)
+ * Replace UnsortedColumns, EmptyColumns, TreeMapBackedSortedColumns with new
+ ArrayBackedSortedColumns (CASSANDRA-6630, CASSANDRA-6662, CASSANDRA-6690)
+ * Add option to use row cache with a given amount of rows (CASSANDRA-5357)
+ * Avoid repairing already repaired data (CASSANDRA-5351)
+ * Reject counter updates with USING TTL/TIMESTAMP (CASSANDRA-6649)
+ * Replace index_interval with min/max_index_interval (CASSANDRA-6379)
+ * Lift limitation that order by columns must be selected for IN queries (CASSANDRA-4911)
+
+
2.0.6
+ * fix CME in SessionInfo updateProgress affecting netstats (CASSANDRA-6577)
* Allow repairing between specific replicas (CASSANDRA-6440)
* Allow per-dc enabling of hints (CASSANDRA-6157)
* Add compatibility for Hadoop 0.2.x (CASSANDRA-5201)
[2/6] git commit: fix CME in SessionInfo updateProgress affecting
netstats patch by Josh McKenzie; reviewed by Tyler Hobbs for CASSANDRA-6577
Posted by jb...@apache.org.
fix CME in SessionInfo updateProgress affecting netstats
patch by Josh McKenzie; reviewed by Tyler Hobbs for CASSANDRA-6577
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/468cc72f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/468cc72f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/468cc72f
Branch: refs/heads/cassandra-2.1
Commit: 468cc72face6593effe542ab45b48e99b436f79a
Parents: 50e544f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Feb 22 08:15:32 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Feb 22 08:15:40 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/streaming/SessionInfo.java | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/468cc72f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b25ff47..bfcb6a4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.6
+ * fix CME in SessionInfo updateProgress affecting netstats (CASSANDRA-6577)
* Allow repairing between specific replicas (CASSANDRA-6440)
* Allow per-dc enabling of hints (CASSANDRA-6157)
* Add compatibility for Hadoop 0.2.x (CASSANDRA-5201)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/468cc72f/src/java/org/apache/cassandra/streaming/SessionInfo.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/SessionInfo.java b/src/java/org/apache/cassandra/streaming/SessionInfo.java
index 9532041..b722ecf 100644
--- a/src/java/org/apache/cassandra/streaming/SessionInfo.java
+++ b/src/java/org/apache/cassandra/streaming/SessionInfo.java
@@ -20,8 +20,8 @@ package org.apache.cassandra.streaming;
import java.io.Serializable;
import java.net.InetAddress;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableSet;
@@ -51,8 +51,8 @@ public final class SessionInfo implements Serializable
this.peer = peer;
this.receivingSummaries = ImmutableSet.copyOf(receivingSummaries);
this.sendingSummaries = ImmutableSet.copyOf(sendingSummaries);
- this.receivingFiles = new HashMap<>();
- this.sendingFiles = new HashMap<>();
+ this.receivingFiles = new ConcurrentHashMap<>();
+ this.sendingFiles = new ConcurrentHashMap<>();
this.state = state;
}
@@ -66,7 +66,7 @@ public final class SessionInfo implements Serializable
*
* @param newProgress new progress info
*/
- public synchronized void updateProgress(ProgressInfo newProgress)
+ public void updateProgress(ProgressInfo newProgress)
{
assert peer.equals(newProgress.peer);
[5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by jb...@apache.org.
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/a53d531a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a53d531a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a53d531a
Branch: refs/heads/cassandra-2.1
Commit: a53d531aee288c3a78d33d93d9340af210a97cab
Parents: 0508a15 468cc72
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Feb 22 08:15:46 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Feb 22 08:15:46 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/streaming/SessionInfo.java | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a53d531a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 67d5a0d,bfcb6a4..2b07926
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,48 -1,5 +1,49 @@@
+2.1.0-beta2
+ * Fix ABTC NPE (CASSANDRA-6692)
+ * Allow nodetool to use a file or prompt for password (CASSANDRA-6660)
+ * Fix AIOOBE when concurrently accessing ABSC (CASSANDRA-6742)
+
+
+2.1.0-beta1
+ * Add flush directory distinct from compaction directories (CASSANDRA-6357)
+ * Require JNA by default (CASSANDRA-6575)
+ * add listsnapshots command to nodetool (CASSANDRA-5742)
+ * Introduce AtomicBTreeColumns (CASSANDRA-6271, 6692)
+ * Multithreaded commitlog (CASSANDRA-3578)
+ * allocate fixed index summary memory pool and resample cold index summaries
+ to use less memory (CASSANDRA-5519)
+ * Removed multithreaded compaction (CASSANDRA-6142)
+ * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
+ * change logging from log4j to logback (CASSANDRA-5883)
+ * switch to LZ4 compression for internode communication (CASSANDRA-5887)
+ * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
+ * Remove 1.2 network compatibility code (CASSANDRA-5960)
+ * Remove leveled json manifest migration code (CASSANDRA-5996)
+ * Remove CFDefinition (CASSANDRA-6253)
+ * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278)
+ * User-defined types for CQL3 (CASSANDRA-5590)
+ * Use of o.a.c.metrics in nodetool (CASSANDRA-5871, 6406)
+ * Batch read from OTC's queue and cleanup (CASSANDRA-1632)
+ * Secondary index support for collections (CASSANDRA-4511, 6383)
+ * SSTable metadata(Stats.db) format change (CASSANDRA-6356)
+ * Push composites support in the storage engine
+ (CASSANDRA-5417, CASSANDRA-6520)
+ * Add snapshot space used to cfstats (CASSANDRA-6231)
+ * Add cardinality estimator for key count estimation (CASSANDRA-5906)
+ * CF id is changed to be non-deterministic. Data dir/key cache are created
+ uniquely for CF id (CASSANDRA-5202)
+ * New counters implementation (CASSANDRA-6504)
+ * Replace UnsortedColumns, EmptyColumns, TreeMapBackedSortedColumns with new
+ ArrayBackedSortedColumns (CASSANDRA-6630, CASSANDRA-6662, CASSANDRA-6690)
+ * Add option to use row cache with a given amount of rows (CASSANDRA-5357)
+ * Avoid repairing already repaired data (CASSANDRA-5351)
+ * Reject counter updates with USING TTL/TIMESTAMP (CASSANDRA-6649)
+ * Replace index_interval with min/max_index_interval (CASSANDRA-6379)
+ * Lift limitation that order by columns must be selected for IN queries (CASSANDRA-4911)
+
+
2.0.6
+ * fix CME in SessionInfo updateProgress affecting netstats (CASSANDRA-6577)
* Allow repairing between specific replicas (CASSANDRA-6440)
* Allow per-dc enabling of hints (CASSANDRA-6157)
* Add compatibility for Hadoop 0.2.x (CASSANDRA-5201)
[3/6] git commit: fix CME in SessionInfo updateProgress affecting
netstats patch by Josh McKenzie; reviewed by Tyler Hobbs for CASSANDRA-6577
Posted by jb...@apache.org.
fix CME in SessionInfo updateProgress affecting netstats
patch by Josh McKenzie; reviewed by Tyler Hobbs for CASSANDRA-6577
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/468cc72f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/468cc72f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/468cc72f
Branch: refs/heads/trunk
Commit: 468cc72face6593effe542ab45b48e99b436f79a
Parents: 50e544f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Feb 22 08:15:32 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sat Feb 22 08:15:40 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/streaming/SessionInfo.java | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/468cc72f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b25ff47..bfcb6a4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.6
+ * fix CME in SessionInfo updateProgress affecting netstats (CASSANDRA-6577)
* Allow repairing between specific replicas (CASSANDRA-6440)
* Allow per-dc enabling of hints (CASSANDRA-6157)
* Add compatibility for Hadoop 0.2.x (CASSANDRA-5201)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/468cc72f/src/java/org/apache/cassandra/streaming/SessionInfo.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/SessionInfo.java b/src/java/org/apache/cassandra/streaming/SessionInfo.java
index 9532041..b722ecf 100644
--- a/src/java/org/apache/cassandra/streaming/SessionInfo.java
+++ b/src/java/org/apache/cassandra/streaming/SessionInfo.java
@@ -20,8 +20,8 @@ package org.apache.cassandra.streaming;
import java.io.Serializable;
import java.net.InetAddress;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableSet;
@@ -51,8 +51,8 @@ public final class SessionInfo implements Serializable
this.peer = peer;
this.receivingSummaries = ImmutableSet.copyOf(receivingSummaries);
this.sendingSummaries = ImmutableSet.copyOf(sendingSummaries);
- this.receivingFiles = new HashMap<>();
- this.sendingFiles = new HashMap<>();
+ this.receivingFiles = new ConcurrentHashMap<>();
+ this.sendingFiles = new ConcurrentHashMap<>();
this.state = state;
}
@@ -66,7 +66,7 @@ public final class SessionInfo implements Serializable
*
* @param newProgress new progress info
*/
- public synchronized void updateProgress(ProgressInfo newProgress)
+ public void updateProgress(ProgressInfo newProgress)
{
assert peer.equals(newProgress.peer);