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/08/13 17:23:24 UTC
[01/15] git commit: Remove duplicates from
StorageService.getJoiningNodes patch by jbellis;
reviewed by ayeschenko for CASSANDRA-7478
Repository: cassandra
Updated Branches:
refs/heads/cassandra-1.2 2738e8678 -> 3fe702825
refs/heads/cassandra-2.0 6e73a5179 -> 40deb9115
refs/heads/cassandra-2.1 f08785fcc -> 607f56800
refs/heads/cassandra-2.1.0 fe4c8c2c5 -> 5d6632223
refs/heads/trunk b6ce0a6bb -> 2eae43649
Remove duplicates from StorageService.getJoiningNodes
patch by jbellis; reviewed by ayeschenko for CASSANDRA-7478
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3fe70282
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3fe70282
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3fe70282
Branch: refs/heads/cassandra-1.2
Commit: 3fe702825e882398052fa26b230861aac47a0671
Parents: 2738e86
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 13 10:22:00 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 13 10:22:00 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
src/java/org/apache/cassandra/utils/BiMultiValMap.java | 5 +++++
3 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fe70282/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5dd3ad2..4c261c9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.19
+ * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
* Clone token map outside of hot gossip loops (CASSANDRA-7758)
* Add stop method to EmbeddedCassandraService (CASSANDRA-7595)
* Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fe70282/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 563b259..4ffa4b2 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2115,7 +2115,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
public List<String> getJoiningNodes()
{
- return stringify(tokenMetadata.getBootstrapTokens().values());
+ return stringify(tokenMetadata.getBootstrapTokens().valueSet());
}
public List<String> getLiveNodes()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fe70282/src/java/org/apache/cassandra/utils/BiMultiValMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/BiMultiValMap.java b/src/java/org/apache/cassandra/utils/BiMultiValMap.java
index 3712d25..2cc11b2 100644
--- a/src/java/org/apache/cassandra/utils/BiMultiValMap.java
+++ b/src/java/org/apache/cassandra/utils/BiMultiValMap.java
@@ -138,4 +138,9 @@ public class BiMultiValMap<K, V> implements Map<K, V>
{
return reverseMap.keys();
}
+
+ public Collection<V> valueSet()
+ {
+ return reverseMap.keySet();
+ }
}
[14/15] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by jb...@apache.org.
Merge branch 'cassandra-2.1.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/607f5680
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/607f5680
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/607f5680
Branch: refs/heads/cassandra-2.1
Commit: 607f56800b0cad99311503fdc41f4f6d6613d7f7
Parents: f08785f 5d66322
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 13 10:23:06 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 13 10:23:06 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
src/java/org/apache/cassandra/utils/BiMultiValMap.java | 5 +++++
3 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/607f5680/CHANGES.txt
----------------------------------------------------------------------
[06/15] git commit: merge from 1.2
Posted by jb...@apache.org.
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/40deb911
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40deb911
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40deb911
Branch: refs/heads/trunk
Commit: 40deb9115beed0244ea751a8a66bb94de17fc6c8
Parents: 6e73a51 3fe7028
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 13 10:22:23 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 13 10:22:23 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
src/java/org/apache/cassandra/utils/BiMultiValMap.java | 5 +++++
3 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/40deb911/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e659891,4c261c9..334feb5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,48 -1,5 +1,49 @@@
-1.2.19
+2.0.10
+ * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
+ * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752)
+ * Do not flush on truncate if durable_writes is false (CASSANDRA-7750)
+ * Give CRR a default input_cql Statement (CASSANDRA-7226)
+ * Better error message when adding a collection with the same name
+ than a previously dropped one (CASSANDRA-6276)
+ * Fix validation when adding static columns (CASSANDRA-7730)
+ * (Thrift) fix range deletion of supercolumns (CASSANDRA-7733)
+ * Fix potential AssertionError in RangeTombstoneList (CASSANDRA-7700)
+ * Validate arguments of blobAs* functions (CASSANDRA-7707)
+ * Fix potential AssertionError with 2ndary indexes (CASSANDRA-6612)
+ * Avoid logging CompactionInterrupted at ERROR (CASSANDRA-7694)
+ * Minor leak in sstable2jon (CASSANDRA-7709)
+ * Add cassandra.auto_bootstrap system property (CASSANDRA-7650)
+ * Remove CqlPagingRecordReader/CqlPagingInputFormat (CASSANDRA-7570)
+ * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
+ * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
+ * Update java driver (for hadoop) (CASSANDRA-7618)
+ * Fix truncate to always flush (CASSANDRA-7511)
+ * Remove shuffle and taketoken (CASSANDRA-7601)
+ * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
+ * Always merge ranges owned by a single node (CASSANDRA-6930)
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
+ * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
+ * Fix range merging when DES scores are zero (CASSANDRA-7535)
+ * Warn when SSL certificates have expired (CASSANDRA-7528)
+ * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254)
+ * Fix race in FileCacheService RemovalListener (CASSANDRA-7278)
+ * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM
+ operations to incorrect become full QUORUM (CASSANDRA-7345)
+ * Properly handle unrecognized opcodes and flags (CASSANDRA-7440)
+ * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459)
+ * Make sure high level sstables get compacted (CASSANDRA-7414)
+ * Fix AssertionError when using empty clustering columns and static columns
+ (CASSANDRA-7455)
+ * Add inter_dc_stream_throughput_outbound_megabits_per_sec (CASSANDRA-6596)
+ * Add option to disable STCS in L0 (CASSANDRA-6621)
+ * Fix error when doing reversed queries with static columns (CASSANDRA-7490)
+ * Backport CASSANDRA-6747 (CASSANDRA-7560)
+ * Track max/min timestamps for range tombstones (CASSANDRA-7647)
+ * Fix NPE when listing saved caches dir (CASSANDRA-7632)
+Merged from 1.2:
+ * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
* Clone token map outside of hot gossip loops (CASSANDRA-7758)
* Add stop method to EmbeddedCassandraService (CASSANDRA-7595)
* Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/40deb911/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/40deb911/src/java/org/apache/cassandra/utils/BiMultiValMap.java
----------------------------------------------------------------------
[10/15] git commit: merge from 1.2
Posted by jb...@apache.org.
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/5d663222
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d663222
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d663222
Branch: refs/heads/trunk
Commit: 5d663222379cea3b4c73ed37b953a537b594dd68
Parents: fe4c8c2 40deb91
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 13 10:22:54 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 13 10:22:54 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
src/java/org/apache/cassandra/utils/BiMultiValMap.java | 5 +++++
3 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d663222/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 57b0183,334feb5..b270f85
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
-2.0.10
- * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
+2.1.0-rc6
+ * Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741)
+ * Add tracing entries about concurrent range requests (CASSANDRA-7599)
+ * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729)
+ * Remove netty buffer ref-counting (CASSANDRA-7735)
+ * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742)
+ * Include stress yaml example in release and deb (CASSANDRA-7717)
+ * workaround for netty issue causing corrupted data off the wire (CASSANDRA-7695)
+ * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
+ * Fix binding null values inside UDT (CASSANDRA-7685)
+ * Fix UDT field selection with empty fields (CASSANDRA-7670)
+ * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
+Merged from 2.0:
++ * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
+ * Clone token map outside of hot gossip loops (CASSANDRA-7758)
* Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752)
* Do not flush on truncate if durable_writes is false (CASSANDRA-7750)
* Give CRR a default input_cql Statement (CASSANDRA-7226)
@@@ -140,6 -43,8 +141,7 @@@ Merged from 2.0
* Track max/min timestamps for range tombstones (CASSANDRA-7647)
* Fix NPE when listing saved caches dir (CASSANDRA-7632)
Merged from 1.2:
- * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
+ * Clone token map outside of hot gossip loops (CASSANDRA-7758)
* Add stop method to EmbeddedCassandraService (CASSANDRA-7595)
* Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
* Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d663222/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[03/15] git commit: Remove duplicates from
StorageService.getJoiningNodes patch by jbellis;
reviewed by ayeschenko for CASSANDRA-7478
Posted by jb...@apache.org.
Remove duplicates from StorageService.getJoiningNodes
patch by jbellis; reviewed by ayeschenko for CASSANDRA-7478
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3fe70282
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3fe70282
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3fe70282
Branch: refs/heads/cassandra-2.1
Commit: 3fe702825e882398052fa26b230861aac47a0671
Parents: 2738e86
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 13 10:22:00 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 13 10:22:00 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
src/java/org/apache/cassandra/utils/BiMultiValMap.java | 5 +++++
3 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fe70282/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5dd3ad2..4c261c9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.19
+ * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
* Clone token map outside of hot gossip loops (CASSANDRA-7758)
* Add stop method to EmbeddedCassandraService (CASSANDRA-7595)
* Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fe70282/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 563b259..4ffa4b2 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2115,7 +2115,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
public List<String> getJoiningNodes()
{
- return stringify(tokenMetadata.getBootstrapTokens().values());
+ return stringify(tokenMetadata.getBootstrapTokens().valueSet());
}
public List<String> getLiveNodes()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fe70282/src/java/org/apache/cassandra/utils/BiMultiValMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/BiMultiValMap.java b/src/java/org/apache/cassandra/utils/BiMultiValMap.java
index 3712d25..2cc11b2 100644
--- a/src/java/org/apache/cassandra/utils/BiMultiValMap.java
+++ b/src/java/org/apache/cassandra/utils/BiMultiValMap.java
@@ -138,4 +138,9 @@ public class BiMultiValMap<K, V> implements Map<K, V>
{
return reverseMap.keys();
}
+
+ public Collection<V> valueSet()
+ {
+ return reverseMap.keySet();
+ }
}
[08/15] git commit: merge from 1.2
Posted by jb...@apache.org.
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/40deb911
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40deb911
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40deb911
Branch: refs/heads/cassandra-2.0
Commit: 40deb9115beed0244ea751a8a66bb94de17fc6c8
Parents: 6e73a51 3fe7028
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 13 10:22:23 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 13 10:22:23 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
src/java/org/apache/cassandra/utils/BiMultiValMap.java | 5 +++++
3 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/40deb911/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e659891,4c261c9..334feb5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,48 -1,5 +1,49 @@@
-1.2.19
+2.0.10
+ * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
+ * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752)
+ * Do not flush on truncate if durable_writes is false (CASSANDRA-7750)
+ * Give CRR a default input_cql Statement (CASSANDRA-7226)
+ * Better error message when adding a collection with the same name
+ than a previously dropped one (CASSANDRA-6276)
+ * Fix validation when adding static columns (CASSANDRA-7730)
+ * (Thrift) fix range deletion of supercolumns (CASSANDRA-7733)
+ * Fix potential AssertionError in RangeTombstoneList (CASSANDRA-7700)
+ * Validate arguments of blobAs* functions (CASSANDRA-7707)
+ * Fix potential AssertionError with 2ndary indexes (CASSANDRA-6612)
+ * Avoid logging CompactionInterrupted at ERROR (CASSANDRA-7694)
+ * Minor leak in sstable2jon (CASSANDRA-7709)
+ * Add cassandra.auto_bootstrap system property (CASSANDRA-7650)
+ * Remove CqlPagingRecordReader/CqlPagingInputFormat (CASSANDRA-7570)
+ * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
+ * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
+ * Update java driver (for hadoop) (CASSANDRA-7618)
+ * Fix truncate to always flush (CASSANDRA-7511)
+ * Remove shuffle and taketoken (CASSANDRA-7601)
+ * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
+ * Always merge ranges owned by a single node (CASSANDRA-6930)
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
+ * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
+ * Fix range merging when DES scores are zero (CASSANDRA-7535)
+ * Warn when SSL certificates have expired (CASSANDRA-7528)
+ * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254)
+ * Fix race in FileCacheService RemovalListener (CASSANDRA-7278)
+ * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM
+ operations to incorrect become full QUORUM (CASSANDRA-7345)
+ * Properly handle unrecognized opcodes and flags (CASSANDRA-7440)
+ * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459)
+ * Make sure high level sstables get compacted (CASSANDRA-7414)
+ * Fix AssertionError when using empty clustering columns and static columns
+ (CASSANDRA-7455)
+ * Add inter_dc_stream_throughput_outbound_megabits_per_sec (CASSANDRA-6596)
+ * Add option to disable STCS in L0 (CASSANDRA-6621)
+ * Fix error when doing reversed queries with static columns (CASSANDRA-7490)
+ * Backport CASSANDRA-6747 (CASSANDRA-7560)
+ * Track max/min timestamps for range tombstones (CASSANDRA-7647)
+ * Fix NPE when listing saved caches dir (CASSANDRA-7632)
+Merged from 1.2:
+ * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
* Clone token map outside of hot gossip loops (CASSANDRA-7758)
* Add stop method to EmbeddedCassandraService (CASSANDRA-7595)
* Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/40deb911/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/40deb911/src/java/org/apache/cassandra/utils/BiMultiValMap.java
----------------------------------------------------------------------
[05/15] git commit: Remove duplicates from
StorageService.getJoiningNodes patch by jbellis;
reviewed by ayeschenko for CASSANDRA-7478
Posted by jb...@apache.org.
Remove duplicates from StorageService.getJoiningNodes
patch by jbellis; reviewed by ayeschenko for CASSANDRA-7478
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3fe70282
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3fe70282
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3fe70282
Branch: refs/heads/cassandra-2.1.0
Commit: 3fe702825e882398052fa26b230861aac47a0671
Parents: 2738e86
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 13 10:22:00 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 13 10:22:00 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
src/java/org/apache/cassandra/utils/BiMultiValMap.java | 5 +++++
3 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fe70282/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5dd3ad2..4c261c9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.19
+ * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
* Clone token map outside of hot gossip loops (CASSANDRA-7758)
* Add stop method to EmbeddedCassandraService (CASSANDRA-7595)
* Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fe70282/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 563b259..4ffa4b2 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2115,7 +2115,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
public List<String> getJoiningNodes()
{
- return stringify(tokenMetadata.getBootstrapTokens().values());
+ return stringify(tokenMetadata.getBootstrapTokens().valueSet());
}
public List<String> getLiveNodes()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fe70282/src/java/org/apache/cassandra/utils/BiMultiValMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/BiMultiValMap.java b/src/java/org/apache/cassandra/utils/BiMultiValMap.java
index 3712d25..2cc11b2 100644
--- a/src/java/org/apache/cassandra/utils/BiMultiValMap.java
+++ b/src/java/org/apache/cassandra/utils/BiMultiValMap.java
@@ -138,4 +138,9 @@ public class BiMultiValMap<K, V> implements Map<K, V>
{
return reverseMap.keys();
}
+
+ public Collection<V> valueSet()
+ {
+ return reverseMap.keySet();
+ }
}
[11/15] git commit: merge from 1.2
Posted by jb...@apache.org.
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/5d663222
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d663222
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d663222
Branch: refs/heads/cassandra-2.1
Commit: 5d663222379cea3b4c73ed37b953a537b594dd68
Parents: fe4c8c2 40deb91
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 13 10:22:54 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 13 10:22:54 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
src/java/org/apache/cassandra/utils/BiMultiValMap.java | 5 +++++
3 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d663222/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 57b0183,334feb5..b270f85
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
-2.0.10
- * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
+2.1.0-rc6
+ * Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741)
+ * Add tracing entries about concurrent range requests (CASSANDRA-7599)
+ * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729)
+ * Remove netty buffer ref-counting (CASSANDRA-7735)
+ * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742)
+ * Include stress yaml example in release and deb (CASSANDRA-7717)
+ * workaround for netty issue causing corrupted data off the wire (CASSANDRA-7695)
+ * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
+ * Fix binding null values inside UDT (CASSANDRA-7685)
+ * Fix UDT field selection with empty fields (CASSANDRA-7670)
+ * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
+Merged from 2.0:
++ * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
+ * Clone token map outside of hot gossip loops (CASSANDRA-7758)
* Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752)
* Do not flush on truncate if durable_writes is false (CASSANDRA-7750)
* Give CRR a default input_cql Statement (CASSANDRA-7226)
@@@ -140,6 -43,8 +141,7 @@@ Merged from 2.0
* Track max/min timestamps for range tombstones (CASSANDRA-7647)
* Fix NPE when listing saved caches dir (CASSANDRA-7632)
Merged from 1.2:
- * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
+ * Clone token map outside of hot gossip loops (CASSANDRA-7758)
* Add stop method to EmbeddedCassandraService (CASSANDRA-7595)
* Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
* Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d663222/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[12/15] git commit: merge from 1.2
Posted by jb...@apache.org.
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/5d663222
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d663222
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d663222
Branch: refs/heads/cassandra-2.1.0
Commit: 5d663222379cea3b4c73ed37b953a537b594dd68
Parents: fe4c8c2 40deb91
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 13 10:22:54 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 13 10:22:54 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
src/java/org/apache/cassandra/utils/BiMultiValMap.java | 5 +++++
3 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d663222/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 57b0183,334feb5..b270f85
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
-2.0.10
- * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
+2.1.0-rc6
+ * Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741)
+ * Add tracing entries about concurrent range requests (CASSANDRA-7599)
+ * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729)
+ * Remove netty buffer ref-counting (CASSANDRA-7735)
+ * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742)
+ * Include stress yaml example in release and deb (CASSANDRA-7717)
+ * workaround for netty issue causing corrupted data off the wire (CASSANDRA-7695)
+ * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
+ * Fix binding null values inside UDT (CASSANDRA-7685)
+ * Fix UDT field selection with empty fields (CASSANDRA-7670)
+ * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
+Merged from 2.0:
++ * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
+ * Clone token map outside of hot gossip loops (CASSANDRA-7758)
* Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752)
* Do not flush on truncate if durable_writes is false (CASSANDRA-7750)
* Give CRR a default input_cql Statement (CASSANDRA-7226)
@@@ -140,6 -43,8 +141,7 @@@ Merged from 2.0
* Track max/min timestamps for range tombstones (CASSANDRA-7647)
* Fix NPE when listing saved caches dir (CASSANDRA-7632)
Merged from 1.2:
- * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
+ * Clone token map outside of hot gossip loops (CASSANDRA-7758)
* Add stop method to EmbeddedCassandraService (CASSANDRA-7595)
* Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
* Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d663222/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[09/15] git commit: merge from 1.2
Posted by jb...@apache.org.
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/40deb911
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40deb911
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40deb911
Branch: refs/heads/cassandra-2.1.0
Commit: 40deb9115beed0244ea751a8a66bb94de17fc6c8
Parents: 6e73a51 3fe7028
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 13 10:22:23 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 13 10:22:23 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
src/java/org/apache/cassandra/utils/BiMultiValMap.java | 5 +++++
3 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/40deb911/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e659891,4c261c9..334feb5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,48 -1,5 +1,49 @@@
-1.2.19
+2.0.10
+ * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
+ * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752)
+ * Do not flush on truncate if durable_writes is false (CASSANDRA-7750)
+ * Give CRR a default input_cql Statement (CASSANDRA-7226)
+ * Better error message when adding a collection with the same name
+ than a previously dropped one (CASSANDRA-6276)
+ * Fix validation when adding static columns (CASSANDRA-7730)
+ * (Thrift) fix range deletion of supercolumns (CASSANDRA-7733)
+ * Fix potential AssertionError in RangeTombstoneList (CASSANDRA-7700)
+ * Validate arguments of blobAs* functions (CASSANDRA-7707)
+ * Fix potential AssertionError with 2ndary indexes (CASSANDRA-6612)
+ * Avoid logging CompactionInterrupted at ERROR (CASSANDRA-7694)
+ * Minor leak in sstable2jon (CASSANDRA-7709)
+ * Add cassandra.auto_bootstrap system property (CASSANDRA-7650)
+ * Remove CqlPagingRecordReader/CqlPagingInputFormat (CASSANDRA-7570)
+ * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
+ * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
+ * Update java driver (for hadoop) (CASSANDRA-7618)
+ * Fix truncate to always flush (CASSANDRA-7511)
+ * Remove shuffle and taketoken (CASSANDRA-7601)
+ * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
+ * Always merge ranges owned by a single node (CASSANDRA-6930)
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
+ * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
+ * Fix range merging when DES scores are zero (CASSANDRA-7535)
+ * Warn when SSL certificates have expired (CASSANDRA-7528)
+ * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254)
+ * Fix race in FileCacheService RemovalListener (CASSANDRA-7278)
+ * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM
+ operations to incorrect become full QUORUM (CASSANDRA-7345)
+ * Properly handle unrecognized opcodes and flags (CASSANDRA-7440)
+ * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459)
+ * Make sure high level sstables get compacted (CASSANDRA-7414)
+ * Fix AssertionError when using empty clustering columns and static columns
+ (CASSANDRA-7455)
+ * Add inter_dc_stream_throughput_outbound_megabits_per_sec (CASSANDRA-6596)
+ * Add option to disable STCS in L0 (CASSANDRA-6621)
+ * Fix error when doing reversed queries with static columns (CASSANDRA-7490)
+ * Backport CASSANDRA-6747 (CASSANDRA-7560)
+ * Track max/min timestamps for range tombstones (CASSANDRA-7647)
+ * Fix NPE when listing saved caches dir (CASSANDRA-7632)
+Merged from 1.2:
+ * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
* Clone token map outside of hot gossip loops (CASSANDRA-7758)
* Add stop method to EmbeddedCassandraService (CASSANDRA-7595)
* Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/40deb911/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/40deb911/src/java/org/apache/cassandra/utils/BiMultiValMap.java
----------------------------------------------------------------------
[07/15] git commit: merge from 1.2
Posted by jb...@apache.org.
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/40deb911
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40deb911
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40deb911
Branch: refs/heads/cassandra-2.1
Commit: 40deb9115beed0244ea751a8a66bb94de17fc6c8
Parents: 6e73a51 3fe7028
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 13 10:22:23 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 13 10:22:23 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
src/java/org/apache/cassandra/utils/BiMultiValMap.java | 5 +++++
3 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/40deb911/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e659891,4c261c9..334feb5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,48 -1,5 +1,49 @@@
-1.2.19
+2.0.10
+ * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
+ * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752)
+ * Do not flush on truncate if durable_writes is false (CASSANDRA-7750)
+ * Give CRR a default input_cql Statement (CASSANDRA-7226)
+ * Better error message when adding a collection with the same name
+ than a previously dropped one (CASSANDRA-6276)
+ * Fix validation when adding static columns (CASSANDRA-7730)
+ * (Thrift) fix range deletion of supercolumns (CASSANDRA-7733)
+ * Fix potential AssertionError in RangeTombstoneList (CASSANDRA-7700)
+ * Validate arguments of blobAs* functions (CASSANDRA-7707)
+ * Fix potential AssertionError with 2ndary indexes (CASSANDRA-6612)
+ * Avoid logging CompactionInterrupted at ERROR (CASSANDRA-7694)
+ * Minor leak in sstable2jon (CASSANDRA-7709)
+ * Add cassandra.auto_bootstrap system property (CASSANDRA-7650)
+ * Remove CqlPagingRecordReader/CqlPagingInputFormat (CASSANDRA-7570)
+ * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
+ * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
+ * Update java driver (for hadoop) (CASSANDRA-7618)
+ * Fix truncate to always flush (CASSANDRA-7511)
+ * Remove shuffle and taketoken (CASSANDRA-7601)
+ * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
+ * Always merge ranges owned by a single node (CASSANDRA-6930)
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
+ * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
+ * Fix range merging when DES scores are zero (CASSANDRA-7535)
+ * Warn when SSL certificates have expired (CASSANDRA-7528)
+ * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254)
+ * Fix race in FileCacheService RemovalListener (CASSANDRA-7278)
+ * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM
+ operations to incorrect become full QUORUM (CASSANDRA-7345)
+ * Properly handle unrecognized opcodes and flags (CASSANDRA-7440)
+ * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459)
+ * Make sure high level sstables get compacted (CASSANDRA-7414)
+ * Fix AssertionError when using empty clustering columns and static columns
+ (CASSANDRA-7455)
+ * Add inter_dc_stream_throughput_outbound_megabits_per_sec (CASSANDRA-6596)
+ * Add option to disable STCS in L0 (CASSANDRA-6621)
+ * Fix error when doing reversed queries with static columns (CASSANDRA-7490)
+ * Backport CASSANDRA-6747 (CASSANDRA-7560)
+ * Track max/min timestamps for range tombstones (CASSANDRA-7647)
+ * Fix NPE when listing saved caches dir (CASSANDRA-7632)
+Merged from 1.2:
+ * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
* Clone token map outside of hot gossip loops (CASSANDRA-7758)
* Add stop method to EmbeddedCassandraService (CASSANDRA-7595)
* Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/40deb911/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/40deb911/src/java/org/apache/cassandra/utils/BiMultiValMap.java
----------------------------------------------------------------------
[13/15] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by jb...@apache.org.
Merge branch 'cassandra-2.1.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/607f5680
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/607f5680
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/607f5680
Branch: refs/heads/trunk
Commit: 607f56800b0cad99311503fdc41f4f6d6613d7f7
Parents: f08785f 5d66322
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 13 10:23:06 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 13 10:23:06 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
src/java/org/apache/cassandra/utils/BiMultiValMap.java | 5 +++++
3 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/607f5680/CHANGES.txt
----------------------------------------------------------------------
[04/15] git commit: Remove duplicates from
StorageService.getJoiningNodes patch by jbellis;
reviewed by ayeschenko for CASSANDRA-7478
Posted by jb...@apache.org.
Remove duplicates from StorageService.getJoiningNodes
patch by jbellis; reviewed by ayeschenko for CASSANDRA-7478
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3fe70282
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3fe70282
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3fe70282
Branch: refs/heads/trunk
Commit: 3fe702825e882398052fa26b230861aac47a0671
Parents: 2738e86
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 13 10:22:00 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 13 10:22:00 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
src/java/org/apache/cassandra/utils/BiMultiValMap.java | 5 +++++
3 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fe70282/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5dd3ad2..4c261c9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.19
+ * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
* Clone token map outside of hot gossip loops (CASSANDRA-7758)
* Add stop method to EmbeddedCassandraService (CASSANDRA-7595)
* Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fe70282/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 563b259..4ffa4b2 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2115,7 +2115,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
public List<String> getJoiningNodes()
{
- return stringify(tokenMetadata.getBootstrapTokens().values());
+ return stringify(tokenMetadata.getBootstrapTokens().valueSet());
}
public List<String> getLiveNodes()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fe70282/src/java/org/apache/cassandra/utils/BiMultiValMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/BiMultiValMap.java b/src/java/org/apache/cassandra/utils/BiMultiValMap.java
index 3712d25..2cc11b2 100644
--- a/src/java/org/apache/cassandra/utils/BiMultiValMap.java
+++ b/src/java/org/apache/cassandra/utils/BiMultiValMap.java
@@ -138,4 +138,9 @@ public class BiMultiValMap<K, V> implements Map<K, V>
{
return reverseMap.keys();
}
+
+ public Collection<V> valueSet()
+ {
+ return reverseMap.keySet();
+ }
}
[02/15] git commit: Remove duplicates from
StorageService.getJoiningNodes patch by jbellis;
reviewed by ayeschenko for CASSANDRA-7478
Posted by jb...@apache.org.
Remove duplicates from StorageService.getJoiningNodes
patch by jbellis; reviewed by ayeschenko for CASSANDRA-7478
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3fe70282
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3fe70282
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3fe70282
Branch: refs/heads/cassandra-2.0
Commit: 3fe702825e882398052fa26b230861aac47a0671
Parents: 2738e86
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 13 10:22:00 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 13 10:22:00 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
src/java/org/apache/cassandra/utils/BiMultiValMap.java | 5 +++++
3 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fe70282/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5dd3ad2..4c261c9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.19
+ * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
* Clone token map outside of hot gossip loops (CASSANDRA-7758)
* Add stop method to EmbeddedCassandraService (CASSANDRA-7595)
* Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fe70282/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 563b259..4ffa4b2 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2115,7 +2115,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
public List<String> getJoiningNodes()
{
- return stringify(tokenMetadata.getBootstrapTokens().values());
+ return stringify(tokenMetadata.getBootstrapTokens().valueSet());
}
public List<String> getLiveNodes()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fe70282/src/java/org/apache/cassandra/utils/BiMultiValMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/BiMultiValMap.java b/src/java/org/apache/cassandra/utils/BiMultiValMap.java
index 3712d25..2cc11b2 100644
--- a/src/java/org/apache/cassandra/utils/BiMultiValMap.java
+++ b/src/java/org/apache/cassandra/utils/BiMultiValMap.java
@@ -138,4 +138,9 @@ public class BiMultiValMap<K, V> implements Map<K, V>
{
return reverseMap.keys();
}
+
+ public Collection<V> valueSet()
+ {
+ return reverseMap.keySet();
+ }
}
[15/15] 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/2eae4364
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2eae4364
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2eae4364
Branch: refs/heads/trunk
Commit: 2eae43649819c6c350a64c3447b619b88e2f9341
Parents: b6ce0a6 607f568
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 13 10:23:13 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 13 10:23:13 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
src/java/org/apache/cassandra/utils/BiMultiValMap.java | 5 +++++
3 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2eae4364/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2eae4364/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------