From 01fcb8cac25b1f617d16a3f72672ecafc02fe458 Mon Sep 17 00:00:00 2001 From: Aleksey Yeschenko Date: Thu, 13 Dec 2012 22:07:58 +0300 Subject: [PATCH] Fix ALTER TABLE overriding compression options with defaults; patch by Aleksey Yeschenko, reviewed by Jonathan Ellis for CASSANDRA-4996 --- CHANGES.txt | 1 + .../org/apache/cassandra/cql/CFPropDefs.java | 24 +++++++------------ .../cql/CreateColumnFamilyStatement.java | 3 +++ .../org/apache/cassandra/cql3/CFPropDefs.java | 12 +++------- .../CreateColumnFamilyStatement.java | 7 +++--- 5 files changed, 20 insertions(+), 27 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index e6b1b95544..75c715c55c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -5,6 +5,7 @@ * Fall back to old describe_splits if d_s_ex is not available (CASSANDRA-4803) * Improve error reporting when streaming ranges fail (CASSANDRA-5009) * cqlsh: fix timestamp formatting on some platforms (CASSANDRA-5046) + * Fix ALTER TABLE overriding compression options with defaults (CASSANDRA-4996) 1.1.7 diff --git a/src/java/org/apache/cassandra/cql/CFPropDefs.java b/src/java/org/apache/cassandra/cql/CFPropDefs.java index 7350b3f789..b7c6a92235 100644 --- a/src/java/org/apache/cassandra/cql/CFPropDefs.java +++ b/src/java/org/apache/cassandra/cql/CFPropDefs.java @@ -21,22 +21,22 @@ package org.apache.cassandra.cql; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + import com.google.common.collect.Sets; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ConfigurationException; 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.io.compress.CompressionParameters; -import org.apache.cassandra.io.compress.SnappyCompressor; import org.apache.cassandra.thrift.InvalidRequestException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; public class CFPropDefs { private static Logger logger = LoggerFactory.getLogger(CFPropDefs.class); @@ -63,8 +63,6 @@ public class CFPropDefs { public static final String COMPACTION_OPTIONS_PREFIX = "compaction_strategy_options"; public static final String COMPRESSION_PARAMETERS_PREFIX = "compression_parameters"; - private static final String DEFAULT_COMPRESSOR = SnappyCompressor.isAvailable() ? SnappyCompressor.class.getCanonicalName() : null; - static { comparators.put("ascii", "AsciiType"); @@ -111,11 +109,7 @@ public class CFPropDefs { public final Map properties = new HashMap(); public Class compactionStrategyClass; public final Map compactionStrategyOptions = new HashMap(); - public final Map compressionParameters = new HashMap() - {{ - if (CFMetaData.DEFAULT_COMPRESSOR != null) - put(CompressionParameters.SSTABLE_COMPRESSION, CFMetaData.DEFAULT_COMPRESSOR); - }}; + public final Map compressionParameters = new HashMap(); public void validate() throws InvalidRequestException { diff --git a/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java b/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java index 0895e02672..bf02035d5e 100644 --- a/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java +++ b/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java @@ -169,6 +169,9 @@ public class CreateColumnFamilyStatement comparator, null); + if (CFMetaData.DEFAULT_COMPRESSOR != null && cfProps.compressionParameters.isEmpty()) + cfProps.compressionParameters.put(CompressionParameters.SSTABLE_COMPRESSION, CFMetaData.DEFAULT_COMPRESSOR); + newCFMD.comment(cfProps.getProperty(CFPropDefs.KW_COMMENT)) .readRepairChance(getPropertyDouble(CFPropDefs.KW_READREPAIRCHANCE, CFMetaData.DEFAULT_READ_REPAIR_CHANCE)) .dcLocalReadRepairChance(getPropertyDouble(CFPropDefs.KW_DCLOCALREADREPAIRCHANCE, CFMetaData.DEFAULT_DCLOCAL_READ_REPAIR_CHANCE)) diff --git a/src/java/org/apache/cassandra/cql3/CFPropDefs.java b/src/java/org/apache/cassandra/cql3/CFPropDefs.java index ec8bd5a400..721ef723d4 100644 --- a/src/java/org/apache/cassandra/cql3/CFPropDefs.java +++ b/src/java/org/apache/cassandra/cql3/CFPropDefs.java @@ -18,7 +18,6 @@ */ package org.apache.cassandra.cql3; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -35,8 +34,6 @@ import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.TypeParser; import org.apache.cassandra.io.compress.CompressionParameters; import org.apache.cassandra.thrift.InvalidRequestException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class CFPropDefs extends PropertyDefinitions { @@ -95,11 +92,7 @@ public class CFPropDefs extends PropertyDefinitions private Class compactionStrategyClass = null; public final Map compactionStrategyOptions = new HashMap(); - public final Map compressionParameters = new HashMap() - {{ - if (CFMetaData.DEFAULT_COMPRESSOR != null) - put(CompressionParameters.SSTABLE_COMPRESSION, CFMetaData.DEFAULT_COMPRESSOR); - }}; + public final Map compressionParameters = new HashMap(); public static AbstractType parseType(String type) throws InvalidRequestException { @@ -169,7 +162,8 @@ public class CFPropDefs extends PropertyDefinitions cfm.compactionStrategyOptions(new HashMap(compactionStrategyOptions)); } - cfm.compressionParameters(CompressionParameters.create(compressionParameters)); + if (!compressionParameters.isEmpty()) + cfm.compressionParameters(CompressionParameters.create(compressionParameters)); } @Override diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java index 1f0e0d350c..cffb006b27 100644 --- a/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java @@ -24,11 +24,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.cassandra.auth.Permission; -import org.apache.commons.lang.StringUtils; import com.google.common.collect.HashMultiset; import com.google.common.collect.Multiset; +import org.apache.commons.lang.StringUtils; +import org.apache.cassandra.auth.Permission; import org.apache.cassandra.config.Schema; import org.apache.cassandra.cql3.*; import org.apache.cassandra.config.CFMetaData; @@ -44,7 +44,6 @@ import org.apache.cassandra.service.MigrationManager; import org.apache.cassandra.thrift.CqlResult; import org.apache.cassandra.thrift.InvalidRequestException; import org.apache.cassandra.io.compress.CompressionParameters; -import org.apache.cassandra.utils.Pair; /** A CREATE COLUMNFAMILY parsed from a CQL query statement. */ public class CreateColumnFamilyStatement extends SchemaAlteringStatement @@ -64,6 +63,8 @@ public class CreateColumnFamilyStatement extends SchemaAlteringStatement { super(name); this.properties = properties; + if (CFMetaData.DEFAULT_COMPRESSOR != null && this.properties.compressionParameters.isEmpty()) + this.properties.compressionParameters.put(CompressionParameters.SSTABLE_COMPRESSION, CFMetaData.DEFAULT_COMPRESSOR); } public void checkAccess(ClientState state) throws InvalidRequestException