cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Wed, 16 Oct 2013 18:47:27 GMT
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 <brandonwilliams@apache.org>
Authored: Wed Oct 16 13:45:38 2013 -0500
Committer: Brandon Williams <brandonwilliams@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)
  


Mime
View raw message