Author: jbellis
Date: Sat May 21 02:03:30 2011
New Revision: 1125612
URL: http://svn.apache.org/viewvc?rev=1125612&view=rev
Log:
inline getComparator -> TypeParser.parse
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/ColumnDefinition.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/marshal/TypeParser.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/thrift/ThriftValidation.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/utils/FBUtilities.java
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java?rev=1125612&r1=1125611&r2=1125612&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java
Sat May 21 02:03:30 2011
@@ -504,7 +504,7 @@ public class CliClient
{
try
{
- return FBUtilities.getComparator(compareWith);
+ return TypeParser.parse(compareWith);
}
catch (ConfigurationException ce)
{
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java?rev=1125612&r1=1125611&r2=1125612&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java
Sat May 21 02:03:30 2011
@@ -29,18 +29,13 @@ import org.apache.commons.lang.builder.H
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.avro.util.Utf8;
-import org.apache.cassandra.cache.ConcurrentLinkedHashCache;
-import org.apache.cassandra.cache.ConcurrentLinkedHashCacheProvider;
import org.apache.cassandra.cache.IRowCacheProvider;
+import org.apache.cassandra.db.marshal.*;
import org.apache.cassandra.db.migration.avro.ColumnDef;
import org.apache.cassandra.db.ColumnFamilyType;
import org.apache.cassandra.db.HintedHandOffManager;
import org.apache.cassandra.db.SystemTable;
import org.apache.cassandra.db.Table;
-import org.apache.cassandra.db.marshal.AbstractType;
-import org.apache.cassandra.db.marshal.BytesType;
-import org.apache.cassandra.db.marshal.TimeUUIDType;
-import org.apache.cassandra.db.marshal.UTF8Type;
import org.apache.cassandra.db.migration.Migration;
import org.apache.cassandra.io.SerDeUtils;
import org.apache.cassandra.thrift.InvalidRequestException;
@@ -360,11 +355,11 @@ public final class CFMetaData
try
{
- comparator =
DatabaseDescriptor.getComparator(cf.comparator_type.toString());
+ comparator = TypeParser.parse(cf.comparator_type.toString());
if (cf.subcomparator_type != null)
- subcolumnComparator =
DatabaseDescriptor.getComparator(cf.subcomparator_type);
- validator =
DatabaseDescriptor.getComparator(cf.default_validation_class);
- keyValidator =
DatabaseDescriptor.getComparator(cf.key_validation_class);
+ subcolumnComparator = TypeParser.parse(cf.subcomparator_type);
+ validator = TypeParser.parse(cf.default_validation_class);
+ keyValidator = TypeParser.parse(cf.key_validation_class);
}
catch (Exception ex)
{
@@ -645,8 +640,8 @@ public final class CFMetaData
CFMetaData newCFMD = new CFMetaData(cf_def.keyspace,
cf_def.name,
cfType,
-
DatabaseDescriptor.getComparator(cf_def.comparator_type),
- cf_def.subcomparator_type == null
? null : DatabaseDescriptor.getComparator(cf_def.subcomparator_type));
+
TypeParser.parse(cf_def.comparator_type),
+ cf_def.subcomparator_type == null
? null : TypeParser.parse(cf_def.subcomparator_type));
if (cf_def.isSetGc_grace_seconds()) {
newCFMD.gcGraceSeconds(cf_def.gc_grace_seconds); }
if (cf_def.isSetMin_compaction_threshold()) {
newCFMD.minCompactionThreshold(cf_def.min_compaction_threshold); }
@@ -659,15 +654,15 @@ public final class CFMetaData
if (cf_def.isSetMerge_shards_chance()) {
newCFMD.mergeShardsChance(cf_def.merge_shards_chance); }
if (cf_def.isSetRow_cache_provider()) {
newCFMD.rowCacheProvider(FBUtilities.newCacheProvider(cf_def.row_cache_provider));
}
if (cf_def.isSetKey_alias()) { newCFMD.keyAlias(cf_def.key_alias); }
- if (cf_def.isSetKey_validation_class()) {
newCFMD.keyValidator(DatabaseDescriptor.getComparator(cf_def.key_validation_class));
}
+ if (cf_def.isSetKey_validation_class()) {
newCFMD.keyValidator(TypeParser.parse(cf_def.key_validation_class)); }
return newCFMD.comment(cf_def.comment)
.rowCacheSize(cf_def.row_cache_size)
.keyCacheSize(cf_def.key_cache_size)
.readRepairChance(cf_def.read_repair_chance)
.replicateOnWrite(cf_def.replicate_on_write)
-
.defaultValidator(DatabaseDescriptor.getComparator(cf_def.default_validation_class))
-
.keyValidator(DatabaseDescriptor.getComparator(cf_def.key_validation_class))
+
.defaultValidator(TypeParser.parse(cf_def.default_validation_class))
+
.keyValidator(TypeParser.parse(cf_def.key_validation_class))
.columnMetadata(ColumnDefinition.fromColumnDef(cf_def.column_metadata));
}
@@ -683,7 +678,7 @@ public final class CFMetaData
throw new ConfigurationException("names do not match.");
if (!cf_def.column_type.toString().equals(cfType.name()))
throw new ConfigurationException("types do not match.");
- if (comparator !=
DatabaseDescriptor.getComparator(cf_def.comparator_type))
+ if (comparator != TypeParser.parse(cf_def.comparator_type))
throw new ConfigurationException("comparators do not match.");
if (cf_def.subcomparator_type == null ||
cf_def.subcomparator_type.equals(""))
{
@@ -691,7 +686,7 @@ public final class CFMetaData
throw new ConfigurationException("subcolumncomparators do not
match.");
// else, it's null and we're good.
}
- else if (subcolumnComparator !=
DatabaseDescriptor.getComparator(cf_def.subcomparator_type))
+ else if (subcolumnComparator !=
TypeParser.parse(cf_def.subcomparator_type))
throw new ConfigurationException("subcolumncomparators do not
match.");
validateMinMaxCompactionThresholds(cf_def);
@@ -704,8 +699,8 @@ public final class CFMetaData
readRepairChance = cf_def.read_repair_chance;
replicateOnWrite = cf_def.replicate_on_write;
gcGraceSeconds = cf_def.gc_grace_seconds;
- defaultValidator =
DatabaseDescriptor.getComparator(cf_def.default_validation_class);
- keyValidator =
DatabaseDescriptor.getComparator(cf_def.key_validation_class);
+ defaultValidator = TypeParser.parse(cf_def.default_validation_class);
+ keyValidator = TypeParser.parse(cf_def.key_validation_class);
minCompactionThreshold = cf_def.min_compaction_threshold;
maxCompactionThreshold = cf_def.max_compaction_threshold;
rowCacheSavePeriodInSeconds = cf_def.row_cache_save_period_in_seconds;
@@ -741,14 +736,14 @@ public final class CFMetaData
ColumnDefinition oldDef = column_metadata.get(def.name);
if (oldDef == null)
continue;
-
oldDef.setValidator(DatabaseDescriptor.getComparator(def.validation_class));
+ oldDef.setValidator(TypeParser.parse(def.validation_class));
oldDef.setIndexType(def.index_type == null ? null :
org.apache.cassandra.thrift.IndexType.valueOf(def.index_type.name()));
oldDef.setIndexName(def.index_name == null ? null :
def.index_name.toString());
}
// add the new ones coming in.
for (org.apache.cassandra.db.migration.avro.ColumnDef def : toAdd)
{
- AbstractType dValidClass =
DatabaseDescriptor.getComparator(def.validation_class);
+ AbstractType dValidClass = TypeParser.parse(def.validation_class);
ColumnDefinition cd = new ColumnDefinition(def.name,
dValidClass,
def.index_type == null
? null :
org.apache.cassandra.thrift.IndexType.valueOf(def.index_type.toString()),
@@ -972,7 +967,7 @@ public final class CFMetaData
public static void
validateAliasCompares(org.apache.cassandra.db.migration.avro.CfDef cf_def)
throws ConfigurationException
{
- AbstractType comparator =
DatabaseDescriptor.getComparator(cf_def.comparator_type);
+ AbstractType comparator = TypeParser.parse(cf_def.comparator_type);
if (cf_def.key_alias != null)
comparator.validate(cf_def.key_alias);
}
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/ColumnDefinition.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/ColumnDefinition.java?rev=1125612&r1=1125611&r2=1125612&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/ColumnDefinition.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/ColumnDefinition.java
Sat May 21 02:03:30 2011
@@ -26,6 +26,7 @@ import java.util.*;
import org.apache.avro.util.Utf8;
import org.apache.cassandra.db.marshal.AbstractType;
+import org.apache.cassandra.db.marshal.TypeParser;
import org.apache.cassandra.thrift.ColumnDef;
import org.apache.cassandra.thrift.IndexType;
import org.apache.cassandra.utils.ByteBufferUtil;
@@ -93,7 +94,7 @@ public class ColumnDefinition
String index_name = cd.index_name == null ? null :
cd.index_name.toString();
try
{
- AbstractType validatorType =
DatabaseDescriptor.getComparator(cd.validation_class);
+ AbstractType validatorType = TypeParser.parse(cd.validation_class);
return new ColumnDefinition(cd.name, validatorType, index_type,
index_name);
}
catch (ConfigurationException e)
@@ -104,14 +105,14 @@ public class ColumnDefinition
public static ColumnDefinition fromColumnDef(ColumnDef thriftColumnDef)
throws ConfigurationException
{
- AbstractType validatorType =
DatabaseDescriptor.getComparator(thriftColumnDef.validation_class);
+ AbstractType validatorType =
TypeParser.parse(thriftColumnDef.validation_class);
return new
ColumnDefinition(ByteBufferUtil.clone(thriftColumnDef.name), validatorType,
thriftColumnDef.index_type, thriftColumnDef.index_name);
}
public static ColumnDefinition
fromColumnDef(org.apache.cassandra.db.migration.avro.ColumnDef avroColumnDef)
throws ConfigurationException
{
validateIndexType(avroColumnDef);
- AbstractType validatorType =
DatabaseDescriptor.getComparator(avroColumnDef.validation_class);
+ AbstractType validatorType =
TypeParser.parse(avroColumnDef.validation_class);
return new ColumnDefinition(avroColumnDef.name,
validatorType,
IndexType.valueOf(avroColumnDef.index_type == null ?
D_COLDEF_INDEXTYPE : avroColumnDef.index_type.name()),
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=1125612&r1=1125611&r2=1125612&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Sat May 21 02:03:30 2011
@@ -25,7 +25,6 @@ import java.net.UnknownHostException;
import java.nio.ByteBuffer;
import java.util.*;
-import com.google.common.base.Charsets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,6 +38,7 @@ import org.apache.cassandra.db.ColumnFam
import org.apache.cassandra.db.DefsTable;
import org.apache.cassandra.db.Table;
import org.apache.cassandra.db.marshal.AbstractType;
+import org.apache.cassandra.db.marshal.TypeParser;
import org.apache.cassandra.db.migration.Migration;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.io.sstable.Descriptor;
@@ -46,7 +46,6 @@ import org.apache.cassandra.io.util.File
import org.apache.cassandra.locator.*;
import org.apache.cassandra.scheduler.IRequestScheduler;
import org.apache.cassandra.scheduler.NoScheduler;
-import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.Pair;
import org.yaml.snakeyaml.Loader;
@@ -529,14 +528,6 @@ public class DatabaseDescriptor
return conf.thrift_framed_transport_size_in_mb * 1024 * 1024;
}
- public static AbstractType getComparator(CharSequence compareWith) throws
ConfigurationException
- {
- if (compareWith == null)
- compareWith = "BytesType";
-
- return FBUtilities.getComparator(compareWith.toString());
- }
-
/**
* Creates all storage-related directories.
* @throws IOException when a disk problem is encountered.
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java?rev=1125612&r1=1125611&r2=1125612&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
Sat May 21 02:03:30 2011
@@ -31,9 +31,9 @@ import java.util.Set;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.ColumnDefinition;
import org.apache.cassandra.config.ConfigurationException;
-import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.ColumnFamilyType;
import org.apache.cassandra.db.marshal.AbstractType;
+import org.apache.cassandra.db.marshal.TypeParser;
import org.apache.cassandra.thrift.InvalidRequestException;
import org.apache.cassandra.utils.FBUtilities;
@@ -203,7 +203,7 @@ public class CreateColumnFamilyStatement
{
ByteBuffer columnName = col.getKey().getByteBuffer(comparator);
String validatorClassName =
comparators.containsKey(col.getValue()) ? comparators.get(col.getValue()) :
col.getValue();
- AbstractType<?> validator =
DatabaseDescriptor.getComparator(validatorClassName);
+ AbstractType<?> validator =
TypeParser.parse(validatorClassName);
columnDefs.put(columnName, new ColumnDefinition(columnName,
validator, null, null));
}
catch (ConfigurationException e)
@@ -242,7 +242,7 @@ public class CreateColumnFamilyStatement
String validatorString =
(comparators.get(getPropertyString(KW_DEFAULTVALIDATION, "text")) != null)
?
comparators.get(getPropertyString(KW_DEFAULTVALIDATION, "text"))
: getPropertyString(KW_DEFAULTVALIDATION,
"text");
- AbstractType<?> comparator =
DatabaseDescriptor.getComparator(comparatorString);
+ AbstractType<?> comparator = TypeParser.parse(comparatorString);
newCFMD = new CFMetaData(keyspace,
name,
@@ -256,7 +256,7 @@ public class CreateColumnFamilyStatement
.readRepairChance(getPropertyDouble(KW_READREPAIRCHANCE,
CFMetaData.DEFAULT_READ_REPAIR_CHANCE))
.replicateOnWrite(getPropertyBoolean(KW_REPLICATEONWRITE,
CFMetaData.DEFAULT_REPLICATE_ON_WRITE))
.gcGraceSeconds(getPropertyInt(KW_GCGRACESECONDS,
CFMetaData.DEFAULT_GC_GRACE_SECONDS))
-
.defaultValidator(DatabaseDescriptor.getComparator(validatorString))
+ .defaultValidator(TypeParser.parse(validatorString))
.minCompactionThreshold(getPropertyInt(KW_MINCOMPACTIONTHRESHOLD,
CFMetaData.DEFAULT_MIN_COMPACTION_THRESHOLD))
.maxCompactionThreshold(getPropertyInt(KW_MAXCOMPACTIONTHRESHOLD,
CFMetaData.DEFAULT_MAX_COMPACTION_THRESHOLD))
.rowCacheSavePeriod(getPropertyInt(KW_ROWCACHESAVEPERIODSECS,
CFMetaData.DEFAULT_ROW_CACHE_SAVE_PERIOD_IN_SECONDS))
@@ -266,7 +266,7 @@ public class CreateColumnFamilyStatement
.memOps(getPropertyDouble(KW_MEMTABLEOPSINMILLIONS,
CFMetaData.DEFAULT_MEMTABLE_OPERATIONS_IN_MILLIONS))
.mergeShardsChance(0.0)
.columnMetadata(getColumns(comparator))
-
.keyValidator(DatabaseDescriptor.getComparator(comparators.get(getKeyType())))
+
.keyValidator(TypeParser.parse(comparators.get(getKeyType())))
.rowCacheProvider(FBUtilities.newCacheProvider(getPropertyString(KW_ROW_CACHE_PROVIDER,
CFMetaData.DEFAULT_ROW_CACHE_PROVIDER)));
}
catch (ConfigurationException e)
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/marshal/TypeParser.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/marshal/TypeParser.java?rev=1125612&r1=1125611&r2=1125612&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/marshal/TypeParser.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/marshal/TypeParser.java
Sat May 21 02:03:30 2011
@@ -87,6 +87,11 @@ public class TypeParser
return type;
}
+ public static AbstractType parse(CharSequence compareWith) throws
ConfigurationException
+ {
+ return parse(compareWith == null ? null : compareWith.toString());
+ }
+
/**
* Parse an AbstractType from current position of this parser.
*/
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java?rev=1125612&r1=1125611&r2=1125612&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
Sat May 21 02:03:30 2011
@@ -33,6 +33,7 @@ import org.apache.cassandra.auth.SimpleA
import org.apache.cassandra.config.ConfigurationException;
import org.apache.cassandra.db.IColumn;
import org.apache.cassandra.db.marshal.AbstractType;
+import org.apache.cassandra.db.marshal.TypeParser;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.thrift.*;
import org.apache.cassandra.utils.FBUtilities;
@@ -198,8 +199,8 @@ public class ColumnFamilyRecordReader ex
int idx = cfnames.indexOf(cfName);
CfDef cf_def = ks_def.cf_defs.get(idx);
- comparator = FBUtilities.getComparator(cf_def.comparator_type);
- subComparator = cf_def.subcomparator_type == null ? null :
FBUtilities.getComparator(cf_def.subcomparator_type);
+ comparator = TypeParser.parse(cf_def.comparator_type);
+ subComparator = cf_def.subcomparator_type == null ? null :
TypeParser.parse(cf_def.subcomparator_type);
}
catch (ConfigurationException e)
{
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/thrift/ThriftValidation.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/thrift/ThriftValidation.java?rev=1125612&r1=1125611&r2=1125612&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/thrift/ThriftValidation.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/thrift/ThriftValidation.java
Sat May 21 02:03:30 2011
@@ -28,6 +28,7 @@ import org.apache.cassandra.db.*;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.AsciiType;
import org.apache.cassandra.db.marshal.MarshalException;
+import org.apache.cassandra.db.marshal.TypeParser;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.dht.RandomPartitioner;
import org.apache.cassandra.dht.Token;
@@ -536,9 +537,9 @@ public class ThriftValidation
if (cfType == null)
throw new InvalidRequestException("invalid column type " +
cf_def.column_type);
- DatabaseDescriptor.getComparator(cf_def.comparator_type);
- DatabaseDescriptor.getComparator(cf_def.subcomparator_type);
- DatabaseDescriptor.getComparator(cf_def.default_validation_class);
+ TypeParser.parse(cf_def.comparator_type);
+ TypeParser.parse(cf_def.subcomparator_type);
+ TypeParser.parse(cf_def.default_validation_class);
if (cfType != ColumnFamilyType.Super && cf_def.subcomparator_type
!= null)
throw new InvalidRequestException("subcomparator_type is
invalid for standard columns");
@@ -546,8 +547,8 @@ public class ThriftValidation
return;
AbstractType comparator = cfType == ColumnFamilyType.Standard
- ?
DatabaseDescriptor.getComparator(cf_def.comparator_type)
- :
DatabaseDescriptor.getComparator(cf_def.subcomparator_type);
+ ? TypeParser.parse(cf_def.comparator_type)
+ :
TypeParser.parse(cf_def.subcomparator_type);
Set<String> indexNames = new HashSet<String>();
for (ColumnDef c : cf_def.column_metadata)
@@ -558,7 +559,7 @@ public class ThriftValidation
throw new InvalidRequestException("Duplicate index names "
+ idxName);
indexNames.add(idxName);
- DatabaseDescriptor.getComparator(c.validation_class);
+ TypeParser.parse(c.validation_class);
try
{
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/utils/FBUtilities.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/utils/FBUtilities.java?rev=1125612&r1=1125611&r2=1125612&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/utils/FBUtilities.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/utils/FBUtilities.java
Sat May 21 02:03:30 2011
@@ -522,11 +522,6 @@ public class FBUtilities
return FBUtilities.construct(partitionerClassName, "partitioner");
}
- public static AbstractType getComparator(String compareWith) throws
ConfigurationException
- {
- return TypeParser.parse(compareWith);
- }
-
/**
* @return The Class for the given name.
* @param classname Fully qualified classname.
