Author: jbellis
Date: Tue Jun 1 13:43:25 2010
New Revision: 950073
URL: http://svn.apache.org/viewvc?rev=950073&view=rev
Log:
make AbstractType subclasses singletons. patch by jbellis
Modified:
cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java
cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
cassandra/trunk/src/java/org/apache/cassandra/config/KSMetaData.java
cassandra/trunk/src/java/org/apache/cassandra/db/DefsTable.java
cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AsciiType.java
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/BytesType.java
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LexicalUUIDType.java
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LongType.java
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/UTF8Type.java
cassandra/trunk/src/java/org/apache/cassandra/db/migration/AddColumnFamily.java
cassandra/trunk/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java
cassandra/trunk/test/unit/org/apache/cassandra/db/RowTest.java
cassandra/trunk/test/unit/org/apache/cassandra/db/SuperColumnTest.java
cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java
cassandra/trunk/test/unit/org/apache/cassandra/db/TimeSortTest.java
cassandra/trunk/test/unit/org/apache/cassandra/utils/UUIDTests.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=950073&r1=950072&r2=950073&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 1 13:43:25 2010
@@ -55,10 +55,10 @@ 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, new UTF8Type(), null,
"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, new UTF8Type(), new BytesType(),
"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, new TimeUUIDType(), null,
"individual schema mutations", 0, false, 2);
- public static final CFMetaData SchemaCf = new
CFMetaData(Table.SYSTEM_TABLE, Migration.SCHEMA_CF, ColumnFamilyType.Standard,
ClockType.Timestamp, new UTF8Type(), null, "current state of the schema", 0,
false, 3);
+ public static final CFMetaData StatusCf = new
CFMetaData(Table.SYSTEM_TABLE, SystemTable.STATUS_CF,
ColumnFamilyType.Standard, ClockType.Timestamp, UTF8Type.instance, null,
"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, "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,
"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, "current state of the schema", 0,
false, 3);
/**
* @return An immutable mapping of (ksname,cfname) to id.
@@ -122,7 +122,7 @@ public final class CFMetaData
this.comparator = comparator;
// the default subcolumncomparator is null per thrift spec, but only
should be null if cfType == Standard. If
// cfType == Super, subcolumnComparator should default to BytesType if
not set.
- this.subcolumnComparator = subcolumnComparator == null && cfType ==
ColumnFamilyType.Super ? new BytesType() : subcolumnComparator;
+ this.subcolumnComparator = subcolumnComparator == null && cfType ==
ColumnFamilyType.Super ? BytesType.instance : subcolumnComparator;
this.comment = comment;
this.rowCacheSize = rowCacheSize;
this.preloadRowCache = preloadRowCache;
@@ -207,31 +207,16 @@ public final class CFMetaData
return bout.toByteArray();
}
- public static CFMetaData deserialize(InputStream in) throws IOException
+ public static CFMetaData deserialize(InputStream in) throws IOException,
ConfigurationException
{
DataInputStream din = new DataInputStream(in);
String tableName = din.readUTF();
String cfName = din.readUTF();
ColumnFamilyType cfType = ColumnFamilyType.create(din.readUTF());
ClockType clockType = ClockType.create(din.readUTF());
- AbstractType comparator = null;
- try
- {
- comparator =
(AbstractType)Class.forName(din.readUTF()).newInstance();
- }
- catch (Exception ex)
- {
- throw new IOException(ex);
- }
+ AbstractType comparator =
DatabaseDescriptor.getComparator(din.readUTF());
AbstractType subcolumnComparator = null;
- try
- {
- subcolumnComparator = din.readBoolean() ?
(AbstractType)Class.forName(din.readUTF()).newInstance() : null;
- }
- catch (Exception ex)
- {
- throw new IOException(ex);
- }
+ subcolumnComparator = din.readBoolean() ?
DatabaseDescriptor.getComparator(din.readUTF()) : null;
String comment = din.readBoolean() ? din.readUTF() : null;
double rowCacheSize = din.readDouble();
boolean preloadRowCache = din.readBoolean();
Modified:
cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=950073&r1=950072&r2=950073&view=diff
==============================================================================
---
cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
(original)
+++
cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Tue Jun 1 13:43:25 2010
@@ -50,6 +50,7 @@ import java.io.IOError;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.util.*;
import java.net.InetAddress;
@@ -541,8 +542,8 @@ public class DatabaseDescriptor
}
public static AbstractType getComparator(String compareWith) throws
ConfigurationException
-// throws ConfigurationException, TransformerException,
NoSuchMethodException, InvocationTargetException, IllegalAccessException,
InstantiationException
{
+ logger.info(compareWith);
Class<? extends AbstractType> typeClass;
if (compareWith == null)
@@ -561,11 +562,13 @@ public class DatabaseDescriptor
throw new ConfigurationException("Unable to load class " +
className);
}
}
+
try
{
- return typeClass.getConstructor().newInstance();
+ Field field = typeClass.getDeclaredField("instance");
+ return (AbstractType) field.get(null);
}
- catch (InstantiationException e)
+ catch (NoSuchFieldException e)
{
ConfigurationException ex = new
ConfigurationException(e.getMessage());
ex.initCause(e);
@@ -577,18 +580,6 @@ public class DatabaseDescriptor
ex.initCause(e);
throw ex;
}
- catch (InvocationTargetException e)
- {
- ConfigurationException ex = new
ConfigurationException(e.getMessage());
- ex.initCause(e);
- throw ex;
- }
- catch (NoSuchMethodException e)
- {
- ConfigurationException ex = new
ConfigurationException(e.getMessage());
- ex.initCause(e);
- throw ex;
- }
}
/**
Modified: cassandra/trunk/src/java/org/apache/cassandra/config/KSMetaData.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/config/KSMetaData.java?rev=950073&r1=950072&r2=950073&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/config/KSMetaData.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/config/KSMetaData.java Tue
Jun 1 13:43:25 2010
@@ -108,10 +108,9 @@ public final class KSMetaData
{
cfMetaData[i] = CFMetaData.deserialize(din);
}
- catch (IOException ex)
+ catch (ConfigurationException e)
{
- System.err.println(name);
- throw ex;
+ throw new IOException(e);
}
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/DefsTable.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/DefsTable.java?rev=950073&r1=950072&r2=950073&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/DefsTable.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/DefsTable.java Tue Jun 1
13:43:25 2010
@@ -18,6 +18,7 @@
package org.apache.cassandra.db;
+import org.apache.cassandra.config.ConfigurationException;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.KSMetaData;
import org.apache.cassandra.db.commitlog.CommitLog;
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java?rev=950073&r1=950072&r2=950073&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java Tue Jun
1 13:43:25 2010
@@ -119,7 +119,7 @@ public class SystemTable
/* Read the system table to retrieve the storage ID and the generation
*/
IPartitioner p = StorageService.getPartitioner();
Table table = Table.open(Table.SYSTEM_TABLE);
- SortedSet<byte[]> columns = new TreeSet<byte[]>(new BytesType());
+ SortedSet<byte[]> columns = new TreeSet<byte[]>(BytesType.instance);
columns.add(TOKEN);
columns.add(GENERATION);
columns.add(CLUSTERNAME);
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AsciiType.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AsciiType.java?rev=950073&r1=950072&r2=950073&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AsciiType.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AsciiType.java Tue
Jun 1 13:43:25 2010
@@ -25,6 +25,10 @@ import java.io.UnsupportedEncodingExcept
public class AsciiType extends BytesType
{
+ public static final AsciiType instance = new AsciiType();
+
+ AsciiType() {} // singleton
+
@Override
public String getString(byte[] bytes)
{
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/BytesType.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/BytesType.java?rev=950073&r1=950072&r2=950073&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/marshal/BytesType.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/marshal/BytesType.java Tue
Jun 1 13:43:25 2010
@@ -27,6 +27,10 @@ import org.apache.cassandra.utils.FBUtil
public class BytesType extends AbstractType
{
+ public static final BytesType instance = new BytesType();
+
+ BytesType() {} // singleton
+
public int compare(byte[] o1, byte[] o2)
{
return FBUtilities.compareByteArrays(o1, o2);
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LexicalUUIDType.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LexicalUUIDType.java?rev=950073&r1=950072&r2=950073&view=diff
==============================================================================
---
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LexicalUUIDType.java
(original)
+++
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LexicalUUIDType.java
Tue Jun 1 13:43:25 2010
@@ -26,6 +26,10 @@ import java.nio.ByteBuffer;
public class LexicalUUIDType extends AbstractType
{
+ public static final LexicalUUIDType instance = new LexicalUUIDType();
+
+ LexicalUUIDType() {} // singleton
+
static UUID getUUID(byte[] bytes)
{
ByteBuffer bb = ByteBuffer.wrap(bytes);
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LongType.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LongType.java?rev=950073&r1=950072&r2=950073&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LongType.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LongType.java Tue
Jun 1 13:43:25 2010
@@ -26,6 +26,10 @@ import java.nio.ByteOrder;
public class LongType extends AbstractType
{
+ public static final LongType instance = new LongType();
+
+ LongType() {} // singleton
+
public int compare(byte[] o1, byte[] o2)
{
if (o1.length == 0)
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java?rev=950073&r1=950072&r2=950073&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java
Tue Jun 1 13:43:25 2010
@@ -26,6 +26,10 @@ import org.apache.cassandra.utils.FBUtil
public class TimeUUIDType extends AbstractType
{
+ public static final TimeUUIDType instance = new TimeUUIDType();
+
+ TimeUUIDType() {} // singleton
+
public int compare(byte[] o1, byte[] o2)
{
if (o1.length == 0)
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/marshal/UTF8Type.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/UTF8Type.java?rev=950073&r1=950072&r2=950073&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/marshal/UTF8Type.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/marshal/UTF8Type.java Tue
Jun 1 13:43:25 2010
@@ -25,6 +25,10 @@ import java.io.UnsupportedEncodingExcept
public class UTF8Type extends AbstractType
{
+ public static final UTF8Type instance = new UTF8Type();
+
+ UTF8Type() {} // singleton
+
public int compare(byte[] o1, byte[] o2)
{
try
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/migration/AddColumnFamily.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/migration/AddColumnFamily.java?rev=950073&r1=950072&r2=950073&view=diff
==============================================================================
---
cassandra/trunk/src/java/org/apache/cassandra/db/migration/AddColumnFamily.java
(original)
+++
cassandra/trunk/src/java/org/apache/cassandra/db/migration/AddColumnFamily.java
Tue Jun 1 13:43:25 2010
@@ -45,7 +45,14 @@ public class AddColumnFamily extends Mig
{
super(UUIDGen.makeType1UUID(din), UUIDGen.makeType1UUID(din));
rm = RowMutation.serializer().deserialize(din);
- cfm = CFMetaData.deserialize(din);
+ try
+ {
+ cfm = CFMetaData.deserialize(din);
+ }
+ catch (ConfigurationException e)
+ {
+ throw new IOException(e);
+ }
}
public AddColumnFamily(CFMetaData cfm) throws ConfigurationException,
IOException
@@ -111,7 +118,7 @@ public class AddColumnFamily extends Mig
}
public AddColumnFamily deserialize(DataInputStream dis) throws
IOException
- {
+ {
return new AddColumnFamily(dis);
}
}
Modified:
cassandra/trunk/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java?rev=950073&r1=950072&r2=950073&view=diff
==============================================================================
---
cassandra/trunk/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
(original)
+++
cassandra/trunk/test/unit/org/apache/cassandra/config/DatabaseDescriptorTest.java
Tue Jun 1 13:43:25 2010
@@ -38,7 +38,7 @@ public class DatabaseDescriptorTest
}
@Test
- public void testCFMetaDataSerialization() throws IOException
+ public void testCFMetaDataSerialization() throws IOException,
ConfigurationException
{
// test serialization of all defined test CFs.
for (String table : DatabaseDescriptor.getNonSystemTables())
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=950073&r1=950072&r2=950073&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 1
13:43:25 2010
@@ -77,7 +77,7 @@ public class DefsTest extends CleanupHel
@Test
public void addNewCfToBogusTable() throws InterruptedException
{
- CFMetaData newCf = new CFMetaData("MadeUpKeyspace", "NewCF",
ColumnFamilyType.Standard, ClockType.Timestamp, new UTF8Type(), null, "new cf",
0, false, 0);
+ CFMetaData newCf = new CFMetaData("MadeUpKeyspace", "NewCF",
ColumnFamilyType.Standard, ClockType.Timestamp, UTF8Type.instance, null, "new
cf", 0, false, 0);
try
{
new AddColumnFamily(newCf).apply();
@@ -102,7 +102,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, new UTF8Type(), null,
"Migration CF ", 0, false, 0);
+ CFMetaData newCf1 = new CFMetaData("Keyspace1", "MigrationCf_1",
ColumnFamilyType.Standard, ClockType.Timestamp, UTF8Type.instance, null,
"Migration CF ", 0, false, 0);
Migration m1 = new AddColumnFamily(newCf1);
m1.apply();
UUID ver1 = m1.getVersion();
@@ -161,7 +161,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, new UTF8Type(), null, "A New
Column Family", 0, false, 0);
+ CFMetaData newCf = new CFMetaData(original.name, cf,
ColumnFamilyType.Standard, ClockType.Timestamp, UTF8Type.instance, null, "A New
Column Family", 0, false, 0);
assert
!DatabaseDescriptor.getTableDefinition(ks).cfMetaData().containsKey(newCf.cfName);
new AddColumnFamily(newCf).apply();
@@ -275,7 +275,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, new UTF8Type(), null, "A new cf
for a new ks", 0, false, 0);
+ CFMetaData newCf = new CFMetaData("NewKeyspace1", "AddedStandard1",
ColumnFamilyType.Standard, ClockType.Timestamp, UTF8Type.instance, null, "A new
cf for a new ks", 0, false, 0);
KSMetaData newKs = new KSMetaData(newCf.tableName,
RackUnawareStrategy.class, 5, newCf);
new AddKeyspace(newKs).apply();
@@ -410,7 +410,7 @@ public class DefsTest extends CleanupHel
store.forceBlockingFlush();
// read on new should work.
- SortedSet<byte[]> cols = new TreeSet<byte[]>(new BytesType());
+ SortedSet<byte[]> cols = new TreeSet<byte[]>(BytesType.instance);
cols.add("col0".getBytes());
cols.add("col1".getBytes());
ColumnFamily cfam =
store.getColumnFamily(QueryFilter.getNamesFilter(dk, new QueryPath(cfName),
cols));
@@ -431,7 +431,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, new UTF8Type(), null, "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, "A new
CF to add to an empty KS", 0, false, 0);
//should not exist until apply
assert
!DatabaseDescriptor.getTableDefinition(newKs.name).cfMetaData().containsKey(newCf.cfName);
Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/RowTest.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/RowTest.java?rev=950073&r1=950072&r2=950073&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/db/RowTest.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/db/RowTest.java Tue Jun 1
13:43:25 2010
@@ -46,10 +46,10 @@ public class RowTest extends SchemaLoade
@Test
public void testDiffSuperColumn()
{
- SuperColumn sc1 = new SuperColumn("one".getBytes(), new AsciiType(),
ClockType.Timestamp);
+ SuperColumn sc1 = new SuperColumn("one".getBytes(),
AsciiType.instance, ClockType.Timestamp);
sc1.addColumn(column("subcolumn", "A", new TimestampClock(0)));
- SuperColumn sc2 = new SuperColumn("one".getBytes(), new AsciiType(),
ClockType.Timestamp);
+ SuperColumn sc2 = new SuperColumn("one".getBytes(),
AsciiType.instance, ClockType.Timestamp);
sc2.markForDeleteAt(0, new TimestampClock(0));
SuperColumn scDiff = (SuperColumn)sc1.diff(sc2);
Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/SuperColumnTest.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/SuperColumnTest.java?rev=950073&r1=950072&r2=950073&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/db/SuperColumnTest.java
(original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/db/SuperColumnTest.java Tue
Jun 1 13:43:25 2010
@@ -28,7 +28,7 @@ public class SuperColumnTest
{
@Test
public void testMissingSubcolumn() {
- SuperColumn sc = new SuperColumn("sc1".getBytes(), new LongType(),
ClockType.Timestamp);
+ SuperColumn sc = new SuperColumn("sc1".getBytes(), LongType.instance,
ClockType.Timestamp);
sc.addColumn(new Column(getBytes(1), "value".getBytes(), new
TimestampClock(1)));
assertNotNull(sc.getSubColumn(getBytes(1)));
assertNull(sc.getSubColumn(getBytes(2)));
Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java?rev=950073&r1=950072&r2=950073&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java Tue Jun 1
13:43:25 2010
@@ -497,7 +497,7 @@ public class TableTest extends CleanupHe
RowMutation rm = new RowMutation("Keyspace1", ROW.key);
ColumnFamily cf = ColumnFamily.create("Keyspace1", "Super1");
- SuperColumn sc = new SuperColumn("sc1".getBytes(), new LongType(),
ClockType.Timestamp);
+ SuperColumn sc = new SuperColumn("sc1".getBytes(), LongType.instance,
ClockType.Timestamp);
sc.addColumn(new Column(getBytes(1), "val1".getBytes(), new
TimestampClock(1L)));
cf.addColumn(sc);
rm.add(cf);
Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/TimeSortTest.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/TimeSortTest.java?rev=950073&r1=950072&r2=950073&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/db/TimeSortTest.java
(original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/db/TimeSortTest.java Tue Jun
1 13:43:25 2010
@@ -105,7 +105,7 @@ public class TimeSortTest extends Cleanu
column = iter.next();
assert Arrays.equals(column.name(), getBytes(j));
}
- TreeSet<byte[]> columnNames = new TreeSet<byte[]>(new LongType());
+ TreeSet<byte[]> columnNames = new TreeSet<byte[]>(LongType.instance);
columnNames.add(getBytes(10));
columnNames.add(getBytes(0));
cf =
cfStore.getColumnFamily(QueryFilter.getNamesFilter(Util.dk("900"), new
QueryPath("StandardLong1"), columnNames));
Modified: cassandra/trunk/test/unit/org/apache/cassandra/utils/UUIDTests.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/utils/UUIDTests.java?rev=950073&r1=950072&r2=950073&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/utils/UUIDTests.java
(original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/utils/UUIDTests.java Tue Jun
1 13:43:25 2010
@@ -61,7 +61,7 @@ public class UUIDTests
@Test
public void testTimeUUIDType() throws UnknownHostException
{
- TimeUUIDType comp = new TimeUUIDType();
+ TimeUUIDType comp = TimeUUIDType.instance;
byte[] first =
UUIDGen.decompose(UUIDGen.makeType1UUIDFromHost(InetAddress.getByName("127.0.0.1")));
byte[] second =
UUIDGen.decompose(UUIDGen.makeType1UUIDFromHost(InetAddress.getByName("127.0.0.1")));
assert comp.compare(first, second) < 0;
