CNDB-15581: CDNB-15253: ninja-fix for ant check

Rebase notes:
 - squash into previous commit (9a21657)

Author: michaelsembwever

src/java/org/apache/cassandra/config/CassandraRelevantProperties.java

@@ -1012,6 +1012,16 @@ public enum CassandraRelevantProperties
     /** Set this property to true in order to use DSE-like histogram bucket boundaries and behaviour */
     USE_DSE_COMPATIBLE_HISTOGRAM_BOUNDARIES("cassandra.use_dse_compatible_histogram_boundaries", "false"),
     USE_DYNAMIC_SNITCH_FOR_COUNTER_LEADER("cassandra.counter_leader.use_dynamic_snitch", "false"),
+
+    /**
+     * Whether to use factorization-based shard count growth for smoother progression when base_shard_count is not power of 2.
+     * When enabled (default: true), instead of using power-of-two jumps like 1→2→8→1000, the system will
+     * use prime factorization to create smooth sequences like 1→5→25→125→250→500→1000 for num_shards=1000.
+     * This prevents the large jumps that were involved in the data loss incident caused by HCD-130
+     * <p>
+     */
+    USE_FACTORIZATION_SHARD_COUNT_GROWTH("use_factorization_shard_count_growth", "true"),
+
     /** Set this property to true in order to switch to micrometer metrics */
     USE_MICROMETER("cassandra.use_micrometer_metrics", "false"),
     /** When enabled, recursive directory deletion will be executed using a unix command `rm -rf` instead of traversing

src/java/org/apache/cassandra/db/compaction/unified/Controller.java

@@ -322,14 +322,7 @@ public abstract class Controller
     static final String MAX_SSTABLES_PER_SHARD_FACTOR_OPTION = "max_sstables_per_shard_factor";
     static final double DEFAULT_MAX_SSTABLES_PER_SHARD_FACTOR = UCS_MAX_SSTABLES_PER_SHARD_FACTOR.getDoubleWithLegacyFallback();
 
-    /**
-     * Whether to use factorization-based shard count growth for smoother progression when base_shard_count is not power of 2.
-     * When enabled (default: true), instead of using power-of-two jumps like 1→2→8→1000, the system will
-     * use prime factorization to create smooth sequences like 1→5→25→125→250→500→1000 for num_shards=1000.
-     * This prevents the large jumps that were involved in the data loss incident caused by HCD-130
-     * <p>
-     */
-    static final boolean USE_FACTORIZATION_SHARD_COUNT_GROWTH = Boolean.parseBoolean(System.getProperty("use_factorization_shard_count_growth", "true"));
+    static final boolean USE_FACTORIZATION_SHARD_COUNT_GROWTH = CassandraRelevantProperties.USE_FACTORIZATION_SHARD_COUNT_GROWTH.getBoolean();
 
     protected final MonotonicClock clock;
     protected final Environment env;

test/unit/org/apache/cassandra/db/compaction/unified/ControllerTest.java

@@ -18,7 +18,6 @@
 
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;