diff --git a/CHANGES.txt b/CHANGES.txt index f5036df91b..e932b40467 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -193,6 +193,7 @@ 3.11.2 + * Fix ReadCommandTest (CASSANDRA-14234) * Remove trailing period from latency reports at keyspace level (CASSANDRA-14233) * Remove dependencies on JVM internal classes from JMXServerUtils (CASSANDRA-14173) * Add DEFAULT, UNSET, MBEAN and MBEANS to `ReservedKeywords` (CASSANDRA-14205) diff --git a/test/unit/org/apache/cassandra/db/ReadCommandTest.java b/test/unit/org/apache/cassandra/db/ReadCommandTest.java index f646a2fd04..6a82a5a7fa 100644 --- a/test/unit/org/apache/cassandra/db/ReadCommandTest.java +++ b/test/unit/org/apache/cassandra/db/ReadCommandTest.java @@ -66,6 +66,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 @@ -92,8 +94,36 @@ public class ReadCommandTest .addRegularColumn("e", AsciiType.instance) .addRegularColumn("f", AsciiType.instance); + TableMetadata.Builder metadata4 = + TableMetadata.builder(KEYSPACE, CF4) + .addPartitionKeyColumn("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); + + TableMetadata.Builder metadata5 = + TableMetadata.builder(KEYSPACE, CF5) + .addPartitionKeyColumn("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); + SchemaLoader.prepareServer(); - SchemaLoader.createKeyspace(KEYSPACE, KeyspaceParams.simple(1), metadata1, metadata2, metadata3); + SchemaLoader.createKeyspace(KEYSPACE, + KeyspaceParams.simple(1), + metadata1, + metadata2, + metadata3, + metadata4, + metadata5); } @Test @@ -348,10 +378,7 @@ public class ReadCommandTest @Test public void testCountDeletedRows() throws Exception { - ColumnFamilyStore cfs = Keyspace.open(KEYSPACE).getColumnFamilyStore(CF3); - // cfs = Mockito.spy(cfs); - // TableMetrics metricsMock = Mockito.mock(TableMetrics.class); - // Mockito.doReturn(metricsMock).when(cfs).metric; + ColumnFamilyStore cfs = Keyspace.open(KEYSPACE).getColumnFamilyStore(CF4); String[][][] groups = new String[][][] { new String[][] { @@ -440,7 +467,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[][] {