Repository: cassandra Updated Branches: refs/heads/cassandra-3.11 d10e6ac60 -> 1d506f9d0 refs/heads/trunk 74b2013ea -> cf66b7ea2
Fix ReadCommandTest patch by Kurt Greaves; reviewed by jasobrown for CASSANDRA-14234 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1d506f9d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1d506f9d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1d506f9d Branch: refs/heads/cassandra-3.11 Commit: 1d506f9d09c880ff2b2693e3e27fa58c02ecf398 Parents: d10e6ac Author: kurt <k...@instaclustr.com> Authored: Wed Feb 14 01:06:24 2018 +0000 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Wed Feb 14 05:19:48 2018 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/ReadCommandTest.java | 31 ++++++++++++++++++-- 2 files changed, 29 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d506f9d/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 31cee26..e2ccc53 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.11.2 + * Fix ReadCommandTest (CASSANDRA-14234) * Remove trailing period from latency reports at keyspace level (CASSANDRA-14233) * Backport CASSANDRA-13080: Use new token allocation for non bootstrap case as well (CASSANDRA-14212) * Remove dependencies on JVM internal classes from JMXServerUtils (CASSANDRA-14173) http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d506f9d/test/unit/org/apache/cassandra/db/ReadCommandTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/ReadCommandTest.java b/test/unit/org/apache/cassandra/db/ReadCommandTest.java index 960539c..774645e 100644 --- a/test/unit/org/apache/cassandra/db/ReadCommandTest.java +++ b/test/unit/org/apache/cassandra/db/ReadCommandTest.java @@ -61,6 +61,8 @@ public class ReadCommandTest private static final String CF1 = "Standard1"; private static final String CF2 = "Standard2"; private static final String CF3 = "Standard3"; + private static final String CF4 = "Standard4"; + private static final String CF5 = "Standard5"; @BeforeClass public static void defineSchema() throws ConfigurationException @@ -85,12 +87,35 @@ public class ReadCommandTest .addRegularColumn("e", AsciiType.instance) .addRegularColumn("f", AsciiType.instance).build(); + CFMetaData metadata4 = CFMetaData.Builder.create(KEYSPACE, CF4) + .addPartitionKey("key", BytesType.instance) + .addClusteringColumn("col", AsciiType.instance) + .addRegularColumn("a", AsciiType.instance) + .addRegularColumn("b", AsciiType.instance) + .addRegularColumn("c", AsciiType.instance) + .addRegularColumn("d", AsciiType.instance) + .addRegularColumn("e", AsciiType.instance) + .addRegularColumn("f", AsciiType.instance).build(); + + CFMetaData metadata5 = CFMetaData.Builder.create(KEYSPACE, CF5) + .addPartitionKey("key", BytesType.instance) + .addClusteringColumn("col", AsciiType.instance) + .addRegularColumn("a", AsciiType.instance) + .addRegularColumn("b", AsciiType.instance) + .addRegularColumn("c", AsciiType.instance) + .addRegularColumn("d", AsciiType.instance) + .addRegularColumn("e", AsciiType.instance) + .addRegularColumn("f", AsciiType.instance).build(); + + SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE, KeyspaceParams.simple(1), metadata1, metadata2, - metadata3); + metadata3, + metadata4, + metadata5); } @Test @@ -260,7 +285,7 @@ public class ReadCommandTest @Test public void testCountDeletedRows() throws Exception { - ColumnFamilyStore cfs = Keyspace.open(KEYSPACE).getColumnFamilyStore(CF3); + ColumnFamilyStore cfs = Keyspace.open(KEYSPACE).getColumnFamilyStore(CF4); String[][][] groups = new String[][][] { new String[][] { @@ -308,7 +333,7 @@ public class ReadCommandTest @Test public void testCountWithNoDeletedRow() throws Exception { - ColumnFamilyStore cfs = Keyspace.open(KEYSPACE).getColumnFamilyStore(CF3); + ColumnFamilyStore cfs = Keyspace.open(KEYSPACE).getColumnFamilyStore(CF5); String[][][] groups = new String[][][] { new String[][] { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org