Skip to content

Reduce allocations in DefaultQueryOptions when read thresholds are en… #4883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
frankgh wants to merge 3 commits into
base: trunk
Choose a base branch
from
+15 −2
Open

Reduce allocations in DefaultQueryOptions when read thresholds are en… #4883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
999d6d7
Reduce allocations in DefaultQueryOptions when read thresholds are en…
frankgh Jun 16, 2026
aa61260
Address PR comments from Dmitry
frankgh Jun 29, 2026
80d4da6
cleanup
frankgh Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/java/org/apache/cassandra/config/DatabaseDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
import com.google.common.util.concurrent.RateLimiter;
import com.googlecode.concurrenttrees.common.Iterables;

import org.apache.cassandra.cql3.QueryOptions;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
Expand Down Expand Up @@ -267,6 +268,8 @@ public class DatabaseDescriptor

public static volatile boolean allowUnlimitedConcurrentValidations = ALLOW_UNLIMITED_CONCURRENT_VALIDATIONS.getBoolean();

private static volatile QueryOptions.DefaultReadThresholds defaultReadThresholds;

/**
* The configuration for guardrails.
*/
Expand Down Expand Up @@ -5452,6 +5455,14 @@ public static boolean getInvalidLegacyProtocolMagicNoSpamEnabled()
return conf.invalid_legacy_protocol_magic_no_spam_enabled;
}

public static QueryOptions.DefaultReadThresholds getDefaultReadThresholds()
{
if (defaultReadThresholds == null)
defaultReadThresholds = new QueryOptions.DefaultReadThresholds(getCoordinatorReadSizeWarnThreshold(),
getCoordinatorReadSizeFailThreshold());
return defaultReadThresholds;
}

public static boolean getReadThresholdsEnabled()
{
return conf.read_thresholds_enabled;
Expand All @@ -5476,6 +5487,7 @@ public static void setCoordinatorReadSizeWarnThreshold(@Nullable DataStorageSpec
{
logger.info("updating coordinator_read_size_warn_threshold to {}", value);
conf.coordinator_read_size_warn_threshold = value;
defaultReadThresholds = new QueryOptions.DefaultReadThresholds(value, getCoordinatorReadSizeFailThreshold());
}

@Nullable
Expand All @@ -5488,6 +5500,7 @@ public static void setCoordinatorReadSizeFailThreshold(@Nullable DataStorageSpec
{
logger.info("updating coordinator_read_size_fail_threshold to {}", value);
conf.coordinator_read_size_fail_threshold = value;
defaultReadThresholds = new QueryOptions.DefaultReadThresholds(getCoordinatorReadSizeWarnThreshold(), value);
}

@Nullable
Expand Down
4 changes: 2 additions & 2 deletions src/java/org/apache/cassandra/cql3/QueryOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ static ReadThresholds create()
// if daemon initialization hasn't happened yet (very common in tests) then ignore
if (!DatabaseDescriptor.isDaemonInitialized() || !DatabaseDescriptor.getReadThresholdsEnabled())
return DisabledReadThresholds.INSTANCE;
return new DefaultReadThresholds(DatabaseDescriptor.getCoordinatorReadSizeWarnThreshold(), DatabaseDescriptor.getCoordinatorReadSizeFailThreshold());
return DatabaseDescriptor.getDefaultReadThresholds();
}
}

Expand All @@ -349,7 +349,7 @@ public long getCoordinatorReadSizeFailThresholdBytes()
}
}

private static class DefaultReadThresholds implements ReadThresholds
public static class DefaultReadThresholds implements ReadThresholds
{
private final long warnThresholdBytes;
private final long abortThresholdBytes;
Expand Down