Updated Branches: refs/heads/cassandra-1.0 46adb0db9 -> 119fa0503
Revert "fix setting compaction_strategy_class using CQL" This reverts commit 2c62adab36a589e9ff9e9169fd2125272e067918. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/119fa050 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/119fa050 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/119fa050 Branch: refs/heads/cassandra-1.0 Commit: 119fa050307a9ea768ef5c9fcb90124950feb56b Parents: 46adb0d Author: Pavel Yaskevich <pove...@gmail.com> Authored: Sun Jan 29 04:31:49 2012 +0200 Committer: Pavel Yaskevich <pove...@gmail.com> Committed: Sun Jan 29 04:31:49 2012 +0200 ---------------------------------------------------------------------- .../cassandra/cql/CreateColumnFamilyStatement.java | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/119fa050/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java b/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java index c0568b9..1095a72 100644 --- a/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java +++ b/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java @@ -37,7 +37,6 @@ import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.config.ConfigurationException; import org.apache.cassandra.db.ColumnFamilyType; -import org.apache.cassandra.db.compaction.AbstractCompactionStrategy; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.TypeParser; import org.apache.cassandra.thrift.InvalidRequestException; @@ -115,7 +114,6 @@ public class CreateColumnFamilyStatement private final Map<String, String> properties = new HashMap<String, String>(); private List<String> keyValidator = new ArrayList<String>(); private ByteBuffer keyAlias = null; - private Class<? extends AbstractCompactionStrategy> compactionStrategyClass; private final Map<String, String> compactionStrategyOptions = new HashMap<String, String>(); private final Map<String, String> compressionParameters = new HashMap<String, String>(); @@ -127,17 +125,6 @@ public class CreateColumnFamilyStatement /** Perform validation of parsed params */ private void validate() throws InvalidRequestException { - String compStrategy = getPropertyString(KW_COMPACTION_STRATEGY_CLASS, CFMetaData.DEFAULT_COMPACTION_STRATEGY_CLASS); - - try - { - compactionStrategyClass = CFMetaData.createCompactionStrategy(compStrategy); - } - catch (ConfigurationException e) - { - throw new InvalidRequestException(e.getMessage()); - } - // we need to remove parent:key = value pairs from the main properties Set<String> propsToRemove = new HashSet<String>(); @@ -351,7 +338,6 @@ public class CreateColumnFamilyStatement .keyValidator(TypeParser.parse(comparators.get(getKeyType()))) .rowCacheProvider(FBUtilities.newCacheProvider(getPropertyString(KW_ROW_CACHE_PROVIDER, CFMetaData.DEFAULT_ROW_CACHE_PROVIDER.getClass().getName()))) .keyAlias(keyAlias) - .compactionStrategyClass(compactionStrategyClass) .compactionStrategyOptions(compactionStrategyOptions) .compressionParameters(CompressionParameters.create(compressionParameters)) .validate();