You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/01/19 20:31:57 UTC
[2/3] clean up AbtractType generics treatment patch by Dave Brosius;
reviewed by jbellis for CASSANDRA-3689
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bc0d4db/src/java/org/apache/cassandra/thrift/ThriftValidation.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/ThriftValidation.java b/src/java/org/apache/cassandra/thrift/ThriftValidation.java
index 64f5d6d..31035e3 100644
--- a/src/java/org/apache/cassandra/thrift/ThriftValidation.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftValidation.java
@@ -235,7 +235,7 @@ public class ThriftValidation
if (metadata.cfType == ColumnFamilyType.Standard)
throw new InvalidRequestException("supercolumn specified to ColumnFamily " + metadata.cfName + " containing normal columns");
}
- AbstractType comparator = metadata.getComparatorFor(superColumnName);
+ AbstractType<?> comparator = metadata.getComparatorFor(superColumnName);
for (ByteBuffer name : column_names)
{
if (name.remaining() > IColumn.MAX_NAME_LENGTH)
@@ -260,7 +260,7 @@ public class ThriftValidation
public static void validateRange(CFMetaData metadata, ColumnParent column_parent, SliceRange range) throws InvalidRequestException
{
- AbstractType comparator = metadata.getComparatorFor(column_parent.super_column);
+ AbstractType<?> comparator = metadata.getComparatorFor(column_parent.super_column);
try
{
comparator.validate(range.start);
@@ -428,7 +428,7 @@ public class ThriftValidation
ColumnDefinition columnDef = metadata.getColumnDefinition(column.name);
try
{
- AbstractType validator = metadata.getValueValidator(columnDef);
+ AbstractType<?> validator = metadata.getValueValidator(columnDef);
if (validator != null)
validator.validate(column.value);
}
@@ -552,7 +552,7 @@ public class ThriftValidation
return false;
Set<ByteBuffer> indexedColumns = Table.open(metadata.ksName).getColumnFamilyStore(metadata.cfName).indexManager.getIndexedColumns();
- AbstractType nameValidator = ColumnFamily.getComparatorFor(metadata.ksName, metadata.cfName, null);
+ AbstractType<?> nameValidator = ColumnFamily.getComparatorFor(metadata.ksName, metadata.cfName, null);
boolean isIndexed = false;
for (IndexExpression expression : index_clause)
@@ -569,7 +569,7 @@ public class ThriftValidation
me.getMessage()));
}
- AbstractType valueValidator = Schema.instance.getValueValidator(metadata.ksName, metadata.cfName, expression.column_name);
+ AbstractType<?> valueValidator = Schema.instance.getValueValidator(metadata.ksName, metadata.cfName, expression.column_name);
try
{
valueValidator.validate(expression.value);
@@ -624,7 +624,7 @@ public class ThriftValidation
if (cf_def.column_metadata == null)
return;
- AbstractType comparator = cfType == ColumnFamilyType.Standard
+ AbstractType<?> comparator = cfType == ColumnFamilyType.Standard
? TypeParser.parse(cf_def.comparator_type)
: TypeParser.parse(cf_def.subcomparator_type);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bc0d4db/src/java/org/apache/cassandra/tools/SSTableExport.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/SSTableExport.java b/src/java/org/apache/cassandra/tools/SSTableExport.java
index 8c9ee5f..c521755 100644
--- a/src/java/org/apache/cassandra/tools/SSTableExport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableExport.java
@@ -100,7 +100,7 @@ public class SSTableExport
* @param comparator columns comparator
* @param cfMetaData Column Family metadata (to get validator)
*/
- private static void serializeColumns(Iterator<IColumn> columns, PrintStream out, AbstractType comparator, CFMetaData cfMetaData)
+ private static void serializeColumns(Iterator<IColumn> columns, PrintStream out, AbstractType<?> comparator, CFMetaData cfMetaData)
{
while (columns.hasNext())
{
@@ -120,7 +120,7 @@ public class SSTableExport
*
* @return column as serialized list
*/
- private static List<Object> serializeColumn(IColumn column, AbstractType comparator, CFMetaData cfMetaData)
+ private static List<Object> serializeColumn(IColumn column, AbstractType<?> comparator, CFMetaData cfMetaData)
{
ArrayList<Object> serializedColumn = new ArrayList<Object>();
@@ -134,7 +134,7 @@ public class SSTableExport
}
else
{
- AbstractType validator = cfMetaData.getValueValidator(name);
+ AbstractType<?> validator = cfMetaData.getValueValidator(name);
serializedColumn.add(validator.getString(value));
}
serializedColumn.add(column.timestamp());
@@ -169,7 +169,7 @@ public class SSTableExport
ColumnFamily columnFamily = row.getColumnFamily();
boolean isSuperCF = columnFamily.isSuper();
CFMetaData cfMetaData = columnFamily.metadata();
- AbstractType comparator = columnFamily.getComparator();
+ AbstractType<?> comparator = columnFamily.getComparator();
writeKey(out, bytesToHex(key.key));
out.print(isSuperCF ? "{" : "[");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bc0d4db/src/java/org/apache/cassandra/tools/SSTableImport.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/SSTableImport.java b/src/java/org/apache/cassandra/tools/SSTableImport.java
index 82b0acf..cbe9dd6 100644
--- a/src/java/org/apache/cassandra/tools/SSTableImport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableImport.java
@@ -98,7 +98,7 @@ public class SSTableImport
{
if (json instanceof List)
{
- AbstractType comparator = (isSubColumn) ? meta.subcolumnComparator : meta.comparator;
+ AbstractType<?> comparator = (isSubColumn) ? meta.subcolumnComparator : meta.comparator;
List fields = (List<?>) json;
assert fields.size() >= 3 : "Column definition should have at least 3";
@@ -221,7 +221,7 @@ public class SSTableImport
CFMetaData metaData = cfamily.metadata();
assert metaData != null;
- AbstractType comparator = metaData.comparator;
+ AbstractType<?> comparator = metaData.comparator;
// Super columns
for (Map.Entry<?, ?> entry : row.entrySet())
@@ -516,7 +516,7 @@ public class SSTableImport
* @param type type to use for conversion
* @return byte buffer representation of the given string
*/
- private static ByteBuffer stringAsType(String content, AbstractType type)
+ private static ByteBuffer stringAsType(String content, AbstractType<?> type)
{
try
{