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/f542a20e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f542a20e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f542a20e Branch: refs/heads/cassandra-3.0 Commit: f542a20eaa54db21123001c85f211999180bae14 Parents: a22d16b 426109c Author: Yuki Morishita <yu...@apache.org> Authored: Wed Sep 16 08:47:14 2015 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Wed Sep 16 08:47:14 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/utils/FBUtilities.java | 15 ++++++++++++++- .../apache/cassandra/utils/FBUtilitiesTest.java | 18 ++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f542a20e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7bb5b71,7deebcf..c688615 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,48 -1,8 +1,49 @@@ -2.2.2 +3.0.0-rc1 + * Add flag to enable/disable coordinator batchlog for MV writes (CASSANDRA-10230) + * Update cqlsh COPY for new internal driver serialization interface (CASSANDRA-10318) + * Give index implementations more control over rebuild operations (CASSANDRA-10312) + * Update index file format (CASSANDRA-10314) + * Add "shadowable" row tombstones to deal with mv timestamp issues (CASSANDRA-10261) + * CFS.loadNewSSTables() broken for pre-3.0 sstables + * Cache selected index in read command to reduce lookups (CASSANDRA-10215) + * Small optimizations of sstable index serialization (CASSANDRA-10232) + * Support for both encrypted and unencrypted native transport connections (CASSANDRA-9590) +Merged from 2.2: * Defer default role manager setup until all nodes are on 2.2+ (CASSANDRA-9761) + * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209) +Merged from 2.1: ++ * Fix NPE in nodetool compactionhistory (CASSANDRA-9758) + * (Pig) support BulkOutputFormat as a URL parameter (CASSANDRA-7410) + * BATCH statement is broken in cqlsh (CASSANDRA-10272) + * (cqlsh) Make cqlsh PEP8 Compliant (CASSANDRA-10066) + * (cqlsh) Fix error when starting cqlsh with --debug (CASSANDRA-10282) + * Scrub, Cleanup and Upgrade do not unmark compacting until all operations + have completed, regardless of the occurence of exceptions (CASSANDRA-10274) + + +3.0.0-beta2 + * Fix columns returned by AbstractBtreePartitions (CASSANDRA-10220) + * Fix backward compatibility issue due to AbstractBounds serialization bug (CASSANDRA-9857) + * Fix startup error when upgrading nodes (CASSANDRA-10136) + * Base table PRIMARY KEY can be assumed to be NOT NULL in MV creation (CASSANDRA-10147) + * Improve batchlog write patch (CASSANDRA-9673) + * Re-apply MaterializedView updates on commitlog replay (CASSANDRA-10164) + * Require AbstractType.isByteOrderComparable declaration in constructor (CASSANDRA-9901) + * Avoid digest mismatch on upgrade to 3.0 (CASSANDRA-9554) + * Fix Materialized View builder when adding multiple MVs (CASSANDRA-10156) + * Choose better poolingOptions for protocol v4 in cassandra-stress (CASSANDRA-10182) + * Fix LWW bug affecting Materialized Views (CASSANDRA-10197) + * Ensures frozen sets and maps are always sorted (CASSANDRA-10162) + * Don't deadlock when flushing CFS backed custom indexes (CASSANDRA-10181) + * Fix double flushing of secondary index tables (CASSANDRA-10180) + * Fix incorrect handling of range tombstones in thrift (CASSANDRA-10046) + * Only use batchlog when paired materialized view replica is remote (CASSANDRA-10061) + * Reuse TemporalRow when updating multiple MaterializedViews (CASSANDRA-10060) + * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917) + * Fix sstablerepairedset (CASSANDRA-10132) +Merged from 2.2: * Cancel transaction for sstables we wont redistribute index summary for (CASSANDRA-10270) - * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209) * Retry snapshot deletion after compaction and gc on Windows (CASSANDRA-10222) * Fix failure to start with space in directory path on Windows (CASSANDRA-10239) * Fix repair hang when snapshot failed (CASSANDRA-10057) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f542a20e/src/java/org/apache/cassandra/utils/FBUtilities.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/utils/FBUtilities.java index 6d31d8c,6ef64ef..c4b4193 --- a/src/java/org/apache/cassandra/utils/FBUtilities.java +++ b/src/java/org/apache/cassandra/utils/FBUtilities.java @@@ -26,10 -28,14 +26,13 @@@ import java.security.MessageDigest import java.security.NoSuchAlgorithmException; import java.util.*; import java.util.concurrent.*; -import java.util.zip.Adler32; +import java.util.zip.CRC32; import java.util.zip.Checksum; + import javax.annotation.Nonnull; + import javax.annotation.Nullable; + import com.google.common.base.Joiner; -import com.google.common.collect.AbstractIterator; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@@ -485,13 -486,18 +488,23 @@@ public class FBUtilitie return s; } + public static <T> NavigableSet<T> emptySortedSet(Comparator<? super T> comparator) + { + return new TreeSet<T>(comparator); + } + - public static String toString(Map<?,?> map) + /** + * Make straing out of the given {@code Map}. + * + * @param map Map to make string. + * @return String representation of all entries in the map, + * where key and value pair is concatenated with ':'. + */ + @Nonnull + public static String toString(@Nullable Map<?, ?> map) { + if (map == null) + return ""; Joiner.MapJoiner joiner = Joiner.on(", ").withKeyValueSeparator(":"); return joiner.join(map); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/f542a20e/test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java index 062387f,c82bcc9..90c5f05 --- a/test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java +++ b/test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java @@@ -26,7 -27,10 +26,11 @@@ import java.nio.charset.StandardCharset import com.google.common.primitives.Ints; import org.junit.Test; + import java.util.Map; + import java.util.TreeMap; + + import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; public class FBUtilitiesTest {
