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 1 commit into
base: trunk
Choose a base branch
from
+6 −11
Open

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 6 additions & 11 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 DefaultReadThresholds.INSTANCE;
}
}

Expand Down Expand Up @@ -351,14 +351,7 @@ public long getCoordinatorReadSizeFailThresholdBytes()

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

public DefaultReadThresholds(DataStorageSpec.LongBytesBound warnThreshold, DataStorageSpec.LongBytesBound abortThreshold)
{
this.warnThresholdBytes = warnThreshold == null ? -1 : warnThreshold.toBytes();
this.abortThresholdBytes = abortThreshold == null ? -1 : abortThreshold.toBytes();
}
private static final DefaultReadThresholds INSTANCE = new DefaultReadThresholds();

@Override
public boolean isEnabled()
Expand All @@ -369,13 +362,15 @@ public boolean isEnabled()
@Override
public long getCoordinatorReadSizeWarnThresholdBytes()
{
return warnThresholdBytes;
DataStorageSpec.LongBytesBound warnThreshold = DatabaseDescriptor.getCoordinatorReadSizeWarnThreshold();
return warnThreshold == null ? -1 : warnThreshold.toBytes();
}

@Override
public long getCoordinatorReadSizeFailThresholdBytes()
{
return abortThresholdBytes;
DataStorageSpec.LongBytesBound abortThreshold = DatabaseDescriptor.getCoordinatorReadSizeFailThreshold();
return abortThreshold == null ? -1 : abortThreshold.toBytes();
}
}

Expand Down