Repository: cassandra Updated Branches: refs/heads/trunk 7e53db0b9 -> 0368e97ee
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0368e97e/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 5be732e..d6fb0ee 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java @@ -30,7 +30,6 @@ import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.*; import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; import org.apache.cassandra.db.filter.QueryFilter; @@ -40,14 +39,11 @@ import org.apache.cassandra.dht.BytesToken; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.io.sstable.Component; -import org.apache.cassandra.io.sstable.SSTableReader; -import org.apache.cassandra.io.sstable.SSTableScanner; -import org.apache.cassandra.io.sstable.SSTableWriter; -import org.apache.cassandra.io.sstable.metadata.MetadataCollector; +import org.apache.cassandra.io.sstable.*; +import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.io.sstable.format.SSTableWriter; import org.apache.cassandra.io.sstable.metadata.StatsMetadata; import org.apache.cassandra.locator.SimpleStrategy; -import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; @@ -193,7 +189,7 @@ public class CompactionsTest // check that the shadowed column is gone SSTableReader sstable = cfs.getSSTables().iterator().next(); Range keyRange = new Range<RowPosition>(key, sstable.partitioner.getMinimumToken().maxKeyBound()); - SSTableScanner scanner = sstable.getScanner(DataRange.forKeyRange(keyRange)); + ICompactionScanner scanner = sstable.getScanner(DataRange.forKeyRange(keyRange)); OnDiskAtomIterator iter = scanner.next(); assertEquals(key, iter.getKey()); assertTrue(iter.next() instanceof RangeTombstone); @@ -406,12 +402,7 @@ public class CompactionsTest cf.addColumn(Util.column("a", "a", 3)); cf.deletionInfo().add(new RangeTombstone(Util.cellname("0"), Util.cellname("b"), 2, (int) (System.currentTimeMillis()/1000)),cfmeta.comparator); - SSTableWriter writer = new SSTableWriter(cfs.getTempSSTablePath(dir.getDirectoryForNewSSTables()), - 0, - 0, - cfs.metadata, - StorageService.getPartitioner(), - new MetadataCollector(cfs.metadata.comparator)); + SSTableWriter writer = SSTableWriter.create(Descriptor.fromFilename(cfs.getTempSSTablePath(dir.getDirectoryForNewSSTables())), 0, 0, 0); writer.append(Util.dk("0"), cf); @@ -419,12 +410,7 @@ public class CompactionsTest writer.append(Util.dk("3"), cf); cfs.addSSTable(writer.closeAndOpenReader()); - writer = new SSTableWriter(cfs.getTempSSTablePath(dir.getDirectoryForNewSSTables()), - 0, - 0, - cfs.metadata, - StorageService.getPartitioner(), - new MetadataCollector(cfs.metadata.comparator)); + writer = SSTableWriter.create(Descriptor.fromFilename(cfs.getTempSSTablePath(dir.getDirectoryForNewSSTables())), 0, 0, 0); writer.append(Util.dk("0"), cf); writer.append(Util.dk("1"), cf); http://git-wip-us.apache.org/repos/asf/cassandra/blob/0368e97e/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java index eeb98b7..309f43f 100644 --- a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java @@ -34,9 +34,8 @@ import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.Mutation; import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.io.sstable.SSTableReader; +import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.locator.SimpleStrategy; -import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.Pair; import static org.apache.cassandra.db.compaction.DateTieredCompactionStrategy.getBuckets; http://git-wip-us.apache.org/repos/asf/cassandra/blob/0368e97e/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 7d79c76..a999025 100644 --- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; +import org.apache.cassandra.io.sstable.format.SSTableReader; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -43,7 +44,6 @@ import org.apache.cassandra.db.Mutation; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.repair.RepairJobDesc; import org.apache.cassandra.repair.Validator; http://git-wip-us.apache.org/repos/asf/cassandra/blob/0368e97e/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 56fa7a1..962957c 100644 --- a/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.db.compaction; import java.nio.ByteBuffer; import java.util.*; +import org.apache.cassandra.io.sstable.format.SSTableReader; import org.junit.BeforeClass; import org.junit.Test; @@ -28,7 +29,6 @@ import org.apache.cassandra.Util; import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.db.*; import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.metrics.RestorableMeter; import org.apache.cassandra.utils.Pair; http://git-wip-us.apache.org/repos/asf/cassandra/blob/0368e97e/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java b/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java index f3a693c..636370b 100644 --- a/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java @@ -20,6 +20,7 @@ package org.apache.cassandra.db.compaction; * */ +import org.apache.cassandra.io.sstable.format.SSTableReader; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,8 +32,6 @@ import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.db.*; import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.io.sstable.SSTableReader; -import org.apache.cassandra.io.sstable.SSTableScanner; import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.utils.ByteBufferUtil; import static org.junit.Assert.assertEquals; @@ -148,7 +147,7 @@ public class TTLExpiryTest cfs.enableAutoCompaction(true); assertEquals(1, cfs.getSSTables().size()); SSTableReader sstable = cfs.getSSTables().iterator().next(); - SSTableScanner scanner = sstable.getScanner(DataRange.allData(sstable.partitioner)); + ICompactionScanner scanner = sstable.getScanner(DataRange.allData(sstable.partitioner)); assertTrue(scanner.hasNext()); while(scanner.hasNext()) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/0368e97e/test/unit/org/apache/cassandra/io/sstable/DescriptorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/DescriptorTest.java b/test/unit/org/apache/cassandra/io/sstable/DescriptorTest.java index 71145f7..70ab8ba 100644 --- a/test/unit/org/apache/cassandra/io/sstable/DescriptorTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/DescriptorTest.java @@ -21,7 +21,9 @@ import java.io.File; import java.io.IOException; import java.util.UUID; +import org.apache.cassandra.io.sstable.format.SSTableFormat; import org.apache.commons.lang3.StringUtils; +import org.junit.Assert; import org.junit.Test; import org.apache.cassandra.db.Directories; @@ -87,11 +89,11 @@ public class DescriptorTest checkFromFilename(new Descriptor(idxDir, ksname, cfname + Directories.SECONDARY_INDEX_NAME_SEPARATOR + idxName, 5, Descriptor.Type.TEMP), false); // legacy version - checkFromFilename(new Descriptor("ja", dir, ksname, cfname, 1, Descriptor.Type.FINAL), false); + checkFromFilename(new Descriptor("ja", dir, ksname, cfname, 1, Descriptor.Type.FINAL, SSTableFormat.Type.LEGACY), false); // legacy tmp - checkFromFilename(new Descriptor("ja", dir, ksname, cfname, 2, Descriptor.Type.TEMP), false); + checkFromFilename(new Descriptor("ja", dir, ksname, cfname, 2, Descriptor.Type.TEMP, SSTableFormat.Type.LEGACY), false); // legacy secondary index - checkFromFilename(new Descriptor("ja", dir, ksname, cfname + Directories.SECONDARY_INDEX_NAME_SEPARATOR + idxName, 3, Descriptor.Type.FINAL), false); + checkFromFilename(new Descriptor("ja", dir, ksname, cfname + Directories.SECONDARY_INDEX_NAME_SEPARATOR + idxName, 3, Descriptor.Type.FINAL, SSTableFormat.Type.LEGACY), false); } private void checkFromFilename(Descriptor original, boolean skipComponent) @@ -117,4 +119,48 @@ public class DescriptorTest assertEquals(Component.DATA.name(), pair.right); } } + + @Test + public void validateNames() + { + + String names[] = { + /*"system-schema_keyspaces-ka-1-CompressionInfo.db", "system-schema_keyspaces-ka-1-Summary.db", + "system-schema_keyspaces-ka-1-Data.db", "system-schema_keyspaces-ka-1-TOC.txt", + "system-schema_keyspaces-ka-1-Digest.sha1", "system-schema_keyspaces-ka-2-CompressionInfo.db", + "system-schema_keyspaces-ka-1-Filter.db", "system-schema_keyspaces-ka-2-Data.db", + "system-schema_keyspaces-ka-1-Index.db", "system-schema_keyspaces-ka-2-Digest.sha1", + "system-schema_keyspaces-ka-1-Statistics.db", + "system-schema_keyspacest-tmp-ka-1-Data.db",*/ + "system-schema_keyspace-ka-1-"+ SSTableFormat.Type.BIG.name+"-Data.db" + }; + + for (String name : names) + { + Descriptor d = Descriptor.fromFilename(name); + } + } + + @Test + public void badNames() + { + String names[] = { + "system-schema_keyspaces-k234a-1-CompressionInfo.db", "system-schema_keyspaces-ka-aa-Summary.db", + "system-schema_keyspaces-XXX-ka-1-Data.db", "system-schema_keyspaces-k", + "system-schema_keyspace-ka-1-AAA-Data.db", "system-schema-keyspace-ka-1-AAA-Data.db" + }; + + for (String name : names) + { + try + { + Descriptor d = Descriptor.fromFilename(name); + Assert.fail(name); + } catch (Throwable e) { + //good + } + } + } + + } http://git-wip-us.apache.org/repos/asf/cassandra/blob/0368e97e/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 2d0c40b..2b88135 100644 --- a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java @@ -24,6 +24,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; +import org.apache.cassandra.io.sstable.format.SSTableReader; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; http://git-wip-us.apache.org/repos/asf/cassandra/blob/0368e97e/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java index f0767db..2383095 100644 --- a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java @@ -26,6 +26,10 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; +import org.apache.cassandra.io.sstable.format.SSTableFormat; +import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.io.sstable.format.Version; import org.junit.BeforeClass; import org.junit.Test; @@ -37,7 +41,6 @@ import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.DeletionInfo; import org.apache.cassandra.db.Keyspace; -import org.apache.cassandra.db.columniterator.SSTableNamesIterator; import org.apache.cassandra.db.composites.CellNameType; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Range; @@ -92,7 +95,7 @@ public class LegacySSTableTest protected Descriptor getDescriptor(String ver) { File directory = new File(LEGACY_SSTABLE_ROOT + File.separator + ver + File.separator + KSNAME); - return new Descriptor(ver, directory, KSNAME, CFNAME, 0, Descriptor.Type.FINAL); + return new Descriptor(ver, directory, KSNAME, CFNAME, 0, Descriptor.Type.FINAL, SSTableFormat.Type.LEGACY); } /** @@ -119,7 +122,7 @@ public class LegacySSTableTest StorageService.instance.initServer(); for (File version : LEGACY_SSTABLE_ROOT.listFiles()) - if (Descriptor.Version.validate(version.getName()) && new Descriptor.Version(version.getName()).isCompatible()) + if (Version.validate(version.getName()) && SSTableFormat.Type.LEGACY.info.getVersion(version.getName()).isCompatible()) testStreaming(version.getName()); } @@ -144,7 +147,7 @@ public class LegacySSTableTest for (String keystring : TEST_DATA) { ByteBuffer key = ByteBufferUtil.bytes(keystring); - SSTableNamesIterator iter = new SSTableNamesIterator(sstable, Util.dk(key), FBUtilities.singleton(Util.cellname(key), type)); + OnDiskAtomIterator iter = sstable.iterator(Util.dk(key), FBUtilities.singleton(Util.cellname(key), type)); ColumnFamily cf = iter.getColumnFamily(); // check not deleted (CASSANDRA-6527) @@ -160,7 +163,7 @@ public class LegacySSTableTest for (File version : LEGACY_SSTABLE_ROOT.listFiles()) { - if (Descriptor.Version.validate(version.getName()) && new Descriptor.Version(version.getName()).isCompatible()) + if (Version.validate(version.getName()) && SSTableFormat.Type.LEGACY.info.getVersion(version.getName()).isCompatible()) { notSkipped = true; testVersion(version.getName()); @@ -181,7 +184,7 @@ public class LegacySSTableTest ByteBuffer key = ByteBufferUtil.bytes(keystring); // confirm that the bloom filter does not reject any keys/names DecoratedKey dk = reader.partitioner.decorateKey(key); - SSTableNamesIterator iter = new SSTableNamesIterator(reader, dk, FBUtilities.singleton(Util.cellname(key), type)); + OnDiskAtomIterator iter = reader.iterator(dk, FBUtilities.singleton(Util.cellname(key), type)); assert iter.next().name().toByteBuffer().equals(key); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/0368e97e/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 7af40fd..67d5e0a 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableMetadataTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableMetadataTest.java @@ -27,6 +27,7 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.ExecutionException; +import org.apache.cassandra.io.sstable.format.SSTableReader; import org.junit.BeforeClass; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/cassandra/blob/0368e97e/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 71eaad8..46d5801 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java @@ -36,6 +36,7 @@ import java.util.concurrent.ThreadPoolExecutor; import com.google.common.collect.Sets; import org.apache.cassandra.cache.CachingOptions; import org.apache.cassandra.config.KSMetaData; +import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.locator.SimpleStrategy; import org.junit.Assert; import org.junit.BeforeClass; http://git-wip-us.apache.org/repos/asf/cassandra/blob/0368e97e/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java index d044947..0d7d3c9 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableScannerTest.java @@ -21,6 +21,7 @@ package org.apache.cassandra.io.sstable; import java.util.ArrayList; import java.util.Collection; +import org.apache.cassandra.io.sstable.format.SSTableReader; import org.junit.BeforeClass; import org.junit.Test; @@ -91,7 +92,7 @@ public class SSTableScannerTest private static void assertScanMatches(SSTableReader sstable, int scanStart, int scanEnd, int expectedStart, int expectedEnd) { - SSTableScanner scanner = sstable.getScanner(new DataRange(boundsFor(scanStart, scanEnd), new IdentityQueryFilter())); + ICompactionScanner scanner = sstable.getScanner(new DataRange(boundsFor(scanStart, scanEnd), new IdentityQueryFilter())); for (int i = expectedStart; i <= expectedEnd; i++) assertEquals(toKey(i), new String(scanner.next().getKey().getKey().array())); assertFalse(scanner.hasNext()); @@ -99,7 +100,7 @@ public class SSTableScannerTest private static void assertScanEmpty(SSTableReader sstable, int scanStart, int scanEnd) { - SSTableScanner scanner = sstable.getScanner(new DataRange(boundsFor(scanStart, scanEnd), new IdentityQueryFilter())); + ICompactionScanner scanner = sstable.getScanner(new DataRange(boundsFor(scanStart, scanEnd), new IdentityQueryFilter())); assertFalse(String.format("scan of (%03d, %03d] should be empty", scanStart, scanEnd), scanner.hasNext()); } @@ -121,7 +122,7 @@ public class SSTableScannerTest SSTableReader sstable = store.getSSTables().iterator().next(); // full range scan - SSTableScanner scanner = sstable.getScanner(); + ICompactionScanner scanner = sstable.getScanner(); for (int i = 2; i < 10; i++) assertEquals(toKey(i), new String(scanner.next().getKey().getKey().array())); @@ -185,7 +186,7 @@ public class SSTableScannerTest SSTableReader sstable = store.getSSTables().iterator().next(); // full range scan - SSTableScanner fullScanner = sstable.getScanner(); + ICompactionScanner fullScanner = sstable.getScanner(); assertScanContainsRanges(fullScanner, 2, 9, 102, 109, @@ -315,7 +316,7 @@ public class SSTableScannerTest SSTableReader sstable = store.getSSTables().iterator().next(); // full range scan - SSTableScanner fullScanner = sstable.getScanner(); + ICompactionScanner fullScanner = sstable.getScanner(); assertScanContainsRanges(fullScanner, 205, 205); // scan three ranges separately http://git-wip-us.apache.org/repos/asf/cassandra/blob/0368e97e/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java b/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java index 57c9477..4f3d22a 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java @@ -25,6 +25,9 @@ import java.util.*; import org.apache.cassandra.db.*; import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; +import org.apache.cassandra.db.compaction.ICompactionScanner; +import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.io.sstable.format.SSTableWriter; import org.apache.cassandra.service.ActiveRepairService; import org.apache.cassandra.utils.ByteBufferUtil; @@ -81,8 +84,8 @@ public class SSTableUtils public static void assertContentEquals(SSTableReader lhs, SSTableReader rhs) { - SSTableScanner slhs = lhs.getScanner(); - SSTableScanner srhs = rhs.getScanner(); + ICompactionScanner slhs = lhs.getScanner(); + ICompactionScanner srhs = rhs.getScanner(); while (slhs.hasNext()) { OnDiskAtomIterator ilhs = slhs.next(); @@ -211,7 +214,7 @@ public class SSTableUtils public SSTableReader write(int expectedSize, Appender appender) throws IOException { File datafile = (dest == null) ? tempSSTableFile(ksname, cfname, generation) : new File(dest.filenameFor(Component.DATA)); - SSTableWriter writer = new SSTableWriter(datafile.getAbsolutePath(), expectedSize); + SSTableWriter writer = SSTableWriter.create(Descriptor.fromFilename(datafile.getAbsolutePath()), expectedSize, ActiveRepairService.UNREPAIRED_SSTABLE, 0); while (appender.append(writer)) { /* pass */ } SSTableReader reader = writer.closeAndOpenReader(); // mark all components for removal http://git-wip-us.apache.org/repos/asf/cassandra/blob/0368e97e/test/unit/org/apache/cassandra/io/sstable/metadata/MetadataSerializerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/metadata/MetadataSerializerTest.java b/test/unit/org/apache/cassandra/io/sstable/metadata/MetadataSerializerTest.java index 7751a51..9cc2d23 100644 --- a/test/unit/org/apache/cassandra/io/sstable/metadata/MetadataSerializerTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/metadata/MetadataSerializerTest.java @@ -75,7 +75,7 @@ public class MetadataSerializerTest serializer.serialize(originalMetadata, out); } - Descriptor desc = new Descriptor(Descriptor.Version.CURRENT, statsFile.getParentFile(), "", "", 0, Descriptor.Type.FINAL); + Descriptor desc = new Descriptor( statsFile.getParentFile(), "", "", 0, Descriptor.Type.FINAL); try (RandomAccessReader in = RandomAccessReader.open(statsFile)) { Map<MetadataType, MetadataComponent> deserialized = serializer.deserialize(desc, in, EnumSet.allOf(MetadataType.class)); http://git-wip-us.apache.org/repos/asf/cassandra/blob/0368e97e/test/unit/org/apache/cassandra/repair/ValidatorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/repair/ValidatorTest.java b/test/unit/org/apache/cassandra/repair/ValidatorTest.java index ea46204..74d1ad3 100644 --- a/test/unit/org/apache/cassandra/repair/ValidatorTest.java +++ b/test/unit/org/apache/cassandra/repair/ValidatorTest.java @@ -22,6 +22,7 @@ import java.net.InetAddress; import java.security.MessageDigest; import java.util.UUID; +import org.apache.cassandra.io.util.SequentialWriter; import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; @@ -143,7 +144,7 @@ public class ValidatorTest super(key); } - public RowIndexEntry write(long currentPosition, DataOutputPlus out) throws IOException + public RowIndexEntry write(long currentPosition, SequentialWriter out) throws IOException { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/0368e97e/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java b/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java index 5e4e1c5..d3685d9 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java @@ -25,6 +25,7 @@ import java.util.concurrent.Future; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; +import org.apache.cassandra.io.sstable.format.SSTableReader; import org.junit.BeforeClass; import org.junit.Test; @@ -36,7 +37,6 @@ import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.utils.FBUtilities; http://git-wip-us.apache.org/repos/asf/cassandra/blob/0368e97e/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 b193d9d..6bc6827 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java @@ -26,6 +26,7 @@ import java.util.concurrent.TimeUnit; import com.google.common.collect.Iterables; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; +import org.apache.cassandra.io.sstable.format.SSTableReader; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -49,7 +50,6 @@ import org.apache.cassandra.db.marshal.IntegerType; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; -import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.io.sstable.SSTableUtils; import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.service.StorageService; http://git-wip-us.apache.org/repos/asf/cassandra/blob/0368e97e/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 f93e168..8e3f5ca 100644 --- a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java +++ b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java @@ -46,8 +46,8 @@ import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.db.marshal.UUIDType; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.Descriptor; -import org.apache.cassandra.io.sstable.SSTableReader; -import org.apache.cassandra.io.sstable.SSTableWriter; +import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.io.sstable.format.SSTableWriter; import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.service.ActiveRepairService; import org.apache.cassandra.utils.ByteBufferUtil; @@ -97,7 +97,7 @@ public class SSTableExportTest { File tempSS = tempSSTableFile(KEYSPACE1, "Standard1"); ColumnFamily cfamily = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1"); - SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2); + SSTableWriter writer = SSTableWriter.create(tempSS.getPath(), 2, ActiveRepairService.UNREPAIRED_SSTABLE, 0); // Add rowA cfamily.addColumn(Util.cellname("colA"), ByteBufferUtil.bytes("valA"), System.currentTimeMillis()); @@ -134,7 +134,7 @@ public class SSTableExportTest { File tempSS = tempSSTableFile(KEYSPACE1, "Standard1"); ColumnFamily cfamily = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1"); - SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2); + SSTableWriter writer = SSTableWriter.create(tempSS.getPath(), 2, ActiveRepairService.UNREPAIRED_SSTABLE, 0); int nowInSec = (int)(System.currentTimeMillis() / 1000) + 42; //live for 42 seconds // Add rowA @@ -191,7 +191,7 @@ public class SSTableExportTest ColumnFamilyStore cfs = Keyspace.open(KEYSPACE1).getColumnFamilyStore("Standard1"); File tempSS = tempSSTableFile(KEYSPACE1, "Standard1"); ColumnFamily cfamily = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1"); - SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2); + SSTableWriter writer = SSTableWriter.create(tempSS.getPath(), 2, ActiveRepairService.UNREPAIRED_SSTABLE, 0); // Add rowA cfamily.addColumn(Util.cellname("name"), ByteBufferUtil.bytes("val"), System.currentTimeMillis()); @@ -231,7 +231,7 @@ public class SSTableExportTest { File tempSS = tempSSTableFile(KEYSPACE1, "Counter1"); ColumnFamily cfamily = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Counter1"); - SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2); + SSTableWriter writer = SSTableWriter.create(tempSS.getPath(), 2, ActiveRepairService.UNREPAIRED_SSTABLE, 0); // Add rowA cfamily.addColumn(BufferCounterCell.createLocal(Util.cellname("colA"), 42, System.currentTimeMillis(), Long.MIN_VALUE)); @@ -263,7 +263,7 @@ public class SSTableExportTest { File tempSS = tempSSTableFile(KEYSPACE1, "ValuesWithQuotes"); ColumnFamily cfamily = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "ValuesWithQuotes"); - SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2); + SSTableWriter writer = SSTableWriter.create(tempSS.getPath(), 2, ActiveRepairService.UNREPAIRED_SSTABLE); // Add rowA cfamily.addColumn(new BufferCell(Util.cellname("data"), UTF8Type.instance.fromString("{\"foo\":\"bar\"}"))); @@ -295,7 +295,7 @@ public class SSTableExportTest { File tempSS = tempSSTableFile(KEYSPACE1, "Standard1"); ColumnFamily cfamily = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "Standard1"); - SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2); + SSTableWriter writer = SSTableWriter.create(tempSS.getPath(), 2, ActiveRepairService.UNREPAIRED_SSTABLE); // Add rowA cfamily.addColumn(Util.cellname("colName"), ByteBufferUtil.bytes("val"), System.currentTimeMillis()); @@ -357,7 +357,7 @@ public class SSTableExportTest { File tempSS = tempSSTableFile(KEYSPACE1, "UUIDKeys"); ColumnFamily cfamily = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "UUIDKeys"); - SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2); + SSTableWriter writer = SSTableWriter.create(tempSS.getPath(), 2, ActiveRepairService.UNREPAIRED_SSTABLE); // Add a row cfamily.addColumn(column(CFMetaData.DEFAULT_KEY_ALIAS, "not a uuid", 1L)); @@ -387,7 +387,7 @@ public class SSTableExportTest { File tempSS = tempSSTableFile(KEYSPACE1, "AsciiKeys"); ColumnFamily cfamily = ArrayBackedSortedColumns.factory.create(KEYSPACE1, "AsciiKeys"); - SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2, ActiveRepairService.UNREPAIRED_SSTABLE, 0); + SSTableWriter writer = SSTableWriter.create(tempSS.getPath(), 2, ActiveRepairService.UNREPAIRED_SSTABLE, 0); // Add a row cfamily.addColumn(column("column", "value", 1L)); http://git-wip-us.apache.org/repos/asf/cassandra/blob/0368e97e/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 01becfe..e2cecb2 100644 --- a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java +++ b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java @@ -31,6 +31,7 @@ import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; +import org.apache.cassandra.io.sstable.format.SSTableReader; import org.junit.BeforeClass; import org.hamcrest.Description; import org.hamcrest.Matcher; @@ -59,7 +60,6 @@ import org.apache.cassandra.db.marshal.BytesType; import org.apache.cassandra.db.marshal.CounterColumnType; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.Descriptor; -import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.locator.SimpleStrategy; import org.apache.thrift.TException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/0368e97e/tools/cqlstress-example.yaml ---------------------------------------------------------------------- diff --git a/tools/cqlstress-example.yaml b/tools/cqlstress-example.yaml index 4dd5e4a..3c60c32 100644 --- a/tools/cqlstress-example.yaml +++ b/tools/cqlstress-example.yaml @@ -42,9 +42,10 @@ table_definition: | uid timeuuid, value blob, PRIMARY KEY((name,choice), date, address, dbl, lval, ival, uid) - ) WITH COMPACT STORAGE - AND compaction = { 'class':'LeveledCompactionStrategy' } - AND comment='A table of many types to test wide rows' + ) + WITH compaction = { 'class':'LeveledCompactionStrategy' } +# AND compression = { 'sstable_compression' : '' } +# AND comment='A table of many types to test wide rows' # # Optional meta information on the generated columns in the above table @@ -67,7 +68,7 @@ table_definition: | columnspec: - name: name size: uniform(1..10) - population: uniform(1..1M) # the range of unique values to select for the field (default is 100Billion) + population: uniform(1..10) # the range of unique values to select for the field (default is 100Billion) - name: date cluster: uniform(20..40) - name: lval http://git-wip-us.apache.org/repos/asf/cassandra/blob/0368e97e/tools/cqlstress-insanity-example.yaml ---------------------------------------------------------------------- diff --git a/tools/cqlstress-insanity-example.yaml b/tools/cqlstress-insanity-example.yaml index ea4f97f..a286625 100644 --- a/tools/cqlstress-insanity-example.yaml +++ b/tools/cqlstress-insanity-example.yaml @@ -41,8 +41,6 @@ table_definition: | fval float, ival int, uid timeuuid, - dates list<timestamp>, - inets set<inet>, value blob, PRIMARY KEY((name, choice), date) ) WITH compaction = { 'class':'LeveledCompactionStrategy' }
