Skip to content

Remove redundant LongDoubleState interface #16672

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
raunaqmorarka merged 1 commit into from
Mar 22, 2023
Merged

Remove redundant LongDoubleState interface #16672

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
25 changes: 13 additions & 12 deletions core/trino-main/src/main/java/io/trino/operator/aggregation/DoubleSumAggregation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
*/
package io.trino.operator.aggregation;

import io.trino.operator.aggregation.state.LongAndDoubleState;
import io.trino.spi.block.BlockBuilder;
import io.trino.spi.function.AggregationFunction;
import io.trino.spi.function.AggregationState;
Expand All @@ -30,34 +31,34 @@ public final class DoubleSumAggregation
private DoubleSumAggregation() {}

@InputFunction
public static void sum(@AggregationState LongDoubleState state, @SqlType(StandardTypes.DOUBLE) double value)
public static void sum(@AggregationState LongAndDoubleState state, @SqlType(StandardTypes.DOUBLE) double value)
{
state.setFirst(state.getFirst() + 1);
state.setSecond(state.getSecond() + value);
state.setLong(state.getLong() + 1);
state.setDouble(state.getDouble() + value);
}

@RemoveInputFunction
public static void removeInput(@AggregationState LongDoubleState state, @SqlType(StandardTypes.DOUBLE) double value)
public static void removeInput(@AggregationState LongAndDoubleState state, @SqlType(StandardTypes.DOUBLE) double value)
{
state.setFirst(state.getFirst() - 1);
state.setSecond(state.getSecond() - value);
state.setLong(state.getLong() - 1);
state.setDouble(state.getDouble() - value);
}

@CombineFunction
public static void combine(@AggregationState LongDoubleState state, @AggregationState LongDoubleState otherState)
public static void combine(@AggregationState LongAndDoubleState state, @AggregationState LongAndDoubleState otherState)
{
state.setFirst(state.getFirst() + otherState.getFirst());
state.setSecond(state.getSecond() + otherState.getSecond());
state.setLong(state.getLong() + otherState.getLong());
state.setDouble(state.getDouble() + otherState.getDouble());
}

@OutputFunction(StandardTypes.DOUBLE)
public static void output(@AggregationState LongDoubleState state, BlockBuilder out)
public static void output(@AggregationState LongAndDoubleState state, BlockBuilder out)
{
if (state.getFirst() == 0) {
if (state.getLong() == 0) {
out.appendNull();
}
else {
DoubleType.DOUBLE.writeDouble(out, state.getSecond());
DoubleType.DOUBLE.writeDouble(out, state.getDouble());
}
}
}
28 changes: 0 additions & 28 deletions core/trino-main/src/main/java/io/trino/operator/aggregation/LongDoubleState.java
View file
Open in desktop

This file was deleted.