Author: gdusbabek
Date: Tue Jun 15 14:51:01 2010
New Revision: 954918
URL: http://svn.apache.org/viewvc?rev=954918&view=rev
Log:
avoid constructor proliferation in CFM. Patch by gdusbabek, reviewed by
jbellis. CASSANDRA-1180
Modified:
cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java
cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java
Modified:
cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java?rev=954918&r1=954917&r2=954918&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java Tue
Jun 15 14:51:01 2010
@@ -537,7 +537,8 @@ public class CassandraServer implements
cfDef.comment == null ? D_CF_COMMENT :
cfDef.comment.toString(),
cfDef.row_cache_size == null ? D_CF_ROWCACHE :
cfDef.row_cache_size,
cfDef.preload_row_cache == null ?
D_CF_PRELOAD_ROWCACHE : cfDef.preload_row_cache,
- cfDef.key_cache_size == null ? D_CF_KEYCACHE :
cfDef.key_cache_size);
+ cfDef.key_cache_size == null ? D_CF_KEYCACHE :
cfDef.key_cache_size,
+ CFMetaData.DEFAULT_READ_REPAIR_CHANCE);
cfDefs.add(cfmeta);
}
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=954918&r1=954917&r2=954918&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java Tue
Jun 15 14:51:01 2010
@@ -59,8 +59,8 @@ public final class CFMetaData
public static final CFMetaData StatusCf = new
CFMetaData(Table.SYSTEM_TABLE, SystemTable.STATUS_CF,
ColumnFamilyType.Standard, ClockType.Timestamp, UTF8Type.instance, null, new
TimestampReconciler(), "persistent metadata for the local node", 0, false,
0.01, 0);
public static final CFMetaData HintsCf = new
CFMetaData(Table.SYSTEM_TABLE, HintedHandOffManager.HINTS_CF,
ColumnFamilyType.Super, ClockType.Timestamp, UTF8Type.instance,
BytesType.instance, new TimestampReconciler(), "hinted handoff data", 0, false,
0.01, 1);
- public static final CFMetaData MigrationsCf = new
CFMetaData(Table.SYSTEM_TABLE, Migration.MIGRATIONS_CF,
ColumnFamilyType.Standard, ClockType.Timestamp, TimeUUIDType.instance, null,
new TimestampReconciler(), "individual schema mutations", 0, false, 2);
- public static final CFMetaData SchemaCf = new
CFMetaData(Table.SYSTEM_TABLE, Migration.SCHEMA_CF, ColumnFamilyType.Standard,
ClockType.Timestamp, UTF8Type.instance, null, new TimestampReconciler(),
"current state of the schema", 0, false, 3);
+ public static final CFMetaData MigrationsCf = new
CFMetaData(Table.SYSTEM_TABLE, Migration.MIGRATIONS_CF,
ColumnFamilyType.Standard, ClockType.Timestamp, TimeUUIDType.instance, null,
new TimestampReconciler(), "individual schema mutations", 0, false, 0.01, 2);
+ public static final CFMetaData SchemaCf = new
CFMetaData(Table.SYSTEM_TABLE, Migration.SCHEMA_CF, ColumnFamilyType.Standard,
ClockType.Timestamp, UTF8Type.instance, null, new TimestampReconciler(),
"current state of the schema", 0, false, 0.01, 3);
/**
* @return An immutable mapping of (ksname,cfname) to id.
@@ -147,11 +147,6 @@ public final class CFMetaData
currentCfNames.put(cfm.cfId, cfm.cfName);
}
}
-
- public CFMetaData(String tableName, String cfName, ColumnFamilyType
cfType, ClockType clockType, AbstractType comparator, AbstractType
subcolumnComparator, AbstractReconciler reconciler, String comment, double
rowCacheSize, boolean preloadRowCache, double keyCacheSize)
- {
- this(tableName, cfName, cfType, clockType, comparator,
subcolumnComparator, reconciler, comment, rowCacheSize, preloadRowCache,
keyCacheSize, DEFAULT_READ_REPAIR_CHANCE, nextId());
- }
public CFMetaData(String tableName, String cfName, ColumnFamilyType
cfType, ClockType clockType, AbstractType comparator, AbstractType
subcolumnComparator, AbstractReconciler reconciler, String comment, double
rowCacheSize, boolean preloadRowCache, double keyCacheSize, double
readRepairChance)
{
Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java?rev=954918&r1=954917&r2=954918&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java Tue Jun 15
14:51:01 2010
@@ -78,7 +78,7 @@ public class DefsTest extends CleanupHel
@Test
public void addNewCfToBogusTable() throws InterruptedException
{
- CFMetaData newCf = new CFMetaData("MadeUpKeyspace", "NewCF",
ColumnFamilyType.Standard, ClockType.Timestamp, UTF8Type.instance, null, new
TimestampReconciler(), "new cf", 0, false, 0);
+ CFMetaData newCf = new CFMetaData("MadeUpKeyspace", "NewCF",
ColumnFamilyType.Standard, ClockType.Timestamp, UTF8Type.instance, null, new
TimestampReconciler(), "new cf", 0, false, 1.0, 0);
try
{
new AddColumnFamily(newCf).apply();
@@ -103,7 +103,7 @@ public class DefsTest extends CleanupHel
assert DatabaseDescriptor.getDefsVersion().equals(prior);
// add a cf.
- CFMetaData newCf1 = new CFMetaData("Keyspace1", "MigrationCf_1",
ColumnFamilyType.Standard, ClockType.Timestamp, UTF8Type.instance, null, new
TimestampReconciler(), "Migration CF ", 0, false, 0);
+ CFMetaData newCf1 = new CFMetaData("Keyspace1", "MigrationCf_1",
ColumnFamilyType.Standard, ClockType.Timestamp, UTF8Type.instance, null, new
TimestampReconciler(), "Migration CF ", 0, false, 1.0, 0);
Migration m1 = new AddColumnFamily(newCf1);
m1.apply();
UUID ver1 = m1.getVersion();
@@ -162,7 +162,7 @@ public class DefsTest extends CleanupHel
final String cf = "BrandNewCf";
KSMetaData original = DatabaseDescriptor.getTableDefinition(ks);
- CFMetaData newCf = new CFMetaData(original.name, cf,
ColumnFamilyType.Standard, ClockType.Timestamp, UTF8Type.instance, null, new
TimestampReconciler(), "A New Column Family", 0, false, 0);
+ CFMetaData newCf = new CFMetaData(original.name, cf,
ColumnFamilyType.Standard, ClockType.Timestamp, UTF8Type.instance, null, new
TimestampReconciler(), "A New Column Family", 0, false, 1.0, 0);
assert
!DatabaseDescriptor.getTableDefinition(ks).cfMetaData().containsKey(newCf.cfName);
new AddColumnFamily(newCf).apply();
@@ -276,7 +276,7 @@ public class DefsTest extends CleanupHel
public void addNewKS() throws ConfigurationException, IOException,
ExecutionException, InterruptedException
{
DecoratedKey dk = Util.dk("key0");
- CFMetaData newCf = new CFMetaData("NewKeyspace1", "AddedStandard1",
ColumnFamilyType.Standard, ClockType.Timestamp, UTF8Type.instance, null, new
TimestampReconciler(), "A new cf for a new ks", 0, false, 0);
+ CFMetaData newCf = new CFMetaData("NewKeyspace1", "AddedStandard1",
ColumnFamilyType.Standard, ClockType.Timestamp, UTF8Type.instance, null, new
TimestampReconciler(), "A new cf for a new ks", 0, false, 1.0, 0);
KSMetaData newKs = new KSMetaData(newCf.tableName,
RackUnawareStrategy.class, 5, newCf);
new AddKeyspace(newKs).apply();
@@ -432,7 +432,7 @@ public class DefsTest extends CleanupHel
new AddKeyspace(newKs).apply();
assert DatabaseDescriptor.getTableDefinition("EmptyKeyspace") != null;
- CFMetaData newCf = new CFMetaData("EmptyKeyspace", "AddedLater",
ColumnFamilyType.Standard, ClockType.Timestamp, UTF8Type.instance, null, new
TimestampReconciler(), "A new CF to add to an empty KS", 0, false, 0);
+ CFMetaData newCf = new CFMetaData("EmptyKeyspace", "AddedLater",
ColumnFamilyType.Standard, ClockType.Timestamp, UTF8Type.instance, null, new
TimestampReconciler(), "A new CF to add to an empty KS", 0, false, 1.0, 0);
//should not exist until apply
assert
!DatabaseDescriptor.getTableDefinition(newKs.name).cfMetaData().containsKey(newCf.cfName);
