jffwang
/
hetu-core
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!943 [I3VW8S] Capture groupBy field 

Merge pull request !943 from sandygao/I3VW8S-capture-groupBy-field
This commit is contained in:
i-robot 2021-06-17 21:55:09 +08:00 committed by Gitee
parent 21c03f2418 c78c66a269
commit 8cc975e0e8
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
presto-main/src/main/java/io/prestosql/operator/aggregation/builder/InMemoryAggregationBuilder.java
View File

@ -51,7 +51,7 @@ import static io.prestosql.operator.GroupByHash.createGroupByHash;
import static io.prestosql.operator.GroupBySort.createGroupBySort;
import static java.util.Objects.requireNonNull;
@RestorableConfig(uncapturedFields = {"groupBy", "updateMemory"})
@RestorableConfig(uncapturedFields = {"updateMemory"})
public abstract class InMemoryAggregationBuilder
implements AggregationBuilder, Restorable
{
@ -363,6 +363,7 @@ public abstract class InMemoryAggregationBuilder
public Object capture(BlockEncodingSerdeProvider serdeProvider)
{
InMemoryAggregationBuilderState myState = new InMemoryAggregationBuilderState();
myState.groupBy = groupBy.capture(serdeProvider);
List<Object> aggregators = new ArrayList<>();
for (Aggregator aggregator : this.aggregators) {
aggregators.add(aggregator.capture(serdeProvider));
@ -376,6 +377,7 @@ public abstract class InMemoryAggregationBuilder
public void restore(Object state, BlockEncodingSerdeProvider serdeProvider)
{
InMemoryAggregationBuilderState myState = (InMemoryAggregationBuilderState) state;
this.groupBy.restore(myState.groupBy, serdeProvider);
for (int i = 0; i < this.aggregators.size(); i++) {
this.aggregators.get(i).restore(myState.aggregators.get(i), serdeProvider);
}
@ -391,6 +393,7 @@ public abstract class InMemoryAggregationBuilder
private static class InMemoryAggregationBuilderState
implements Serializable
{
private Object groupBy;
private List<Object> aggregators;
private boolean full;
}

5
presto-spi/src/test/java/io/prestosql/spi/snapshot/SnapshotTestUtil.java
View File

@ -107,7 +107,10 @@ public final class SnapshotTestUtil
for (Field field : obj.getClass().getDeclaredFields()) {
field.setAccessible(true);
try {
result.put(field.getName(), toFullSnapshotMapping(field.get(obj)));
// Too complex to compare groupBy content
if (!field.getName().equals("groupBy")) {
result.put(field.getName(), toFullSnapshotMapping(field.get(obj)));
}
}
catch (IllegalAccessException e) {
e.printStackTrace();