Skip to content
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

Jump to bottom

Improve KLL Sketch perf for non-grouped queries #22619

Merged
merged 1 commit into from May 1, 2024
Merged

Improve KLL Sketch perf for non-grouped queries #22619

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions ...n/java/com/facebook/presto/operator/aggregation/sketch/kll/KllSketchAggregationState.java
View file
Open in desktop
Expand Up @@ -34,6 +34,7 @@

import java.util.Comparator;
import java.util.Map;
import java.util.function.Supplier;

import static com.facebook.presto.spi.StandardErrorCode.GENERIC_INTERNAL_ERROR;
import static com.facebook.presto.spi.StandardErrorCode.INVALID_ARGUMENTS;
Expand All @@ -60,7 +61,7 @@ public interface KllSketchAggregationState
@Nullable
<T> KllItemsSketch<T> getSketch();

void addMemoryUsage(long value);
void addMemoryUsage(Supplier<Long> usage);

Type getType();

Expand Down Expand Up @@ -115,7 +116,7 @@ public <T> void setSketch(KllItemsSketch<T> sketch)
}

@Override
public void addMemoryUsage(long value)
public void addMemoryUsage(Supplier<Long> usage)
{
// noop
}
Expand Down Expand Up @@ -161,9 +162,9 @@ public <T> KllItemsSketch<T> getSketch()
}

@Override
public void addMemoryUsage(long value)
public void addMemoryUsage(Supplier<Long> usage)
{
accumulatedSizeInBytes += value;
accumulatedSizeInBytes += usage.get();
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...in/java/com/facebook/presto/operator/aggregation/sketch/kll/KllSketchStateSerializer.java
View file
Open in desktop
Expand Up @@ -65,8 +65,8 @@ public void deserialize(Block block, int index, KllSketchAggregationState state)
KllSketchAggregationState.SketchParameters parameters = KllSketchAggregationState.getSketchParameters(type);
// use heapify over wrap in order to get a writable sketch for updates and merges
KllItemsSketch sketch = KllItemsSketch.heapify(memory, parameters.getComparator(), parameters.getSerde());
state.addMemoryUsage(-getEstimatedKllInMemorySize(state.getSketch(), type.getJavaType()));
state.addMemoryUsage(() -> -getEstimatedKllInMemorySize(state.getSketch(), type.getJavaType()));
state.setSketch(sketch);
state.addMemoryUsage(getEstimatedKllInMemorySize(state.getSketch(), type.getJavaType()));
state.addMemoryUsage(() -> getEstimatedKllInMemorySize(state.getSketch(), type.getJavaType()));
}
}
24 changes: 12 additions & 12 deletions ...om/facebook/presto/operator/aggregation/sketch/kll/KllSketchWithKAggregationFunction.java
View file
Open in desktop
Expand Up @@ -54,9 +54,9 @@ public static void input(@AggregationState KllSketchAggregationState state, @Sql
{
initializeSketch(state, () -> Long::compareTo, ArrayOfLongsSerDe::new, k);
KllItemsSketch<Long> sketch = state.getSketch();
state.addMemoryUsage(-getEstimatedKllInMemorySize(sketch, long.class));
state.addMemoryUsage(() -> -getEstimatedKllInMemorySize(sketch, long.class));
state.getSketch().update(value);
state.addMemoryUsage(getEstimatedKllInMemorySize(sketch, long.class));
state.addMemoryUsage(() -> getEstimatedKllInMemorySize(sketch, long.class));
}

@InputFunction
Expand All @@ -65,9 +65,9 @@ public static void input(@AggregationState KllSketchAggregationState state, @Sql
{
initializeSketch(state, () -> Double::compareTo, ArrayOfDoublesSerDe::new, k);
KllItemsSketch<Double> sketch = state.getSketch();
state.addMemoryUsage(-getEstimatedKllInMemorySize(sketch, double.class));
state.addMemoryUsage(() -> -getEstimatedKllInMemorySize(sketch, double.class));
state.getSketch().update(value);
state.addMemoryUsage(getEstimatedKllInMemorySize(sketch, double.class));
state.addMemoryUsage(() -> getEstimatedKllInMemorySize(sketch, double.class));
}

@InputFunction
Expand All @@ -76,9 +76,9 @@ public static void input(@AggregationState KllSketchAggregationState state, @Sql
{
initializeSketch(state, () -> String::compareTo, ArrayOfStringsSerDe::new, k);
KllItemsSketch sketch = state.getSketch();
state.addMemoryUsage(-getEstimatedKllInMemorySize(sketch, Slice.class));
state.addMemoryUsage(() -> -getEstimatedKllInMemorySize(sketch, Slice.class));
state.getSketch().update(value.toStringUtf8());
state.addMemoryUsage(getEstimatedKllInMemorySize(sketch, Slice.class));
state.addMemoryUsage(() -> getEstimatedKllInMemorySize(sketch, Slice.class));
}

@InputFunction
Expand All @@ -87,22 +87,22 @@ public static void input(@AggregationState KllSketchAggregationState state, @Sql
{
initializeSketch(state, () -> Boolean::compareTo, ArrayOfBooleansSerDe::new, k);
KllItemsSketch<Boolean> sketch = state.getSketch();
state.addMemoryUsage(-getEstimatedKllInMemorySize(sketch, boolean.class));
state.addMemoryUsage(() -> -getEstimatedKllInMemorySize(sketch, boolean.class));
state.getSketch().update(value);
state.addMemoryUsage(getEstimatedKllInMemorySize(sketch, boolean.class));
state.addMemoryUsage(() -> getEstimatedKllInMemorySize(sketch, boolean.class));
}

@CombineFunction
public static void combine(@AggregationState KllSketchAggregationState state, @AggregationState KllSketchAggregationState otherState)
{
if (state.getSketch() != null && otherState.getSketch() != null) {
state.addMemoryUsage(-getEstimatedKllInMemorySize(state.getSketch(), state.getType().getJavaType()));
state.addMemoryUsage(() -> -getEstimatedKllInMemorySize(state.getSketch(), state.getType().getJavaType()));
state.getSketch().merge(otherState.getSketch());
state.addMemoryUsage(getEstimatedKllInMemorySize(state.getSketch(), state.getType().getJavaType()));
state.addMemoryUsage(() -> getEstimatedKllInMemorySize(state.getSketch(), state.getType().getJavaType()));
}
else if (state.getSketch() == null) {
state.setSketch(otherState.getSketch());
state.addMemoryUsage(getEstimatedKllInMemorySize(otherState.getSketch(), state.getType().getJavaType()));
state.addMemoryUsage(() -> getEstimatedKllInMemorySize(otherState.getSketch(), state.getType().getJavaType()));
}
}

Expand All @@ -125,7 +125,7 @@ private static <T> void initializeSketch(KllSketchAggregationState state, Suppli
if (state.getSketch() == null) {
KllItemsSketch<T> sketch = KllItemsSketch.newHeapInstance((int) k, comparator.get(), serdeSupplier.get());
state.setSketch(sketch);
state.addMemoryUsage(getEstimatedKllInMemorySize(sketch, state.getType().getJavaType()));
state.addMemoryUsage(() -> getEstimatedKllInMemorySize(sketch, state.getType().getJavaType()));
}
}
}