From 8be8ff512c06f6f2758c425f6864a134bf12c300 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Fri, 2 Dec 2011 19:21:38 +0000 Subject: [PATCH] Fix typo in method name git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0@1209644 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/cassandra/config/CFMetaData.java | 11 +++++------ .../src/org/apache/cassandra/stress/Session.java | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java index ff112418ef..1ceb43d08b 100644 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@ -39,7 +39,6 @@ import org.apache.cassandra.io.compress.CompressionParameters; import org.apache.cassandra.thrift.InvalidRequestException; import org.apache.cassandra.cache.ConcurrentLinkedHashCacheProvider; import org.apache.cassandra.cache.SerializingCacheProvider; -import org.apache.cassandra.utils.CLibrary; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; @@ -218,7 +217,7 @@ public final class CFMetaData try { - compactionStrategyClass = createCompactionSrategy(DEFAULT_COMPACTION_STRATEGY_CLASS); + compactionStrategyClass = createCompactionStrategy(DEFAULT_COMPACTION_STRATEGY_CLASS); } catch (ConfigurationException e) { @@ -409,7 +408,7 @@ public final class CFMetaData { try { - newCFMD.compactionStrategyClass = createCompactionSrategy(cf.compaction_strategy.toString()); + newCFMD.compactionStrategyClass = createCompactionStrategy(cf.compaction_strategy.toString()); } catch (ConfigurationException e) { @@ -676,7 +675,7 @@ public final class CFMetaData if (cf_def.isSetKey_alias()) { newCFMD.keyAlias(cf_def.key_alias); } if (cf_def.isSetKey_validation_class()) { newCFMD.keyValidator(TypeParser.parse(cf_def.key_validation_class)); } if (cf_def.isSetCompaction_strategy()) - newCFMD.compactionStrategyClass = createCompactionSrategy(cf_def.compaction_strategy); + newCFMD.compactionStrategyClass = createCompactionStrategy(cf_def.compaction_strategy); if (cf_def.isSetCompaction_strategy_options()) newCFMD.compactionStrategyOptions(new HashMap(cf_def.compaction_strategy_options)); @@ -784,7 +783,7 @@ public final class CFMetaData } if (cf_def.compaction_strategy != null) - compactionStrategyClass = createCompactionSrategy(cf_def.compaction_strategy.toString()); + compactionStrategyClass = createCompactionStrategy(cf_def.compaction_strategy.toString()); if (null != cf_def.compaction_strategy_options) { @@ -798,7 +797,7 @@ public final class CFMetaData logger.debug("application result is {}", this); } - public static Class createCompactionSrategy(String className) throws ConfigurationException + public static Class createCompactionStrategy(String className) throws ConfigurationException { className = className.contains(".") ? className : "org.apache.cassandra.db.compaction." + className; try diff --git a/tools/stress/src/org/apache/cassandra/stress/Session.java b/tools/stress/src/org/apache/cassandra/stress/Session.java index ddc6a697b0..052025e991 100644 --- a/tools/stress/src/org/apache/cassandra/stress/Session.java +++ b/tools/stress/src/org/apache/cassandra/stress/Session.java @@ -316,7 +316,7 @@ public class Session implements Serializable try { // validate compaction strategy class - CFMetaData.createCompactionSrategy(compactionStrategy); + CFMetaData.createCompactionStrategy(compactionStrategy); } catch (ConfigurationException e) {