natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix test compilation after 3689

This commit is contained in:
Brandon Williams 2012-01-19 17:34:44 -06:00
parent 91c45d445c
commit e86469ee05
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/unit/org/apache/cassandra/SchemaLoader.java
View File

@ -92,11 +92,11 @@ public class SchemaLoader
ColumnFamilyType su = ColumnFamilyType.Super;
AbstractType bytes = BytesType.instance;
AbstractType composite = CompositeType.getInstance(Arrays.asList(new AbstractType[]{BytesType.instance, TimeUUIDType.instance, IntegerType.instance}));
Map<Byte, AbstractType> aliases = new HashMap<Byte, AbstractType>();
AbstractType<?> composite = CompositeType.getInstance(Arrays.asList(new AbstractType<?>[]{BytesType.instance, TimeUUIDType.instance, IntegerType.instance}));
Map<Byte, AbstractType<?>> aliases = new HashMap<Byte, AbstractType<?>>();
aliases.put((byte)'b', BytesType.instance);
aliases.put((byte)'t', TimeUUIDType.instance);
AbstractType dynamicComposite = DynamicCompositeType.getInstance(aliases);
AbstractType<?> dynamicComposite = DynamicCompositeType.getInstance(aliases);
// these column definitions will will be applied to the jdbc utf and integer column familes respectively.
Map<ByteBuffer, ColumnDefinition> integerColumn = new HashMap<ByteBuffer, ColumnDefinition>();

2
test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java
View File

@ -42,7 +42,7 @@ public class CompositeTypeTest extends CleanupHelper
private static final CompositeType comparator;
static
{
List<AbstractType> subComparators = new ArrayList<AbstractType>();
List<AbstractType<?>> subComparators = new ArrayList<AbstractType<?>>();
subComparators.add(BytesType.instance);
subComparators.add(TimeUUIDType.instance);
subComparators.add(IntegerType.instance);

2
test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
View File

@ -42,7 +42,7 @@ public class DynamicCompositeTypeTest extends CleanupHelper
private static final DynamicCompositeType comparator;
static
{
Map<Byte, AbstractType> aliases = new HashMap<Byte, AbstractType>();
Map<Byte, AbstractType<?>> aliases = new HashMap<Byte, AbstractType<?>>();
aliases.put((byte)'b', BytesType.instance);
aliases.put((byte)'t', TimeUUIDType.instance);
comparator = DynamicCompositeType.getInstance(aliases);