Skip to content

Commit 3e670ec

Browse files
authored
CC5 fix AlterTest (#1921)
### What is the issue Fixes riptano/cndb#14954 ### What does this PR fix and why was it fixed Fixes CC5 test failure by removing an assert that was likely due to a rebase mistake. ``` assertThat(AbstractShardedMemtable.getDefaultShardCount()).isEqualTo(1);; ``` The assert comes from a CC ticket, STAR-840, but this assert does not appear on `main` branch in `AlterTest`. In fact `AbstractShardedMemtable` is a CC 5.0 only class. Without digging more into the history of how/why this got added ... it's not needed here since the `main` branch version does not have any similar check.
1 parent 6e8b4ce commit 3e670ec

File tree

1 file changed

+0
-3
lines changed
  • test/unit/org/apache/cassandra/cql3/validation/operations

1 file changed

+0
-3
lines changed

test/unit/org/apache/cassandra/cql3/validation/operations/AlterTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.apache.cassandra.cql3.CQLTester;
3030
import org.apache.cassandra.db.ColumnFamilyStore;
3131
import org.apache.cassandra.db.Keyspace;
32-
import org.apache.cassandra.db.memtable.AbstractShardedMemtable;
3332
import org.apache.cassandra.db.memtable.Memtable;
3433
import org.apache.cassandra.db.memtable.SkipListMemtable;
3534
import org.apache.cassandra.db.memtable.TestMemtable;
@@ -47,7 +46,6 @@
4746

4847
import static java.lang.String.format;
4948
import static org.apache.cassandra.config.CassandraRelevantProperties.TRIE_MEMTABLE_SHARD_COUNT;
50-
import static org.assertj.core.api.Assertions.assertThat;
5149
import static org.junit.Assert.assertEquals;
5250
import static org.junit.Assert.assertNull;
5351
import static org.junit.Assert.assertSame;
@@ -63,7 +61,6 @@ public static void setUpClass()
6361
// into TokenMetadata; expect trouble
6462
TRIE_MEMTABLE_SHARD_COUNT.setString("1");
6563
CQLTester.setUpClass();
66-
assertThat(AbstractShardedMemtable.getDefaultShardCount()).isEqualTo(1);;
6764
}
6865

6966
@Test

0 commit comments

Comments
 (0)