Repository: cassandra Updated Branches: refs/heads/trunk 16e350753 -> 30bb255ec
http://git-wip-us.apache.org/repos/asf/cassandra/blob/30bb255e/test/unit/org/apache/cassandra/cql3/validation/entities/FrozenCollectionsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/FrozenCollectionsTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/FrozenCollectionsTest.java index 4c7c135..4c52ed2 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/FrozenCollectionsTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/FrozenCollectionsTest.java @@ -41,10 +41,12 @@ import static org.junit.Assert.assertEquals; public class FrozenCollectionsTest extends CQLTester { @BeforeClass - public static void setUpClass() + public static void setUpClass() // overrides CQLTester.setUpClass() { // Selecting partitioner for a table is not exposed on CREATE TABLE. StorageService.instance.setPartitionerUnsafe(ByteOrderedPartitioner.instance); + + prepareServer(); } @Test http://git-wip-us.apache.org/repos/asf/cassandra/blob/30bb255e/test/unit/org/apache/cassandra/cql3/validation/entities/UserTypesTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/UserTypesTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/UserTypesTest.java index 5501561..2bffb09 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/UserTypesTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/UserTypesTest.java @@ -29,10 +29,12 @@ import org.apache.cassandra.service.StorageService; public class UserTypesTest extends CQLTester { @BeforeClass - public static void setUpClass() + public static void setUpClass() // overrides CQLTester.setUpClass() { // Selecting partitioner for a table is not exposed on CREATE TABLE. StorageService.instance.setPartitionerUnsafe(ByteOrderedPartitioner.instance); + + prepareServer(); } @Test http://git-wip-us.apache.org/repos/asf/cassandra/blob/30bb255e/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 d059f7d..2760ae5 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/CrcCheckChanceTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/CrcCheckChanceTest.java @@ -30,8 +30,8 @@ import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.compaction.CompactionInterruptedException; import org.apache.cassandra.db.compaction.CompactionManager; -import org.apache.cassandra.io.compress.CompressedRandomAccessReader; import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.utils.FBUtilities; @@ -153,8 +153,8 @@ public class CrcCheckChanceTest extends CQLTester // note: only compressed files currently perform crc checks, so only the dfile reader is relevant here SSTableReader baseSSTable = cfs.getLiveSSTables().iterator().next(); SSTableReader idxSSTable = indexCfs.getLiveSSTables().iterator().next(); - try (CompressedRandomAccessReader baseDataReader = (CompressedRandomAccessReader)baseSSTable.openDataReader(); - CompressedRandomAccessReader idxDataReader = (CompressedRandomAccessReader)idxSSTable.openDataReader()) + try (RandomAccessReader baseDataReader = baseSSTable.openDataReader(); + RandomAccessReader idxDataReader = idxSSTable.openDataReader()) { Assert.assertEquals(0.03, baseDataReader.getCrcCheckChance()); Assert.assertEquals(0.03, idxDataReader.getCrcCheckChance()); http://git-wip-us.apache.org/repos/asf/cassandra/blob/30bb255e/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 a736668..df654bf 100644 --- a/test/unit/org/apache/cassandra/db/ScrubTest.java +++ b/test/unit/org/apache/cassandra/db/ScrubTest.java @@ -29,6 +29,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.apache.cassandra.*; +import org.apache.cassandra.cache.ChunkCache; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.Operator; @@ -417,6 +418,8 @@ public class ScrubTest file.seek(startPosition); file.writeBytes(StringUtils.repeat('z', (int) (endPosition - startPosition))); file.close(); + if (ChunkCache.instance != null) + ChunkCache.instance.invalidateFile(sstable.getFilename()); } private static void assertOrderedAll(ColumnFamilyStore cfs, int expectedSize) http://git-wip-us.apache.org/repos/asf/cassandra/blob/30bb255e/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 9de01c1..d216860 100644 --- a/test/unit/org/apache/cassandra/db/VerifyTest.java +++ b/test/unit/org/apache/cassandra/db/VerifyTest.java @@ -23,6 +23,7 @@ import com.google.common.base.Charsets; import org.apache.cassandra.OrderedJUnit4ClassRunner; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; +import org.apache.cassandra.cache.ChunkCache; import org.apache.cassandra.UpdateBuilder; import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.compaction.Verifier; @@ -313,6 +314,8 @@ public class VerifyTest file.seek(startPosition); file.writeBytes(StringUtils.repeat('z', (int) 2)); file.close(); + if (ChunkCache.instance != null) + ChunkCache.instance.invalidateFile(sstable.getFilename()); // Update the Digest to have the right Checksum writeChecksum(simpleFullChecksum(sstable.getFilename()), sstable.descriptor.filenameFor(sstable.descriptor.digestComponent)); http://git-wip-us.apache.org/repos/asf/cassandra/blob/30bb255e/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 19d2347..b442df0 100644 --- a/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java @@ -33,6 +33,7 @@ import static org.junit.Assert.assertNotNull; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; +import org.apache.cassandra.cache.ChunkCache; import org.apache.cassandra.db.*; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.format.SSTableReader; @@ -148,6 +149,8 @@ public class BlacklistingCompactionsTest byte[] corruption = new byte[corruptionSize]; Arrays.fill(corruption, (byte)0xFF); raf.write(corruption); + if (ChunkCache.instance != null) + ChunkCache.instance.invalidateFile(sstable.getFilename()); } finally http://git-wip-us.apache.org/repos/asf/cassandra/blob/30bb255e/test/unit/org/apache/cassandra/hints/ChecksummedDataInputTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/hints/ChecksummedDataInputTest.java b/test/unit/org/apache/cassandra/hints/ChecksummedDataInputTest.java index 323a12d..6b3b5c8 100644 --- a/test/unit/org/apache/cassandra/hints/ChecksummedDataInputTest.java +++ b/test/unit/org/apache/cassandra/hints/ChecksummedDataInputTest.java @@ -111,7 +111,7 @@ public class ChecksummedDataInputTest // assert that the crc matches, and that we've read exactly as many bytes as expected assertTrue(reader.checkCrc()); - assertEquals(0, reader.bytesRemaining()); + assertTrue(reader.isEOF()); reader.checkLimit(0); } @@ -177,7 +177,7 @@ public class ChecksummedDataInputTest assertEquals(2.2f, reader.readFloat()); assertEquals(42, reader.readInt()); assertTrue(reader.checkCrc()); - assertEquals(0, reader.bytesRemaining()); + assertTrue(reader.isEOF()); } } @@ -227,7 +227,7 @@ public class ChecksummedDataInputTest assertEquals(10, reader.readByte()); assertEquals('t', reader.readChar()); assertFalse(reader.checkCrc()); - assertEquals(0, reader.bytesRemaining()); + assertTrue(reader.isEOF()); } } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/30bb255e/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 74b5c74..53535e5 100644 --- a/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java +++ b/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java @@ -96,8 +96,8 @@ public class CompressedRandomAccessReaderTest writer.finish(); } - try(RandomAccessReader reader = new CompressedRandomAccessReader.Builder(channel, - new CompressionMetadata(filename + ".metadata", f.length(), ChecksumType.CRC32)) + try(RandomAccessReader reader = RandomAccessReader.builder(channel) + .compression(new CompressionMetadata(filename + ".metadata", f.length(), ChecksumType.CRC32)) .build()) { String res = reader.readLine(); @@ -142,16 +142,17 @@ public class CompressedRandomAccessReaderTest assert f.exists(); CompressionMetadata compressionMetadata = compressed ? new CompressionMetadata(filename + ".metadata", f.length(), ChecksumType.CRC32) : null; - RandomAccessReader.Builder builder = compressed - ? new CompressedRandomAccessReader.Builder(channel, compressionMetadata) - : new RandomAccessReader.Builder(channel); + RandomAccessReader.Builder builder = RandomAccessReader.builder(channel); + if (compressed) + builder.compression(compressionMetadata); + MmappedRegions regions = null; if (usemmap) { - if (compressed) - builder.regions(MmappedRegions.map(channel, compressionMetadata)); - else - builder.regions(MmappedRegions.map(channel, f.length())); + regions = compressed + ? MmappedRegions.map(channel, compressionMetadata) + : MmappedRegions.map(channel, f.length()); + builder.regions(regions); } try(RandomAccessReader reader = builder.build()) @@ -163,8 +164,8 @@ public class CompressedRandomAccessReaderTest assert new String(b).equals(expected) : "Expecting '" + expected + "', got '" + new String(b) + '\''; } - if (usemmap) - builder.regions.close(); + if (regions != null) + regions.close(); } finally { @@ -203,7 +204,7 @@ public class CompressedRandomAccessReaderTest CompressionMetadata meta = new CompressionMetadata(metadata.getPath(), file.length(), ChecksumType.CRC32); CompressionMetadata.Chunk chunk = meta.chunkFor(0); - try(RandomAccessReader reader = new CompressedRandomAccessReader.Builder(channel, meta).build()) + try(RandomAccessReader reader = RandomAccessReader.builder(channel).compression(meta).build()) {// read and verify compressed data assertEquals(CONTENT, reader.readLine()); @@ -228,7 +229,7 @@ public class CompressedRandomAccessReaderTest checksumModifier.write(random.nextInt()); SyncUtil.sync(checksumModifier); // making sure that change was synced with disk - try (final RandomAccessReader r = new CompressedRandomAccessReader.Builder(channel, meta).build()) + try (final RandomAccessReader r = RandomAccessReader.builder(channel).compression(meta).build()) { Throwable exception = null; try @@ -248,7 +249,7 @@ public class CompressedRandomAccessReaderTest // lets write original checksum and check if we can read data updateChecksum(checksumModifier, chunk.length, checksum); - try (RandomAccessReader cr = new CompressedRandomAccessReader.Builder(channel, meta).build()) + try (RandomAccessReader cr = RandomAccessReader.builder(channel).compression(meta).build()) { // read and verify compressed data assertEquals(CONTENT, cr.readLine()); http://git-wip-us.apache.org/repos/asf/cassandra/blob/30bb255e/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 66a0e28..ad2e4b4 100644 --- a/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java +++ b/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java @@ -117,7 +117,7 @@ public class CompressedSequentialWriterTest extends SequentialWriterTest } assert f.exists(); - RandomAccessReader reader = new CompressedRandomAccessReader.Builder(channel, new CompressionMetadata(filename + ".metadata", f.length(), ChecksumType.CRC32)).build(); + RandomAccessReader reader = RandomAccessReader.builder(channel).compression(new CompressionMetadata(filename + ".metadata", f.length(), ChecksumType.CRC32)).build(); assertEquals(dataPre.length + rawPost.length, reader.length()); byte[] result = new byte[(int)reader.length()]; http://git-wip-us.apache.org/repos/asf/cassandra/blob/30bb255e/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java b/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java index 360d262..4ecbdcc 100644 --- a/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java +++ b/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java @@ -18,6 +18,7 @@ * */ package org.apache.cassandra.io.util; +import org.apache.cassandra.io.FSReadError; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.SyncUtil; @@ -330,7 +331,7 @@ public class BufferedRandomAccessFileTest { File file1 = writeTemporaryFile(new byte[16]); try (final ChannelProxy channel = new ChannelProxy(file1); - final RandomAccessReader file = new RandomAccessReader.Builder(channel) + final RandomAccessReader file = RandomAccessReader.builder(channel) .bufferSize(bufferSize) .build()) { @@ -343,7 +344,7 @@ public class BufferedRandomAccessFileTest { File file1 = writeTemporaryFile(new byte[16]); try (final ChannelProxy channel = new ChannelProxy(file1); - final RandomAccessReader file = new RandomAccessReader.Builder(channel).bufferSize(bufferSize).build()) + final RandomAccessReader file = RandomAccessReader.builder(channel).bufferSize(bufferSize).build()) { expectEOF(() -> { while (true) http://git-wip-us.apache.org/repos/asf/cassandra/blob/30bb255e/test/unit/org/apache/cassandra/io/util/MmappedRegionsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/util/MmappedRegionsTest.java b/test/unit/org/apache/cassandra/io/util/MmappedRegionsTest.java index 9df3fed..85e8460 100644 --- a/test/unit/org/apache/cassandra/io/util/MmappedRegionsTest.java +++ b/test/unit/org/apache/cassandra/io/util/MmappedRegionsTest.java @@ -99,8 +99,8 @@ public class MmappedRegionsTest { MmappedRegions.Region region = regions.floor(i); assertNotNull(region); - assertEquals(0, region.bottom()); - assertEquals(1024, region.top()); + assertEquals(0, region.offset()); + assertEquals(1024, region.end()); } regions.extend(2048); @@ -110,13 +110,13 @@ public class MmappedRegionsTest assertNotNull(region); if (i < 1024) { - assertEquals(0, region.bottom()); - assertEquals(1024, region.top()); + assertEquals(0, region.offset()); + assertEquals(1024, region.end()); } else { - assertEquals(1024, region.bottom()); - assertEquals(2048, region.top()); + assertEquals(1024, region.offset()); + assertEquals(2048, region.end()); } } } @@ -141,8 +141,8 @@ public class MmappedRegionsTest { MmappedRegions.Region region = regions.floor(i); assertNotNull(region); - assertEquals(SIZE * (i / SIZE), region.bottom()); - assertEquals(SIZE + (SIZE * (i / SIZE)), region.top()); + assertEquals(SIZE * (i / SIZE), region.offset()); + assertEquals(SIZE + (SIZE * (i / SIZE)), region.end()); } } finally @@ -169,8 +169,8 @@ public class MmappedRegionsTest { MmappedRegions.Region region = regions.floor(i); assertNotNull(region); - assertEquals(SIZE * (i / SIZE), region.bottom()); - assertEquals(SIZE + (SIZE * (i / SIZE)), region.top()); + assertEquals(SIZE * (i / SIZE), region.offset()); + assertEquals(SIZE + (SIZE * (i / SIZE)), region.end()); } } finally @@ -209,8 +209,8 @@ public class MmappedRegionsTest { MmappedRegions.Region region = snapshot.floor(i); assertNotNull(region); - assertEquals(SIZE * (i / SIZE), region.bottom()); - assertEquals(SIZE + (SIZE * (i / SIZE)), region.top()); + assertEquals(SIZE * (i / SIZE), region.offset()); + assertEquals(SIZE + (SIZE * (i / SIZE)), region.end()); // check we can access the buffer assertNotNull(region.buffer.duplicate().getInt()); @@ -267,8 +267,8 @@ public class MmappedRegionsTest { MmappedRegions.Region region = regions.floor(i); assertNotNull(region); - assertEquals(0, region.bottom()); - assertEquals(4096, region.top()); + assertEquals(0, region.offset()); + assertEquals(4096, region.end()); } } } @@ -326,8 +326,8 @@ public class MmappedRegionsTest assertNotNull(compressedChunk); assertEquals(chunk.length + 4, compressedChunk.capacity()); - assertEquals(chunk.offset, region.bottom()); - assertEquals(chunk.offset + chunk.length + 4, region.top()); + assertEquals(chunk.offset, region.offset()); + assertEquals(chunk.offset + chunk.length + 4, region.end()); i += metadata.chunkLength(); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/30bb255e/test/unit/org/apache/cassandra/io/util/RandomAccessReaderTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/util/RandomAccessReaderTest.java b/test/unit/org/apache/cassandra/io/util/RandomAccessReaderTest.java index e83c015..14c549c 100644 --- a/test/unit/org/apache/cassandra/io/util/RandomAccessReaderTest.java +++ b/test/unit/org/apache/cassandra/io/util/RandomAccessReaderTest.java @@ -67,12 +67,6 @@ public class RandomAccessReaderTest this.maxSegmentSize = maxSegmentSize; return this; } - - public Parameters expected(byte[] expected) - { - this.expected = expected; - return this; - } } @Test @@ -108,6 +102,7 @@ public class RandomAccessReaderTest @Test public void testMultipleSegments() throws IOException { + // FIXME: This is the same as above. testReadFully(new Parameters(8192, 4096).mmappedRegions(true).maxSegmentSize(1024)); } @@ -119,7 +114,7 @@ public class RandomAccessReaderTest try(ChannelProxy channel = new ChannelProxy("abc", new FakeFileChannel(SIZE))) { - RandomAccessReader.Builder builder = new RandomAccessReader.Builder(channel) + RandomAccessReader.Builder builder = RandomAccessReader.builder(channel) .bufferType(params.bufferType) .bufferSize(params.bufferSize); @@ -270,11 +265,15 @@ public class RandomAccessReaderTest final File f = writeFile(params); try(ChannelProxy channel = new ChannelProxy(f)) { - RandomAccessReader.Builder builder = new RandomAccessReader.Builder(channel) + RandomAccessReader.Builder builder = RandomAccessReader.builder(channel) .bufferType(params.bufferType) .bufferSize(params.bufferSize); + MmappedRegions regions = null; if (params.mmappedRegions) - builder.regions(MmappedRegions.map(channel, f.length())); + { + regions = MmappedRegions.map(channel, f.length()); + builder.regions(regions); + } try(RandomAccessReader reader = builder.build()) { @@ -296,8 +295,8 @@ public class RandomAccessReaderTest assertEquals(0, reader.bytesRemaining()); } - if (builder.regions != null) - assertNull(builder.regions.close(null)); + if (regions != null) + assertNull(regions.close(null)); } } @@ -316,7 +315,7 @@ public class RandomAccessReaderTest assert f.exists(); try(ChannelProxy channel = new ChannelProxy(f); - RandomAccessReader reader = new RandomAccessReader.Builder(channel).build()) + RandomAccessReader reader = RandomAccessReader.builder(channel).build()) { assertEquals(f.getAbsolutePath(), reader.getPath()); assertEquals(expected.length(), reader.length()); @@ -346,7 +345,7 @@ public class RandomAccessReaderTest assert f.exists(); try(ChannelProxy channel = new ChannelProxy(f); - RandomAccessReader reader = new RandomAccessReader.Builder(channel).build()) + RandomAccessReader reader = RandomAccessReader.builder(channel).build()) { assertEquals(expected.length() * numIterations, reader.length()); @@ -428,7 +427,7 @@ public class RandomAccessReaderTest { final Runnable worker = () -> { - try(RandomAccessReader reader = new RandomAccessReader.Builder(channel).build()) + try(RandomAccessReader reader = RandomAccessReader.builder(channel).build()) { assertEquals(expected.length, reader.length());
