Author: gdusbabek
Date: Wed Aug 4 12:38:27 2010
New Revision: 982237
URL: http://svn.apache.org/viewvc?rev=982237&view=rev
Log:
use correct constructor when creating static CFM instances. patch by gdusbabek,
reviewed by jbellis. CASSANDRA-1354
Modified:
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/config/CFMetaData.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java?rev=982237&r1=982236&r2=982237&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java Wed
Aug 4 12:38:27 2010
@@ -61,11 +61,11 @@ public final class CFMetaData
private static final BiMap<Pair<String, String>, Integer> cfIdMap =
HashBiMap.<Pair<String, String>, Integer>create();
- 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, DEFAULT_GC_GRACE_SECONDS, 0,
Collections.<byte[],ColumnDefinition>emptyMap());
- public static final CFMetaData HintsCf = new
CFMetaData(Table.SYSTEM_TABLE, HintedHandOffManager.HINTS_CF,
ColumnFamilyType.Super, ClockType.Timestamp, BytesType.instance,
BytesType.instance, new TimestampReconciler(), "hinted handoff data", 0, false,
0.01, DEFAULT_GC_GRACE_SECONDS, 1, Collections.<byte[],
ColumnDefinition>emptyMap());
- 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,
DEFAULT_GC_GRACE_SECONDS, 2, Collections.<byte[], ColumnDefinition>emptyMap());
- 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, DEFAULT_GC_GRACE_SECONDS, 3,
Collections. <byte[], ColumnDefinition>emptyMap());
- public static final CFMetaData StatisticsCf = new
CFMetaData(Table.SYSTEM_TABLE, StatisticsTable.STATISTICS_CF,
ColumnFamilyType.Super, ClockType.Timestamp, UTF8Type.instance,
BytesType.instance, new TimestampReconciler(), "persistent CF statistics for
the local node", 0, false, 0.01, DEFAULT_GC_GRACE_SECONDS, 4,
Collections.<byte[], ColumnDefinition>emptyMap());
+ 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, DEFAULT_GC_GRACE_SECONDS, 0,
Collections.<byte[],ColumnDefinition>emptyMap());
+ public static final CFMetaData HintsCf = new
CFMetaData(Table.SYSTEM_TABLE, HintedHandOffManager.HINTS_CF,
ColumnFamilyType.Super, ClockType.Timestamp, BytesType.instance,
BytesType.instance, new TimestampReconciler(), "hinted handoff data", 0, false,
0.01, 0, DEFAULT_GC_GRACE_SECONDS, 1, Collections.<byte[],
ColumnDefinition>emptyMap());
+ 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, 0,
DEFAULT_GC_GRACE_SECONDS, 2, Collections.<byte[], ColumnDefinition>emptyMap());
+ 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, 0, DEFAULT_GC_GRACE_SECONDS, 3,
Collections. <byte[], ColumnDefinition>emptyMap());
+ public static final CFMetaData StatisticsCf = new
CFMetaData(Table.SYSTEM_TABLE, StatisticsTable.STATISTICS_CF,
ColumnFamilyType.Super, ClockType.Timestamp, UTF8Type.instance,
BytesType.instance, new TimestampReconciler(), "persistent CF statistics for
the local node", 0, false, 0.01, DEFAULT_GC_GRACE_SECONDS, 0, 4,
Collections.<byte[], ColumnDefinition>emptyMap());
/**
* @return An immutable mapping of (ksname,cfname) to id.
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=982237&r1=982236&r2=982237&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java Wed Aug 4
12:38:27 2010
@@ -18,9 +18,6 @@
package org.apache.cassandra.db;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
import java.io.IOException;
import java.util.*;
import java.util.concurrent.ExecutionException;
@@ -43,6 +40,16 @@ import org.apache.cassandra.utils.UUIDGe
public class DefsTest extends CleanupHelper
{
@Test
+ public void ensureStaticCFMIdsAreLessThan1000()
+ {
+ assert CFMetaData.StatusCf.cfId == 0;
+ assert CFMetaData.HintsCf.cfId == 1;
+ assert CFMetaData.MigrationsCf.cfId == 2;
+ assert CFMetaData.SchemaCf.cfId == 3;
+ assert CFMetaData.StatisticsCf.cfId == 4;
+ }
+
+ @Test
public void saveAndRestore() throws IOException
{
// verify dump and reload.
