Skip to content

[CASSANDRA-21289][trunk] Avoid capturing lambda allocation in UnfilteredSerializer.deserializeRowBody #4710

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
netudima wants to merge 1 commit into
base: trunk
Choose a base branch
from
+43 −17
Open

[CASSANDRA-21289][trunk] Avoid capturing lambda allocation in UnfilteredSerializer.deserializeRowBody #4710

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
6 changes: 6 additions & 0 deletions src/java/org/apache/cassandra/db/Columns.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.util.Comparator;
import java.util.Iterator;
import java.util.Objects;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Predicate;

Expand Down Expand Up @@ -431,6 +432,11 @@ public void apply(Consumer<ColumnMetadata> function)
BTree.apply(columns, function);
}

public <A> void apply(BiConsumer<A, ColumnMetadata> function, A argument)
{
BTree.apply(columns, function, argument);
}

@Override
public boolean equals(Object other)
{
Expand Down
13 changes: 13 additions & 0 deletions src/java/org/apache/cassandra/db/rows/DeserializationHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,20 @@
import java.nio.ByteBuffer;
import java.util.Map;

import javax.annotation.concurrent.NotThreadSafe;

import org.apache.cassandra.db.DeletionTime;
import org.apache.cassandra.db.LivenessInfo;
import org.apache.cassandra.db.SerializationHeader;
import org.apache.cassandra.db.context.CounterContext;
import org.apache.cassandra.db.filter.ColumnFilter;
import org.apache.cassandra.db.marshal.ValueAccessor;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.schema.ColumnMetadata;
import org.apache.cassandra.schema.DroppedColumn;
import org.apache.cassandra.schema.TableMetadata;

@NotThreadSafe
public class DeserializationHelper
{
/**
Expand Down Expand Up @@ -57,6 +62,14 @@ public enum Flag
private final Map<ByteBuffer, DroppedColumn> droppedColumns;
private DroppedColumn currentDroppedComplex;

// reusable fields to avoid extra allocation during cells processing
// within org.apache.cassandra.db.rows.UnfilteredSerializer.deserializeRowBody
DataInputPlus in;
SerializationHeader header;
Row.Builder builder;
LivenessInfo livenessInfo;
boolean hasComplexDeletion;


public DeserializationHelper(TableMetadata metadata, int version, Flag flag, ColumnFilter columnsToFetch)
{
Expand Down
41 changes: 24 additions & 17 deletions src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,20 +626,12 @@ public Row deserializeRowBody(DataInputPlus in,

try
{
DataInputPlus finalIn = in;
columns.apply(column -> {
try
{
if (column.isSimple())
readSimpleColumn(column, finalIn, header, helper, builder, livenessInfo);
else
readComplexColumn(column, finalIn, header, helper, hasComplexDeletion, builder, livenessInfo);
}
catch (IOException e)
{
throw new WrappedException(e);
}
});
helper.in = in;
helper.header = header;
helper.builder = builder;
helper.livenessInfo = livenessInfo;
helper.hasComplexDeletion = hasComplexDeletion;
columns.apply(UnfilteredSerializer::readColumn, helper);
}
catch (WrappedException e)
{
Expand All @@ -661,7 +653,22 @@ public Row deserializeRowBody(DataInputPlus in,
}
}

private void readSimpleColumn(ColumnMetadata column, DataInputPlus in, SerializationHeader header, DeserializationHelper helper, Row.Builder builder, LivenessInfo rowLiveness)
private static void readColumn(DeserializationHelper helper, ColumnMetadata column)
{
try
{
if (column.isSimple())
readSimpleColumn(column, helper.in, helper.header, helper, helper.builder, helper.livenessInfo);
else
readComplexColumn(column, helper.in, helper.header, helper, helper.hasComplexDeletion, helper.builder, helper.livenessInfo);
}
catch (IOException e)
{
throw new WrappedException(e);
}
}

private static void readSimpleColumn(ColumnMetadata column, DataInputPlus in, SerializationHeader header, DeserializationHelper helper, Row.Builder builder, LivenessInfo rowLiveness)
throws IOException
{
if (helper.includes(column))
Expand All @@ -676,7 +683,7 @@ private void readSimpleColumn(ColumnMetadata column, DataInputPlus in, Serializa
}
}

private void readComplexColumn(ColumnMetadata column, DataInputPlus in, SerializationHeader header, DeserializationHelper helper, boolean hasComplexDeletion, Row.Builder builder, LivenessInfo rowLiveness)
private static void readComplexColumn(ColumnMetadata column, DataInputPlus in, SerializationHeader header, DeserializationHelper helper, boolean hasComplexDeletion, Row.Builder builder, LivenessInfo rowLiveness)
throws IOException
{
if (helper.includes(column))
Expand Down Expand Up @@ -733,7 +740,7 @@ public void skipMarkerBody(DataInputPlus in) throws IOException
in.skipBytesFully(markerSize);
}

private void skipComplexColumn(DataInputPlus in, ColumnMetadata column, SerializationHeader header, boolean hasComplexDeletion)
private static void skipComplexColumn(DataInputPlus in, ColumnMetadata column, SerializationHeader header, boolean hasComplexDeletion)
throws IOException
{
if (hasComplexDeletion)
Expand Down