This is an automated email from the ASF dual-hosted git repository.
maedhroz pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 5bdfd790b7 Ensure that SSTablesSystemViewTest compacts to a single
SSTable in testVirtualTableThroughIndexLifeCycle even w/ UCS
5bdfd790b7 is described below
commit 5bdfd790b7b8cc638a96efb5c34181ece35b04a1
Author: Caleb Rackliffe <calebrackli...@gmail.com>
AuthorDate: Tue Aug 1 14:53:07 2023 -0500
Ensure that SSTablesSystemViewTest compacts to a single SSTable in
testVirtualTableThroughIndexLifeCycle even w/ UCS
patch by Caleb Rackliffe; reviewed by Mick Semb Wever for CASSANDRA-18703
---
.../apache/cassandra/index/sai/virtual/SSTablesSystemViewTest.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git
a/test/unit/org/apache/cassandra/index/sai/virtual/SSTablesSystemViewTest.java
b/test/unit/org/apache/cassandra/index/sai/virtual/SSTablesSystemViewTest.java
index d0a481860f..2150d356a2 100644
---
a/test/unit/org/apache/cassandra/index/sai/virtual/SSTablesSystemViewTest.java
+++
b/test/unit/org/apache/cassandra/index/sai/virtual/SSTablesSystemViewTest.java
@@ -20,11 +20,14 @@ package org.apache.cassandra.index.sai.virtual;
import java.util.Objects;
import com.google.common.collect.ImmutableList;
+import com.googlecode.concurrenttrees.common.Iterables;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.apache.cassandra.Util;
import org.apache.cassandra.cql3.CQLTester;
import org.apache.cassandra.db.ColumnFamilyStore;
+import org.apache.cassandra.db.lifecycle.SSTableSet;
import org.apache.cassandra.db.virtual.VirtualKeyspace;
import org.apache.cassandra.db.virtual.VirtualKeyspaceRegistry;
import org.apache.cassandra.dht.AbstractBounds;
@@ -122,8 +125,10 @@ public class SSTablesSystemViewTest extends SAITester
assertRowsIgnoringOrder(execute(SELECT), row1, row2, row6, row3, row4,
row5, row7);
// compact the table and verify that the virtual table has a single
entry per index
- compact();
+ ColumnFamilyStore cfs = getCurrentColumnFamilyStore();
+ Util.compact(cfs, Iterables.toList(cfs.getSSTables(SSTableSet.LIVE)));
waitForCompactions();
+
SSTableId[] ids5 = currentIdsSorted();
// Compaction may result in sstables with generation 5 or 6. Try both.
// key 4, key 6 are not indexable on v1
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
