From 8c592323f3927a4c1ea0d1f3767232978142f7d1 Mon Sep 17 00:00:00 2001 From: Danny Faught Date: Fri, 27 Sep 2024 11:29:54 -0700 Subject: [PATCH] refactor: introduce variables Plus a rename Co-Authored-By: Lada Kesseler <23501754+lexler@users.noreply.github.com> --- .../org/apache/cassandra/service/StorageService.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index 5cf3881900..e82cc48afa 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -3557,11 +3557,10 @@ public class StorageService extends NotificationBroadcasterSupport implements IE { int minSamplesPerSplit = 4; int maxSplitCount = numberOfKeys / minSamplesPerSplit + 1; - int splitCount = Math.max(1, - Math.min( - maxSplitCount, - (int) (totalRowCountEstimate / keysPerSplit))); - return splitCount; + int calculatedSplitCount = (int) (totalRowCountEstimate / keysPerSplit); + int splitCountMaxOrLess = Math.min(maxSplitCount, calculatedSplitCount); + int splitCountOneOrHigher = Math.max(1, splitCountMaxOrLess); + return splitCountOneOrHigher; } private List, Long>> getSplits(List tokens, int splitCount, ColumnFamilyStore cfs)