Bring parts of CNDB-11336 from main missing here

datastax · Nov 7, 2024 · 3554475 · 3554475
1 parent 3846e52
commit 3554475
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/test/unit/org/apache/cassandra/index/sai/SAITester.java b/test/unit/org/apache/cassandra/index/sai/SAITester.java
@@ -92,6 +92,7 @@
 import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.service.snapshot.TableSnapshot;
 import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.ReflectionUtils;
 import org.apache.cassandra.utils.Throwables;
 import org.apache.lucene.codecs.CodecUtil;
 import org.awaitility.Awaitility;
@@ -898,7 +899,7 @@ protected static void setSegmentWriteBufferSpace(final int segmentSize) throws E
         NamedMemoryLimiter limiter = (NamedMemoryLimiter) V1OnDiskFormat.class.getDeclaredField("SEGMENT_BUILD_MEMORY_LIMITER").get(null);
         Field limitBytes = limiter.getClass().getDeclaredField("limitBytes");
         limitBytes.setAccessible(true);
-        Field modifiersField = Field.class.getDeclaredField("modifiers");
+        Field modifiersField = ReflectionUtils.getField(Field.class, "modifiers");
         modifiersField.setAccessible(true);
         modifiersField.setInt(limitBytes, limitBytes.getModifiers() & ~Modifier.FINAL);
         limitBytes.set(limiter, segmentSize);

diff --git a/test/unit/org/apache/cassandra/index/sai/SAIUtil.java b/test/unit/org/apache/cassandra/index/sai/SAIUtil.java
@@ -21,6 +21,7 @@
 import java.lang.reflect.Field;
 
 import org.apache.cassandra.index.sai.disk.format.Version;
+import org.apache.cassandra.utils.ReflectionUtils;
 
 public class SAIUtil
 {
@@ -31,7 +32,7 @@ public static void setLatestVersion(Version version)
         {
             latest = Version.class.getDeclaredField("LATEST");
             latest.setAccessible(true);
-            Field modifiersField = Field.class.getDeclaredField("modifiers");
+            Field modifiersField = ReflectionUtils.getField(Field.class, "modifiers");
             modifiersField.setAccessible(true);
             latest.set(null, version);
         }