natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid Cell iterator for alive rows in MetricsRecording transformation of ReadCommand 

patch by Dmitry Konstantinov; reviewed by Francisco Guerrero for CASSANDRA-21288
This commit is contained in:
Dmitry Konstantinov 2026-04-06 21:16:25 +01:00
parent 536504969c
commit 9bcdf5d746
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
6.0-alpha2
* Avoid Cell iterator for alive rows in MetricsRecording transformation of ReadCommand (CASSANDRA-21288)
* Reuse a single TrackedDataInputPlus instance per UnfilteredSerializer (CASSANDRA-21296)
* In-tree docs are included in binary artifacts (tarball, deb, rpm) as html and man pages (CASSANDRA-17260)
* Add tooling to repair system peers and peers_v2 if inconsistent with cluster metadata (CASSANDRA-21187)

19
src/java/org/apache/cassandra/db/ReadCommand.java
View File

@ -644,19 +644,24 @@ public abstract class ReadCommand extends AbstractReadQuery
public Row applyToRow(Row row)
{
boolean hasTombstones = false;
for (Cell<?> cell : row.cells())
final long nowInSec = ReadCommand.this.nowInSec();
final boolean rowHasDeletion = row.hasDeletion(nowInSec);
if (rowHasDeletion) // perf optimization, to avoid iteration if all cells are alive
{
if (!cell.isLive(ReadCommand.this.nowInSec()))
for (Cell<?> cell : row.cells())
{
countTombstone(row.clustering());
hasTombstones = true; // allows to avoid counting an extra tombstone if the whole row expired
if (!cell.isLive(nowInSec))
{
countTombstone(row.clustering());
hasTombstones = true; // allows to avoid counting an extra tombstone if the whole row expired
}
}
}
if (row.hasLiveData(ReadCommand.this.nowInSec(), enforceStrictLiveness))
if (row.hasLiveData(nowInSec, enforceStrictLiveness))
++liveRows;
else if (!row.primaryKeyLivenessInfo().isLive(ReadCommand.this.nowInSec())
&& row.hasDeletion(ReadCommand.this.nowInSec())
else if (!row.primaryKeyLivenessInfo().isLive(nowInSec)
&& rowHasDeletion
&& !hasTombstones)
{
// We're counting primary key deletions only here.