Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 06c55f779 -> 322f7e9bb refs/heads/cassandra-3.11 287a960af -> 4f30dae1d refs/heads/trunk ee9e06b5a -> 9e36a445b
ninja edit naming in LegacyLayoutTest.testStaticRangeTombstoneRoundTripDroppedColumn Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/322f7e9b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/322f7e9b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/322f7e9b Branch: refs/heads/cassandra-3.0 Commit: 322f7e9bb4177d0ba2b7fbc710ad7d3b1e023f42 Parents: 06c55f7 Author: Benedict Elliott Smith <[email protected]> Authored: Thu Sep 20 14:18:58 2018 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Thu Sep 20 14:18:58 2018 +0100 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/LegacyLayoutTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/322f7e9b/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java b/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java index 2bed35e..e34f58e 100644 --- a/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java +++ b/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java @@ -253,12 +253,12 @@ public class LegacyLayoutTest } @Test - public void testStaticRangeTombstoneRoundTripDroppedColumn() throws Throwable + public void testCollectionDeletionRoundTripForDroppedColumn() throws Throwable { // this variant of the bug deletes a row with the same clustering key value as the name of the static collection - QueryProcessor.executeInternal(String.format("CREATE TABLE \"%s\".legacy_static_rt_rt_dc (pk int, ck1 text, v int, s set<text>, primary key (pk, ck1))", KEYSPACE)); + QueryProcessor.executeInternal(String.format("CREATE TABLE \"%s\".legacy_rt_rt_dc (pk int, ck1 text, v int, s set<text>, primary key (pk, ck1))", KEYSPACE)); Keyspace keyspace = Keyspace.open(KEYSPACE); - CFMetaData table = keyspace.getColumnFamilyStore("legacy_static_rt_rt_dc").metadata; + CFMetaData table = keyspace.getColumnFamilyStore("legacy_rt_rt_dc").metadata; ColumnDefinition v = table.getColumnDefinition(new ColumnIdentifier("v", false)); ColumnDefinition bug = table.getColumnDefinition(new ColumnIdentifier("s", false)); @@ -277,7 +277,7 @@ public class LegacyLayoutTest DataOutputBuffer serialized21 = new DataOutputBuffer()) { LegacyLayout.serializeAsLegacyPartition(null, upd.unfilteredIterator(), serialized21, MessagingService.VERSION_21); - QueryProcessor.executeInternal(String.format("ALTER TABLE \"%s\".legacy_static_rt_rt_dc DROP s", KEYSPACE)); + QueryProcessor.executeInternal(String.format("ALTER TABLE \"%s\".legacy_rt_rt_dc DROP s", KEYSPACE)); try (DataInputBuffer in = new DataInputBuffer(serialized21.buffer(), false)) { try (UnfilteredRowIterator deser21 = LegacyLayout.deserializeLegacyPartition(in, MessagingService.VERSION_21, SerializationHelper.Flag.LOCAL, upd.partitionKey().getKey()); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
