Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df892a38 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df892a38 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df892a38 Branch: refs/heads/trunk Commit: df892a38ff7fc083f33e3f2d8d77a2590f58898d Parents: cba5d51 d8b7630 Author: Benedict Elliott Smith <[email protected]> Authored: Fri Aug 24 17:30:31 2018 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Fri Aug 24 17:30:31 2018 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/df892a38/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java index 7b75fad,e8bcee1..44ac0a0 --- a/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java +++ b/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java @@@ -39,7 -43,29 +39,7 @@@ public class SortedBiMultiValMap<K, V> public static <K extends Comparable<K>, V extends Comparable<V>> SortedBiMultiValMap<K, V> create(BiMultiValMap<K, V> map) { SortedBiMultiValMap<K, V> newMap = SortedBiMultiValMap.<K,V>create(); - newMap.forwardMap.putAll(map); - copy(map, newMap); - return newMap; - } - - public static <K, V> SortedBiMultiValMap<K, V> create(BiMultiValMap<K, V> map, Comparator<K> keyComparator, Comparator<V> valueComparator) - { - SortedBiMultiValMap<K, V> newMap = create(keyComparator, valueComparator); - copy(map, newMap); - return newMap; - } - - private static <K, V> void copy(BiMultiValMap<K, V> map, BiMultiValMap<K, V> newMap) - { + newMap.forwardMap.putAll(map.forwardMap); // Put each individual TreeSet instead of Multimap#putAll(Multimap) to get linear complexity // See CASSANDRA-14660 for (Entry<V, Collection<K>> entry : map.inverse().asMap().entrySet()) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
