Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix grouper closing in GroupByMergingQueryRunnerV2. (#3316) 

The grouperHolder should be closed on failure, not the grouper.
This commit is contained in:
Gian Merlino 2016-08-02 21:02:30 -07:00 committed by Fangjin Yang
parent 0299ac73b8
commit a4b95af839
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
processing/src/main/java/io/druid/query/groupby/epinephelinae/GroupByMergingQueryRunnerV2.java
View File

@ -133,6 +133,8 @@ public class GroupByMergingQueryRunnerV2 implements QueryRunner
String.format("druid-groupBy-%s_%s", UUID.randomUUID(), query.getId())
);
final int priority = BaseQuery.getContextPriority(query, 0);
// Figure out timeoutAt time now, so we can apply the timeout to both the mergeBufferPool.take and the actual
// query processing together.
final Number queryTimeout = query.getContextValue(QueryContextKeys.TIMEOUT, null);
@ -181,9 +183,6 @@ public class GroupByMergingQueryRunnerV2 implements QueryRunner
);
final Grouper<RowBasedKey> grouper = pair.lhs;
final Accumulator<Grouper<RowBasedKey>, Row> accumulator = pair.rhs;
closeOnFailure.add(grouper);
final int priority = BaseQuery.getContextPriority(query, 0);
final ReferenceCountingResourceHolder<Grouper<RowBasedKey>> grouperHolder = new ReferenceCountingResourceHolder<>(
grouper,
@ -196,6 +195,7 @@ public class GroupByMergingQueryRunnerV2 implements QueryRunner
}
}
);
closeOnFailure.add(grouperHolder);
ListenableFuture<List<Boolean>> futures = Futures.allAsList(
Lists.newArrayList(