You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2025/07/02 17:09:42 UTC

(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk

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

commit 30f094080f6db18995a9f398c8239745a473d7d5
Merge: c9e52399e6 81fcacdfa4
Author: Caleb Rackliffe <ca...@gmail.com>
AuthorDate: Wed Jul 2 12:02:50 2025 -0500

    Merge branch 'cassandra-5.0' into trunk
    
    * cassandra-5.0:
      Ensure CassandraIndexTest sets up properly when using SAI in the wake of CASSANDRA-20732

 .../index/internal/CassandraIndexTest.java         | 23 +++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --cc test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java
index 3b3ca94794,9e8fc27398..39ee219c96
--- a/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java
+++ b/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java
@@@ -31,7 -36,7 +36,13 @@@ import org.apache.cassandra.Util
  import org.apache.cassandra.cql3.CQLTester;
  import org.apache.cassandra.cql3.UntypedResultSet;
  import org.apache.cassandra.cql3.restrictions.StatementRestrictions;
--import org.apache.cassandra.db.*;
++import org.apache.cassandra.db.ColumnFamilyStore;
++import org.apache.cassandra.db.DecoratedKey;
++import org.apache.cassandra.db.ReadExecutionController;
++import org.apache.cassandra.db.SinglePartitionReadCommand;
++import org.apache.cassandra.db.Slice;
++import org.apache.cassandra.db.Slices;
++import org.apache.cassandra.db.SystemKeyspace;
  import org.apache.cassandra.db.filter.ClusteringIndexFilter;
  import org.apache.cassandra.db.filter.ClusteringIndexSliceFilter;
  import org.apache.cassandra.db.filter.ColumnFilter;
@@@ -42,10 -47,9 +53,10 @@@ import org.apache.cassandra.exceptions.
  import org.apache.cassandra.schema.ColumnMetadata;
  import org.apache.cassandra.schema.SchemaConstants;
  import org.apache.cassandra.schema.TableMetadata;
+ import org.apache.cassandra.service.StorageService;
 +import org.apache.cassandra.service.accord.AccordKeyspace;
  import org.apache.cassandra.utils.ByteBufferUtil;
  import org.apache.cassandra.utils.FBUtilities;
- import org.awaitility.Awaitility;
  
  import static org.apache.cassandra.Util.throwAssert;
  import static org.junit.Assert.assertArrayEquals;
@@@ -59,6 -63,12 +70,12 @@@ import static org.junit.Assert.fail
   */
  public class CassandraIndexTest extends CQLTester
  {
+     @BeforeClass
+     public static void setup()
+     {
 -        StorageService.instance.initServer(); // Ensure the node has advanced out of STARTING mode
++        StorageService.instance.unsafeSetInitialized();
+     }
+ 
      @Test
      public void indexOnRegularColumn() throws Throwable
      {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org