Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 6932bd879 -> b31845c4a
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java index 5f11f51..5493edb 100644 --- a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java @@ -39,7 +39,6 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.OrderedJUnit4ClassRunner; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; -import org.apache.cassandra.cache.CachingOptions; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.RowUpdateBuilder; @@ -49,6 +48,7 @@ import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.db.lifecycle.LifecycleTransaction; import org.apache.cassandra.metrics.RestorableMeter; +import org.apache.cassandra.schema.CachingParams; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.utils.ByteBufferUtil; @@ -87,12 +87,11 @@ public class IndexSummaryManagerTest SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLOWiINTERVAL) .minIndexInterval(8) .maxIndexInterval(256) - .caching(CachingOptions.NONE), + .caching(CachingParams.CACHE_NOTHING), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDRACE) .minIndexInterval(8) .maxIndexInterval(256) - .caching(CachingOptions.NONE) - ); + .caching(CachingParams.CACHE_NOTHING)); } @Before @@ -102,8 +101,8 @@ public class IndexSummaryManagerTest String cfname = CF_STANDARDLOWiINTERVAL; // index interval of 8, no key caching Keyspace keyspace = Keyspace.open(ksname); ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfname); - originalMinIndexInterval = cfs.metadata.getMinIndexInterval(); - originalMaxIndexInterval = cfs.metadata.getMaxIndexInterval(); + originalMinIndexInterval = cfs.metadata.params.minIndexInterval; + originalMaxIndexInterval = cfs.metadata.params.maxIndexInterval; originalCapacity = IndexSummaryManager.instance.getMemoryPoolCapacityInMB(); } @@ -215,15 +214,15 @@ public class IndexSummaryManagerTest sstable.overrideReadMeter(new RestorableMeter(100.0, 100.0)); for (SSTableReader sstable : sstables) - assertEquals(cfs.metadata.getMinIndexInterval(), sstable.getEffectiveIndexInterval(), 0.001); + assertEquals(cfs.metadata.params.minIndexInterval, sstable.getEffectiveIndexInterval(), 0.001); // double the min_index_interval cfs.metadata.minIndexInterval(originalMinIndexInterval * 2); IndexSummaryManager.instance.redistributeSummaries(); for (SSTableReader sstable : cfs.getLiveSSTables()) { - assertEquals(cfs.metadata.getMinIndexInterval(), sstable.getEffectiveIndexInterval(), 0.001); - assertEquals(numRows / cfs.metadata.getMinIndexInterval(), sstable.getIndexSummarySize()); + assertEquals(cfs.metadata.params.minIndexInterval, sstable.getEffectiveIndexInterval(), 0.001); + assertEquals(numRows / cfs.metadata.params.minIndexInterval, sstable.getIndexSummarySize()); } // return min_index_interval to its original value @@ -231,8 +230,8 @@ public class IndexSummaryManagerTest IndexSummaryManager.instance.redistributeSummaries(); for (SSTableReader sstable : cfs.getLiveSSTables()) { - assertEquals(cfs.metadata.getMinIndexInterval(), sstable.getEffectiveIndexInterval(), 0.001); - assertEquals(numRows / cfs.metadata.getMinIndexInterval(), sstable.getIndexSummarySize()); + assertEquals(cfs.metadata.params.minIndexInterval, sstable.getEffectiveIndexInterval(), 0.001); + assertEquals(numRows / cfs.metadata.params.minIndexInterval, sstable.getIndexSummarySize()); } // halve the min_index_interval, but constrain the available space to exactly what we have now; as a result, @@ -281,7 +280,7 @@ public class IndexSummaryManagerTest redistributeSummaries(Collections.EMPTY_LIST, of(cfs.metadata.cfId, txn), 10); } sstable = cfs.getLiveSSTables().iterator().next(); - assertEquals(cfs.metadata.getMinIndexInterval(), sstable.getEffectiveIndexInterval(), 0.001); + assertEquals(cfs.metadata.params.minIndexInterval, sstable.getEffectiveIndexInterval(), 0.001); } @Test @@ -305,10 +304,10 @@ public class IndexSummaryManagerTest } sstables = new ArrayList<>(cfs.getLiveSSTables()); for (SSTableReader sstable : sstables) - assertEquals(cfs.metadata.getMaxIndexInterval(), sstable.getEffectiveIndexInterval(), 0.01); + assertEquals(cfs.metadata.params.maxIndexInterval, sstable.getEffectiveIndexInterval(), 0.01); // halve the max_index_interval - cfs.metadata.maxIndexInterval(cfs.metadata.getMaxIndexInterval() / 2); + cfs.metadata.maxIndexInterval(cfs.metadata.params.maxIndexInterval / 2); try (LifecycleTransaction txn = cfs.getTracker().tryModify(sstables, OperationType.UNKNOWN)) { redistributeSummaries(Collections.EMPTY_LIST, of(cfs.metadata.cfId, txn), 1); @@ -316,20 +315,20 @@ public class IndexSummaryManagerTest sstables = new ArrayList<>(cfs.getLiveSSTables()); for (SSTableReader sstable : sstables) { - assertEquals(cfs.metadata.getMaxIndexInterval(), sstable.getEffectiveIndexInterval(), 0.01); - assertEquals(numRows / cfs.metadata.getMaxIndexInterval(), sstable.getIndexSummarySize()); + assertEquals(cfs.metadata.params.maxIndexInterval, sstable.getEffectiveIndexInterval(), 0.01); + assertEquals(numRows / cfs.metadata.params.maxIndexInterval, sstable.getIndexSummarySize()); } // return max_index_interval to its original value - cfs.metadata.maxIndexInterval(cfs.metadata.getMaxIndexInterval() * 2); + cfs.metadata.maxIndexInterval(cfs.metadata.params.maxIndexInterval * 2); try (LifecycleTransaction txn = cfs.getTracker().tryModify(sstables, OperationType.UNKNOWN)) { redistributeSummaries(Collections.EMPTY_LIST, of(cfs.metadata.cfId, txn), 1); } for (SSTableReader sstable : cfs.getLiveSSTables()) { - assertEquals(cfs.metadata.getMaxIndexInterval(), sstable.getEffectiveIndexInterval(), 0.01); - assertEquals(numRows / cfs.metadata.getMaxIndexInterval(), sstable.getIndexSummarySize()); + assertEquals(cfs.metadata.params.maxIndexInterval, sstable.getEffectiveIndexInterval(), 0.01); + assertEquals(numRows / cfs.metadata.params.maxIndexInterval, sstable.getIndexSummarySize()); } } @@ -344,7 +343,7 @@ public class IndexSummaryManagerTest int numRows = 256; createSSTables(ksname, cfname, numSSTables, numRows); - int minSamplingLevel = (BASE_SAMPLING_LEVEL * cfs.metadata.getMinIndexInterval()) / cfs.metadata.getMaxIndexInterval(); + int minSamplingLevel = (BASE_SAMPLING_LEVEL * cfs.metadata.params.minIndexInterval) / cfs.metadata.params.maxIndexInterval; List<SSTableReader> sstables = new ArrayList<>(cfs.getLiveSSTables()); for (SSTableReader sstable : sstables) @@ -520,7 +519,7 @@ public class IndexSummaryManagerTest { sstable = sstable.cloneWithNewSummarySamplingLevel(cfs, samplingLevel); assertEquals(samplingLevel, sstable.getIndexSummarySamplingLevel()); - int expectedSize = (numRows * samplingLevel) / (sstable.metadata.getMinIndexInterval() * BASE_SAMPLING_LEVEL); + int expectedSize = (numRows * samplingLevel) / (sstable.metadata.params.minIndexInterval * BASE_SAMPLING_LEVEL); assertEquals(expectedSize, sstable.getIndexSummarySize(), 1); txn.update(sstable, true); txn.checkpoint(); @@ -575,20 +574,20 @@ public class IndexSummaryManagerTest cfs.forceBlockingFlush(); } - assertTrue(manager.getAverageIndexInterval() >= cfs.metadata.getMinIndexInterval()); + assertTrue(manager.getAverageIndexInterval() >= cfs.metadata.params.minIndexInterval); Map<String, Integer> intervals = manager.getIndexIntervals(); for (Map.Entry<String, Integer> entry : intervals.entrySet()) if (entry.getKey().contains(CF_STANDARDLOWiINTERVAL)) - assertEquals(cfs.metadata.getMinIndexInterval(), entry.getValue(), 0.001); + assertEquals(cfs.metadata.params.minIndexInterval, entry.getValue(), 0.001); manager.setMemoryPoolCapacityInMB(0); manager.redistributeSummaries(); - assertTrue(manager.getAverageIndexInterval() > cfs.metadata.getMinIndexInterval()); + assertTrue(manager.getAverageIndexInterval() > cfs.metadata.params.minIndexInterval); intervals = manager.getIndexIntervals(); for (Map.Entry<String, Integer> entry : intervals.entrySet()) { if (entry.getKey().contains(CF_STANDARDLOWiINTERVAL)) - assertTrue(entry.getValue() >= cfs.metadata.getMinIndexInterval()); + assertTrue(entry.getValue() >= cfs.metadata.params.minIndexInterval); } } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java index 2fe5ef2..6f92bd3 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java @@ -38,7 +38,6 @@ import org.junit.runner.RunWith; import org.apache.cassandra.OrderedJUnit4ClassRunner; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; -import org.apache.cassandra.cache.CachingOptions; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.db.BufferDecoratedKey; @@ -58,6 +57,7 @@ import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.util.FileDataInput; import org.apache.cassandra.io.util.MmappedSegmentedFile; import org.apache.cassandra.io.util.SegmentedFile; +import org.apache.cassandra.schema.CachingParams; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.service.CacheService; import org.apache.cassandra.utils.ByteBufferUtil; @@ -95,7 +95,7 @@ public class SSTableReaderTest SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLOWINDEXINTERVAL) .minIndexInterval(8) .maxIndexInterval(256) - .caching(CachingOptions.NONE)); + .caching(CachingParams.CACHE_NOTHING)); } @Test @@ -342,7 +342,7 @@ public class SSTableReaderTest DecoratedKey firstKey = null, lastKey = null; long timestamp = System.currentTimeMillis(); - for (int i = 0; i < store.metadata.getMinIndexInterval(); i++) + for (int i = 0; i < store.metadata.params.minIndexInterval; i++) { DecoratedKey key = Util.dk(String.valueOf(i)); if (firstKey == null) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/schema/DefsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/schema/DefsTest.java b/test/unit/org/apache/cassandra/schema/DefsTest.java index df78cef..680c016 100644 --- a/test/unit/org/apache/cassandra/schema/DefsTest.java +++ b/test/unit/org/apache/cassandra/schema/DefsTest.java @@ -24,6 +24,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Supplier; +import com.google.common.collect.ImmutableMap; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -105,8 +106,8 @@ public class DefsTest cfm.comment("No comment") .readRepairChance(0.5) .gcGraceSeconds(100000) - .minCompactionThreshold(500) - .maxCompactionThreshold(500); + .compaction(CompactionParams.scts(ImmutableMap.of("min_threshold", "500", + "max_threshold", "500"))); // we'll be adding this one later. make sure it's not already there. assertNull(cfm.getColumnDefinition(ByteBuffer.wrap(new byte[]{ 5 }))); @@ -158,22 +159,6 @@ public class DefsTest } @Test - public void addNewCfWithNullComment() throws ConfigurationException - { - final String ks = KEYSPACE1; - final String cf = "BrandNewCfWithNull"; - KeyspaceMetadata original = Schema.instance.getKSMetaData(ks); - - CFMetaData newCf = addTestTable(original.name, cf, null); - - assertFalse(Schema.instance.getKSMetaData(ks).tables.get(newCf.cfName).isPresent()); - MigrationManager.announceNewColumnFamily(newCf); - - assertTrue(Schema.instance.getKSMetaData(ks).tables.get(newCf.cfName).isPresent()); - assertEquals(newCf, Schema.instance.getKSMetaData(ks).tables.get(newCf.cfName).get()); - } - - @Test public void addNewTable() throws ConfigurationException { final String ksName = KEYSPACE1; @@ -402,7 +387,7 @@ public class DefsTest } Map<String, String> replicationMap = new HashMap<>(); - replicationMap.put(KeyspaceParams.Replication.CLASS, OldNetworkTopologyStrategy.class.getName()); + replicationMap.put(ReplicationParams.CLASS, OldNetworkTopologyStrategy.class.getName()); replicationMap.put("replication_factor", "1"); KeyspaceMetadata newKs = KeyspaceMetadata.create(cf.ksName, KeyspaceParams.create(true, replicationMap)); http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/schema/LegacySchemaMigratorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/schema/LegacySchemaMigratorTest.java b/test/unit/org/apache/cassandra/schema/LegacySchemaMigratorTest.java index 82922e6..1b0fb12 100644 --- a/test/unit/org/apache/cassandra/schema/LegacySchemaMigratorTest.java +++ b/test/unit/org/apache/cassandra/schema/LegacySchemaMigratorTest.java @@ -26,13 +26,11 @@ import com.google.common.collect.ImmutableList; import org.junit.Test; import org.apache.cassandra.SchemaLoader; -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.cql3.functions.*; import org.apache.cassandra.db.*; -import org.apache.cassandra.db.compaction.LeveledCompactionStrategy; import org.apache.cassandra.db.marshal.*; import org.apache.cassandra.thrift.ThriftConversion; @@ -122,13 +120,14 @@ public class LegacySchemaMigratorTest // Make it easy to test compaction Map<String, String> compactionOptions = new HashMap<>(); compactionOptions.put("tombstone_compaction_interval", "1"); + Map<String, String> leveledOptions = new HashMap<>(); leveledOptions.put("sstable_size_in_mb", "1"); keyspaces.add(KeyspaceMetadata.create(ks1, KeyspaceParams.simple(1), Tables.of(SchemaLoader.standardCFMD(ks1, "Standard1") - .compactionStrategyOptions(compactionOptions), + .compaction(CompactionParams.scts(compactionOptions)), SchemaLoader.standardCFMD(ks1, "StandardGCGS0").gcGraceSeconds(0), SchemaLoader.standardCFMD(ks1, "StandardLong1"), SchemaLoader.superCFMD(ks1, "Super1", LongType.instance), @@ -145,15 +144,13 @@ public class LegacySchemaMigratorTest SchemaLoader.jdbcCFMD(ks1, "JdbcBytes", BytesType.instance), SchemaLoader.jdbcCFMD(ks1, "JdbcAscii", AsciiType.instance), SchemaLoader.standardCFMD(ks1, "StandardLeveled") - .compactionStrategyClass(LeveledCompactionStrategy.class) - .compactionStrategyOptions(leveledOptions), + .compaction(CompactionParams.lcs(leveledOptions)), SchemaLoader.standardCFMD(ks1, "legacyleveled") - .compactionStrategyClass(LeveledCompactionStrategy.class) - .compactionStrategyOptions(leveledOptions), + .compaction(CompactionParams.lcs(leveledOptions)), SchemaLoader.standardCFMD(ks1, "StandardLowIndexInterval") .minIndexInterval(8) .maxIndexInterval(256) - .caching(CachingOptions.NONE)))); + .caching(CachingParams.CACHE_NOTHING)))); // Keyspace 2 keyspaces.add(KeyspaceMetadata.create(ks2, @@ -184,6 +181,7 @@ public class LegacySchemaMigratorTest keyspaces.add(KeyspaceMetadata.create(ks5, KeyspaceParams.simple(2), Tables.of(SchemaLoader.standardCFMD(ks5, "Standard1")))); + // Keyspace 6 keyspaces.add(KeyspaceMetadata.create(ks6, KeyspaceParams.simple(1), @@ -193,13 +191,11 @@ public class LegacySchemaMigratorTest keyspaces.add(KeyspaceMetadata.create(ks_rcs, KeyspaceParams.simple(1), Tables.of(SchemaLoader.standardCFMD(ks_rcs, "CFWithoutCache") - .caching(CachingOptions.NONE), + .caching(CachingParams.CACHE_NOTHING), SchemaLoader.standardCFMD(ks_rcs, "CachedCF") - .caching(CachingOptions.ALL), + .caching(CachingParams.CACHE_EVERYTHING), SchemaLoader.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))))); keyspaces.add(KeyspaceMetadata.create(ks_nocommit, KeyspaceParams.simpleTransient(1), @@ -423,23 +419,23 @@ public class LegacySchemaMigratorTest adder.add("comparator", LegacyLayout.makeLegacyComparator(table).toString()); } - adder.add("bloom_filter_fp_chance", table.getBloomFilterFpChance()) - .add("caching", table.getCaching().toString()) - .add("comment", table.getComment()) - .add("compaction_strategy_class", table.compactionStrategyClass.getName()) - .add("compaction_strategy_options", json(table.compactionStrategyOptions)) - .add("compression_parameters", json(ThriftConversion.compressionParametersToThrift(table.compressionParameters))) - .add("default_time_to_live", table.getDefaultTimeToLive()) - .add("gc_grace_seconds", table.getGcGraceSeconds()) + adder.add("bloom_filter_fp_chance", table.params.bloomFilterFpChance) + .add("caching", cachingToString(table.params.caching)) + .add("comment", table.params.comment) + .add("compaction_strategy_class", table.params.compaction.klass().getName()) + .add("compaction_strategy_options", json(table.params.compaction.options())) + .add("compression_parameters", json(ThriftConversion.compressionParametersToThrift(table.params.compression))) + .add("default_time_to_live", table.params.defaultTimeToLive) + .add("gc_grace_seconds", table.params.gcGraceSeconds) .add("key_validator", table.getKeyValidator().toString()) - .add("local_read_repair_chance", table.getDcLocalReadRepairChance()) - .add("max_compaction_threshold", table.getMaxCompactionThreshold()) - .add("max_index_interval", table.getMaxIndexInterval()) - .add("memtable_flush_period_in_ms", table.getMemtableFlushPeriod()) - .add("min_compaction_threshold", table.getMinCompactionThreshold()) - .add("min_index_interval", table.getMinIndexInterval()) - .add("read_repair_chance", table.getReadRepairChance()) - .add("speculative_retry", table.getSpeculativeRetry().toString()); + .add("local_read_repair_chance", table.params.dcLocalReadRepairChance) + .add("max_compaction_threshold", table.params.compaction.maxCompactionThreshold()) + .add("max_index_interval", table.params.maxIndexInterval) + .add("memtable_flush_period_in_ms", table.params.memtableFlushPeriodInMs) + .add("min_compaction_threshold", table.params.compaction.minCompactionThreshold()) + .add("min_index_interval", table.params.minIndexInterval) + .add("read_repair_chance", table.params.readRepairChance) + .add("speculative_retry", table.params.speculativeRetry.toString()); for (Map.Entry<ByteBuffer, CFMetaData.DroppedColumn> entry : table.getDroppedColumns().entrySet()) { @@ -464,6 +460,13 @@ public class LegacySchemaMigratorTest adder.build(); } + private static String cachingToString(CachingParams caching) + { + return format("{\"keys\":\"%s\", \"rows_per_partition\":\"%s\"}", + caching.keysAsString(), + caching.rowsPerPartitionAsString()); + } + private static void addColumnToSchemaMutation(CFMetaData table, ColumnDefinition column, long timestamp, Mutation mutation) { // We need to special case pk-only dense tables. See CASSANDRA-9874. http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/schema/SchemaKeyspaceTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/schema/SchemaKeyspaceTest.java b/test/unit/org/apache/cassandra/schema/SchemaKeyspaceTest.java index 0545cc4..11fe3f1 100644 --- a/test/unit/org/apache/cassandra/schema/SchemaKeyspaceTest.java +++ b/test/unit/org/apache/cassandra/schema/SchemaKeyspaceTest.java @@ -31,10 +31,6 @@ import org.apache.cassandra.db.partitions.PartitionUpdate; import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.io.compress.*; -import org.apache.cassandra.schema.KeyspaceMetadata; -import org.apache.cassandra.schema.KeyspaceParams; -import org.apache.cassandra.schema.SchemaKeyspace; import org.apache.cassandra.thrift.CfDef; import org.apache.cassandra.thrift.ColumnDef; import org.apache.cassandra.thrift.IndexType; @@ -126,7 +122,7 @@ public class SchemaKeyspaceTest // 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/service/StorageServiceServerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java b/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java index 6f19aff..392b6f4 100644 --- a/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java +++ b/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java @@ -49,6 +49,7 @@ import org.apache.cassandra.locator.IEndpointSnitch; import org.apache.cassandra.locator.PropertyFileSnitch; import org.apache.cassandra.locator.TokenMetadata; import org.apache.cassandra.schema.KeyspaceParams; +import org.apache.cassandra.schema.ReplicationParams; import org.apache.cassandra.schema.SchemaKeyspace; import org.apache.cassandra.utils.FBUtilities; @@ -192,7 +193,7 @@ public class StorageServiceServerTest Map<String, String> configOptions = new HashMap<>(); configOptions.put("DC1", "1"); configOptions.put("DC2", "1"); - configOptions.put(KeyspaceParams.Replication.CLASS, "NetworkTopologyStrategy"); + configOptions.put(ReplicationParams.CLASS, "NetworkTopologyStrategy"); Keyspace.clear("Keyspace1"); KeyspaceMetadata meta = KeyspaceMetadata.create("Keyspace1", KeyspaceParams.create(false, configOptions)); @@ -235,7 +236,7 @@ public class StorageServiceServerTest Map<String, String> configOptions = new HashMap<>(); configOptions.put("DC1", "1"); configOptions.put("DC2", "1"); - configOptions.put(KeyspaceParams.Replication.CLASS, "NetworkTopologyStrategy"); + configOptions.put(ReplicationParams.CLASS, "NetworkTopologyStrategy"); Keyspace.clear("Keyspace1"); KeyspaceMetadata meta = KeyspaceMetadata.create("Keyspace1", KeyspaceParams.create(false, configOptions)); @@ -272,7 +273,7 @@ public class StorageServiceServerTest Map<String, String> configOptions = new HashMap<>(); configOptions.put("DC2", "2"); - configOptions.put(KeyspaceParams.Replication.CLASS, "NetworkTopologyStrategy"); + configOptions.put(ReplicationParams.CLASS, "NetworkTopologyStrategy"); Keyspace.clear("Keyspace1"); KeyspaceMetadata meta = KeyspaceMetadata.create("Keyspace1", KeyspaceParams.create(false, configOptions)); @@ -311,7 +312,7 @@ public class StorageServiceServerTest Map<String, String> configOptions = new HashMap<>(); configOptions.put("DC2", "2"); - configOptions.put(KeyspaceParams.Replication.CLASS, "NetworkTopologyStrategy"); + configOptions.put(ReplicationParams.CLASS, "NetworkTopologyStrategy"); Keyspace.clear("Keyspace1"); KeyspaceMetadata meta = KeyspaceMetadata.create("Keyspace1", KeyspaceParams.create(false, configOptions)); @@ -363,7 +364,7 @@ public class StorageServiceServerTest Map<String, String> configOptions = new HashMap<>(); configOptions.put("DC2", "2"); - configOptions.put(KeyspaceParams.Replication.CLASS, "NetworkTopologyStrategy"); + configOptions.put(ReplicationParams.CLASS, "NetworkTopologyStrategy"); Keyspace.clear("Keyspace1"); KeyspaceMetadata meta = KeyspaceMetadata.create("Keyspace1", KeyspaceParams.create(false, configOptions)); @@ -430,7 +431,7 @@ public class StorageServiceServerTest Map<String, String> configOptions = new HashMap<>(); configOptions.put("DC1", "1"); configOptions.put("DC2", "2"); - configOptions.put(KeyspaceParams.Replication.CLASS, "NetworkTopologyStrategy"); + configOptions.put(ReplicationParams.CLASS, "NetworkTopologyStrategy"); Keyspace.clear("Keyspace1"); KeyspaceMetadata meta = KeyspaceMetadata.create("Keyspace1", KeyspaceParams.create(false, configOptions)); http://git-wip-us.apache.org/repos/asf/cassandra/blob/b31845c4/test/unit/org/apache/cassandra/streaming/compression/CompressedInputStreamTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/streaming/compression/CompressedInputStreamTest.java b/test/unit/org/apache/cassandra/streaming/compression/CompressedInputStreamTest.java index 132abaa..37aea91 100644 --- a/test/unit/org/apache/cassandra/streaming/compression/CompressedInputStreamTest.java +++ b/test/unit/org/apache/cassandra/streaming/compression/CompressedInputStreamTest.java @@ -26,8 +26,7 @@ import org.apache.cassandra.db.ClusteringComparator; import org.apache.cassandra.db.marshal.BytesType; import org.apache.cassandra.io.compress.CompressedSequentialWriter; import org.apache.cassandra.io.compress.CompressionMetadata; -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.sstable.Component; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.metadata.MetadataCollector; @@ -66,7 +65,7 @@ public class CompressedInputStreamTest File tmp = new File(File.createTempFile("cassandra", "unittest").getParent(), "ks-cf-ib-1-Data.db"); Descriptor desc = Descriptor.fromFilename(tmp.getAbsolutePath()); MetadataCollector collector = new MetadataCollector(new ClusteringComparator(BytesType.instance)); - CompressionParameters param = CompressionParameters.snappy(32); + CompressionParams param = CompressionParams.snappy(32); CompressedSequentialWriter writer = new CompressedSequentialWriter(tmp, desc.filenameFor(Component.COMPRESSION_INFO), param, collector); Map<Long, Long> index = new HashMap<Long, Long>(); for (long l = 0L; l < 1000; l++)
