Skip to content

fix(cassandra): use counted() not rowsCounted() for GROUP BY ShortReadProtection #5062

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
shoemoney wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

fix(cassandra): use counted() not rowsCounted() for GROUP BY ShortReadProtection #5062

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/java/org/apache/cassandra/db/filter/DataLimits.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ public boolean isUnlimited()

public DataLimits forShortReadRetry(int toFetch)
{
return new CQLLimits(toFetch);
return new CQLGroupByLimits(toFetch, groupPerPartitionLimit, rowLimit, groupBySpec, state);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/java/org/apache/cassandra/service/reads/ShortReadPartitionsProtection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public UnfilteredPartitionIterator moreContents()
* then future ShortReadRowsProtection.moreContents() calls will fetch the missing ones.
*/
int toQuery = command.limits().count() != DataLimits.NO_LIMIT
? command.limits().count() - mergedResultCounter.rowsCounted()
? Math.max(0, command.limits().count() - mergedResultCounter.counted())
: command.limits().perPartitionCount();

ColumnFamilyStore.metricsFor(command.metadata().id).shortReadProtectionRequests.mark();
Expand Down