Skip to content

Fix UnsupportedOperationException in max_by and min_by aggregation #10599

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

Merged
dain merged 1 commit into from
Jan 14, 2022
Merged

Fix UnsupportedOperationException in max_by and min_by aggregation #10599

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
29 changes: 25 additions & 4 deletions core/trino-main/src/main/java/io/trino/operator/aggregation/minmaxby/AbstractMinMaxBy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,16 @@
import io.trino.operator.aggregation.state.BlockPositionState;
import io.trino.operator.aggregation.state.BlockPositionStateSerializer;
import io.trino.operator.aggregation.state.NullableBooleanState;
import io.trino.operator.aggregation.state.NullableBooleanStateSerializer;
import io.trino.operator.aggregation.state.NullableDoubleState;
import io.trino.operator.aggregation.state.NullableDoubleStateSerializer;
import io.trino.operator.aggregation.state.NullableLongState;
import io.trino.operator.aggregation.state.NullableLongStateSerializer;
import io.trino.operator.aggregation.state.NullableState;
import io.trino.spi.block.Block;
import io.trino.spi.block.BlockBuilder;
import io.trino.spi.function.AccumulatorState;
import io.trino.spi.function.AccumulatorStateSerializer;
import io.trino.spi.type.Type;
import io.trino.spi.type.TypeSignature;
import io.trino.util.MinMaxCompare;
Expand All @@ -46,7 +50,6 @@
import static io.trino.metadata.Signature.orderableTypeParameter;
import static io.trino.metadata.Signature.typeVariable;
import static io.trino.operator.aggregation.state.StateCompiler.generateStateFactory;
import static io.trino.operator.aggregation.state.StateCompiler.generateStateSerializer;
import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.BLOCK_POSITION;
import static io.trino.spi.function.InvocationConvention.InvocationArgumentConvention.NEVER_NULL;
import static io.trino.spi.function.InvocationConvention.InvocationReturnConvention.FAIL_ON_NULL;
Expand Down Expand Up @@ -126,14 +129,14 @@ private static AccumulatorStateDescriptor<? extends AccumulatorState> getAccumul
new BlockPositionStateSerializer(type),
generateStateFactory(BlockPositionState.class));
}
return getAccumulatorStateDescriptor(stateClass);
return getAccumulatorStateDescriptor(stateClass, type);
}

private static <T extends AccumulatorState> AccumulatorStateDescriptor<T> getAccumulatorStateDescriptor(Class<T> stateClass)
private static <T extends AccumulatorState> AccumulatorStateDescriptor<T> getAccumulatorStateDescriptor(Class<T> stateClass, Type type)
{
return new AccumulatorStateDescriptor<>(
stateClass,
generateStateSerializer(stateClass),
getStateSerializer(stateClass, type),
generateStateFactory(stateClass));
}

Expand Down Expand Up @@ -291,6 +294,24 @@ private static Class<? extends AccumulatorState> getStateClass(Type type)
return BlockPositionState.class;
}

@SuppressWarnings("unchecked")
private static <T extends AccumulatorState> AccumulatorStateSerializer<T> getStateSerializer(Class<T> state, Type type)
{
if (NullableLongState.class.equals(state)) {
return (AccumulatorStateSerializer<T>) new NullableLongStateSerializer(type);
}
if (NullableDoubleState.class.equals(state)) {
return (AccumulatorStateSerializer<T>) new NullableDoubleStateSerializer(type);
}
if (NullableBooleanState.class.equals(state)) {
return (AccumulatorStateSerializer<T>) new NullableBooleanStateSerializer(type);
}
if (BlockPositionState.class.equals(state)) {
return (AccumulatorStateSerializer<T>) new BlockPositionStateSerializer(type);
}
throw new IllegalArgumentException("Unsupported state class: " + state);
}

private static MethodHandle getSetStateValue(Type type, Class<?> stateClass)
throws ReflectiveOperationException
{
Expand Down
19 changes: 18 additions & 1 deletion ...ain/src/main/java/io/trino/operator/aggregation/state/NullableBooleanStateSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,37 @@
*/
package io.trino.operator.aggregation.state;

import io.trino.annotation.UsedByGeneratedCode;
import io.trino.spi.block.Block;
import io.trino.spi.block.BlockBuilder;
import io.trino.spi.function.AccumulatorStateSerializer;
import io.trino.spi.type.Type;

import static com.google.common.base.Preconditions.checkArgument;
import static io.trino.spi.type.BooleanType.BOOLEAN;
import static java.util.Objects.requireNonNull;

public class NullableBooleanStateSerializer
implements AccumulatorStateSerializer<NullableBooleanState>
{
private final Type type;

@UsedByGeneratedCode
public NullableBooleanStateSerializer()
{
this(BOOLEAN);
}

public NullableBooleanStateSerializer(Type type)
{
this.type = requireNonNull(type, "type is null");
checkArgument(type.getJavaType() == boolean.class, "Type must use boolean stack type: " + type);
}

@Override
public Type getSerializedType()
{
return BOOLEAN;
return type;
}

@Override
Expand Down
23 changes: 20 additions & 3 deletions ...main/src/main/java/io/trino/operator/aggregation/state/NullableDoubleStateSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,37 @@
*/
package io.trino.operator.aggregation.state;

import io.trino.annotation.UsedByGeneratedCode;
import io.trino.spi.block.Block;
import io.trino.spi.block.BlockBuilder;
import io.trino.spi.function.AccumulatorStateSerializer;
import io.trino.spi.type.Type;

import static com.google.common.base.Preconditions.checkArgument;
import static io.trino.spi.type.DoubleType.DOUBLE;
import static java.util.Objects.requireNonNull;

public class NullableDoubleStateSerializer
implements AccumulatorStateSerializer<NullableDoubleState>
{
private final Type type;

@UsedByGeneratedCode
public NullableDoubleStateSerializer()
{
this(DOUBLE);
}

public NullableDoubleStateSerializer(Type type)
{
this.type = requireNonNull(type, "type is null");
checkArgument(type.getJavaType() == double.class, "Type must use double stack type: " + type);
}

@Override
public Type getSerializedType()
{
return DOUBLE;
return type;
}

@Override
Expand All @@ -36,7 +53,7 @@ public void serialize(NullableDoubleState state, BlockBuilder out)
out.appendNull();
}
else {
DOUBLE.writeDouble(out, state.getValue());
type.writeDouble(out, state.getValue());
}
}

Expand All @@ -48,7 +65,7 @@ public void deserialize(Block block, int index, NullableDoubleState state)
}
else {
state.setNull(false);
state.setValue(DOUBLE.getDouble(block, index));
state.setValue(type.getDouble(block, index));
}
}
}
23 changes: 20 additions & 3 deletions ...o-main/src/main/java/io/trino/operator/aggregation/state/NullableLongStateSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,37 @@
*/
package io.trino.operator.aggregation.state;

import io.trino.annotation.UsedByGeneratedCode;
import io.trino.spi.block.Block;
import io.trino.spi.block.BlockBuilder;
import io.trino.spi.function.AccumulatorStateSerializer;
import io.trino.spi.type.Type;

import static com.google.common.base.Preconditions.checkArgument;
import static io.trino.spi.type.BigintType.BIGINT;
import static java.util.Objects.requireNonNull;

public class NullableLongStateSerializer
implements AccumulatorStateSerializer<NullableLongState>
{
private final Type type;

@UsedByGeneratedCode
public NullableLongStateSerializer()
{
this(BIGINT);
}

public NullableLongStateSerializer(Type type)
{
this.type = requireNonNull(type, "type is null");
checkArgument(type.getJavaType() == long.class, "Type must use long stack type: " + type);
}

@Override
public Type getSerializedType()
{
return BIGINT;
return type;
}

@Override
Expand All @@ -36,7 +53,7 @@ public void serialize(NullableLongState state, BlockBuilder out)
out.appendNull();
}
else {
BIGINT.writeLong(out, state.getValue());
type.writeLong(out, state.getValue());
}
}

Expand All @@ -48,7 +65,7 @@ public void deserialize(Block block, int index, NullableLongState state)
}
else {
state.setNull(false);
state.setValue(BIGINT.getLong(block, index));
state.setValue(type.getLong(block, index));
}
}
}
3 changes: 3 additions & 0 deletions testing/trino-tests/src/test/java/io/trino/tests/AbstractTestEngineOnlyQueries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3409,6 +3409,9 @@ public void testAverageAll()
public void testMaxBy()
{
assertQuery("SELECT MAX_BY(orderkey, totalprice) FROM orders", "SELECT orderkey FROM orders ORDER BY totalprice DESC LIMIT 1");
assertQuery(
"SELECT clerk, max_by(orderstatus, shippriority) FROM orders WHERE orderstatus = 'O' GROUP BY 1",
"SELECT clerk, 'O' FROM orders GROUP BY clerk");
}

@Test
Expand Down