Updated Branches: refs/heads/trunk bcfaeaa9c -> a7b72140b
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7b72140/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 38c6d56..8eb9199 100644 --- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java @@ -24,6 +24,8 @@ import java.util.List; import java.util.concurrent.ExecutionException; import java.util.UUID; +import org.junit.After; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -36,25 +38,42 @@ import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.repair.RepairJobDesc; import org.apache.cassandra.repair.Validator; +import org.apache.cassandra.service.ActiveRepairService; import org.apache.cassandra.utils.FBUtilities; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @RunWith(OrderedJUnit4ClassRunner.class) public class LeveledCompactionStrategyTest extends SchemaLoader { + private String ksname = "Keyspace1"; + private String cfname = "StandardLeveled"; + private Keyspace keyspace = Keyspace.open(ksname); + private ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfname); + + @Before + public void enableCompaction() + { + cfs.enableAutoCompaction(); + } + + /** + * Since we use StandardLeveled CF for every test, we want to clean up after the test. + */ + @After + public void truncateSTandardLeveled() + { + cfs.truncateBlocking(); + } + /* * This exercises in particular the code of #4142 */ @Test public void testValidationMultipleSSTablePerLevel() throws Exception { - String ksname = "Keyspace1"; - String cfname = "StandardLeveled"; - Keyspace keyspace = Keyspace.open(ksname); - ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfname); - ByteBuffer value = ByteBuffer.wrap(new byte[100 * 1024]); // 100 KB value, make it easy to have multiple files // Enough data to have a level 1 and 2 @@ -80,9 +99,11 @@ public class LeveledCompactionStrategyTest extends SchemaLoader assert strategy.getLevelSize(1) > 0; assert strategy.getLevelSize(2) > 0; - Range<Token> range = new Range<Token>(Util.token(""), Util.token("")); + Range<Token> range = new Range<>(Util.token(""), Util.token("")); int gcBefore = keyspace.getColumnFamilyStore(cfname).gcBefore(System.currentTimeMillis()); - RepairJobDesc desc = new RepairJobDesc(UUID.randomUUID(), ksname, cfname, range); + UUID parentRepSession = UUID.randomUUID(); + ActiveRepairService.instance.registerParentRepairSession(parentRepSession, Arrays.asList(cfs), Arrays.asList(range)); + RepairJobDesc desc = new RepairJobDesc(parentRepSession, UUID.randomUUID(), ksname, cfname, range); Validator validator = new Validator(desc, FBUtilities.getBroadcastAddress(), gcBefore); CompactionManager.instance.submitValidation(cfs, validator).get(); } @@ -101,11 +122,6 @@ public class LeveledCompactionStrategyTest extends SchemaLoader @Test public void testCompactionProgress() throws Exception { - String ksname = "Keyspace1"; - String cfname = "StandardLeveled"; - Keyspace keyspace = Keyspace.open(ksname); - ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfname); - // make sure we have SSTables in L1 ByteBuffer value = ByteBuffer.wrap(new byte[100 * 1024]); int rows = 2; @@ -142,11 +158,6 @@ public class LeveledCompactionStrategyTest extends SchemaLoader @Test public void testMutateLevel() throws Exception { - String ksname = "Keyspace1"; - String cfname = "StandardLeveled"; - Keyspace keyspace = Keyspace.open(ksname); - ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfname); - ByteBuffer value = ByteBuffer.wrap(new byte[100 * 1024]); // 100 KB value, make it easy to have multiple files // Enough data to have a level 1 and 2 @@ -189,4 +200,89 @@ public class LeveledCompactionStrategyTest extends SchemaLoader // verify that the manifest has correct amount of sstables assertEquals(cfs.getSSTables().size(), levels[6]); } + + @Test + public void testNewRepairedSSTable() throws Exception + { + ByteBuffer value = ByteBuffer.wrap(new byte[100 * 1024]); // 100 KB value, make it easy to have multiple files + + // Enough data to have a level 1 and 2 + int rows = 20; + int columns = 10; + + // Adds enough data to trigger multiple sstable per level + for (int r = 0; r < rows; r++) + { + DecoratedKey key = Util.dk(String.valueOf(r)); + Mutation rm = new Mutation(ksname, key.key); + for (int c = 0; c < columns; c++) + { + rm.add(cfname, Util.cellname("column" + c), value, 0); + } + rm.apply(); + cfs.forceBlockingFlush(); + } + waitForLeveling(cfs); + cfs.disableAutoCompaction(); + + while(CompactionManager.instance.isCompacting(Arrays.asList(cfs))) + Thread.sleep(100); + + LeveledCompactionStrategy strategy = (LeveledCompactionStrategy) cfs.getCompactionStrategy(); + assertTrue(strategy.getLevelSize(1) > 0); + assertTrue(strategy.getLevelSize(2) > 0); + + for (SSTableReader sstable : cfs.getSSTables()) + { + assertFalse(sstable.isRepaired()); + } + int sstableCount = 0; + for (List<SSTableReader> level : strategy.manifest.generations) + sstableCount += level.size(); + + assertEquals(sstableCount, cfs.getSSTables().size()); + + assertFalse(strategy.manifest.hasRepairedData()); + assertTrue(strategy.manifest.unrepairedL0.size() == 0); + + SSTableReader sstable1 = strategy.manifest.generations[2].get(0); + SSTableReader sstable2 = strategy.manifest.generations[1].get(0); + + // "repair" an sstable: + strategy.manifest.remove(sstable1); + sstable1.descriptor.getMetadataSerializer().mutateRepairedAt(sstable1.descriptor, System.currentTimeMillis()); + sstable1.reloadSSTableMetadata(); + assertTrue(sstable1.isRepaired()); + + // make sure adding a repaired sstable makes the manifest contain only repaired data; + strategy.manifest.add(sstable1); + assertTrue(strategy.manifest.hasRepairedData()); + assertTrue(strategy.manifest.generations[2].contains(sstable1)); + assertFalse(strategy.manifest.generations[1].contains(sstable2)); + assertTrue(strategy.manifest.unrepairedL0.contains(sstable2)); + sstableCount = 0; + for (int i = 0; i < strategy.manifest.generations.length; i++) + { + sstableCount += strategy.manifest.generations[i].size(); + if (i != 2) + assertEquals(strategy.manifest.generations[i].size(), 0); + else + assertEquals(strategy.manifest.generations[i].size(), 1); + } + assertEquals(1, sstableCount); + + // make sure adding an unrepaired sstable puts it in unrepairedL0: + strategy.manifest.remove(sstable2); + strategy.manifest.add(sstable2); + assertTrue(strategy.manifest.unrepairedL0.contains(sstable2)); + assertEquals(strategy.manifest.unrepairedL0.size(), cfs.getSSTables().size() - 1); + + // make sure repairing an sstable takes it away from unrepairedL0 and puts it in the correct level: + strategy.manifest.remove(sstable2); + sstable2.descriptor.getMetadataSerializer().mutateRepairedAt(sstable2.descriptor, System.currentTimeMillis()); + sstable2.reloadSSTableMetadata(); + strategy.manifest.add(sstable2); + assertFalse(strategy.manifest.unrepairedL0.contains(sstable2)); + assertTrue(strategy.manifest.generations[1].contains(sstable2)); + } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7b72140/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 ab6506d..ae4e12b 100644 --- a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java @@ -112,7 +112,7 @@ public class LegacySSTableTest extends SchemaLoader ArrayList<StreamSession.SSTableStreamingSections> details = new ArrayList<>(); details.add(new StreamSession.SSTableStreamingSections(sstable, sstable.getPositionsForRanges(ranges), - sstable.estimatedKeysForRanges(ranges))); + sstable.estimatedKeysForRanges(ranges), sstable.getSSTableMetadata().repairedAt)); new StreamPlan("LegacyStreamingTest").transferFiles(FBUtilities.getBroadcastAddress(), details) .execute().get(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7b72140/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 561b36c..b25e49c 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java @@ -25,6 +25,7 @@ import java.util.*; import org.apache.cassandra.db.*; import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; +import org.apache.cassandra.service.ActiveRepairService; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.Util; @@ -198,7 +199,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 = new SSTableWriter(datafile.getAbsolutePath(), expectedSize, ActiveRepairService.UNREPAIRED_SSTABLE); while (appender.append(writer)) { /* pass */ } SSTableReader reader = writer.closeAndOpenReader(); // mark all components for removal http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7b72140/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 6793c85..6b66746 100644 --- a/test/unit/org/apache/cassandra/io/sstable/metadata/MetadataSerializerTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/metadata/MetadataSerializerTest.java @@ -65,7 +65,7 @@ public class MetadataSerializerTest String partitioner = RandomPartitioner.class.getCanonicalName(); double bfFpChance = 0.1; - Map<MetadataType, MetadataComponent> originalMetadata = collector.finalizeMetadata(partitioner, bfFpChance); + Map<MetadataType, MetadataComponent> originalMetadata = collector.finalizeMetadata(partitioner, bfFpChance, 0); MetadataSerializer serializer = new MetadataSerializer(); // Serialize to tmp file http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7b72140/test/unit/org/apache/cassandra/repair/DifferencerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/repair/DifferencerTest.java b/test/unit/org/apache/cassandra/repair/DifferencerTest.java index b6dce40..7adbb06 100644 --- a/test/unit/org/apache/cassandra/repair/DifferencerTest.java +++ b/test/unit/org/apache/cassandra/repair/DifferencerTest.java @@ -18,6 +18,8 @@ package org.apache.cassandra.repair; import java.net.InetAddress; +import java.util.Arrays; +import java.util.Collections; import java.util.HashSet; import java.util.Set; import java.util.UUID; @@ -26,13 +28,17 @@ import org.junit.After; import org.junit.Test; import org.apache.cassandra.SchemaLoader; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; +import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.net.MessageIn; import org.apache.cassandra.net.MessageOut; import org.apache.cassandra.net.MessagingService; +import org.apache.cassandra.service.ActiveRepairService; import org.apache.cassandra.sink.IMessageSink; import org.apache.cassandra.sink.SinkManager; import org.apache.cassandra.repair.messages.RepairMessage; @@ -82,7 +88,7 @@ public class DifferencerTest extends SchemaLoader } }); Range<Token> range = new Range<>(partirioner.getMinimumToken(), partirioner.getRandomToken()); - RepairJobDesc desc = new RepairJobDesc(UUID.randomUUID(), "Keyspace1", "Standard1", range); + RepairJobDesc desc = new RepairJobDesc(UUID.randomUUID(), UUID.randomUUID(), "Keyspace1", "Standard1", range); MerkleTree tree1 = createInitialTree(desc); MerkleTree tree2 = createInitialTree(desc); @@ -101,7 +107,13 @@ public class DifferencerTest extends SchemaLoader public void testDifference() throws Throwable { Range<Token> range = new Range<>(partirioner.getMinimumToken(), partirioner.getRandomToken()); - RepairJobDesc desc = new RepairJobDesc(UUID.randomUUID(), "Keyspace1", "Standard1", range); + UUID parentRepairSession = UUID.randomUUID(); + Keyspace keyspace = Keyspace.open("Keyspace1"); + ColumnFamilyStore cfs = keyspace.getColumnFamilyStore("Standard1"); + + ActiveRepairService.instance.registerParentRepairSession(parentRepairSession, Arrays.asList(cfs), Arrays.asList(range)); + + RepairJobDesc desc = new RepairJobDesc(parentRepairSession, UUID.randomUUID(), "Keyspace1", "Standard1", range); MerkleTree tree1 = createInitialTree(desc); MerkleTree tree2 = createInitialTree(desc); http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7b72140/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 757254c..05936e2 100644 --- a/test/unit/org/apache/cassandra/repair/ValidatorTest.java +++ b/test/unit/org/apache/cassandra/repair/ValidatorTest.java @@ -65,7 +65,7 @@ public class ValidatorTest extends SchemaLoader public void testValidatorComplete() throws Throwable { Range<Token> range = new Range<>(partitioner.getMinimumToken(), partitioner.getRandomToken()); - final RepairJobDesc desc = new RepairJobDesc(UUID.randomUUID(), keyspace, columnFamily, range); + final RepairJobDesc desc = new RepairJobDesc(UUID.randomUUID(), UUID.randomUUID(), keyspace, columnFamily, range); final SimpleCondition lock = new SimpleCondition(); SinkManager.add(new IMessageSink() @@ -146,7 +146,7 @@ public class ValidatorTest extends SchemaLoader public void testValidatorFailed() throws Throwable { Range<Token> range = new Range<>(partitioner.getMinimumToken(), partitioner.getRandomToken()); - final RepairJobDesc desc = new RepairJobDesc(UUID.randomUUID(), keyspace, columnFamily, range); + final RepairJobDesc desc = new RepairJobDesc(UUID.randomUUID(), UUID.randomUUID(), keyspace, columnFamily, range); final SimpleCondition lock = new SimpleCondition(); SinkManager.add(new IMessageSink() http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7b72140/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java b/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java index 78ae1c1..6e485fa 100644 --- a/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java +++ b/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java @@ -102,7 +102,7 @@ public abstract class AntiEntropyServiceTestAbstract extends SchemaLoader local_range = StorageService.instance.getPrimaryRangesForEndpoint(keyspaceName, LOCAL).iterator().next(); - desc = new RepairJobDesc(UUID.randomUUID(), keyspaceName, cfname, local_range); + desc = new RepairJobDesc(UUID.randomUUID(), UUID.randomUUID(), keyspaceName, cfname, local_range); // Set a fake session corresponding to this fake request ActiveRepairService.instance.submitArtificialRepairSession(desc); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7b72140/test/unit/org/apache/cassandra/service/SerializationsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/SerializationsTest.java b/test/unit/org/apache/cassandra/service/SerializationsTest.java index b47f4d8..f1d23f0 100644 --- a/test/unit/org/apache/cassandra/service/SerializationsTest.java +++ b/test/unit/org/apache/cassandra/service/SerializationsTest.java @@ -33,6 +33,7 @@ import org.apache.cassandra.dht.RandomPartitioner; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.net.MessageIn; +import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.repair.NodePair; import org.apache.cassandra.repair.RepairJobDesc; import org.apache.cassandra.repair.Validator; @@ -49,7 +50,7 @@ public class SerializationsTest extends AbstractSerializationsTester private static final UUID RANDOM_UUID = UUID.fromString("b5c3d033-75aa-4c2f-a819-947aac7a0c54"); private static final Range<Token> FULL_RANGE = new Range<>(StorageService.getPartitioner().getMinimumToken(), StorageService.getPartitioner().getMinimumToken()); - private static final RepairJobDesc DESC = new RepairJobDesc(RANDOM_UUID, "Keyspace1", "Standard1", FULL_RANGE); + private static final RepairJobDesc DESC = new RepairJobDesc(getVersion() < MessagingService.VERSION_21 ? null : RANDOM_UUID, RANDOM_UUID, "Keyspace1", "Standard1", FULL_RANGE); private void testRepairMessageWrite(String fileName, RepairMessage... messages) throws IOException { http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7b72140/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 c7e7ee7..e0a89c3 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java @@ -213,7 +213,7 @@ public class StreamingTransferTest extends SchemaLoader { details.add(new StreamSession.SSTableStreamingSections(sstable, sstable.getPositionsForRanges(ranges), - sstable.estimatedKeysForRanges(ranges))); + sstable.estimatedKeysForRanges(ranges), sstable.getSSTableMetadata().repairedAt)); } return details; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7b72140/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 5f0fb5c..df7a988 100644 --- a/test/unit/org/apache/cassandra/tools/SSTableExportTest.java +++ b/test/unit/org/apache/cassandra/tools/SSTableExportTest.java @@ -38,6 +38,7 @@ import org.apache.cassandra.db.marshal.UTF8Type; 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.service.ActiveRepairService; import org.apache.cassandra.utils.ByteBufferUtil; import org.json.simple.JSONArray; import org.json.simple.JSONObject; @@ -56,7 +57,7 @@ public class SSTableExportTest extends SchemaLoader { File tempSS = tempSSTableFile("Keyspace1", "Standard1"); ColumnFamily cfamily = TreeMapBackedSortedColumns.factory.create("Keyspace1", "Standard1"); - SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2); + SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2, ActiveRepairService.UNREPAIRED_SSTABLE); // Add rowA cfamily.addColumn(Util.cellname("colA"), ByteBufferUtil.bytes("valA"), System.currentTimeMillis()); @@ -82,7 +83,7 @@ public class SSTableExportTest extends SchemaLoader { File tempSS = tempSSTableFile("Keyspace1", "Standard1"); ColumnFamily cfamily = TreeMapBackedSortedColumns.factory.create("Keyspace1", "Standard1"); - SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2); + SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2, ActiveRepairService.UNREPAIRED_SSTABLE); // Add rowA cfamily.addColumn(Util.cellname("colA"), ByteBufferUtil.bytes("valA"), System.currentTimeMillis()); @@ -117,7 +118,7 @@ public class SSTableExportTest extends SchemaLoader { File tempSS = tempSSTableFile("Keyspace1", "Standard1"); ColumnFamily cfamily = TreeMapBackedSortedColumns.factory.create("Keyspace1", "Standard1"); - SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2); + SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2, ActiveRepairService.UNREPAIRED_SSTABLE); int nowInSec = (int)(System.currentTimeMillis() / 1000) + 42; //live for 42 seconds // Add rowA @@ -173,7 +174,7 @@ public class SSTableExportTest extends SchemaLoader ColumnFamilyStore cfs = Keyspace.open("Keyspace1").getColumnFamilyStore("Standard1"); File tempSS = tempSSTableFile("Keyspace1", "Standard1"); ColumnFamily cfamily = TreeMapBackedSortedColumns.factory.create("Keyspace1", "Standard1"); - SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2); + SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2, ActiveRepairService.UNREPAIRED_SSTABLE); // Add rowA cfamily.addColumn(Util.cellname("name"), ByteBufferUtil.bytes("val"), System.currentTimeMillis()); @@ -212,7 +213,7 @@ public class SSTableExportTest extends SchemaLoader { File tempSS = tempSSTableFile("Keyspace1", "Counter1"); ColumnFamily cfamily = TreeMapBackedSortedColumns.factory.create("Keyspace1", "Counter1"); - SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2); + SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2, ActiveRepairService.UNREPAIRED_SSTABLE); // Add rowA cfamily.addColumn(CounterCell.createLocal(Util.cellname("colA"), 42, System.currentTimeMillis(), Long.MIN_VALUE)); @@ -243,7 +244,7 @@ public class SSTableExportTest extends SchemaLoader { File tempSS = tempSSTableFile("Keyspace1", "ValuesWithQuotes"); ColumnFamily cfamily = TreeMapBackedSortedColumns.factory.create("Keyspace1", "ValuesWithQuotes"); - SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2); + SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2, ActiveRepairService.UNREPAIRED_SSTABLE); // Add rowA cfamily.addColumn(new Cell(Util.cellname("data"), UTF8Type.instance.fromString("{\"foo\":\"bar\"}"))); @@ -275,7 +276,7 @@ public class SSTableExportTest extends SchemaLoader File tempSS = tempSSTableFile("Keyspace1", "Standard1"); ColumnFamily cfamily = TreeMapBackedSortedColumns.factory.create("Keyspace1", "Standard1"); - SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2); + SSTableWriter writer = new SSTableWriter(tempSS.getPath(), 2, ActiveRepairService.UNREPAIRED_SSTABLE); // Add rowA cfamily.addColumn(Util.cellname("colName"), ByteBufferUtil.bytes("val"), System.currentTimeMillis());
