Updated Branches: refs/heads/cassandra-1.2 360d1a222 -> cc66c73ba refs/heads/trunk 152213469 -> 789cd0696
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/789cd069 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/789cd069 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/789cd069 Branch: refs/heads/trunk Commit: 789cd0696f05a48fa9dd8f64d5ae2a108bc5b9b3 Parents: 1522134 cc66c73 Author: Jonathan Ellis <[email protected]> Authored: Thu Jan 24 13:44:14 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Thu Jan 24 13:44:14 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/locator/TokenMetadata.java | 17 ++- .../apache/cassandra/service/StorageService.java | 86 ++++++++++++--- .../org/apache/cassandra/streaming/StreamOut.java | 10 ++- 4 files changed, 94 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/789cd069/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d0cfd8e,3a53a34..cdaec38 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,5 +1,12 @@@ +1.3 + * make index_interval configurable per columnfamily (CASSANDRA-3961) + * add default_tim_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + * replace supercolumns internally by composites (CASSANDRA-3237, 5123) + * upgrade thrift to 0.9.0 (CASSANDRA-3719) + 1.2.1 + * stream undelivered hints on decommission (CASSANDRA-5128) * GossipingPropertyFileSnitch loads saved dc/rack info if needed (CASSANDRA-5133) * drain should flush system CFs too (CASSANDRA-4446) * add inter_dc_tcp_nodelay setting (CASSANDRA-5148) http://git-wip-us.apache.org/repos/asf/cassandra/blob/789cd069/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/789cd069/src/java/org/apache/cassandra/streaming/StreamOut.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/streaming/StreamOut.java index 5d332c7,7855d6b..6e23a99 --- a/src/java/org/apache/cassandra/streaming/StreamOut.java +++ b/src/java/org/apache/cassandra/streaming/StreamOut.java @@@ -80,8 -80,16 +80,16 @@@ public class StreamOu */ public static void transferRanges(InetAddress target, Table table, Collection<Range<Token>> ranges, IStreamCallback callback, OperationType type) { + transferRanges(target, table, table.getColumnFamilyStores(), ranges, callback, type); + } + + /** + * Stream the given ranges to the target endpoint for provided CFs in the given keyspace. + */ + public static void transferRanges(InetAddress target, Table table, Iterable<ColumnFamilyStore> cfses, Collection<Range<Token>> ranges, IStreamCallback callback, OperationType type) + { - StreamOutSession session = StreamOutSession.create(table.name, target, callback); + StreamOutSession session = StreamOutSession.create(table.getName(), target, callback); - transferRanges(session, table.getColumnFamilyStores(), ranges, type); + transferRanges(session, cfses, ranges, type); } /**
