You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2018/08/24 14:50:20 UTC

[1/6] cassandra git commit: Improve TokenMetaData cache populating performance avoid long locking

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 299782cff -> 5c4ce600c
  refs/heads/cassandra-3.11 991e19711 -> 68f8966d5
  refs/heads/trunk f5adeeb8d -> ffde38a25


Improve TokenMetaData cache populating performance avoid long locking

patch by Pengchao Wang; reviewed by Benedict for CASSANDRA-14660


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5c4ce600
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c4ce600
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c4ce600

Branch: refs/heads/cassandra-3.0
Commit: 5c4ce600c4e24a656fd538f14ec5f4951d231e6e
Parents: 299782c
Author: Pengchao Wang <wp...@fb.com>
Authored: Fri Aug 24 00:39:06 2018 -0700
Committer: Benedict Elliott Smith <be...@apple.com>
Committed: Fri Aug 24 15:47:08 2018 +0100

----------------------------------------------------------------------
 .../cassandra/utils/SortedBiMultiValMap.java    | 29 ++++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c4ce600/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java b/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java
index 368d3f5..f628061 100644
--- a/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java
+++ b/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java
@@ -17,6 +17,7 @@
  */
 package org.apache.cassandra.utils;
 
+import java.util.Collection;
 import java.util.Comparator;
 import java.util.SortedMap;
 import java.util.TreeMap;
@@ -26,6 +27,9 @@ import com.google.common.collect.TreeMultimap;
 
 public class SortedBiMultiValMap<K, V> extends BiMultiValMap<K, V>
 {
+    @SuppressWarnings("unchecked")
+    private static final Comparator DEFAULT_COMPARATOR = (o1, o2) -> ((Comparable) o1).compareTo(o2);
+
     protected SortedBiMultiValMap(SortedMap<K, V> forwardMap, SortedSetMultimap<V, K> reverseMap)
     {
         super(forwardMap, reverseMap);
@@ -48,28 +52,29 @@ public class SortedBiMultiValMap<K, V> extends BiMultiValMap<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);
-        newMap.reverseMap.putAll(map.inverse());
+        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);
-        newMap.forwardMap.putAll(map);
-        newMap.reverseMap.putAll(map.inverse());
+        copy(map, newMap);
         return newMap;
     }
 
+    private static <K, V> void copy(BiMultiValMap<K, V> map, BiMultiValMap<K, V> newMap)
+    {
+        newMap.forwardMap.putAll(map);
+        // 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())
+            newMap.reverseMap.putAll(entry.getKey(), entry.getValue());
+    }
+
+    @SuppressWarnings("unchecked")
     private static <T> Comparator<T> defaultComparator()
     {
-        return new Comparator<T>()
-        {
-            @SuppressWarnings("unchecked")
-            public int compare(T o1, T o2)
-            {
-                return ((Comparable<T>) o1).compareTo(o2);
-            }
-        };
+        return DEFAULT_COMPARATOR;
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

Posted by be...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68f8966d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68f8966d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68f8966d

Branch: refs/heads/trunk
Commit: 68f8966d5bc1a11a50091290b534c0e33903dd4d
Parents: 991e197 5c4ce60
Author: Benedict Elliott Smith <be...@apple.com>
Authored: Fri Aug 24 15:47:48 2018 +0100
Committer: Benedict Elliott Smith <be...@apple.com>
Committed: Fri Aug 24 15:47:48 2018 +0100

----------------------------------------------------------------------
 .../cassandra/utils/SortedBiMultiValMap.java    | 29 ++++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)
----------------------------------------------------------------------



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

Posted by be...@apache.org.
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/ffde38a2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ffde38a2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ffde38a2

Branch: refs/heads/trunk
Commit: ffde38a2567517da780c0411b0338d5a445ea551
Parents: f5adeeb 68f8966
Author: Benedict Elliott Smith <be...@apple.com>
Authored: Fri Aug 24 15:49:02 2018 +0100
Committer: Benedict Elliott Smith <be...@apple.com>
Committed: Fri Aug 24 15:49:02 2018 +0100

----------------------------------------------------------------------
 .../cassandra/utils/SortedBiMultiValMap.java    | 35 +++-----------------
 1 file changed, 5 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffde38a2/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java
index 368d3f5,f628061..7b75fad
--- a/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java
+++ b/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java
@@@ -17,7 -17,8 +17,7 @@@
   */
  package org.apache.cassandra.utils;
  
- import java.util.Comparator;
+ import java.util.Collection;
 -import java.util.Comparator;
  import java.util.SortedMap;
  import java.util.TreeMap;
  
@@@ -36,40 -40,41 +36,15 @@@ public class SortedBiMultiValMap<K, V> 
          return new SortedBiMultiValMap<K, V>(new TreeMap<K,V>(), TreeMultimap.<V, K>create());
      }
  
--    public static <K, V> SortedBiMultiValMap<K, V> create(Comparator<K> keyComparator, Comparator<V> valueComparator)
--    {
--        if (keyComparator == null)
--            keyComparator = defaultComparator();
--        if (valueComparator == null)
--            valueComparator = defaultComparator();
--        return new SortedBiMultiValMap<K, V>(new TreeMap<K,V>(keyComparator), TreeMultimap.<V, K>create(valueComparator, keyComparator));
--    }
--
      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();
 -        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);
-         newMap.reverseMap.putAll(map.inverse());
-         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);
-         newMap.forwardMap.putAll(map);
-         newMap.reverseMap.putAll(map.inverse());
+         // 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())
+             newMap.reverseMap.putAll(entry.getKey(), entry.getValue());
 +        return newMap;
      }
  
 -    @SuppressWarnings("unchecked")
--    private static <T> Comparator<T> defaultComparator()
--    {
-         return new Comparator<T>()
-         {
-             @SuppressWarnings("unchecked")
-             public int compare(T o1, T o2)
-             {
-                 return ((Comparable<T>) o1).compareTo(o2);
-             }
-         };
 -        return DEFAULT_COMPARATOR;
--    }
  }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[2/6] cassandra git commit: Improve TokenMetaData cache populating performance avoid long locking

Posted by be...@apache.org.
Improve TokenMetaData cache populating performance avoid long locking

patch by Pengchao Wang; reviewed by Benedict for CASSANDRA-14660


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5c4ce600
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c4ce600
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c4ce600

Branch: refs/heads/cassandra-3.11
Commit: 5c4ce600c4e24a656fd538f14ec5f4951d231e6e
Parents: 299782c
Author: Pengchao Wang <wp...@fb.com>
Authored: Fri Aug 24 00:39:06 2018 -0700
Committer: Benedict Elliott Smith <be...@apple.com>
Committed: Fri Aug 24 15:47:08 2018 +0100

----------------------------------------------------------------------
 .../cassandra/utils/SortedBiMultiValMap.java    | 29 ++++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c4ce600/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java b/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java
index 368d3f5..f628061 100644
--- a/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java
+++ b/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java
@@ -17,6 +17,7 @@
  */
 package org.apache.cassandra.utils;
 
+import java.util.Collection;
 import java.util.Comparator;
 import java.util.SortedMap;
 import java.util.TreeMap;
@@ -26,6 +27,9 @@ import com.google.common.collect.TreeMultimap;
 
 public class SortedBiMultiValMap<K, V> extends BiMultiValMap<K, V>
 {
+    @SuppressWarnings("unchecked")
+    private static final Comparator DEFAULT_COMPARATOR = (o1, o2) -> ((Comparable) o1).compareTo(o2);
+
     protected SortedBiMultiValMap(SortedMap<K, V> forwardMap, SortedSetMultimap<V, K> reverseMap)
     {
         super(forwardMap, reverseMap);
@@ -48,28 +52,29 @@ public class SortedBiMultiValMap<K, V> extends BiMultiValMap<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);
-        newMap.reverseMap.putAll(map.inverse());
+        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);
-        newMap.forwardMap.putAll(map);
-        newMap.reverseMap.putAll(map.inverse());
+        copy(map, newMap);
         return newMap;
     }
 
+    private static <K, V> void copy(BiMultiValMap<K, V> map, BiMultiValMap<K, V> newMap)
+    {
+        newMap.forwardMap.putAll(map);
+        // 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())
+            newMap.reverseMap.putAll(entry.getKey(), entry.getValue());
+    }
+
+    @SuppressWarnings("unchecked")
     private static <T> Comparator<T> defaultComparator()
     {
-        return new Comparator<T>()
-        {
-            @SuppressWarnings("unchecked")
-            public int compare(T o1, T o2)
-            {
-                return ((Comparable<T>) o1).compareTo(o2);
-            }
-        };
+        return DEFAULT_COMPARATOR;
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

Posted by be...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68f8966d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68f8966d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68f8966d

Branch: refs/heads/cassandra-3.11
Commit: 68f8966d5bc1a11a50091290b534c0e33903dd4d
Parents: 991e197 5c4ce60
Author: Benedict Elliott Smith <be...@apple.com>
Authored: Fri Aug 24 15:47:48 2018 +0100
Committer: Benedict Elliott Smith <be...@apple.com>
Committed: Fri Aug 24 15:47:48 2018 +0100

----------------------------------------------------------------------
 .../cassandra/utils/SortedBiMultiValMap.java    | 29 ++++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)
----------------------------------------------------------------------



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


[3/6] cassandra git commit: Improve TokenMetaData cache populating performance avoid long locking

Posted by be...@apache.org.
Improve TokenMetaData cache populating performance avoid long locking

patch by Pengchao Wang; reviewed by Benedict for CASSANDRA-14660


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5c4ce600
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c4ce600
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c4ce600

Branch: refs/heads/trunk
Commit: 5c4ce600c4e24a656fd538f14ec5f4951d231e6e
Parents: 299782c
Author: Pengchao Wang <wp...@fb.com>
Authored: Fri Aug 24 00:39:06 2018 -0700
Committer: Benedict Elliott Smith <be...@apple.com>
Committed: Fri Aug 24 15:47:08 2018 +0100

----------------------------------------------------------------------
 .../cassandra/utils/SortedBiMultiValMap.java    | 29 ++++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c4ce600/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java b/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java
index 368d3f5..f628061 100644
--- a/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java
+++ b/src/java/org/apache/cassandra/utils/SortedBiMultiValMap.java
@@ -17,6 +17,7 @@
  */
 package org.apache.cassandra.utils;
 
+import java.util.Collection;
 import java.util.Comparator;
 import java.util.SortedMap;
 import java.util.TreeMap;
@@ -26,6 +27,9 @@ import com.google.common.collect.TreeMultimap;
 
 public class SortedBiMultiValMap<K, V> extends BiMultiValMap<K, V>
 {
+    @SuppressWarnings("unchecked")
+    private static final Comparator DEFAULT_COMPARATOR = (o1, o2) -> ((Comparable) o1).compareTo(o2);
+
     protected SortedBiMultiValMap(SortedMap<K, V> forwardMap, SortedSetMultimap<V, K> reverseMap)
     {
         super(forwardMap, reverseMap);
@@ -48,28 +52,29 @@ public class SortedBiMultiValMap<K, V> extends BiMultiValMap<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);
-        newMap.reverseMap.putAll(map.inverse());
+        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);
-        newMap.forwardMap.putAll(map);
-        newMap.reverseMap.putAll(map.inverse());
+        copy(map, newMap);
         return newMap;
     }
 
+    private static <K, V> void copy(BiMultiValMap<K, V> map, BiMultiValMap<K, V> newMap)
+    {
+        newMap.forwardMap.putAll(map);
+        // 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())
+            newMap.reverseMap.putAll(entry.getKey(), entry.getValue());
+    }
+
+    @SuppressWarnings("unchecked")
     private static <T> Comparator<T> defaultComparator()
     {
-        return new Comparator<T>()
-        {
-            @SuppressWarnings("unchecked")
-            public int compare(T o1, T o2)
-            {
-                return ((Comparable<T>) o1).compareTo(o2);
-            }
-        };
+        return DEFAULT_COMPARATOR;
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org