http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/src/java/org/apache/cassandra/service/AbstractReadExecutor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/AbstractReadExecutor.java b/src/java/org/apache/cassandra/service/AbstractReadExecutor.java index 9a57f45..487a14c 100644 --- a/src/java/org/apache/cassandra/service/AbstractReadExecutor.java +++ b/src/java/org/apache/cassandra/service/AbstractReadExecutor.java @@ -28,7 +28,6 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.concurrent.StageManager; -import org.apache.cassandra.config.CFMetaData.SpeculativeRetry.RetryType; import org.apache.cassandra.config.ReadRepairDecision; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.ConsistencyLevel; @@ -42,10 +41,10 @@ import org.apache.cassandra.exceptions.UnavailableException; import org.apache.cassandra.metrics.ReadRepairMetrics; import org.apache.cassandra.net.MessageOut; import org.apache.cassandra.net.MessagingService; +import org.apache.cassandra.schema.SpeculativeRetryParam; import org.apache.cassandra.service.StorageProxy.LocalReadRunnable; import org.apache.cassandra.tracing.TraceState; import org.apache.cassandra.tracing.Tracing; -import org.apache.cassandra.utils.FBUtilities; /** * Sends a read request to the replicas needed to satisfy a given ConsistencyLevel. @@ -159,10 +158,10 @@ public abstract class AbstractReadExecutor } ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(command.metadata().cfId); - RetryType retryType = cfs.metadata.getSpeculativeRetry().type; + SpeculativeRetryParam retry = cfs.metadata.params.speculativeRetry; // Speculative retry is disabled *OR* there are simply no extra replicas to speculate. - if (retryType == RetryType.NONE || consistencyLevel.blockFor(keyspace) == allReplicas.size()) + if (retry.equals(SpeculativeRetryParam.NONE) || consistencyLevel.blockFor(keyspace) == allReplicas.size()) return new NeverSpeculatingReadExecutor(keyspace, command, consistencyLevel, targetReplicas); if (targetReplicas.size() == allReplicas.size()) @@ -190,7 +189,7 @@ public abstract class AbstractReadExecutor } targetReplicas.add(extraReplica); - if (retryType == RetryType.ALWAYS) + if (retry.equals(SpeculativeRetryParam.ALWAYS)) return new AlwaysSpeculatingReadExecutor(keyspace, cfs, command, consistencyLevel, targetReplicas); else // PERCENTILE or CUSTOM. return new SpeculatingReadExecutor(keyspace, cfs, command, consistencyLevel, targetReplicas);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/src/java/org/apache/cassandra/service/CacheService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/CacheService.java b/src/java/org/apache/cassandra/service/CacheService.java index 253e9e4..c9d9fa5 100644 --- a/src/java/org/apache/cassandra/service/CacheService.java +++ b/src/java/org/apache/cassandra/service/CacheService.java @@ -421,7 +421,7 @@ public class CacheService implements CacheServiceMBean public Future<Pair<RowCacheKey, IRowCacheEntry>> deserialize(DataInputPlus in, final ColumnFamilyStore cfs) throws IOException { final ByteBuffer buffer = ByteBufferUtil.readWithLength(in); - final int rowsToCache = cfs.metadata.getCaching().rowCache.rowsToCache; + final int rowsToCache = cfs.metadata.params.caching.rowsPerPartitionToCache(); return StageManager.getStage(Stage.READ).submit(new Callable<Pair<RowCacheKey, IRowCacheEntry>>() { http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index 9ac94cc..f263a82 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -3277,7 +3277,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE Token token = tokens.get(index); Range<Token> range = new Range<>(prevToken, token); // always return an estimate > 0 (see CASSANDRA-7322) - splits.add(Pair.create(range, Math.max(cfs.metadata.getMinIndexInterval(), cfs.estimatedKeysForRange(range)))); + splits.add(Pair.create(range, Math.max(cfs.metadata.params.minIndexInterval, cfs.estimatedKeysForRange(range)))); prevToken = token; } return splits; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/src/java/org/apache/cassandra/streaming/compress/CompressionInfo.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/compress/CompressionInfo.java b/src/java/org/apache/cassandra/streaming/compress/CompressionInfo.java index 924a656..bd0c2d5 100644 --- a/src/java/org/apache/cassandra/streaming/compress/CompressionInfo.java +++ b/src/java/org/apache/cassandra/streaming/compress/CompressionInfo.java @@ -22,7 +22,7 @@ import java.io.IOException; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.io.compress.CompressionMetadata; -import org.apache.cassandra.io.compress.CompressionParameters; +import org.apache.cassandra.schema.CompressionParams; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; @@ -34,9 +34,9 @@ public class CompressionInfo public static final IVersionedSerializer<CompressionInfo> serializer = new CompressionInfoSerializer(); public final CompressionMetadata.Chunk[] chunks; - public final CompressionParameters parameters; + public final CompressionParams parameters; - public CompressionInfo(CompressionMetadata.Chunk[] chunks, CompressionParameters parameters) + public CompressionInfo(CompressionMetadata.Chunk[] chunks, CompressionParams parameters) { assert chunks != null && parameters != null; this.chunks = chunks; @@ -58,7 +58,7 @@ public class CompressionInfo for (int i = 0; i < chunkCount; i++) CompressionMetadata.Chunk.serializer.serialize(info.chunks[i], out, version); // compression params - CompressionParameters.serializer.serialize(info.parameters, out, version); + CompressionParams.serializer.serialize(info.parameters, out, version); } public CompressionInfo deserialize(DataInputPlus in, int version) throws IOException @@ -73,7 +73,7 @@ public class CompressionInfo chunks[i] = CompressionMetadata.Chunk.serializer.deserialize(in, version); // compression params - CompressionParameters parameters = CompressionParameters.serializer.deserialize(in, version); + CompressionParams parameters = CompressionParams.serializer.deserialize(in, version); return new CompressionInfo(chunks, parameters); } @@ -88,7 +88,7 @@ public class CompressionInfo for (int i = 0; i < chunkCount; i++) size += CompressionMetadata.Chunk.serializer.serializedSize(info.chunks[i], version); // compression params - size += CompressionParameters.serializer.serializedSize(info.parameters, version); + size += CompressionParams.serializer.serializedSize(info.parameters, version); return size; } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/src/java/org/apache/cassandra/thrift/CassandraServer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java index c679479..2f47452 100644 --- a/src/java/org/apache/cassandra/thrift/CassandraServer.java +++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java @@ -1845,8 +1845,7 @@ public class CassandraServer implements Cassandra.Iface requestScheduler.release(); } - public String system_add_column_family(CfDef cf_def) - throws InvalidRequestException, SchemaDisagreementException, TException + public String system_add_column_family(CfDef cf_def) throws TException { logger.debug("add_column_family"); @@ -1857,7 +1856,7 @@ public class CassandraServer implements Cassandra.Iface cState.hasKeyspaceAccess(keyspace, Permission.CREATE); cf_def.unsetId(); // explicitly ignore any id set by client (Hector likes to set zero) CFMetaData cfm = ThriftConversion.fromThrift(cf_def); - CFMetaData.validateCompactionOptions(cfm.compactionStrategyClass, cfm.compactionStrategyOptions); + cfm.params.compaction.validate(); cfm.addDefaultIndexNames(); if (!cfm.getTriggers().isEmpty()) @@ -2007,7 +2006,7 @@ public class CassandraServer implements Cassandra.Iface throw new InvalidRequestException("Cannot modify CQL3 table " + oldCfm.cfName + " as it may break the schema. You should use cqlsh to modify CQL3 tables instead."); CFMetaData cfm = ThriftConversion.fromThriftForUpdate(cf_def, oldCfm); - CFMetaData.validateCompactionOptions(cfm.compactionStrategyClass, cfm.compactionStrategyOptions); + cfm.params.compaction.validate(); cfm.addDefaultIndexNames(); if (!oldCfm.getTriggers().equals(cfm.getTriggers())) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/src/java/org/apache/cassandra/thrift/ThriftConversion.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/ThriftConversion.java b/src/java/org/apache/cassandra/thrift/ThriftConversion.java index 36383e0..1744177 100644 --- a/src/java/org/apache/cassandra/thrift/ThriftConversion.java +++ b/src/java/org/apache/cassandra/thrift/ThriftConversion.java @@ -20,11 +20,10 @@ package org.apache.cassandra.thrift; import java.util.*; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Strings; import com.google.common.collect.Maps; +import org.apache.cassandra.db.compaction.AbstractCompactionStrategy; import org.apache.cassandra.io.compress.ICompressor; -import org.apache.cassandra.cache.CachingOptions; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.config.DatabaseDescriptor; @@ -37,7 +36,7 @@ import org.apache.cassandra.db.WriteType; import org.apache.cassandra.db.filter.RowFilter; import org.apache.cassandra.db.marshal.*; import org.apache.cassandra.exceptions.*; -import org.apache.cassandra.io.compress.CompressionParameters; +import org.apache.cassandra.schema.CompressionParams; import org.apache.cassandra.locator.AbstractReplicationStrategy; import org.apache.cassandra.locator.LocalStrategy; import org.apache.cassandra.schema.*; @@ -158,7 +157,7 @@ public class ThriftConversion Map<String, String> replicationMap = new HashMap<>(); if (ksd.strategy_options != null) replicationMap.putAll(ksd.strategy_options); - replicationMap.put(KeyspaceParams.Replication.CLASS, cls.getName()); + replicationMap.put(ReplicationParams.CLASS, cls.getName()); return KeyspaceMetadata.create(ksd.name, KeyspaceParams.create(ksd.durable_writes, replicationMap), Tables.of(cfDefs)); } @@ -266,6 +265,7 @@ public class ThriftConversion // If it's a thrift table creation, adds the default CQL metadata for the new table if (isCreation) + { addDefaultCQLMetadata(defs, cf_def.keyspace, cf_def.name, @@ -273,6 +273,7 @@ public class ThriftConversion rawComparator, subComparator, defaultValidator); + } // We do not allow Thrift materialized views, so we always set it to false boolean isMaterializedView = false; @@ -281,20 +282,15 @@ public class ThriftConversion 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); - if (cf_def.isSetMax_compaction_threshold()) - newCFMD.maxCompactionThreshold(cf_def.max_compaction_threshold); - if (cf_def.isSetCompaction_strategy()) - newCFMD.compactionStrategyClass(CFMetaData.createCompactionStrategy(cf_def.compaction_strategy)); - if (cf_def.isSetCompaction_strategy_options()) - newCFMD.compactionStrategyOptions(new HashMap<>(cf_def.compaction_strategy_options)); + + newCFMD.compaction(compactionParamsFromThrift(cf_def)); + if (cf_def.isSetBloom_filter_fp_chance()) newCFMD.bloomFilterFpChance(cf_def.bloom_filter_fp_chance); if (cf_def.isSetMemtable_flush_period_in_ms()) newCFMD.memtableFlushPeriod(cf_def.memtable_flush_period_in_ms); if (cf_def.isSetCaching() || cf_def.isSetCells_per_row_to_cache()) - newCFMD.caching(CachingOptions.fromThrift(cf_def.caching, cf_def.cells_per_row_to_cache)); + newCFMD.caching(cachingFromThrift(cf_def.caching, cf_def.cells_per_row_to_cache)); if (cf_def.isSetRead_repair_chance()) newCFMD.readRepairChance(cf_def.read_repair_chance); if (cf_def.isSetDefault_time_to_live()) @@ -306,12 +302,15 @@ public class ThriftConversion if (cf_def.isSetMax_index_interval()) newCFMD.maxIndexInterval(cf_def.max_index_interval); if (cf_def.isSetSpeculative_retry()) - newCFMD.speculativeRetry(CFMetaData.SpeculativeRetry.fromString(cf_def.speculative_retry)); + newCFMD.speculativeRetry(SpeculativeRetryParam.fromString(cf_def.speculative_retry)); if (cf_def.isSetTriggers()) newCFMD.triggers(triggerDefinitionsFromThrift(cf_def.triggers)); + if (cf_def.isSetComment()) + newCFMD.comment(cf_def.comment); + if (cf_def.isSetCompression_options()) + newCFMD.compression(compressionParametersFromThrift(cf_def.compression_options)); - return newCFMD.comment(cf_def.comment) - .compressionParameters(compressionParametersFromThrift(cf_def.compression_options)); + return newCFMD; } catch (SyntaxException | MarshalException e) { @@ -319,9 +318,28 @@ public class ThriftConversion } } - private static CompressionParameters compressionParametersFromThrift(Map<String, String> compression_options) + @SuppressWarnings("unchecked") + private static CompactionParams compactionParamsFromThrift(CfDef cf_def) { - CompressionParameters compressionParameter = CompressionParameters.fromMap(compression_options); + Class<? extends AbstractCompactionStrategy> klass = + CFMetaData.createCompactionStrategy(cf_def.compaction_strategy); + Map<String, String> options = new HashMap<>(cf_def.compaction_strategy_options); + + int minThreshold = cf_def.min_compaction_threshold; + int maxThreshold = cf_def.max_compaction_threshold; + + if (CompactionParams.supportsThresholdParams(klass)) + { + options.putIfAbsent(CompactionParams.Option.MIN_THRESHOLD.toString(), Integer.toString(minThreshold)); + options.putIfAbsent(CompactionParams.Option.MAX_THRESHOLD.toString(), Integer.toString(maxThreshold)); + } + + return CompactionParams.create(klass, options); + } + + private static CompressionParams compressionParametersFromThrift(Map<String, String> compression_options) + { + CompressionParams compressionParameter = CompressionParams.fromMap(compression_options); compressionParameter.validate(); return compressionParameter; } @@ -375,19 +393,19 @@ public class ThriftConversion if (!cf_def.isSetComment()) cf_def.setComment(""); if (!cf_def.isSetMin_compaction_threshold()) - cf_def.setMin_compaction_threshold(CFMetaData.DEFAULT_MIN_COMPACTION_THRESHOLD); + cf_def.setMin_compaction_threshold(CompactionParams.DEFAULT_MIN_THRESHOLD); if (!cf_def.isSetMax_compaction_threshold()) - cf_def.setMax_compaction_threshold(CFMetaData.DEFAULT_MAX_COMPACTION_THRESHOLD); - if (cf_def.compaction_strategy == null) - cf_def.compaction_strategy = CFMetaData.DEFAULT_COMPACTION_STRATEGY_CLASS.getSimpleName(); - if (cf_def.compaction_strategy_options == null) - cf_def.compaction_strategy_options = Collections.emptyMap(); + cf_def.setMax_compaction_threshold(CompactionParams.DEFAULT_MAX_THRESHOLD); + if (!cf_def.isSetCompaction_strategy()) + cf_def.setCompaction_strategy(CompactionParams.DEFAULT.klass().getSimpleName()); + if (!cf_def.isSetCompaction_strategy_options()) + cf_def.setCompaction_strategy_options(Collections.emptyMap()); if (!cf_def.isSetCompression_options()) - cf_def.setCompression_options(Collections.singletonMap(CompressionParameters.SSTABLE_COMPRESSION, CFMetaData.DEFAULT_COMPRESSOR)); + cf_def.setCompression_options(Collections.singletonMap(CompressionParams.SSTABLE_COMPRESSION, CompressionParams.DEFAULT.klass().getCanonicalName())); if (!cf_def.isSetDefault_time_to_live()) - cf_def.setDefault_time_to_live(CFMetaData.DEFAULT_DEFAULT_TIME_TO_LIVE); + cf_def.setDefault_time_to_live(TableParams.DEFAULT_DEFAULT_TIME_TO_LIVE); if (!cf_def.isSetDclocal_read_repair_chance()) - cf_def.setDclocal_read_repair_chance(CFMetaData.DEFAULT_DCLOCAL_READ_REPAIR_CHANCE); + cf_def.setDclocal_read_repair_chance(TableParams.DEFAULT_DCLOCAL_READ_REPAIR_CHANCE); // if index_interval was set, use that for the min_index_interval default if (!cf_def.isSetMin_index_interval()) @@ -395,13 +413,13 @@ public class ThriftConversion if (cf_def.isSetIndex_interval()) cf_def.setMin_index_interval(cf_def.getIndex_interval()); else - cf_def.setMin_index_interval(CFMetaData.DEFAULT_MIN_INDEX_INTERVAL); + cf_def.setMin_index_interval(TableParams.DEFAULT_MIN_INDEX_INTERVAL); } if (!cf_def.isSetMax_index_interval()) { // ensure the max is at least as large as the min - cf_def.setMax_index_interval(Math.max(cf_def.min_index_interval, CFMetaData.DEFAULT_MAX_INDEX_INTERVAL)); + cf_def.setMax_index_interval(Math.max(cf_def.min_index_interval, TableParams.DEFAULT_MAX_INDEX_INTERVAL)); } } @@ -420,29 +438,29 @@ public class ThriftConversion def.setComparator_type(LegacyLayout.makeLegacyComparator(cfm).toString()); } - def.setComment(Strings.nullToEmpty(cfm.getComment())); - def.setRead_repair_chance(cfm.getReadRepairChance()); - def.setDclocal_read_repair_chance(cfm.getDcLocalReadRepairChance()); - def.setGc_grace_seconds(cfm.getGcGraceSeconds()); + def.setComment(cfm.params.comment); + def.setRead_repair_chance(cfm.params.readRepairChance); + def.setDclocal_read_repair_chance(cfm.params.dcLocalReadRepairChance); + def.setGc_grace_seconds(cfm.params.gcGraceSeconds); def.setDefault_validation_class(cfm.makeLegacyDefaultValidator().toString()); def.setKey_validation_class(cfm.getKeyValidator().toString()); - def.setMin_compaction_threshold(cfm.getMinCompactionThreshold()); - def.setMax_compaction_threshold(cfm.getMaxCompactionThreshold()); + def.setMin_compaction_threshold(cfm.params.compaction.minCompactionThreshold()); + def.setMax_compaction_threshold(cfm.params.compaction.maxCompactionThreshold()); // We only return the alias if only one is set since thrift don't know about multiple key aliases if (cfm.partitionKeyColumns().size() == 1) def.setKey_alias(cfm.partitionKeyColumns().get(0).name.bytes); def.setColumn_metadata(columnDefinitionsToThrift(cfm, cfm.allColumns())); - def.setCompaction_strategy(cfm.compactionStrategyClass.getName()); - def.setCompaction_strategy_options(new HashMap<>(cfm.compactionStrategyOptions)); - def.setCompression_options(compressionParametersToThrift(cfm.compressionParameters)); - def.setBloom_filter_fp_chance(cfm.getBloomFilterFpChance()); - def.setMin_index_interval(cfm.getMinIndexInterval()); - def.setMax_index_interval(cfm.getMaxIndexInterval()); - def.setMemtable_flush_period_in_ms(cfm.getMemtableFlushPeriod()); - def.setCaching(cfm.getCaching().toThriftCaching()); - def.setCells_per_row_to_cache(cfm.getCaching().toThriftCellsPerRow()); - def.setDefault_time_to_live(cfm.getDefaultTimeToLive()); - def.setSpeculative_retry(cfm.getSpeculativeRetry().toString()); + def.setCompaction_strategy(cfm.params.compaction.klass().getName()); + def.setCompaction_strategy_options(cfm.params.compaction.options()); + def.setCompression_options(compressionParametersToThrift(cfm.params.compression)); + def.setBloom_filter_fp_chance(cfm.params.bloomFilterFpChance); + def.setMin_index_interval(cfm.params.minIndexInterval); + def.setMax_index_interval(cfm.params.maxIndexInterval); + def.setMemtable_flush_period_in_ms(cfm.params.memtableFlushPeriodInMs); + def.setCaching(toThrift(cfm.params.caching)); + def.setCells_per_row_to_cache(toThriftCellsPerRow(cfm.params.caching)); + def.setDefault_time_to_live(cfm.params.defaultTimeToLive); + def.setSpeculative_retry(cfm.params.speculativeRetry.toString()); def.setTriggers(triggerDefinitionsToThrift(cfm.getTriggers())); return def; @@ -543,15 +561,80 @@ public class ThriftConversion } @SuppressWarnings("deprecation") - public static Map<String, String> compressionParametersToThrift(CompressionParameters parameters) + public static Map<String, String> compressionParametersToThrift(CompressionParams parameters) { if (!parameters.isEnabled()) return Collections.emptyMap(); Map<String, String> options = new HashMap<>(parameters.getOtherOptions()); Class<? extends ICompressor> klass = parameters.getSstableCompressor().getClass(); - options.put(CompressionParameters.SSTABLE_COMPRESSION, klass.getName()); - options.put(CompressionParameters.CHUNK_LENGTH_KB, parameters.chunkLengthInKB()); + options.put(CompressionParams.SSTABLE_COMPRESSION, klass.getName()); + options.put(CompressionParams.CHUNK_LENGTH_KB, parameters.chunkLengthInKB()); return options; } + + private static String toThrift(CachingParams caching) + { + if (caching.cacheRows() && caching.cacheKeys()) + return "ALL"; + + if (caching.cacheRows()) + return "ROWS_ONLY"; + + if (caching.cacheKeys()) + return "KEYS_ONLY"; + + return "NONE"; + } + + private static CachingParams cachingFromTrhfit(String caching) + { + switch (caching.toUpperCase()) + { + case "ALL": + return CachingParams.CACHE_EVERYTHING; + case "ROWS_ONLY": + return new CachingParams(false, Integer.MAX_VALUE); + case "KEYS_ONLY": + return CachingParams.CACHE_KEYS; + case "NONE": + return CachingParams.CACHE_NOTHING; + default: + throw new ConfigurationException(String.format("Invalid value %s for caching parameter", caching)); + } + } + + private static String toThriftCellsPerRow(CachingParams caching) + { + return caching.cacheAllRows() + ? "ALL" + : String.valueOf(caching.rowsPerPartitionToCache()); + } + + private static int fromThriftCellsPerRow(String value) + { + return "ALL".equals(value) + ? Integer.MAX_VALUE + : Integer.parseInt(value); + } + + public static CachingParams cachingFromThrift(String caching, String cellsPerRow) + { + boolean cacheKeys = true; + int rowsPerPartitionToCache = 0; + + // if we get a caching string from thrift it is legacy, "ALL", "KEYS_ONLY" etc + if (caching != null) + { + CachingParams parsed = cachingFromTrhfit(caching); + cacheKeys = parsed.cacheKeys(); + rowsPerPartitionToCache = parsed.rowsPerPartitionToCache(); + } + + // if we get cells_per_row from thrift, it is either "ALL" or "<number of cells to cache>". + if (cellsPerRow != null && rowsPerPartitionToCache > 0) + rowsPerPartitionToCache = fromThriftCellsPerRow(cellsPerRow); + + return new CachingParams(cacheKeys, rowsPerPartitionToCache); + } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/src/java/org/apache/cassandra/utils/FBUtilities.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/FBUtilities.java b/src/java/org/apache/cassandra/utils/FBUtilities.java index 8ce9455..9569619 100644 --- a/src/java/org/apache/cassandra/utils/FBUtilities.java +++ b/src/java/org/apache/cassandra/utils/FBUtilities.java @@ -19,17 +19,13 @@ package org.apache.cassandra.utils; import java.io.*; import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.math.BigInteger; import java.net.*; import java.nio.ByteBuffer; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.text.NumberFormat; import java.util.*; import java.util.concurrent.*; -import java.util.zip.Adler32; import java.util.zip.Checksum; import com.google.common.base.Joiner; @@ -48,7 +44,7 @@ import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.IVersionedSerializer; -import org.apache.cassandra.io.compress.CompressionParameters; +import org.apache.cassandra.schema.CompressionParams; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.io.util.DataOutputBufferFixed; import org.apache.cassandra.io.util.FileUtils; @@ -604,7 +600,7 @@ public class FBUtilities @Override protected byte[] initialValue() { - return new byte[CompressionParameters.DEFAULT_CHUNK_LENGTH]; + return new byte[CompressionParams.DEFAULT_CHUNK_LENGTH]; } }; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java b/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java index 5063245..fb65e34 100644 --- a/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java +++ b/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java @@ -121,7 +121,7 @@ public class NativeSSTableLoaderClient extends SSTableLoader.Client boolean isCounter = flags.contains(CFMetaData.Flag.COUNTER); boolean isDense = flags.contains(CFMetaData.Flag.DENSE); boolean isCompound = flags.contains(CFMetaData.Flag.COMPOUND); - boolean isMaterializedView = flags.contains(CFMetaData.Flag.MATERIALIZEDVIEW); + boolean isMaterializedView = flags.contains(CFMetaData.Flag.VIEW); String columnsQuery = String.format("SELECT * FROM %s.%s WHERE keyspace_name = ? AND table_name = ?", SchemaKeyspace.NAME, http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java ---------------------------------------------------------------------- diff --git a/test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java b/test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java index 9383410..20faa98 100644 --- a/test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java +++ b/test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java @@ -36,6 +36,7 @@ import org.apache.cassandra.db.partitions.*; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.db.lifecycle.LifecycleTransaction; import org.apache.cassandra.io.sstable.SSTableUtils; +import org.apache.cassandra.schema.CompactionParams; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; @@ -49,13 +50,12 @@ public class LongCompactionsTest @BeforeClass public static void defineSchema() throws ConfigurationException { - Map<String, String> compactionOptions = new HashMap<>(); - compactionOptions.put("tombstone_compaction_interval", "1"); + Map<String, String> compactionOptions = Collections.singletonMap("tombstone_compaction_interval", "1"); SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE1, KeyspaceParams.simple(1), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD) - .compactionStrategyOptions(compactionOptions)); + .compaction(CompactionParams.scts(compactionOptions))); } @Before @@ -123,7 +123,7 @@ public class LongCompactionsTest Thread.sleep(1000); long start = System.nanoTime(); - final int gcBefore = (int) (System.currentTimeMillis() / 1000) - Schema.instance.getCFMetaData(KEYSPACE1, "Standard1").getGcGraceSeconds(); + final int gcBefore = (int) (System.currentTimeMillis() / 1000) - Schema.instance.getCFMetaData(KEYSPACE1, "Standard1").params.gcGraceSeconds; try (LifecycleTransaction txn = store.getTracker().tryModify(sstables, OperationType.COMPACTION)) { assert txn != null : "Cannot markCompacting all sstables"; @@ -146,7 +146,7 @@ public class LongCompactionsTest cfs.clearUnsafe(); final int ROWS_PER_SSTABLE = 10; - final int SSTABLES = cfs.metadata.getMinIndexInterval() * 3 / ROWS_PER_SSTABLE; + final int SSTABLES = cfs.metadata.params.minIndexInterval * 3 / ROWS_PER_SSTABLE; // disable compaction while flushing cfs.disableAutoCompaction(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java ---------------------------------------------------------------------- diff --git a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java index 97fd3b3..96ee072 100644 --- a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java +++ b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java @@ -30,6 +30,7 @@ import org.apache.cassandra.Util; import org.apache.cassandra.UpdateBuilder; import org.apache.cassandra.db.*; import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.schema.CompactionParams; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.FBUtilities; @@ -47,8 +48,7 @@ public class LongLeveledCompactionStrategyTest SchemaLoader.createKeyspace(KEYSPACE1, KeyspaceParams.simple(1), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLVL) - .compactionStrategyClass(LeveledCompactionStrategy.class) - .compactionStrategyOptions(leveledOptions)); + .compaction(CompactionParams.lcs(leveledOptions))); } @Test http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/MockSchema.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/MockSchema.java b/test/unit/org/apache/cassandra/MockSchema.java index 11892a8..249dd8d 100644 --- a/test/unit/org/apache/cassandra/MockSchema.java +++ b/test/unit/org/apache/cassandra/MockSchema.java @@ -26,7 +26,6 @@ import java.util.concurrent.atomic.AtomicInteger; import com.google.common.collect.ImmutableSet; -import org.apache.cassandra.cache.CachingOptions; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.*; @@ -45,6 +44,7 @@ import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.io.util.Memory; import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.io.util.SegmentedFile; +import org.apache.cassandra.schema.CachingParams; import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.AlwaysPresentFilter; @@ -150,7 +150,7 @@ public class MockSchema .addRegularColumn("value", UTF8Type.instance) .withPartitioner(Murmur3Partitioner.instance) .build(); - metadata.caching(CachingOptions.NONE); + metadata.caching(CachingParams.CACHE_NOTHING); return metadata; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/SchemaLoader.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/SchemaLoader.java b/test/unit/org/apache/cassandra/SchemaLoader.java index 59b66fe..ffe0ac8 100644 --- a/test/unit/org/apache/cassandra/SchemaLoader.java +++ b/test/unit/org/apache/cassandra/SchemaLoader.java @@ -24,21 +24,20 @@ import java.util.*; import org.junit.After; import org.junit.BeforeClass; -import org.apache.cassandra.cache.CachingOptions; import org.apache.cassandra.config.*; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.db.*; import org.apache.cassandra.db.commitlog.CommitLog; -import org.apache.cassandra.db.compaction.LeveledCompactionStrategy; import org.apache.cassandra.db.index.PerRowSecondaryIndexTest; import org.apache.cassandra.db.index.SecondaryIndex; import org.apache.cassandra.db.marshal.*; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.gms.Gossiper; -import org.apache.cassandra.io.compress.CompressionParameters; -import org.apache.cassandra.io.compress.SnappyCompressor; +import org.apache.cassandra.schema.CompressionParams; import org.apache.cassandra.io.util.FileUtils; +import org.apache.cassandra.schema.CachingParams; +import org.apache.cassandra.schema.CompactionParams; import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.Tables; @@ -118,7 +117,7 @@ public class SchemaLoader KeyspaceParams.simple(1), Tables.of( // Column Families - standardCFMD(ks1, "Standard1").compactionStrategyOptions(compactionOptions), + standardCFMD(ks1, "Standard1").compaction(CompactionParams.scts(compactionOptions)), standardCFMD(ks1, "Standard2"), standardCFMD(ks1, "Standard3"), standardCFMD(ks1, "Standard4"), @@ -147,15 +146,11 @@ public class SchemaLoader //CFMetaData.Builder.create(ks1, "StandardComposite", false, true, false).withColumnNameComparator(composite).build(), //CFMetaData.Builder.create(ks1, "StandardComposite2", false, true, false).withColumnNameComparator(compositeMaxMin).build(), //CFMetaData.Builder.create(ks1, "StandardDynamicComposite", false, true, false).withColumnNameComparator(dynamicComposite).build(), - standardCFMD(ks1, "StandardLeveled") - .compactionStrategyClass(LeveledCompactionStrategy.class) - .compactionStrategyOptions(leveledOptions), - standardCFMD(ks1, "legacyleveled") - .compactionStrategyClass(LeveledCompactionStrategy.class) - .compactionStrategyOptions(leveledOptions), + standardCFMD(ks1, "StandardLeveled").compaction(CompactionParams.lcs(leveledOptions)), + standardCFMD(ks1, "legacyleveled").compaction(CompactionParams.lcs(leveledOptions)), standardCFMD(ks1, "StandardLowIndexInterval").minIndexInterval(8) - .maxIndexInterval(256) - .caching(CachingOptions.NONE) + .maxIndexInterval(256) + .caching(CachingParams.CACHE_NOTHING) //CFMetaData.Builder.create(ks1, "UUIDKeys").addPartitionKey("key",UUIDType.instance).build(), //CFMetaData.Builder.create(ks1, "MixedTypes").withColumnNameComparator(LongType.instance).addPartitionKey("key", UUIDType.instance).build(), //CFMetaData.Builder.create(ks1, "MixedTypesComposite", false, true, false).withColumnNameComparator(composite).addPartitionKey("key", composite).build(), @@ -213,11 +208,10 @@ public class SchemaLoader schema.add(KeyspaceMetadata.create(ks_rcs, KeyspaceParams.simple(1), Tables.of( - standardCFMD(ks_rcs, "CFWithoutCache").caching(CachingOptions.NONE), - standardCFMD(ks_rcs, "CachedCF").caching(CachingOptions.ALL), + standardCFMD(ks_rcs, "CFWithoutCache").caching(CachingParams.CACHE_NOTHING), + standardCFMD(ks_rcs, "CachedCF").caching(CachingParams.CACHE_EVERYTHING), standardCFMD(ks_rcs, "CachedIntCF"). - caching(new CachingOptions(new CachingOptions.KeyCache(CachingOptions.KeyCache.Type.ALL), - new CachingOptions.RowCache(CachingOptions.RowCache.Type.HEAD, 100)))))); + caching(new CachingParams(true, 100))))); // CounterCacheSpace /*schema.add(KeyspaceMetadata.testMetadata(ks_ccs, @@ -323,7 +317,7 @@ public class SchemaLoader { for (KeyspaceMetadata ksm : schema) for (CFMetaData cfm : ksm.tables) - cfm.compressionParameters(CompressionParameters.snappy()); + cfm.compression(CompressionParams.snappy()); } public static CFMetaData counterCFMD(String ksName, String cfName) @@ -334,7 +328,7 @@ public class SchemaLoader .addRegularColumn("val", CounterColumnType.instance) .addRegularColumn("val2", CounterColumnType.instance) .build() - .compressionParameters(getCompressionParameters()); + .compression(getCompressionParameters()); } public static CFMetaData standardCFMD(String ksName, String cfName) @@ -363,7 +357,7 @@ public class SchemaLoader builder.addRegularColumn("val" + i, AsciiType.instance); return builder.build() - .compressionParameters(getCompressionParameters()); + .compression(getCompressionParameters()); } public static CFMetaData denseCFMD(String ksName, String cfName) @@ -385,7 +379,7 @@ public class SchemaLoader .addClusteringColumn("cols", comp) .addRegularColumn("val", AsciiType.instance) .build() - .compressionParameters(getCompressionParameters()); + .compression(getCompressionParameters()); } // TODO: Fix superCFMD failing on legacy table creation. Seems to be applying composite comparator to partition key @@ -424,7 +418,7 @@ public class SchemaLoader cfm.getColumnDefinition(new ColumnIdentifier("birthdate", true)) .setIndex("birthdate_key_index", IndexType.COMPOSITES, Collections.EMPTY_MAP); - return cfm.compressionParameters(getCompressionParameters()); + return cfm.compression(getCompressionParameters()); } public static CFMetaData keysIndexCFMD(String ksName, String cfName, boolean withIndex) throws ConfigurationException { @@ -440,27 +434,27 @@ public class SchemaLoader cfm.getColumnDefinition(new ColumnIdentifier("birthdate", true)) .setIndex("birthdate_composite_index", IndexType.KEYS, Collections.EMPTY_MAP); - return cfm.compressionParameters(getCompressionParameters()); + return cfm.compression(getCompressionParameters()); } public static CFMetaData jdbcCFMD(String ksName, String cfName, AbstractType comp) { return CFMetaData.Builder.create(ksName, cfName).addPartitionKey("key", BytesType.instance) .build() - .compressionParameters(getCompressionParameters()); + .compression(getCompressionParameters()); } - public static CompressionParameters getCompressionParameters() + public static CompressionParams getCompressionParameters() { return getCompressionParameters(null); } - public static CompressionParameters getCompressionParameters(Integer chunkSize) + public static CompressionParams getCompressionParameters(Integer chunkSize) { if (Boolean.parseBoolean(System.getProperty("cassandra.test.compression", "false"))) - return CompressionParameters.snappy(chunkSize); + return CompressionParams.snappy(chunkSize); - return CompressionParameters.noCompression(); + return CompressionParams.noCompression(); } public static void cleanupAndLeaveDirs() throws IOException http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/config/CFMetaDataTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/config/CFMetaDataTest.java b/test/unit/org/apache/cassandra/config/CFMetaDataTest.java index ced6343..567d516 100644 --- a/test/unit/org/apache/cassandra/config/CFMetaDataTest.java +++ b/test/unit/org/apache/cassandra/config/CFMetaDataTest.java @@ -29,7 +29,7 @@ import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.db.rows.UnfilteredRowIterators; import org.apache.cassandra.db.partitions.PartitionUpdate; import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.io.compress.*; +import org.apache.cassandra.schema.CompressionParams; import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.SchemaKeyspace; @@ -125,7 +125,7 @@ public class CFMetaDataTest // Testing with compression to catch #3558 CFMetaData withCompression = cfm.copy(); - withCompression.compressionParameters(CompressionParameters.snappy(32768)); + withCompression.compression(CompressionParams.snappy(32768)); checkInverses(withCompression); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java index 2c30b70..be3568a 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java @@ -461,7 +461,7 @@ public class SecondaryIndexTest extends CQLTester { String tableName = createTable("CREATE TABLE %s (k int PRIMARY KEY, v int,)"); - execute("ALTER TABLE %s WITH CACHING='ALL'"); + execute("ALTER TABLE %s WITH CACHING = { 'keys': 'ALL', 'rows_per_partition': 'ALL' }"); execute("INSERT INTO %s (k,v) VALUES (0,0)"); execute("INSERT INTO %s (k,v) VALUES (1,1)"); http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/CrcCheckChanceTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/CrcCheckChanceTest.java b/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/CrcCheckChanceTest.java index ff9d88b..8e1f438 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/CrcCheckChanceTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/CrcCheckChanceTest.java @@ -52,9 +52,9 @@ public class CrcCheckChanceTest extends CQLTester ColumnFamilyStore indexCfs = cfs.indexManager.getIndexesBackedByCfs().iterator().next(); cfs.forceBlockingFlush(); - Assert.assertEquals(0.99, cfs.metadata.compressionParameters.getCrcCheckChance()); + Assert.assertEquals(0.99, cfs.metadata.params.compression.getCrcCheckChance()); Assert.assertEquals(0.99, cfs.getLiveSSTables().iterator().next().getCompressionMetadata().parameters.getCrcCheckChance()); - Assert.assertEquals(0.99, indexCfs.metadata.compressionParameters.getCrcCheckChance()); + Assert.assertEquals(0.99, indexCfs.metadata.params.compression.getCrcCheckChance()); Assert.assertEquals(0.99, indexCfs.getLiveSSTables().iterator().next().getCompressionMetadata().parameters.getCrcCheckChance()); //Test for stack overflow @@ -95,9 +95,9 @@ public class CrcCheckChanceTest extends CQLTester //Verify when we alter the value the live sstable readers hold the new one alterTable("ALTER TABLE %s WITH compression = {'sstable_compression': 'LZ4Compressor', 'crc_check_chance': 0.01}"); - Assert.assertEquals( 0.01, cfs.metadata.compressionParameters.getCrcCheckChance()); + Assert.assertEquals( 0.01, cfs.metadata.params.compression.getCrcCheckChance()); Assert.assertEquals( 0.01, cfs.getLiveSSTables().iterator().next().getCompressionMetadata().parameters.getCrcCheckChance()); - Assert.assertEquals( 0.01, indexCfs.metadata.compressionParameters.getCrcCheckChance()); + Assert.assertEquals( 0.01, indexCfs.metadata.params.compression.getCrcCheckChance()); Assert.assertEquals( 0.01, indexCfs.getLiveSSTables().iterator().next().getCompressionMetadata().parameters.getCrcCheckChance()); assertRows(execute("SELECT * FROM %s WHERE p=?", "p1"), @@ -112,9 +112,9 @@ public class CrcCheckChanceTest extends CQLTester //Verify the call used by JMX still works cfs.setCrcCheckChance(0.03); - Assert.assertEquals( 0.03, cfs.metadata.compressionParameters.getCrcCheckChance()); + Assert.assertEquals( 0.03, cfs.metadata.params.compression.getCrcCheckChance()); Assert.assertEquals( 0.03, cfs.getLiveSSTables().iterator().next().getCompressionMetadata().parameters.getCrcCheckChance()); - Assert.assertEquals( 0.03, indexCfs.metadata.compressionParameters.getCrcCheckChance()); + Assert.assertEquals( 0.03, indexCfs.metadata.params.compression.getCrcCheckChance()); Assert.assertEquals( 0.03, indexCfs.getLiveSSTables().iterator().next().getCompressionMetadata().parameters.getCrcCheckChance()); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/OverflowTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/OverflowTest.java b/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/OverflowTest.java index 5b43599..9733eb2 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/OverflowTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/OverflowTest.java @@ -113,8 +113,8 @@ public class OverflowTest extends CQLTester + "AND gc_grace_seconds = 4 " + "AND bloom_filter_fp_chance = 0.01 " + "AND compaction = { 'class' : 'LeveledCompactionStrategy', 'sstable_size_in_mb' : 10 } " - + "AND compression = { 'sstable_compression' : '' } " - + "AND caching = 'all' "); + + "AND compression = { 'enabled': false } " + + "AND caching = { 'keys': 'ALL', 'rows_per_partition': 'ALL' }"); execute("ALTER TABLE %s WITH " + "comment = 'other comment' " @@ -123,8 +123,8 @@ public class OverflowTest extends CQLTester + "AND gc_grace_seconds = 100 " + "AND bloom_filter_fp_chance = 0.1 " + "AND compaction = { 'class': 'SizeTieredCompactionStrategy', 'min_sstable_size' : 42 } " - + "AND compression = { 'sstable_compression' : 'SnappyCompressor' } " - + "AND caching = 'rows_only' "); + + "AND compression = { 'class' : 'SnappyCompressor' } " + + "AND caching = { 'rows_per_partition': 'ALL' }"); } /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/cql3/validation/operations/AlterTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/AlterTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/AlterTest.java index 93f1973..b7f814b 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/operations/AlterTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/operations/AlterTest.java @@ -112,12 +112,12 @@ public class AlterTest extends CQLTester ColumnFamilyStore cfs = Keyspace.open(KEYSPACE).getColumnFamilyStore(tableName); alterTable("ALTER TABLE %s WITH min_index_interval=256 AND max_index_interval=512"); - assertEquals(256, cfs.metadata.getMinIndexInterval()); - assertEquals(512, cfs.metadata.getMaxIndexInterval()); + assertEquals(256, cfs.metadata.params.minIndexInterval); + assertEquals(512, cfs.metadata.params.maxIndexInterval); - alterTable("ALTER TABLE %s WITH caching = 'none'"); - assertEquals(256, cfs.metadata.getMinIndexInterval()); - assertEquals(512, cfs.metadata.getMaxIndexInterval()); + alterTable("ALTER TABLE %s WITH caching = {}"); + assertEquals(256, cfs.metadata.params.minIndexInterval); + assertEquals(512, cfs.metadata.params.maxIndexInterval); } /** @@ -153,7 +153,9 @@ public class AlterTest extends CQLTester execute("CREATE TABLE cf1 (a int PRIMARY KEY, b int) WITH compaction = { 'class' : 'SizeTieredCompactionStrategy', 'min_threshold' : 7 }"); assertRows(execute("SELECT table_name, compaction FROM system_schema.tables WHERE keyspace_name='ks1'"), - row("cf1", map("class", "org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy", "min_threshold", "7"))); + row("cf1", map("class", "org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy", + "min_threshold", "7", + "max_threshold", "32"))); // clean-up execute("DROP KEYSPACE ks1"); http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderedPartitionerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderedPartitionerTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderedPartitionerTest.java index 8a2e1c9..5c587a8 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderedPartitionerTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderedPartitionerTest.java @@ -444,7 +444,7 @@ public class SelectOrderedPartitionerTest extends CQLTester @Test public void testTruncateWithCaching() throws Throwable { - createTable("CREATE TABLE %s (k int PRIMARY KEY, v1 int, v2 int,) WITH CACHING = ALL;"); + createTable("CREATE TABLE %s (k int PRIMARY KEY, v1 int, v2 int) WITH CACHING = { 'keys': 'ALL', 'rows_per_partition': 'ALL' };"); for (int i = 0; i < 3; i++) execute("INSERT INTO %s (k, v1, v2) VALUES (?, ?, ?)", i, i, i * 2); http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/db/HintedHandOffTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java index dfa9e26..e06c95a 100644 --- a/test/unit/org/apache/cassandra/db/HintedHandOffTest.java +++ b/test/unit/org/apache/cassandra/db/HintedHandOffTest.java @@ -31,7 +31,6 @@ import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.cql3.UntypedResultSet; -import org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.marshal.UUIDType; import org.apache.cassandra.exceptions.ConfigurationException; @@ -74,7 +73,6 @@ public class HintedHandOffTest ColumnFamilyStore hintStore = systemKeyspace.getColumnFamilyStore(SystemKeyspace.HINTS); hintStore.clearUnsafe(); hintStore.metadata.gcGraceSeconds(36000); // 10 hours - hintStore.setCompactionStrategyClass(SizeTieredCompactionStrategy.class.getCanonicalName()); hintStore.disableAutoCompaction(); // insert 1 hint http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java index f5a9edf..c20fa46 100644 --- a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java +++ b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java @@ -38,7 +38,6 @@ import org.apache.cassandra.config.*; import org.apache.cassandra.Util; import org.apache.cassandra.UpdateBuilder; import org.apache.cassandra.db.compaction.CompactionManager; -import org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy; import org.apache.cassandra.db.filter.*; import org.apache.cassandra.db.rows.*; import org.apache.cassandra.db.partitions.*; @@ -467,7 +466,6 @@ public class RangeTombstoneTest // remove any existing sstables before starting cfs.truncateBlocking(); cfs.disableAutoCompaction(); - cfs.setCompactionStrategyClass(SizeTieredCompactionStrategy.class.getCanonicalName()); UpdateBuilder builder = UpdateBuilder.create(cfs.metadata, key).withTimestamp(0); for (int i = 0; i < 10; i += 2) @@ -512,7 +510,6 @@ public class RangeTombstoneTest cfs.truncateBlocking(); cfs.disableAutoCompaction(); - cfs.setCompactionStrategyClass(SizeTieredCompactionStrategy.class.getCanonicalName()); ColumnDefinition cd = cfs.metadata.getColumnDefinition(indexedColumnName).copy(); cd.setIndex("test_index", IndexType.CUSTOM, ImmutableMap.of(SecondaryIndex.CUSTOM_INDEX_OPTION_NAME, TestIndex.class.getName())); @@ -549,8 +546,6 @@ public class RangeTombstoneTest cfs.truncateBlocking(); cfs.disableAutoCompaction(); - cfs.setCompactionStrategyClass(SizeTieredCompactionStrategy.class.getCanonicalName()); - ColumnDefinition cd = cfs.metadata.getColumnDefinition(indexedColumnName).copy(); cd.setIndex("test_index", IndexType.CUSTOM, ImmutableMap.of(SecondaryIndex.CUSTOM_INDEX_OPTION_NAME, TestIndex.class.getName())); http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/db/RowCacheCQLTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/RowCacheCQLTest.java b/test/unit/org/apache/cassandra/db/RowCacheCQLTest.java index cb522d6..a3c0e25 100644 --- a/test/unit/org/apache/cassandra/db/RowCacheCQLTest.java +++ b/test/unit/org/apache/cassandra/db/RowCacheCQLTest.java @@ -30,7 +30,7 @@ public class RowCacheCQLTest extends CQLTester public void test7636() throws Throwable { CacheService.instance.setRowCacheCapacityInMB(1); - createTable("CREATE TABLE %s (p1 bigint, c1 int, v int, PRIMARY KEY (p1, c1)) WITH caching = '{\"keys\":\"NONE\", \"rows_per_partition\":\"ALL\"}'"); + createTable("CREATE TABLE %s (p1 bigint, c1 int, v int, PRIMARY KEY (p1, c1)) WITH caching = { 'keys': 'NONE', 'rows_per_partition': 'ALL' }"); execute("INSERT INTO %s (p1, c1, v) VALUES (?, ?, ?)", 123L, 10, 12); assertEmpty(execute("SELECT * FROM %s WHERE p1 = ? and c1 > ?", 123L, 1000)); UntypedResultSet res = execute("SELECT * FROM %s WHERE p1 = ? and c1 > ?", 123L, 0); http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/db/RowCacheTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/RowCacheTest.java b/test/unit/org/apache/cassandra/db/RowCacheTest.java index b89b792..be22b45 100644 --- a/test/unit/org/apache/cassandra/db/RowCacheTest.java +++ b/test/unit/org/apache/cassandra/db/RowCacheTest.java @@ -28,7 +28,6 @@ import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; -import org.apache.cassandra.cache.CachingOptions; import org.apache.cassandra.cache.RowCacheKey; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.Schema; @@ -40,6 +39,7 @@ import org.apache.cassandra.db.partitions.CachedPartition; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.dht.ByteOrderedPartitioner.BytesToken; import org.apache.cassandra.locator.TokenMetadata; +import org.apache.cassandra.schema.CachingParams; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.service.CacheService; import org.apache.cassandra.service.StorageService; @@ -59,10 +59,9 @@ public class RowCacheTest SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE_CACHED, KeyspaceParams.simple(1), - SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHED).caching(CachingOptions.ALL), + SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHED).caching(CachingParams.CACHE_EVERYTHING), SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHEDINT, 1, IntegerType.instance) - .caching(new CachingOptions(new CachingOptions.KeyCache(CachingOptions.KeyCache.Type.ALL), - new CachingOptions.RowCache(CachingOptions.RowCache.Type.HEAD, 100)))); + .caching(new CachingParams(true, 100))); } @AfterClass http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/db/ScrubTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/ScrubTest.java b/test/unit/org/apache/cassandra/db/ScrubTest.java index 25b9cde..07bd22a 100644 --- a/test/unit/org/apache/cassandra/db/ScrubTest.java +++ b/test/unit/org/apache/cassandra/db/ScrubTest.java @@ -91,7 +91,7 @@ public class ScrubTest SchemaLoader.standardCFMD(KEYSPACE, CF2), SchemaLoader.standardCFMD(KEYSPACE, CF3), SchemaLoader.counterCFMD(KEYSPACE, COUNTER_CF) - .compressionParameters(SchemaLoader.getCompressionParameters(COMPRESSION_CHUNK_LENGTH)), + .compression(SchemaLoader.getCompressionParameters(COMPRESSION_CHUNK_LENGTH)), SchemaLoader.standardCFMD(KEYSPACE, CF_UUID, 0, UUIDType.instance), SchemaLoader.keysIndexCFMD(KEYSPACE, CF_INDEX1, true), SchemaLoader.compositeIndexCFMD(KEYSPACE, CF_INDEX2, true), http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/db/VerifyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/VerifyTest.java b/test/unit/org/apache/cassandra/db/VerifyTest.java index f460cb5..3bd4a47 100644 --- a/test/unit/org/apache/cassandra/db/VerifyTest.java +++ b/test/unit/org/apache/cassandra/db/VerifyTest.java @@ -29,11 +29,11 @@ import org.apache.cassandra.db.marshal.UUIDType; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.WriteTimeoutException; import org.apache.cassandra.io.FSWriteError; -import org.apache.cassandra.io.compress.*; import org.apache.cassandra.io.sstable.Component; import org.apache.cassandra.io.sstable.CorruptSSTableException; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.util.FileUtils; +import org.apache.cassandra.schema.CompressionParams; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.commons.lang3.StringUtils; @@ -70,19 +70,19 @@ public class VerifyTest @BeforeClass public static void defineSchema() throws ConfigurationException { - CompressionParameters compressionParameters = CompressionParameters.snappy(32768); + CompressionParams compressionParameters = CompressionParams.snappy(32768); SchemaLoader.loadSchema(); SchemaLoader.createKeyspace(KEYSPACE, KeyspaceParams.simple(1), - SchemaLoader.standardCFMD(KEYSPACE, CF).compressionParameters(compressionParameters), - SchemaLoader.standardCFMD(KEYSPACE, CF2).compressionParameters(compressionParameters), + SchemaLoader.standardCFMD(KEYSPACE, CF).compression(compressionParameters), + SchemaLoader.standardCFMD(KEYSPACE, CF2).compression(compressionParameters), SchemaLoader.standardCFMD(KEYSPACE, CF3), SchemaLoader.standardCFMD(KEYSPACE, CF4), SchemaLoader.standardCFMD(KEYSPACE, CORRUPT_CF), SchemaLoader.standardCFMD(KEYSPACE, CORRUPT_CF2), - SchemaLoader.counterCFMD(KEYSPACE, COUNTER_CF).compressionParameters(compressionParameters), - SchemaLoader.counterCFMD(KEYSPACE, COUNTER_CF2).compressionParameters(compressionParameters), + SchemaLoader.counterCFMD(KEYSPACE, COUNTER_CF).compression(compressionParameters), + SchemaLoader.counterCFMD(KEYSPACE, COUNTER_CF2).compression(compressionParameters), SchemaLoader.counterCFMD(KEYSPACE, COUNTER_CF3), SchemaLoader.counterCFMD(KEYSPACE, COUNTER_CF4), SchemaLoader.counterCFMD(KEYSPACE, CORRUPTCOUNTER_CF), http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java index 7fd3943..81693c7 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java @@ -94,7 +94,7 @@ public class CommitLogUpgradeTest .addClusteringColumn("col", AsciiType.instance) .addRegularColumn("val", BytesType.instance) .build() - .compressionParameters(SchemaLoader.getCompressionParameters()); + .compression(SchemaLoader.getCompressionParameters()); SchemaLoader.loadSchema(); SchemaLoader.createKeyspace(KEYSPACE, KeyspaceParams.simple(1), http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java index 73baeeb..6dc5f53 100644 --- a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java @@ -209,7 +209,6 @@ public class AntiCompactionTest { Keyspace keyspace = Keyspace.open(KEYSPACE1); ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF); - store.setCompactionStrategyClass(compactionStrategy); store.disableAutoCompaction(); for (int table = 0; table < 10; table++) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java index c71463b..19d2347 100644 --- a/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java @@ -96,9 +96,7 @@ public class BlacklistingCompactionsTest final ColumnFamilyStore cfs = keyspace.getColumnFamilyStore("Standard1"); final int ROWS_PER_SSTABLE = 10; - final int SSTABLES = cfs.metadata.getMinIndexInterval() * 2 / ROWS_PER_SSTABLE; - - cfs.setCompactionStrategyClass(compactionStrategy); + final int SSTABLES = cfs.metadata.params.minIndexInterval * 2 / ROWS_PER_SSTABLE; // disable compaction while flushing cfs.disableAutoCompaction(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java index f82a1ba..22f3c6b 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java @@ -26,7 +26,6 @@ import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; -import org.apache.cassandra.cache.CachingOptions; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; @@ -36,13 +35,13 @@ import org.apache.cassandra.db.partitions.ArrayBackedPartition; import org.apache.cassandra.db.partitions.PartitionUpdate; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.schema.CachingParams; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; -import static org.apache.cassandra.Util.dk; import static org.junit.Assert.*; - +import static org.apache.cassandra.Util.dk; public class CompactionsPurgeTest { @@ -68,7 +67,7 @@ public class CompactionsPurgeTest SchemaLoader.standardCFMD(KEYSPACE2, CF_STANDARD1)); SchemaLoader.createKeyspace(KEYSPACE_CACHED, KeyspaceParams.simple(1), - SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHED).caching(CachingOptions.ALL)); + SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHED).caching(CachingParams.CACHE_EVERYTHING)); SchemaLoader.createKeyspace(KEYSPACE_CQL, KeyspaceParams.simple(1), CFMetaData.compile("CREATE TABLE " + CF_CQL + " (" http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java index 700bc3e..091bc03 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java @@ -35,6 +35,7 @@ import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.dht.*; import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.schema.CompactionParams; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; @@ -63,14 +64,17 @@ public class CompactionsTest SchemaLoader.createKeyspace(KEYSPACE1, KeyspaceParams.simple(1), - SchemaLoader.denseCFMD(KEYSPACE1, CF_DENSE1).compactionStrategyOptions(compactionOptions), - SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1).compactionStrategyOptions(compactionOptions), + SchemaLoader.denseCFMD(KEYSPACE1, CF_DENSE1) + .compaction(CompactionParams.scts(compactionOptions)), + SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1) + .compaction(CompactionParams.scts(compactionOptions)), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD2), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD3), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD4), SchemaLoader.superCFMD(KEYSPACE1, CF_SUPER1, AsciiType.instance), SchemaLoader.superCFMD(KEYSPACE1, CF_SUPER5, AsciiType.instance), - SchemaLoader.superCFMD(KEYSPACE1, CF_SUPERGC, AsciiType.instance).gcGraceSeconds(0)); + SchemaLoader.superCFMD(KEYSPACE1, CF_SUPERGC, AsciiType.instance) + .gcGraceSeconds(0)); } public ColumnFamilyStore testSingleSSTableCompaction(String strategyClassName) throws Exception @@ -79,7 +83,6 @@ public class CompactionsTest ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_DENSE1); store.clearUnsafe(); store.metadata.gcGraceSeconds(1); - store.setCompactionStrategyClass(strategyClassName); // disable compaction while flushing store.disableAutoCompaction(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java index a589b0f..c3be08a 100644 --- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java @@ -20,10 +20,9 @@ package org.apache.cassandra.db.compaction; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Collection; -import java.util.HashMap; +import java.util.Collections; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Random; import java.util.UUID; @@ -48,6 +47,7 @@ import org.apache.cassandra.notifications.SSTableAddedNotification; import org.apache.cassandra.notifications.SSTableRepairStatusChanged; import org.apache.cassandra.repair.RepairJobDesc; import org.apache.cassandra.repair.Validator; +import org.apache.cassandra.schema.CompactionParams; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.service.ActiveRepairService; import org.apache.cassandra.utils.FBUtilities; @@ -67,14 +67,11 @@ public class LeveledCompactionStrategyTest @BeforeClass public static void defineSchema() throws ConfigurationException { - Map<String, String> leveledOptions = new HashMap<>(); - leveledOptions.put("sstable_size_in_mb", "1"); SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE1, KeyspaceParams.simple(1), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDDLEVELED) - .compactionStrategyClass(LeveledCompactionStrategy.class) - .compactionStrategyOptions(leveledOptions)); + .compaction(CompactionParams.lcs(Collections.singletonMap("sstable_size_in_mb", "1")))); } @Before http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/db/compaction/OneCompactionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/OneCompactionTest.java b/test/unit/org/apache/cassandra/db/compaction/OneCompactionTest.java index fa3e6e3..f55bf52 100644 --- a/test/unit/org/apache/cassandra/db/compaction/OneCompactionTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/OneCompactionTest.java @@ -17,9 +17,8 @@ */ package org.apache.cassandra.db.compaction; -import java.util.HashMap; +import java.util.Collections; import java.util.HashSet; -import java.util.Map; import java.util.Set; import org.junit.BeforeClass; @@ -31,6 +30,7 @@ import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.RowUpdateBuilder; import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.schema.CompactionParams; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.ByteBufferUtil; @@ -46,12 +46,11 @@ public class OneCompactionTest @BeforeClass public static void defineSchema() throws ConfigurationException { - Map<String, String> leveledOptions = new HashMap<>(); - leveledOptions.put("sstable_size_in_mb", "1"); SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE1, KeyspaceParams.simple(1), - SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1).compactionStrategyOptions(leveledOptions), + SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1) + .compaction(CompactionParams.lcs(Collections.singletonMap("sstable_size_in_mb", "1"))), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD2)); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java index 3cefd49..f4dbea8 100644 --- a/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java @@ -53,13 +53,10 @@ public class SizeTieredCompactionStrategyTest @BeforeClass public static void defineSchema() throws ConfigurationException { - Map<String, String> leveledOptions = new HashMap<>(); - leveledOptions.put("sstable_size_in_mb", "1"); SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE1, KeyspaceParams.simple(1), - SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1) - .compactionStrategyOptions(leveledOptions)); + SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1)); } @Test http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/db/view/MaterializedViewUtilsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/view/MaterializedViewUtilsTest.java b/test/unit/org/apache/cassandra/db/view/MaterializedViewUtilsTest.java index 299c911..2544714 100644 --- a/test/unit/org/apache/cassandra/db/view/MaterializedViewUtilsTest.java +++ b/test/unit/org/apache/cassandra/db/view/MaterializedViewUtilsTest.java @@ -1,4 +1,3 @@ - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -38,6 +37,7 @@ import org.apache.cassandra.locator.PropertyFileSnitch; import org.apache.cassandra.locator.TokenMetadata; import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.ReplicationParams; import org.apache.cassandra.service.StorageService; public class MaterializedViewUtilsTest @@ -65,7 +65,7 @@ public class MaterializedViewUtilsTest metadata.updateNormalToken(new StringToken("D"), InetAddress.getByName("127.0.0.5")); Map<String, String> replicationMap = new HashMap<>(); - replicationMap.put(KeyspaceParams.Replication.CLASS, NetworkTopologyStrategy.class.getName()); + replicationMap.put(ReplicationParams.CLASS, NetworkTopologyStrategy.class.getName()); replicationMap.put("DC1", "1"); replicationMap.put("DC2", "1"); @@ -97,7 +97,7 @@ public class MaterializedViewUtilsTest metadata.updateNormalToken(new StringToken("D"), InetAddress.getByName("127.0.0.5")); Map<String, String> replicationMap = new HashMap<>(); - replicationMap.put(KeyspaceParams.Replication.CLASS, NetworkTopologyStrategy.class.getName()); + replicationMap.put(ReplicationParams.CLASS, NetworkTopologyStrategy.class.getName()); replicationMap.put("DC1", "2"); replicationMap.put("DC2", "2"); http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java b/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java index 3966342..cc76a9e 100644 --- a/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java +++ b/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java @@ -21,7 +21,6 @@ package org.apache.cassandra.io.compress; import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; -import java.util.Collections; import java.util.Random; import org.junit.Test; @@ -35,6 +34,7 @@ import org.apache.cassandra.io.util.ChannelProxy; import org.apache.cassandra.io.util.FileMark; import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.io.util.SequentialWriter; +import org.apache.cassandra.schema.CompressionParams; import org.apache.cassandra.utils.SyncUtil; import static org.junit.Assert.assertEquals; @@ -47,7 +47,7 @@ public class CompressedRandomAccessReaderTest { // test reset in current buffer or previous one testResetAndTruncate(File.createTempFile("normal", "1"), false, 10); - testResetAndTruncate(File.createTempFile("normal", "2"), false, CompressionParameters.DEFAULT_CHUNK_LENGTH); + testResetAndTruncate(File.createTempFile("normal", "2"), false, CompressionParams.DEFAULT_CHUNK_LENGTH); } @Test @@ -55,7 +55,7 @@ public class CompressedRandomAccessReaderTest { // test reset in current buffer or previous one testResetAndTruncate(File.createTempFile("compressed", "1"), true, 10); - testResetAndTruncate(File.createTempFile("compressed", "2"), true, CompressionParameters.DEFAULT_CHUNK_LENGTH); + testResetAndTruncate(File.createTempFile("compressed", "2"), true, CompressionParams.DEFAULT_CHUNK_LENGTH); } @Test @@ -68,7 +68,7 @@ public class CompressedRandomAccessReaderTest { MetadataCollector sstableMetadataCollector = new MetadataCollector(new ClusteringComparator(BytesType.instance)); - CompressedSequentialWriter writer = new CompressedSequentialWriter(f, filename + ".metadata", CompressionParameters.snappy(32), sstableMetadataCollector); + CompressedSequentialWriter writer = new CompressedSequentialWriter(f, filename + ".metadata", CompressionParams.snappy(32), sstableMetadataCollector); for (int i = 0; i < 20; i++) writer.write("x".getBytes()); @@ -110,7 +110,7 @@ public class CompressedRandomAccessReaderTest { MetadataCollector sstableMetadataCollector = new MetadataCollector(new ClusteringComparator(BytesType.instance)).replayPosition(null); SequentialWriter writer = compressed - ? new CompressedSequentialWriter(f, filename + ".metadata", CompressionParameters.snappy(), sstableMetadataCollector) + ? new CompressedSequentialWriter(f, filename + ".metadata", CompressionParams.snappy(), sstableMetadataCollector) : SequentialWriter.open(f); writer.write("The quick ".getBytes()); @@ -162,7 +162,7 @@ public class CompressedRandomAccessReaderTest metadata.deleteOnExit(); MetadataCollector sstableMetadataCollector = new MetadataCollector(new ClusteringComparator(BytesType.instance)).replayPosition(null); - try (SequentialWriter writer = new CompressedSequentialWriter(file, metadata.getPath(), CompressionParameters.snappy(), sstableMetadataCollector)) + try (SequentialWriter writer = new CompressedSequentialWriter(file, metadata.getPath(), CompressionParams.snappy(), sstableMetadataCollector)) { writer.write(CONTENT.getBytes()); writer.finish(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java b/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java index e5a7499..db99317 100644 --- a/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java +++ b/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java @@ -40,10 +40,11 @@ import org.apache.cassandra.io.util.ChannelProxy; import org.apache.cassandra.io.util.FileMark; import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.io.util.SequentialWriterTest; +import org.apache.cassandra.schema.CompressionParams; public class CompressedSequentialWriterTest extends SequentialWriterTest { - private CompressionParameters compressionParameters; + private CompressionParams compressionParameters; private void runTests(String testName) throws IOException { @@ -51,30 +52,30 @@ public class CompressedSequentialWriterTest extends SequentialWriterTest testWrite(File.createTempFile(testName + "_small", "1"), 25); // Test to confirm pipeline w/chunk-aligned data writes works - testWrite(File.createTempFile(testName + "_chunkAligned", "1"), CompressionParameters.DEFAULT_CHUNK_LENGTH); + testWrite(File.createTempFile(testName + "_chunkAligned", "1"), CompressionParams.DEFAULT_CHUNK_LENGTH); // Test to confirm pipeline on non-chunk boundaries works - testWrite(File.createTempFile(testName + "_large", "1"), CompressionParameters.DEFAULT_CHUNK_LENGTH * 3 + 100); + testWrite(File.createTempFile(testName + "_large", "1"), CompressionParams.DEFAULT_CHUNK_LENGTH * 3 + 100); } @Test public void testLZ4Writer() throws IOException { - compressionParameters = CompressionParameters.lz4(); + compressionParameters = CompressionParams.lz4(); runTests("LZ4"); } @Test public void testDeflateWriter() throws IOException { - compressionParameters = CompressionParameters.deflate(); + compressionParameters = CompressionParams.deflate(); runTests("Deflate"); } @Test public void testSnappyWriter() throws IOException { - compressionParameters = CompressionParameters.snappy(); + compressionParameters = CompressionParams.snappy(); runTests("Snappy"); } @@ -104,7 +105,7 @@ public class CompressedSequentialWriterTest extends SequentialWriterTest FileMark mark = writer.mark(); // Write enough garbage to transition chunk - for (int i = 0; i < CompressionParameters.DEFAULT_CHUNK_LENGTH; i++) + for (int i = 0; i < CompressionParams.DEFAULT_CHUNK_LENGTH; i++) { writer.write((byte)i); } @@ -177,7 +178,7 @@ public class CompressedSequentialWriterTest extends SequentialWriterTest { this(file, offsetsFile, new CompressedSequentialWriter(file, offsetsFile.getPath(), - CompressionParameters.lz4(BUFFER_SIZE), + CompressionParams.lz4(BUFFER_SIZE), new MetadataCollector(new ClusteringComparator(UTF8Type.instance)))); }
