You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/10/16 20:47:23 UTC
[1/6] git commit: Remove new asserts in CMFD Patch by Sam Tunnicliffe,
reviewed by brandonwilliams for CASSANDRA-6208
Updated Branches:
refs/heads/cassandra-1.2 8d319b06a -> e655d62a4
refs/heads/cassandra-2.0 2ab13706b -> 96c0256d3
refs/heads/trunk b685e1118 -> 832c4e98b
Remove new asserts in CMFD
Patch by Sam Tunnicliffe, reviewed by brandonwilliams for CASSANDRA-6208
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e655d62a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e655d62a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e655d62a
Branch: refs/heads/cassandra-1.2
Commit: e655d62a476f1507ab77c6ba8de2d15e3851f5e0
Parents: 8d319b0
Author: Brandon Williams <br...@apache.org>
Authored: Wed Oct 16 13:44:34 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Oct 16 13:44:34 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/CFMetaData.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e655d62a/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java
index fcbd012..85c3dcb 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -309,10 +309,6 @@ public final class CFMetaData
CFMetaData(String keyspace, String name, ColumnFamilyType type, AbstractType<?> comp, AbstractType<?> subcc, UUID id)
{
- assert keyspace != null;
- assert name != null;
- assert type != null;
- assert id != null;
// (subcc may be null for non-supercolumns)
// (comp may also be null for custom indexes, which is kind of broken if you ask me)
[2/6] git commit: Remove new asserts in CMFD Patch by Sam Tunnicliffe,
reviewed by brandonwilliams for CASSANDRA-6208
Posted by br...@apache.org.
Remove new asserts in CMFD
Patch by Sam Tunnicliffe, reviewed by brandonwilliams for CASSANDRA-6208
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e655d62a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e655d62a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e655d62a
Branch: refs/heads/cassandra-2.0
Commit: e655d62a476f1507ab77c6ba8de2d15e3851f5e0
Parents: 8d319b0
Author: Brandon Williams <br...@apache.org>
Authored: Wed Oct 16 13:44:34 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Oct 16 13:44:34 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/CFMetaData.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e655d62a/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java
index fcbd012..85c3dcb 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -309,10 +309,6 @@ public final class CFMetaData
CFMetaData(String keyspace, String name, ColumnFamilyType type, AbstractType<?> comp, AbstractType<?> subcc, UUID id)
{
- assert keyspace != null;
- assert name != null;
- assert type != null;
- assert id != null;
// (subcc may be null for non-supercolumns)
// (comp may also be null for custom indexes, which is kind of broken if you ask me)
[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/96c0256d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/96c0256d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/96c0256d
Branch: refs/heads/cassandra-2.0
Commit: 96c0256d3dd4b9e245bee7676fc8af6265340782
Parents: 2ab1370 e655d62
Author: Brandon Williams <br...@apache.org>
Authored: Wed Oct 16 13:45:38 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Oct 16 13:45:38 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/CFMetaData.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/96c0256d/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/CFMetaData.java
index 374f4a5,85c3dcb..d63ee01
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@@ -445,21 -304,11 +445,17 @@@ public final class CFMetaDat
public CFMetaData(String keyspace, String name, ColumnFamilyType type, AbstractType<?> comp, AbstractType<?> subcc)
{
- this(keyspace, name, type, comp, subcc, getId(keyspace, name));
+ this(keyspace, name, type, makeComparator(type, comp, subcc));
}
- CFMetaData(String keyspace, String name, ColumnFamilyType type, AbstractType<?> comp, AbstractType<?> subcc, UUID id)
+ public CFMetaData(String keyspace, String name, ColumnFamilyType type, AbstractType<?> comp)
+ {
+ this(keyspace, name, type, comp, getId(keyspace, name));
+ }
+
+ @VisibleForTesting
+ CFMetaData(String keyspace, String name, ColumnFamilyType type, AbstractType<?> comp, UUID id)
{
- assert keyspace != null;
- assert name != null;
- assert type != null;
- assert id != null;
// (subcc may be null for non-supercolumns)
// (comp may also be null for custom indexes, which is kind of broken if you ask me)
[3/6] git commit: Remove new asserts in CMFD Patch by Sam Tunnicliffe,
reviewed by brandonwilliams for CASSANDRA-6208
Posted by br...@apache.org.
Remove new asserts in CMFD
Patch by Sam Tunnicliffe, reviewed by brandonwilliams for CASSANDRA-6208
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e655d62a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e655d62a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e655d62a
Branch: refs/heads/trunk
Commit: e655d62a476f1507ab77c6ba8de2d15e3851f5e0
Parents: 8d319b0
Author: Brandon Williams <br...@apache.org>
Authored: Wed Oct 16 13:44:34 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Oct 16 13:44:34 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/CFMetaData.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e655d62a/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java
index fcbd012..85c3dcb 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -309,10 +309,6 @@ public final class CFMetaData
CFMetaData(String keyspace, String name, ColumnFamilyType type, AbstractType<?> comp, AbstractType<?> subcc, UUID id)
{
- assert keyspace != null;
- assert name != null;
- assert type != null;
- assert id != null;
// (subcc may be null for non-supercolumns)
// (comp may also be null for custom indexes, which is kind of broken if you ask me)
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/96c0256d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/96c0256d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/96c0256d
Branch: refs/heads/trunk
Commit: 96c0256d3dd4b9e245bee7676fc8af6265340782
Parents: 2ab1370 e655d62
Author: Brandon Williams <br...@apache.org>
Authored: Wed Oct 16 13:45:38 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Oct 16 13:45:38 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/CFMetaData.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/96c0256d/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/CFMetaData.java
index 374f4a5,85c3dcb..d63ee01
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@@ -445,21 -304,11 +445,17 @@@ public final class CFMetaDat
public CFMetaData(String keyspace, String name, ColumnFamilyType type, AbstractType<?> comp, AbstractType<?> subcc)
{
- this(keyspace, name, type, comp, subcc, getId(keyspace, name));
+ this(keyspace, name, type, makeComparator(type, comp, subcc));
}
- CFMetaData(String keyspace, String name, ColumnFamilyType type, AbstractType<?> comp, AbstractType<?> subcc, UUID id)
+ public CFMetaData(String keyspace, String name, ColumnFamilyType type, AbstractType<?> comp)
+ {
+ this(keyspace, name, type, comp, getId(keyspace, name));
+ }
+
+ @VisibleForTesting
+ CFMetaData(String keyspace, String name, ColumnFamilyType type, AbstractType<?> comp, UUID id)
{
- assert keyspace != null;
- assert name != null;
- assert type != null;
- assert id != null;
// (subcc may be null for non-supercolumns)
// (comp may also be null for custom indexes, which is kind of broken if you ask me)
[6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/832c4e98
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/832c4e98
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/832c4e98
Branch: refs/heads/trunk
Commit: 832c4e98b6e6e310f062bf518e849d237c59e106
Parents: b685e11 96c0256
Author: Brandon Williams <br...@apache.org>
Authored: Wed Oct 16 13:45:48 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Oct 16 13:45:48 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/CFMetaData.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/832c4e98/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------