Repository: cassandra Updated Branches: refs/heads/trunk 67b7c3a39 -> 5de72e548
Ensure compression param is honored in unit tests Patch by Tyler Hobbs; reviewed by Philip Thompson for CASSANDRA-9135 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5de72e54 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5de72e54 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5de72e54 Branch: refs/heads/trunk Commit: 5de72e548faf475df60b87370d736722473fb27b Parents: 67b7c3a Author: Tyler Hobbs <[email protected]> Authored: Wed Apr 15 17:50:54 2015 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Wed Apr 15 17:50:54 2015 -0500 ---------------------------------------------------------------------- .../unit/org/apache/cassandra/SchemaLoader.java | 33 +++++++++++++++----- .../cassandra/db/ColumnFamilyStoreTest.java | 2 +- .../apache/cassandra/db/ColumnFamilyTest.java | 4 +-- .../org/apache/cassandra/db/KeyspaceTest.java | 2 +- .../apache/cassandra/db/RangeTombstoneTest.java | 2 +- .../cassandra/db/RecoveryManagerTest.java | 2 +- .../unit/org/apache/cassandra/db/ScrubTest.java | 6 +++- .../org/apache/cassandra/db/VerifyTest.java | 12 +++---- .../cassandra/db/marshal/CompositeTypeTest.java | 2 +- .../db/marshal/DynamicCompositeTypeTest.java | 2 +- .../io/sstable/SSTableMetadataTest.java | 4 +-- .../streaming/StreamingTransferTest.java | 4 +-- .../cassandra/thrift/ThriftValidationTest.java | 4 +-- .../cassandra/tools/SSTableExportTest.java | 4 +-- .../cassandra/tools/SSTableImportTest.java | 2 +- .../cassandra/utils/EncodedStreamsTest.java | 4 +-- 16 files changed, 56 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5de72e54/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 3a2725e..eb260c4 100644 --- a/test/unit/org/apache/cassandra/SchemaLoader.java +++ b/test/unit/org/apache/cassandra/SchemaLoader.java @@ -385,16 +385,24 @@ public class SchemaLoader public static CFMetaData standardCFMD(String ksName, String cfName) { - return CFMetaData.denseCFMetaData(ksName, cfName, BytesType.instance); + return CFMetaData.denseCFMetaData(ksName, cfName, BytesType.instance).compressionParameters(getCompressionParameters()); } + + public static CFMetaData standardCFMD(String ksName, String cfName, AbstractType<?> comparator) + { + return CFMetaData.denseCFMetaData(ksName, cfName, comparator).compressionParameters(getCompressionParameters()); + } + public static CFMetaData superCFMD(String ksName, String cfName, AbstractType subcc) { - return superCFMD(ksName, cfName, BytesType.instance, subcc); + return superCFMD(ksName, cfName, BytesType.instance, subcc).compressionParameters(getCompressionParameters()); } + public static CFMetaData superCFMD(String ksName, String cfName, AbstractType cc, AbstractType subcc) { - return CFMetaData.denseCFMetaData(ksName, cfName, cc, subcc); + return CFMetaData.denseCFMetaData(ksName, cfName, cc, subcc).compressionParameters(getCompressionParameters()); } + public static CFMetaData indexCFMD(String ksName, String cfName, final Boolean withIdxType) throws ConfigurationException { CFMetaData cfm = CFMetaData.sparseCFMetaData(ksName, cfName, BytesType.instance).keyValidator(AsciiType.instance); @@ -402,8 +410,10 @@ public class SchemaLoader ByteBuffer cName = ByteBufferUtil.bytes("birthdate"); IndexType keys = withIdxType ? IndexType.KEYS : null; return cfm.addColumnDefinition(ColumnDefinition.regularDef(cfm, cName, LongType.instance, null) - .setIndex(withIdxType ? ByteBufferUtil.bytesToHex(cName) : null, keys, null)); + .setIndex(withIdxType ? ByteBufferUtil.bytesToHex(cName) : null, keys, null)) + .compressionParameters(getCompressionParameters()); } + public static CFMetaData compositeIndexCFMD(String ksName, String cfName, final Boolean withIdxType) throws ConfigurationException { final CompositeType composite = CompositeType.getInstance(Arrays.asList(new AbstractType<?>[]{UTF8Type.instance, UTF8Type.instance})); @@ -412,17 +422,26 @@ public class SchemaLoader ByteBuffer cName = ByteBufferUtil.bytes("col1"); IndexType idxType = withIdxType ? IndexType.COMPOSITES : null; return cfm.addColumnDefinition(ColumnDefinition.regularDef(cfm, cName, UTF8Type.instance, 1) - .setIndex(withIdxType ? "col1_idx" : null, idxType, Collections.<String, String>emptyMap())); + .setIndex(withIdxType ? "col1_idx" : null, idxType, Collections.<String, String>emptyMap())) + .compressionParameters(getCompressionParameters()); } private static CFMetaData jdbcCFMD(String ksName, String cfName, AbstractType comp) { - return CFMetaData.denseCFMetaData(ksName, cfName, comp).defaultValidator(comp); + return CFMetaData.denseCFMetaData(ksName, cfName, comp).defaultValidator(comp).compressionParameters(getCompressionParameters()); } public static CFMetaData jdbcSparseCFMD(String ksName, String cfName, AbstractType comp) { - return CFMetaData.sparseCFMetaData(ksName, cfName, comp).defaultValidator(comp); + return CFMetaData.sparseCFMetaData(ksName, cfName, comp).defaultValidator(comp).compressionParameters(getCompressionParameters()); + } + + public static CompressionParameters getCompressionParameters() + { + if (Boolean.parseBoolean(System.getProperty("cassandra.test.compression", "false"))) + return new CompressionParameters(SnappyCompressor.instance); + else + return new CompressionParameters(null); } public static void cleanupAndLeaveDirs() http://git-wip-us.apache.org/repos/asf/cassandra/blob/5de72e54/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java index 779128a..7d15c44 100644 --- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java @@ -146,7 +146,7 @@ public class ColumnFamilyStoreTest SchemaLoader.indexCFMD(KEYSPACE1, CF_INDEX2, false), SchemaLoader.superCFMD(KEYSPACE1, CF_SUPER1, LongType.instance), SchemaLoader.superCFMD(KEYSPACE1, CF_SUPER6, LexicalUUIDType.instance, UTF8Type.instance), - CFMetaData.denseCFMetaData(KEYSPACE1, CF_STANDARDINT, IntegerType.instance)); + SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDINT, IntegerType.instance)); SchemaLoader.createKeyspace(KEYSPACE2, SimpleStrategy.class, KSMetaData.optsWithRF(1), http://git-wip-us.apache.org/repos/asf/cassandra/blob/5de72e54/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java index 2cae90a..72ddd40 100644 --- a/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java @@ -67,8 +67,8 @@ public class ColumnFamilyTest SimpleStrategy.class, KSMetaData.optsWithRF(1), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1), - CFMetaData.denseCFMetaData(KEYSPACE1, CF_COUNTER1, BytesType.instance) - .defaultValidator(CounterColumnType.instance)); + SchemaLoader.standardCFMD(KEYSPACE1, CF_COUNTER1) + .defaultValidator(CounterColumnType.instance)); } // TODO test SuperColumns more http://git-wip-us.apache.org/repos/asf/cassandra/blob/5de72e54/test/unit/org/apache/cassandra/db/KeyspaceTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/KeyspaceTest.java b/test/unit/org/apache/cassandra/db/KeyspaceTest.java index 5e9b908..d9481ca 100644 --- a/test/unit/org/apache/cassandra/db/KeyspaceTest.java +++ b/test/unit/org/apache/cassandra/db/KeyspaceTest.java @@ -79,7 +79,7 @@ public class KeyspaceTest SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD2), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLONG), - CFMetaData.denseCFMetaData(KEYSPACE1, CF_STANDARDCOMPOSITE2, compositeMaxMin)); + SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDCOMPOSITE2, compositeMaxMin)); SchemaLoader.createKeyspace(KEYSPACE2, SimpleStrategy.class, KSMetaData.optsWithRF(1), http://git-wip-us.apache.org/repos/asf/cassandra/blob/5de72e54/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 60297b5..34e592a 100644 --- a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java +++ b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java @@ -76,7 +76,7 @@ public class RangeTombstoneTest SchemaLoader.createKeyspace(KSNAME, SimpleStrategy.class, KSMetaData.optsWithRF(1), - CFMetaData.denseCFMetaData(KSNAME, CFNAME, IntegerType.instance)); + SchemaLoader.standardCFMD(KSNAME, CFNAME, IntegerType.instance)); } @Test http://git-wip-us.apache.org/repos/asf/cassandra/blob/5de72e54/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java index 9eefaef..3384e4b 100644 --- a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java +++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java @@ -61,7 +61,7 @@ public class RecoveryManagerTest SimpleStrategy.class, KSMetaData.optsWithRF(1), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1), - CFMetaData.denseCFMetaData(KEYSPACE1, CF_COUNTER1, BytesType.instance).defaultValidator(CounterColumnType.instance)); + SchemaLoader.standardCFMD(KEYSPACE1, CF_COUNTER1).defaultValidator(CounterColumnType.instance)); SchemaLoader.createKeyspace(KEYSPACE2, SimpleStrategy.class, KSMetaData.optsWithRF(1), http://git-wip-us.apache.org/repos/asf/cassandra/blob/5de72e54/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 8482287..9e6aa3d 100644 --- a/test/unit/org/apache/cassandra/db/ScrubTest.java +++ b/test/unit/org/apache/cassandra/db/ScrubTest.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.Set; import java.util.concurrent.ExecutionException; +import org.apache.cassandra.io.compress.CompressionParameters; +import org.apache.cassandra.io.compress.SnappyCompressor; import org.apache.commons.lang3.StringUtils; import org.junit.BeforeClass; import org.junit.Test; @@ -94,7 +96,9 @@ public class ScrubTest SchemaLoader.standardCFMD(KEYSPACE, CF), SchemaLoader.standardCFMD(KEYSPACE, CF2), SchemaLoader.standardCFMD(KEYSPACE, CF3), - CFMetaData.denseCFMetaData(KEYSPACE, COUNTER_CF, BytesType.instance).defaultValidator(CounterColumnType.instance), + SchemaLoader.standardCFMD(KEYSPACE, COUNTER_CF) + .defaultValidator(CounterColumnType.instance) + .compressionParameters(SchemaLoader.getCompressionParameters()), SchemaLoader.standardCFMD(KEYSPACE, CF_UUID).keyValidator(UUIDType.instance), SchemaLoader.indexCFMD(KEYSPACE, CF_INDEX1, true), SchemaLoader.compositeIndexCFMD(KEYSPACE, CF_INDEX2, true)); http://git-wip-us.apache.org/repos/asf/cassandra/blob/5de72e54/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 7a62641..27e99ab 100644 --- a/test/unit/org/apache/cassandra/db/VerifyTest.java +++ b/test/unit/org/apache/cassandra/db/VerifyTest.java @@ -92,12 +92,12 @@ public class VerifyTest SchemaLoader.standardCFMD(KEYSPACE, CF4), SchemaLoader.standardCFMD(KEYSPACE, CORRUPT_CF), SchemaLoader.standardCFMD(KEYSPACE, CORRUPT_CF2), - CFMetaData.denseCFMetaData(KEYSPACE, COUNTER_CF, BytesType.instance).defaultValidator(CounterColumnType.instance).compressionParameters(compressionParameters), - CFMetaData.denseCFMetaData(KEYSPACE, COUNTER_CF2, BytesType.instance).defaultValidator(CounterColumnType.instance).compressionParameters(compressionParameters), - CFMetaData.denseCFMetaData(KEYSPACE, COUNTER_CF3, BytesType.instance).defaultValidator(CounterColumnType.instance), - CFMetaData.denseCFMetaData(KEYSPACE, COUNTER_CF4, BytesType.instance).defaultValidator(CounterColumnType.instance), - CFMetaData.denseCFMetaData(KEYSPACE, CORRUPTCOUNTER_CF, BytesType.instance).defaultValidator(CounterColumnType.instance), - CFMetaData.denseCFMetaData(KEYSPACE, CORRUPTCOUNTER_CF2, BytesType.instance).defaultValidator(CounterColumnType.instance), + SchemaLoader.standardCFMD(KEYSPACE, COUNTER_CF, BytesType.instance).defaultValidator(CounterColumnType.instance).compressionParameters(compressionParameters), + SchemaLoader.standardCFMD(KEYSPACE, COUNTER_CF2, BytesType.instance).defaultValidator(CounterColumnType.instance).compressionParameters(compressionParameters), + SchemaLoader.standardCFMD(KEYSPACE, COUNTER_CF3, BytesType.instance).defaultValidator(CounterColumnType.instance), + SchemaLoader.standardCFMD(KEYSPACE, COUNTER_CF4, BytesType.instance).defaultValidator(CounterColumnType.instance), + SchemaLoader.standardCFMD(KEYSPACE, CORRUPTCOUNTER_CF, BytesType.instance).defaultValidator(CounterColumnType.instance), + SchemaLoader.standardCFMD(KEYSPACE, CORRUPTCOUNTER_CF2, BytesType.instance).defaultValidator(CounterColumnType.instance), SchemaLoader.standardCFMD(KEYSPACE, CF_UUID).keyValidator(UUIDType.instance)); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/5de72e54/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java index 3e75c1a..2e746fa 100644 --- a/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java @@ -69,7 +69,7 @@ public class CompositeTypeTest SchemaLoader.createKeyspace(KEYSPACE1, SimpleStrategy.class, KSMetaData.optsWithRF(1), - CFMetaData.denseCFMetaData(KEYSPACE1, CF_STANDARDCOMPOSITE, composite)); + SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDCOMPOSITE, composite)); } @Test http://git-wip-us.apache.org/repos/asf/cassandra/blob/5de72e54/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java index 05519af..1a6ddc9 100644 --- a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java @@ -72,7 +72,7 @@ public class DynamicCompositeTypeTest SchemaLoader.createKeyspace(KEYSPACE1, SimpleStrategy.class, KSMetaData.optsWithRF(1), - CFMetaData.denseCFMetaData(KEYSPACE1, CF_STANDARDDYNCOMPOSITE, dynamicComposite)); + SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDDYNCOMPOSITE, dynamicComposite)); } @Test http://git-wip-us.apache.org/repos/asf/cassandra/blob/5de72e54/test/unit/org/apache/cassandra/io/sstable/SSTableMetadataTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableMetadataTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableMetadataTest.java index 67d5e0a..755225e 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableMetadataTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableMetadataTest.java @@ -69,8 +69,8 @@ public class SSTableMetadataTest SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD2), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD3), - CFMetaData.denseCFMetaData(KEYSPACE1, CF_STANDARDCOMPOSITE2, compositeMaxMin), - CFMetaData.denseCFMetaData(KEYSPACE1, CF_COUNTER1, BytesType.instance).defaultValidator(CounterColumnType.instance)); + SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDCOMPOSITE2, compositeMaxMin), + SchemaLoader.standardCFMD(KEYSPACE1, CF_COUNTER1).defaultValidator(CounterColumnType.instance)); } @Test http://git-wip-us.apache.org/repos/asf/cassandra/blob/5de72e54/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java index 453bb7f..340089e 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java @@ -89,8 +89,8 @@ public class StreamingTransferTest SimpleStrategy.class, KSMetaData.optsWithRF(1), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD), - CFMetaData.denseCFMetaData(KEYSPACE1, CF_COUNTER, BytesType.instance).defaultValidator(CounterColumnType.instance), - CFMetaData.denseCFMetaData(KEYSPACE1, CF_STANDARDINT, IntegerType.instance), + SchemaLoader.standardCFMD(KEYSPACE1, CF_COUNTER).defaultValidator(CounterColumnType.instance), + SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDINT, IntegerType.instance), SchemaLoader.indexCFMD(KEYSPACE1, CF_INDEX, true)); SchemaLoader.createKeyspace(KEYSPACE2, SimpleStrategy.class, http://git-wip-us.apache.org/repos/asf/cassandra/blob/5de72e54/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java b/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java index 747b522..5df2c47 100644 --- a/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java +++ b/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java @@ -55,9 +55,9 @@ public class ThriftValidationTest SimpleStrategy.class, KSMetaData.optsWithRF(1), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD), - CFMetaData.denseCFMetaData(KEYSPACE1, CF_COUNTER, BytesType.instance).defaultValidator(CounterColumnType.instance), + SchemaLoader.standardCFMD(KEYSPACE1, CF_COUNTER).defaultValidator(CounterColumnType.instance), SchemaLoader.standardCFMD(KEYSPACE1, CF_UUID).keyValidator(UUIDType.instance), - CFMetaData.denseCFMetaData(KEYSPACE1, CF_STANDARDLONG3, IntegerType.instance)); + SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLONG3, IntegerType.instance)); } @Test(expected=org.apache.cassandra.exceptions.InvalidRequestException.class) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5de72e54/test/unit/org/apache/cassandra/tools/SSTableExportTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java index 794d224..7e59207 100644 --- a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java +++ b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java @@ -81,9 +81,9 @@ public class SSTableExportTest SimpleStrategy.class, KSMetaData.optsWithRF(1), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD), - CFMetaData.denseCFMetaData(KEYSPACE1, CF_COUNTER, BytesType.instance).defaultValidator(CounterColumnType.instance), + SchemaLoader.standardCFMD(KEYSPACE1, CF_COUNTER).defaultValidator(CounterColumnType.instance), SchemaLoader.standardCFMD(KEYSPACE1, CF_UUID).keyValidator(UUIDType.instance), - CFMetaData.denseCFMetaData(KEYSPACE1, CF_VALSWITHQUOTES, BytesType.instance).defaultValidator(UTF8Type.instance), + SchemaLoader.standardCFMD(KEYSPACE1, CF_VALSWITHQUOTES).defaultValidator(UTF8Type.instance), SchemaLoader.standardCFMD(KEYSPACE1, "AsciiKeys").keyValidator(AsciiType.instance)); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/5de72e54/test/unit/org/apache/cassandra/tools/SSTableImportTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java index f8cd925..814662c 100644 --- a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java +++ b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java @@ -78,7 +78,7 @@ public class SSTableImportTest SimpleStrategy.class, KSMetaData.optsWithRF(1), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD), - CFMetaData.denseCFMetaData(KEYSPACE1, CF_COUNTER, BytesType.instance).defaultValidator(CounterColumnType.instance), + SchemaLoader.standardCFMD(KEYSPACE1, CF_COUNTER).defaultValidator(CounterColumnType.instance), SchemaLoader.standardCFMD(KEYSPACE1, "AsciiKeys").keyValidator(AsciiType.instance), CFMetaData.compile("CREATE TABLE table1 (k int PRIMARY KEY, v1 text, v2 int)", KEYSPACE1)); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/5de72e54/test/unit/org/apache/cassandra/utils/EncodedStreamsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/utils/EncodedStreamsTest.java b/test/unit/org/apache/cassandra/utils/EncodedStreamsTest.java index 957979f..c23ef53 100644 --- a/test/unit/org/apache/cassandra/utils/EncodedStreamsTest.java +++ b/test/unit/org/apache/cassandra/utils/EncodedStreamsTest.java @@ -58,8 +58,8 @@ public class EncodedStreamsTest SimpleStrategy.class, KSMetaData.optsWithRF(1), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD), - CFMetaData.denseCFMetaData(KEYSPACE1, CF_COUNTER, BytesType.instance) - .defaultValidator(CounterColumnType.instance)); + SchemaLoader.standardCFMD(KEYSPACE1, CF_COUNTER) + .defaultValidator(CounterColumnType.instance)); } @Test
