You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2016/06/30 17:37:22 UTC
[01/22] cassandra git commit: Reduce contention getting instances of
CompositeType
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 fdee942ba -> 3041034fb
refs/heads/cassandra-3.0 4f14bc50d -> 1991fea8b
refs/heads/cassandra-3.9 3dceaaba8 -> 1d9d56659
refs/heads/trunk 54cbdd73c -> 2f5d9e790
Reduce contention getting instances of CompositeType
patch by schlosna; reviewed by slebresne for CASSANDRA-10433
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fda3d8ee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fda3d8ee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fda3d8ee
Branch: refs/heads/cassandra-3.0
Commit: fda3d8ee25adc4837bb5754f718062e522c04788
Parents: 5a9820d
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Oct 15 09:50:40 2015 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jun 30 17:06:24 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/db/marshal/CompositeType.java | 20 ++++++++++++--------
2 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fda3d8ee/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 354a1c2..02afcc2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.15
+ * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
* Account for partition deletions in tombstone histogram (CASSANDRA-12112)
* Avoid stalling paxos when the paxos state expires (CASSANDRA-12043)
* Remove finished incoming streaming connections from MessagingService (CASSANDRA-11854)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fda3d8ee/src/java/org/apache/cassandra/db/marshal/CompositeType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/CompositeType.java b/src/java/org/apache/cassandra/db/marshal/CompositeType.java
index f8ac22d..d25336d 100644
--- a/src/java/org/apache/cassandra/db/marshal/CompositeType.java
+++ b/src/java/org/apache/cassandra/db/marshal/CompositeType.java
@@ -19,18 +19,18 @@ package org.apache.cassandra.db.marshal;
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.util.Arrays;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Arrays;
import java.util.List;
-import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import com.google.common.collect.ImmutableList;
-import org.apache.cassandra.exceptions.ConfigurationException;
-import org.apache.cassandra.exceptions.SyntaxException;
import org.apache.cassandra.cql3.ColumnIdentifier;
import org.apache.cassandra.cql3.Operator;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.exceptions.SyntaxException;
import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.serializers.MarshalException;
import org.apache.cassandra.utils.ByteBufferUtil;
@@ -67,7 +67,7 @@ public class CompositeType extends AbstractCompositeType
public final List<AbstractType<?>> types;
// interning instances
- private static final Map<List<AbstractType<?>>, CompositeType> instances = new HashMap<List<AbstractType<?>>, CompositeType>();
+ private static final ConcurrentMap<List<AbstractType<?>>, CompositeType> instances = new ConcurrentHashMap<List<AbstractType<?>>, CompositeType>();
public static CompositeType getInstance(TypeParser parser) throws ConfigurationException, SyntaxException
{
@@ -97,7 +97,7 @@ public class CompositeType extends AbstractCompositeType
return true;
}
- public static synchronized CompositeType getInstance(List<AbstractType<?>> types)
+ public static CompositeType getInstance(List<AbstractType<?>> types)
{
assert types != null && !types.isEmpty();
@@ -105,7 +105,11 @@ public class CompositeType extends AbstractCompositeType
if (ct == null)
{
ct = new CompositeType(types);
- instances.put(types, ct);
+ CompositeType previous = instances.putIfAbsent(types, ct);
+ if (previous != null)
+ {
+ ct = previous;
+ }
}
return ct;
}
[08/22] cassandra git commit: Fix changelog (2.1.15 is frozen)
Posted by jm...@apache.org.
Fix changelog (2.1.15 is frozen)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40b18d57
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40b18d57
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40b18d57
Branch: refs/heads/cassandra-3.9
Commit: 40b18d57465d9cdbb9e5c633ffb5fdf0a8c164cf
Parents: fda3d8e
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Jun 30 17:10:15 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jun 30 17:10:15 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/40b18d57/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 02afcc2..3aa5ea9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,7 @@
-2.1.15
+2.1.16
* Reduce contention getting instances of CompositeType (CASSANDRA-10433)
+
+2.1.15
* Account for partition deletions in tombstone histogram (CASSANDRA-12112)
* Avoid stalling paxos when the paxos state expires (CASSANDRA-12043)
* Remove finished incoming streaming connections from MessagingService (CASSANDRA-11854)
[20/22] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.9
Posted by jm...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1d9d5665
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1d9d5665
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1d9d5665
Branch: refs/heads/trunk
Commit: 1d9d56659ec5212d3e90dbb91c266088fd7d5b95
Parents: 3dceaab 1991fea
Author: Josh McKenzie <jm...@apache.org>
Authored: Thu Jun 30 13:36:33 2016 -0400
Committer: Josh McKenzie <jm...@apache.org>
Committed: Thu Jun 30 13:36:33 2016 -0400
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d9d5665/conf/cassandra-env.ps1
----------------------------------------------------------------------
[18/22] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by jm...@apache.org.
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/1991fea8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1991fea8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1991fea8
Branch: refs/heads/cassandra-3.9
Commit: 1991fea8bf5b8eb51c32cf1f322fab0a97c81299
Parents: 4f14bc5 3041034
Author: Josh McKenzie <jm...@apache.org>
Authored: Thu Jun 30 13:36:07 2016 -0400
Committer: Josh McKenzie <jm...@apache.org>
Committed: Thu Jun 30 13:36:17 2016 -0400
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1991fea8/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --cc conf/cassandra-env.ps1
index 80645f9,8d4c254..c7ed51f
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@@ -327,26 -326,6 +327,26 @@@ Function SetCassandraEnvironmen
# times. If in doubt, and if you do not particularly want to tweak, go
# 100 MB per physical CPU core.
- New-Item -Force -ItemType directory -Path $env:CASSANDRA_HOME/logs/
++ New-Item -Force -ItemType directory -Path $env:CASSANDRA_HOME/logs/ | Out-Null
+ #GC log path has to be defined here since it needs to find CASSANDRA_HOME
+ $env:JVM_OPTS="$env:JVM_OPTS -Xloggc:""$env:CASSANDRA_HOME/logs/gc.log"""
+
+ # Read user-defined JVM options from jvm.options file
+ $content = Get-Content "$env:CASSANDRA_CONF\jvm.options"
+ for ($i = 0; $i -lt $content.Count; $i++)
+ {
+ $line = $content[$i]
+ if ($line.StartsWith("-"))
+ {
+ $env:JVM_OPTS = "$env:JVM_OPTS $line"
+ }
+ }
+
+ $defined_xmn = $env:JVM_OPTS -like '*Xmn*'
+ $defined_xmx = $env:JVM_OPTS -like '*Xmx*'
+ $defined_xms = $env:JVM_OPTS -like '*Xms*'
+ $using_cms = $env:JVM_OPTS -like '*UseConcMarkSweepGC*'
+
#$env:MAX_HEAP_SIZE="4096M"
#$env:HEAP_NEWSIZE="800M"
CalculateHeapSizes
[11/22] cassandra git commit: Merge commit '40b18d5' into
cassandra-2.2
Posted by jm...@apache.org.
Merge commit '40b18d5' into cassandra-2.2
* commit '40b18d5':
Fix changelog (2.1.15 is frozen)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fdee942b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fdee942b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fdee942b
Branch: refs/heads/cassandra-3.0
Commit: fdee942ba646e01227b60479bb7da31b6689fd32
Parents: f4288f4 40b18d5
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Jun 30 17:10:41 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jun 30 17:10:41 2016 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[12/22] cassandra git commit: Merge commit '40b18d5' into
cassandra-2.2
Posted by jm...@apache.org.
Merge commit '40b18d5' into cassandra-2.2
* commit '40b18d5':
Fix changelog (2.1.15 is frozen)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fdee942b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fdee942b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fdee942b
Branch: refs/heads/trunk
Commit: fdee942ba646e01227b60479bb7da31b6689fd32
Parents: f4288f4 40b18d5
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Jun 30 17:10:41 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jun 30 17:10:41 2016 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[05/22] cassandra git commit: Merge commit
'fda3d8ee25adc4837bb5754f718062e522c04788' into cassandra-2.2
Posted by jm...@apache.org.
Merge commit 'fda3d8ee25adc4837bb5754f718062e522c04788' into cassandra-2.2
* commit 'fda3d8ee25adc4837bb5754f718062e522c04788':
Reduce contention getting instances of CompositeType
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4288f40
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4288f40
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4288f40
Branch: refs/heads/cassandra-3.9
Commit: f4288f40265a11cec34dd8ba0d727bc87dc3f6d2
Parents: f72927e fda3d8e
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Jun 30 17:08:17 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jun 30 17:08:17 2016 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[09/22] cassandra git commit: Fix changelog (2.1.15 is frozen)
Posted by jm...@apache.org.
Fix changelog (2.1.15 is frozen)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40b18d57
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40b18d57
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40b18d57
Branch: refs/heads/trunk
Commit: 40b18d57465d9cdbb9e5c633ffb5fdf0a8c164cf
Parents: fda3d8e
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Jun 30 17:10:15 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jun 30 17:10:15 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/40b18d57/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 02afcc2..3aa5ea9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,7 @@
-2.1.15
+2.1.16
* Reduce contention getting instances of CompositeType (CASSANDRA-10433)
+
+2.1.15
* Account for partition deletions in tombstone histogram (CASSANDRA-12112)
* Avoid stalling paxos when the paxos state expires (CASSANDRA-12043)
* Remove finished incoming streaming connections from MessagingService (CASSANDRA-11854)
[03/22] cassandra git commit: Reduce contention getting instances of
CompositeType
Posted by jm...@apache.org.
Reduce contention getting instances of CompositeType
patch by schlosna; reviewed by slebresne for CASSANDRA-10433
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fda3d8ee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fda3d8ee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fda3d8ee
Branch: refs/heads/trunk
Commit: fda3d8ee25adc4837bb5754f718062e522c04788
Parents: 5a9820d
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Oct 15 09:50:40 2015 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jun 30 17:06:24 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/db/marshal/CompositeType.java | 20 ++++++++++++--------
2 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fda3d8ee/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 354a1c2..02afcc2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.15
+ * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
* Account for partition deletions in tombstone histogram (CASSANDRA-12112)
* Avoid stalling paxos when the paxos state expires (CASSANDRA-12043)
* Remove finished incoming streaming connections from MessagingService (CASSANDRA-11854)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fda3d8ee/src/java/org/apache/cassandra/db/marshal/CompositeType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/CompositeType.java b/src/java/org/apache/cassandra/db/marshal/CompositeType.java
index f8ac22d..d25336d 100644
--- a/src/java/org/apache/cassandra/db/marshal/CompositeType.java
+++ b/src/java/org/apache/cassandra/db/marshal/CompositeType.java
@@ -19,18 +19,18 @@ package org.apache.cassandra.db.marshal;
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.util.Arrays;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Arrays;
import java.util.List;
-import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import com.google.common.collect.ImmutableList;
-import org.apache.cassandra.exceptions.ConfigurationException;
-import org.apache.cassandra.exceptions.SyntaxException;
import org.apache.cassandra.cql3.ColumnIdentifier;
import org.apache.cassandra.cql3.Operator;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.exceptions.SyntaxException;
import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.serializers.MarshalException;
import org.apache.cassandra.utils.ByteBufferUtil;
@@ -67,7 +67,7 @@ public class CompositeType extends AbstractCompositeType
public final List<AbstractType<?>> types;
// interning instances
- private static final Map<List<AbstractType<?>>, CompositeType> instances = new HashMap<List<AbstractType<?>>, CompositeType>();
+ private static final ConcurrentMap<List<AbstractType<?>>, CompositeType> instances = new ConcurrentHashMap<List<AbstractType<?>>, CompositeType>();
public static CompositeType getInstance(TypeParser parser) throws ConfigurationException, SyntaxException
{
@@ -97,7 +97,7 @@ public class CompositeType extends AbstractCompositeType
return true;
}
- public static synchronized CompositeType getInstance(List<AbstractType<?>> types)
+ public static CompositeType getInstance(List<AbstractType<?>> types)
{
assert types != null && !types.isEmpty();
@@ -105,7 +105,11 @@ public class CompositeType extends AbstractCompositeType
if (ct == null)
{
ct = new CompositeType(types);
- instances.put(types, ct);
+ CompositeType previous = instances.putIfAbsent(types, ct);
+ if (previous != null)
+ {
+ ct = previous;
+ }
}
return ct;
}
[02/22] cassandra git commit: Reduce contention getting instances of
CompositeType
Posted by jm...@apache.org.
Reduce contention getting instances of CompositeType
patch by schlosna; reviewed by slebresne for CASSANDRA-10433
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fda3d8ee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fda3d8ee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fda3d8ee
Branch: refs/heads/cassandra-3.9
Commit: fda3d8ee25adc4837bb5754f718062e522c04788
Parents: 5a9820d
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Oct 15 09:50:40 2015 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jun 30 17:06:24 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/db/marshal/CompositeType.java | 20 ++++++++++++--------
2 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fda3d8ee/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 354a1c2..02afcc2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.15
+ * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
* Account for partition deletions in tombstone histogram (CASSANDRA-12112)
* Avoid stalling paxos when the paxos state expires (CASSANDRA-12043)
* Remove finished incoming streaming connections from MessagingService (CASSANDRA-11854)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fda3d8ee/src/java/org/apache/cassandra/db/marshal/CompositeType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/CompositeType.java b/src/java/org/apache/cassandra/db/marshal/CompositeType.java
index f8ac22d..d25336d 100644
--- a/src/java/org/apache/cassandra/db/marshal/CompositeType.java
+++ b/src/java/org/apache/cassandra/db/marshal/CompositeType.java
@@ -19,18 +19,18 @@ package org.apache.cassandra.db.marshal;
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.util.Arrays;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Arrays;
import java.util.List;
-import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import com.google.common.collect.ImmutableList;
-import org.apache.cassandra.exceptions.ConfigurationException;
-import org.apache.cassandra.exceptions.SyntaxException;
import org.apache.cassandra.cql3.ColumnIdentifier;
import org.apache.cassandra.cql3.Operator;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.exceptions.SyntaxException;
import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.serializers.MarshalException;
import org.apache.cassandra.utils.ByteBufferUtil;
@@ -67,7 +67,7 @@ public class CompositeType extends AbstractCompositeType
public final List<AbstractType<?>> types;
// interning instances
- private static final Map<List<AbstractType<?>>, CompositeType> instances = new HashMap<List<AbstractType<?>>, CompositeType>();
+ private static final ConcurrentMap<List<AbstractType<?>>, CompositeType> instances = new ConcurrentHashMap<List<AbstractType<?>>, CompositeType>();
public static CompositeType getInstance(TypeParser parser) throws ConfigurationException, SyntaxException
{
@@ -97,7 +97,7 @@ public class CompositeType extends AbstractCompositeType
return true;
}
- public static synchronized CompositeType getInstance(List<AbstractType<?>> types)
+ public static CompositeType getInstance(List<AbstractType<?>> types)
{
assert types != null && !types.isEmpty();
@@ -105,7 +105,11 @@ public class CompositeType extends AbstractCompositeType
if (ct == null)
{
ct = new CompositeType(types);
- instances.put(types, ct);
+ CompositeType previous = instances.putIfAbsent(types, ct);
+ if (previous != null)
+ {
+ ct = previous;
+ }
}
return ct;
}
[17/22] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by jm...@apache.org.
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/1991fea8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1991fea8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1991fea8
Branch: refs/heads/cassandra-3.0
Commit: 1991fea8bf5b8eb51c32cf1f322fab0a97c81299
Parents: 4f14bc5 3041034
Author: Josh McKenzie <jm...@apache.org>
Authored: Thu Jun 30 13:36:07 2016 -0400
Committer: Josh McKenzie <jm...@apache.org>
Committed: Thu Jun 30 13:36:17 2016 -0400
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1991fea8/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --cc conf/cassandra-env.ps1
index 80645f9,8d4c254..c7ed51f
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@@ -327,26 -326,6 +327,26 @@@ Function SetCassandraEnvironmen
# times. If in doubt, and if you do not particularly want to tweak, go
# 100 MB per physical CPU core.
- New-Item -Force -ItemType directory -Path $env:CASSANDRA_HOME/logs/
++ New-Item -Force -ItemType directory -Path $env:CASSANDRA_HOME/logs/ | Out-Null
+ #GC log path has to be defined here since it needs to find CASSANDRA_HOME
+ $env:JVM_OPTS="$env:JVM_OPTS -Xloggc:""$env:CASSANDRA_HOME/logs/gc.log"""
+
+ # Read user-defined JVM options from jvm.options file
+ $content = Get-Content "$env:CASSANDRA_CONF\jvm.options"
+ for ($i = 0; $i -lt $content.Count; $i++)
+ {
+ $line = $content[$i]
+ if ($line.StartsWith("-"))
+ {
+ $env:JVM_OPTS = "$env:JVM_OPTS $line"
+ }
+ }
+
+ $defined_xmn = $env:JVM_OPTS -like '*Xmn*'
+ $defined_xmx = $env:JVM_OPTS -like '*Xmx*'
+ $defined_xms = $env:JVM_OPTS -like '*Xms*'
+ $using_cms = $env:JVM_OPTS -like '*UseConcMarkSweepGC*'
+
#$env:MAX_HEAP_SIZE="4096M"
#$env:HEAP_NEWSIZE="800M"
CalculateHeapSizes
[19/22] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by jm...@apache.org.
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/1991fea8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1991fea8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1991fea8
Branch: refs/heads/trunk
Commit: 1991fea8bf5b8eb51c32cf1f322fab0a97c81299
Parents: 4f14bc5 3041034
Author: Josh McKenzie <jm...@apache.org>
Authored: Thu Jun 30 13:36:07 2016 -0400
Committer: Josh McKenzie <jm...@apache.org>
Committed: Thu Jun 30 13:36:17 2016 -0400
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1991fea8/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --cc conf/cassandra-env.ps1
index 80645f9,8d4c254..c7ed51f
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@@ -327,26 -326,6 +327,26 @@@ Function SetCassandraEnvironmen
# times. If in doubt, and if you do not particularly want to tweak, go
# 100 MB per physical CPU core.
- New-Item -Force -ItemType directory -Path $env:CASSANDRA_HOME/logs/
++ New-Item -Force -ItemType directory -Path $env:CASSANDRA_HOME/logs/ | Out-Null
+ #GC log path has to be defined here since it needs to find CASSANDRA_HOME
+ $env:JVM_OPTS="$env:JVM_OPTS -Xloggc:""$env:CASSANDRA_HOME/logs/gc.log"""
+
+ # Read user-defined JVM options from jvm.options file
+ $content = Get-Content "$env:CASSANDRA_CONF\jvm.options"
+ for ($i = 0; $i -lt $content.Count; $i++)
+ {
+ $line = $content[$i]
+ if ($line.StartsWith("-"))
+ {
+ $env:JVM_OPTS = "$env:JVM_OPTS $line"
+ }
+ }
+
+ $defined_xmn = $env:JVM_OPTS -like '*Xmn*'
+ $defined_xmx = $env:JVM_OPTS -like '*Xmx*'
+ $defined_xms = $env:JVM_OPTS -like '*Xms*'
+ $using_cms = $env:JVM_OPTS -like '*UseConcMarkSweepGC*'
+
#$env:MAX_HEAP_SIZE="4096M"
#$env:HEAP_NEWSIZE="800M"
CalculateHeapSizes
[21/22] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.9
Posted by jm...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1d9d5665
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1d9d5665
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1d9d5665
Branch: refs/heads/cassandra-3.9
Commit: 1d9d56659ec5212d3e90dbb91c266088fd7d5b95
Parents: 3dceaab 1991fea
Author: Josh McKenzie <jm...@apache.org>
Authored: Thu Jun 30 13:36:33 2016 -0400
Committer: Josh McKenzie <jm...@apache.org>
Committed: Thu Jun 30 13:36:33 2016 -0400
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d9d5665/conf/cassandra-env.ps1
----------------------------------------------------------------------
[22/22] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Posted by jm...@apache.org.
Merge branch 'cassandra-3.9' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f5d9e79
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f5d9e79
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f5d9e79
Branch: refs/heads/trunk
Commit: 2f5d9e790344ab4c9ac91cac7242eebc29802103
Parents: 54cbdd7 1d9d566
Author: Josh McKenzie <jm...@apache.org>
Authored: Thu Jun 30 13:36:44 2016 -0400
Committer: Josh McKenzie <jm...@apache.org>
Committed: Thu Jun 30 13:36:44 2016 -0400
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[06/22] cassandra git commit: Merge commit
'fda3d8ee25adc4837bb5754f718062e522c04788' into cassandra-2.2
Posted by jm...@apache.org.
Merge commit 'fda3d8ee25adc4837bb5754f718062e522c04788' into cassandra-2.2
* commit 'fda3d8ee25adc4837bb5754f718062e522c04788':
Reduce contention getting instances of CompositeType
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4288f40
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4288f40
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4288f40
Branch: refs/heads/trunk
Commit: f4288f40265a11cec34dd8ba0d727bc87dc3f6d2
Parents: f72927e fda3d8e
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Jun 30 17:08:17 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jun 30 17:08:17 2016 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[15/22] cassandra git commit: Ninja: suppress printed output on dir
creation in Win32 startup
Posted by jm...@apache.org.
Ninja: suppress printed output on dir creation in Win32 startup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3041034f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3041034f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3041034f
Branch: refs/heads/trunk
Commit: 3041034fb94aac7080c78ea82e1dd9fe8ce046a6
Parents: fdee942
Author: Josh McKenzie <jm...@apache.org>
Authored: Thu Jun 30 13:35:20 2016 -0400
Committer: Josh McKenzie <jm...@apache.org>
Committed: Thu Jun 30 13:35:20 2016 -0400
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3041034f/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index 60d15bb..8d4c254 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -425,7 +425,7 @@ Function SetCassandraEnvironment
$env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintPromotionFailure"
# $env:JVM_OPTS="$env:JVM_OPTS -XX:PrintFLSStatistics=1"
- New-Item -Force -ItemType directory -Path $env:CASSANDRA_HOME/logs/
+ New-Item -Force -ItemType directory -Path $env:CASSANDRA_HOME/logs/ | Out-Null
$env:JVM_OPTS="$env:JVM_OPTS -Xloggc:""$env:CASSANDRA_HOME/logs/gc.log"""
$env:JVM_OPTS="$env:JVM_OPTS -XX:+UseGCLogFileRotation"
$env:JVM_OPTS="$env:JVM_OPTS -XX:NumberOfGCLogFiles=10"
[13/22] cassandra git commit: Ninja: suppress printed output on dir
creation in Win32 startup
Posted by jm...@apache.org.
Ninja: suppress printed output on dir creation in Win32 startup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3041034f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3041034f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3041034f
Branch: refs/heads/cassandra-2.2
Commit: 3041034fb94aac7080c78ea82e1dd9fe8ce046a6
Parents: fdee942
Author: Josh McKenzie <jm...@apache.org>
Authored: Thu Jun 30 13:35:20 2016 -0400
Committer: Josh McKenzie <jm...@apache.org>
Committed: Thu Jun 30 13:35:20 2016 -0400
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3041034f/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index 60d15bb..8d4c254 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -425,7 +425,7 @@ Function SetCassandraEnvironment
$env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintPromotionFailure"
# $env:JVM_OPTS="$env:JVM_OPTS -XX:PrintFLSStatistics=1"
- New-Item -Force -ItemType directory -Path $env:CASSANDRA_HOME/logs/
+ New-Item -Force -ItemType directory -Path $env:CASSANDRA_HOME/logs/ | Out-Null
$env:JVM_OPTS="$env:JVM_OPTS -Xloggc:""$env:CASSANDRA_HOME/logs/gc.log"""
$env:JVM_OPTS="$env:JVM_OPTS -XX:+UseGCLogFileRotation"
$env:JVM_OPTS="$env:JVM_OPTS -XX:NumberOfGCLogFiles=10"
[07/22] cassandra git commit: Fix changelog (2.1.15 is frozen)
Posted by jm...@apache.org.
Fix changelog (2.1.15 is frozen)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40b18d57
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40b18d57
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40b18d57
Branch: refs/heads/cassandra-3.0
Commit: 40b18d57465d9cdbb9e5c633ffb5fdf0a8c164cf
Parents: fda3d8e
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Jun 30 17:10:15 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jun 30 17:10:15 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/40b18d57/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 02afcc2..3aa5ea9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,7 @@
-2.1.15
+2.1.16
* Reduce contention getting instances of CompositeType (CASSANDRA-10433)
+
+2.1.15
* Account for partition deletions in tombstone histogram (CASSANDRA-12112)
* Avoid stalling paxos when the paxos state expires (CASSANDRA-12043)
* Remove finished incoming streaming connections from MessagingService (CASSANDRA-11854)
[10/22] cassandra git commit: Merge commit '40b18d5' into
cassandra-2.2
Posted by jm...@apache.org.
Merge commit '40b18d5' into cassandra-2.2
* commit '40b18d5':
Fix changelog (2.1.15 is frozen)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fdee942b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fdee942b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fdee942b
Branch: refs/heads/cassandra-3.9
Commit: fdee942ba646e01227b60479bb7da31b6689fd32
Parents: f4288f4 40b18d5
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Jun 30 17:10:41 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jun 30 17:10:41 2016 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[04/22] cassandra git commit: Merge commit
'fda3d8ee25adc4837bb5754f718062e522c04788' into cassandra-2.2
Posted by jm...@apache.org.
Merge commit 'fda3d8ee25adc4837bb5754f718062e522c04788' into cassandra-2.2
* commit 'fda3d8ee25adc4837bb5754f718062e522c04788':
Reduce contention getting instances of CompositeType
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4288f40
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4288f40
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4288f40
Branch: refs/heads/cassandra-3.0
Commit: f4288f40265a11cec34dd8ba0d727bc87dc3f6d2
Parents: f72927e fda3d8e
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Jun 30 17:08:17 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jun 30 17:08:17 2016 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[16/22] cassandra git commit: Ninja: suppress printed output on dir
creation in Win32 startup
Posted by jm...@apache.org.
Ninja: suppress printed output on dir creation in Win32 startup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3041034f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3041034f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3041034f
Branch: refs/heads/cassandra-3.0
Commit: 3041034fb94aac7080c78ea82e1dd9fe8ce046a6
Parents: fdee942
Author: Josh McKenzie <jm...@apache.org>
Authored: Thu Jun 30 13:35:20 2016 -0400
Committer: Josh McKenzie <jm...@apache.org>
Committed: Thu Jun 30 13:35:20 2016 -0400
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3041034f/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index 60d15bb..8d4c254 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -425,7 +425,7 @@ Function SetCassandraEnvironment
$env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintPromotionFailure"
# $env:JVM_OPTS="$env:JVM_OPTS -XX:PrintFLSStatistics=1"
- New-Item -Force -ItemType directory -Path $env:CASSANDRA_HOME/logs/
+ New-Item -Force -ItemType directory -Path $env:CASSANDRA_HOME/logs/ | Out-Null
$env:JVM_OPTS="$env:JVM_OPTS -Xloggc:""$env:CASSANDRA_HOME/logs/gc.log"""
$env:JVM_OPTS="$env:JVM_OPTS -XX:+UseGCLogFileRotation"
$env:JVM_OPTS="$env:JVM_OPTS -XX:NumberOfGCLogFiles=10"
[14/22] cassandra git commit: Ninja: suppress printed output on dir
creation in Win32 startup
Posted by jm...@apache.org.
Ninja: suppress printed output on dir creation in Win32 startup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3041034f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3041034f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3041034f
Branch: refs/heads/cassandra-3.9
Commit: 3041034fb94aac7080c78ea82e1dd9fe8ce046a6
Parents: fdee942
Author: Josh McKenzie <jm...@apache.org>
Authored: Thu Jun 30 13:35:20 2016 -0400
Committer: Josh McKenzie <jm...@apache.org>
Committed: Thu Jun 30 13:35:20 2016 -0400
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3041034f/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index 60d15bb..8d4c254 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -425,7 +425,7 @@ Function SetCassandraEnvironment
$env:JVM_OPTS="$env:JVM_OPTS -XX:+PrintPromotionFailure"
# $env:JVM_OPTS="$env:JVM_OPTS -XX:PrintFLSStatistics=1"
- New-Item -Force -ItemType directory -Path $env:CASSANDRA_HOME/logs/
+ New-Item -Force -ItemType directory -Path $env:CASSANDRA_HOME/logs/ | Out-Null
$env:JVM_OPTS="$env:JVM_OPTS -Xloggc:""$env:CASSANDRA_HOME/logs/gc.log"""
$env:JVM_OPTS="$env:JVM_OPTS -XX:+UseGCLogFileRotation"
$env:JVM_OPTS="$env:JVM_OPTS -XX:NumberOfGCLogFiles=10"