You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by gd...@apache.org on 2011/03/17 15:50:56 UTC
svn commit: r1082511 - in /cassandra/trunk:
src/java/org/apache/cassandra/config/CFMetaData.java
test/unit/org/apache/cassandra/SchemaLoader.java
Author: gdusbabek
Date: Thu Mar 17 14:50:56 2011
New Revision: 1082511
URL: http://svn.apache.org/viewvc?rev=1082511&view=rev
Log:
fix jdbc test. patch by gdusbabek. CASSANDRA-1906
Modified:
cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java
cassandra/trunk/test/unit/org/apache/cassandra/SchemaLoader.java
Modified: cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java?rev=1082511&r1=1082510&r2=1082511&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java Thu Mar 17 14:50:56 2011
@@ -171,17 +171,7 @@ public final class CFMetaData
public CFMetaData(String keyspace, String name, ColumnFamilyType type, AbstractType comp, AbstractType subcc)
{
- // Final fields must be set in constructor
- ksName = keyspace;
- cfName = name;
- cfType = type;
- comparator = comp;
- subcolumnComparator = enforceSubccDefault(type, subcc);
-
- // Default new CFMDs get an id chosen for them
- cfId = nextId();
-
- this.init();
+ this(keyspace, name, type, comp, subcc, nextId());
}
private CFMetaData(String keyspace, String name, ColumnFamilyType type, AbstractType comp, AbstractType subcc, int id)
Modified: cassandra/trunk/test/unit/org/apache/cassandra/SchemaLoader.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/SchemaLoader.java?rev=1082511&r1=1082510&r2=1082511&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/SchemaLoader.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/SchemaLoader.java Thu Mar 17 14:50:56 2011
@@ -217,6 +217,6 @@ public class SchemaLoader
}
private static CFMetaData jdbcCFMD(String ksName, String cfName, AbstractType comp)
{
- return new CFMetaData(ksName, cfName, ColumnFamilyType.Standard, comp, comp);
+ return new CFMetaData(ksName, cfName, ColumnFamilyType.Standard, comp, null).defaultValidator(comp);
}
}