You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2018/09/20 13:24:56 UTC
[1/6] cassandra git commit: ninja edit naming in
LegacyLayoutTest.testStaticRangeTombstoneRoundTripDroppedColumn
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 <be...@apple.com>
Authored: Thu Sep 20 14:18:58 2018 +0100
Committer: Benedict Elliott Smith <be...@apple.com>
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: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by be...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9e36a445
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9e36a445
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9e36a445
Branch: refs/heads/trunk
Commit: 9e36a445b3cbc7c4b28980fe93e3d1cb3edd34d8
Parents: ee9e06b 4f30dae
Author: Benedict Elliott Smith <be...@apple.com>
Authored: Thu Sep 20 14:24:41 2018 +0100
Committer: Benedict Elliott Smith <be...@apple.com>
Committed: Thu Sep 20 14:24:41 2018 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/6] cassandra git commit: ninja edit naming in
LegacyLayoutTest.testStaticRangeTombstoneRoundTripDroppedColumn
Posted by be...@apache.org.
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/trunk
Commit: 322f7e9bb4177d0ba2b7fbc710ad7d3b1e023f42
Parents: 06c55f7
Author: Benedict Elliott Smith <be...@apple.com>
Authored: Thu Sep 20 14:18:58 2018 +0100
Committer: Benedict Elliott Smith <be...@apple.com>
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: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by be...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f30dae1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f30dae1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f30dae1
Branch: refs/heads/trunk
Commit: 4f30dae1d4fcd2ff84dd6d88e18f28509d95d392
Parents: 287a960 322f7e9
Author: Benedict Elliott Smith <be...@apple.com>
Authored: Thu Sep 20 14:21:23 2018 +0100
Committer: Benedict Elliott Smith <be...@apple.com>
Committed: Thu Sep 20 14:21:23 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/4f30dae1/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/6] cassandra git commit: ninja edit naming in
LegacyLayoutTest.testStaticRangeTombstoneRoundTripDroppedColumn
Posted by be...@apache.org.
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.11
Commit: 322f7e9bb4177d0ba2b7fbc710ad7d3b1e023f42
Parents: 06c55f7
Author: Benedict Elliott Smith <be...@apple.com>
Authored: Thu Sep 20 14:18:58 2018 +0100
Committer: Benedict Elliott Smith <be...@apple.com>
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: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by be...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f30dae1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f30dae1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f30dae1
Branch: refs/heads/cassandra-3.11
Commit: 4f30dae1d4fcd2ff84dd6d88e18f28509d95d392
Parents: 287a960 322f7e9
Author: Benedict Elliott Smith <be...@apple.com>
Authored: Thu Sep 20 14:21:23 2018 +0100
Committer: Benedict Elliott Smith <be...@apple.com>
Committed: Thu Sep 20 14:21:23 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/4f30dae1/test/unit/org/apache/cassandra/db/LegacyLayoutTest.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org