Repository: cassandra Updated Branches: refs/heads/trunk cbbc1191c -> 3ad82c730
Fix CFMetaData compaction-related warnings Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b21aef8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b21aef8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b21aef8 Branch: refs/heads/trunk Commit: 1b21aef8152d96a180e75f2fcc5afad9ded6c595 Parents: abbcfc5 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sat Nov 15 00:06:59 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sat Nov 15 00:06:59 2014 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/CFMetaData.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b21aef8/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java index 0fff7d0..57f5757 100644 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@ -1250,7 +1250,7 @@ public final class CFMetaData { className = className.contains(".") ? className : "org.apache.cassandra.db.compaction." + className; Class<AbstractCompactionStrategy> strategyClass = FBUtilities.classForName(className, "compaction strategy"); - if (strategyClass.equals(WrappingCompactionStrategy.class)) + if (className.equals(WrappingCompactionStrategy.class.getName())) throw new ConfigurationException("You can't set WrappingCompactionStrategy as the compaction strategy!"); if (!AbstractCompactionStrategy.class.isAssignableFrom(strategyClass)) throw new ConfigurationException(String.format("Specified compaction strategy class (%s) is not derived from AbstractReplicationStrategy", className)); @@ -1262,10 +1262,8 @@ public final class CFMetaData { try { - Constructor<? extends AbstractCompactionStrategy> constructor = compactionStrategyClass.getConstructor(new Class[] { - ColumnFamilyStore.class, - Map.class // options - }); + Constructor<? extends AbstractCompactionStrategy> constructor = + compactionStrategyClass.getConstructor(ColumnFamilyStore.class, Map.class); return constructor.newInstance(cfs, compactionStrategyOptions); } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException | InstantiationException e)
