You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by "github-advanced-security[bot] (via GitHub)" <gi...@apache.org> on 2024/02/22 22:34:45 UTC
Re: [PR] Fix deadlock that can occur while merging group by results (druid)
github-advanced-security[bot] commented on code in PR #15420:
URL: https://github.com/apache/druid/pull/15420#discussion_r1500021853
##########
processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownInsufficientBufferTest.java:
##########
@@ -380,16 +387,19 @@
// one segment's results use limit push down, the other doesn't because of insufficient buffer capacity
QueryToolChest<ResultRow, GroupByQuery> toolChest = groupByFactory.getToolchest();
+ QueryToolChest<ResultRow, GroupByQuery> tooSmallToolChest = tooSmallGroupByFactory.getToolchest();
QueryRunner<ResultRow> theRunner = new FinalizeResultsQueryRunner<>(
toolChest.mergeResults(
- groupByFactory.mergeRunners(executorService, getRunner1())
+ groupByFactory.mergeRunners(executorService, getRunner1()),
+ true
),
(QueryToolChest) toolChest
);
QueryRunner<ResultRow> theRunner2 = new FinalizeResultsQueryRunner<>(
- toolChest.mergeResults(
- tooSmallGroupByFactory.mergeRunners(executorService, getRunner2())
+ tooSmallToolChest.mergeResults(
+ tooSmallGroupByFactory.mergeRunners(executorService, getRunner2()),
Review Comment:
## Deprecated method or constructor invocation
Invoking [QueryRunnerFactory.mergeRunners](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/druid/security/code-scanning/6740)
##########
processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownMultiNodeMergeTest.java:
##########
@@ -763,23 +795,28 @@
{
// one segment's results use limit push down, the other doesn't because of insufficient buffer capacity
- QueryToolChest<ResultRow, GroupByQuery> toolChest = groupByFactory.getToolchest();
+ QueryToolChest<ResultRow, GroupByQuery> toolChestHistorical = groupByFactoryHistorical.getToolchest();
QueryRunner<ResultRow> theRunner = new FinalizeResultsQueryRunner<>(
- toolChest.mergeResults(
- groupByFactory.mergeRunners(executorService, getRunner1(0))
+ toolChestHistorical.mergeResults(
+ groupByFactoryHistorical.mergeRunners(executorService, getRunner1(0)),
+ true
),
- (QueryToolChest) toolChest
+ (QueryToolChest) toolChestHistorical
);
+ QueryToolChest<ResultRow, GroupByQuery> toolChestHistorical2 = groupByFactoryHistorical2.getToolchest();
QueryRunner<ResultRow> theRunner2 = new FinalizeResultsQueryRunner<>(
- toolChest.mergeResults(
- groupByFactory2.mergeRunners(executorService, getRunner2(1))
+ toolChestHistorical2.mergeResults(
+ groupByFactoryHistorical2.mergeRunners(executorService, getRunner2(1)),
Review Comment:
## Deprecated method or constructor invocation
Invoking [QueryRunnerFactory.mergeRunners](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/druid/security/code-scanning/6747)
##########
processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownMultiNodeMergeTest.java:
##########
@@ -904,23 +945,27 @@
private List<ResultRow> testForcePushLimitDownAccuracyWhenSortHasNonGroupingFieldsHelper(Map<String, Object> context)
{
- QueryToolChest<ResultRow, GroupByQuery> toolChest = groupByFactory.getToolchest();
+ QueryToolChest<ResultRow, GroupByQuery> toolChestHistorical = groupByFactoryHistorical.getToolchest();
QueryRunner<ResultRow> theRunner = new FinalizeResultsQueryRunner<>(
- toolChest.mergeResults(
- groupByFactory.mergeRunners(executorService, getRunner1(4))
+ toolChestHistorical.mergeResults(
+ groupByFactoryHistorical.mergeRunners(executorService, getRunner1(4)),
Review Comment:
## Deprecated method or constructor invocation
Invoking [QueryRunnerFactory.mergeRunners](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/druid/security/code-scanning/6748)
##########
processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownMultiNodeMergeTest.java:
##########
@@ -904,23 +945,27 @@
private List<ResultRow> testForcePushLimitDownAccuracyWhenSortHasNonGroupingFieldsHelper(Map<String, Object> context)
{
- QueryToolChest<ResultRow, GroupByQuery> toolChest = groupByFactory.getToolchest();
+ QueryToolChest<ResultRow, GroupByQuery> toolChestHistorical = groupByFactoryHistorical.getToolchest();
QueryRunner<ResultRow> theRunner = new FinalizeResultsQueryRunner<>(
- toolChest.mergeResults(
- groupByFactory.mergeRunners(executorService, getRunner1(4))
+ toolChestHistorical.mergeResults(
+ groupByFactoryHistorical.mergeRunners(executorService, getRunner1(4)),
+ true
),
- (QueryToolChest) toolChest
+ (QueryToolChest) toolChestHistorical
);
+ QueryToolChest<ResultRow, GroupByQuery> toolChestHistorical2 = groupByFactoryHistorical2.getToolchest();
QueryRunner<ResultRow> theRunner2 = new FinalizeResultsQueryRunner<>(
- toolChest.mergeResults(
- groupByFactory2.mergeRunners(executorService, getRunner2(5))
+ toolChestHistorical2.mergeResults(
+ groupByFactoryHistorical2.mergeRunners(executorService, getRunner2(5)),
Review Comment:
## Deprecated method or constructor invocation
Invoking [QueryRunnerFactory.mergeRunners](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/druid/security/code-scanning/6749)
##########
processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownMultiNodeMergeTest.java:
##########
@@ -626,23 +649,28 @@
@Test
public void testDescendingNumerics()
{
- QueryToolChest<ResultRow, GroupByQuery> toolChest = groupByFactory.getToolchest();
+ QueryToolChest<ResultRow, GroupByQuery> toolChestHistorical = groupByFactoryHistorical.getToolchest();
QueryRunner<ResultRow> theRunner = new FinalizeResultsQueryRunner<>(
- toolChest.mergeResults(
- groupByFactory.mergeRunners(executorService, getRunner1(2))
+ toolChestHistorical.mergeResults(
+ groupByFactoryHistorical.mergeRunners(executorService, getRunner1(2)),
Review Comment:
## Deprecated method or constructor invocation
Invoking [QueryRunnerFactory.mergeRunners](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/druid/security/code-scanning/6744)
##########
processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownInsufficientBufferTest.java:
##########
@@ -380,16 +387,19 @@
// one segment's results use limit push down, the other doesn't because of insufficient buffer capacity
QueryToolChest<ResultRow, GroupByQuery> toolChest = groupByFactory.getToolchest();
+ QueryToolChest<ResultRow, GroupByQuery> tooSmallToolChest = tooSmallGroupByFactory.getToolchest();
QueryRunner<ResultRow> theRunner = new FinalizeResultsQueryRunner<>(
toolChest.mergeResults(
- groupByFactory.mergeRunners(executorService, getRunner1())
+ groupByFactory.mergeRunners(executorService, getRunner1()),
Review Comment:
## Deprecated method or constructor invocation
Invoking [QueryRunnerFactory.mergeRunners](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/druid/security/code-scanning/6739)
##########
processing/src/test/java/org/apache/druid/query/groupby/GroupByMultiSegmentTest.java:
##########
@@ -279,7 +281,8 @@
QueryToolChest<ResultRow, GroupByQuery> toolChest = groupByFactory.getToolchest();
QueryRunner<ResultRow> theRunner = new FinalizeResultsQueryRunner<>(
toolChest.mergeResults(
- groupByFactory.mergeRunners(executorService, makeGroupByMultiRunners())
+ groupByFactory.mergeRunners(executorService, makeGroupByMultiRunners()),
Review Comment:
## Deprecated method or constructor invocation
Invoking [QueryRunnerFactory.mergeRunners](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/druid/security/code-scanning/6741)
##########
processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownMultiNodeMergeTest.java:
##########
@@ -626,23 +649,28 @@
@Test
public void testDescendingNumerics()
{
- QueryToolChest<ResultRow, GroupByQuery> toolChest = groupByFactory.getToolchest();
+ QueryToolChest<ResultRow, GroupByQuery> toolChestHistorical = groupByFactoryHistorical.getToolchest();
QueryRunner<ResultRow> theRunner = new FinalizeResultsQueryRunner<>(
- toolChest.mergeResults(
- groupByFactory.mergeRunners(executorService, getRunner1(2))
+ toolChestHistorical.mergeResults(
+ groupByFactoryHistorical.mergeRunners(executorService, getRunner1(2)),
+ true
),
- (QueryToolChest) toolChest
+ (QueryToolChest) toolChestHistorical
);
+ QueryToolChest<ResultRow, GroupByQuery> toolChestHistorical2 = groupByFactoryHistorical2.getToolchest();
QueryRunner<ResultRow> theRunner2 = new FinalizeResultsQueryRunner<>(
- toolChest.mergeResults(
- groupByFactory2.mergeRunners(executorService, getRunner2(3))
+ toolChestHistorical2.mergeResults(
+ groupByFactoryHistorical2.mergeRunners(executorService, getRunner2(3)),
Review Comment:
## Deprecated method or constructor invocation
Invoking [QueryRunnerFactory.mergeRunners](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/druid/security/code-scanning/6745)
##########
processing/src/test/java/org/apache/druid/query/groupby/GroupByLimitPushDownMultiNodeMergeTest.java:
##########
@@ -763,23 +795,28 @@
{
// one segment's results use limit push down, the other doesn't because of insufficient buffer capacity
- QueryToolChest<ResultRow, GroupByQuery> toolChest = groupByFactory.getToolchest();
+ QueryToolChest<ResultRow, GroupByQuery> toolChestHistorical = groupByFactoryHistorical.getToolchest();
QueryRunner<ResultRow> theRunner = new FinalizeResultsQueryRunner<>(
- toolChest.mergeResults(
- groupByFactory.mergeRunners(executorService, getRunner1(0))
+ toolChestHistorical.mergeResults(
+ groupByFactoryHistorical.mergeRunners(executorService, getRunner1(0)),
Review Comment:
## Deprecated method or constructor invocation
Invoking [QueryRunnerFactory.mergeRunners](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/druid/security/code-scanning/6746)
##########
processing/src/test/java/org/apache/druid/query/groupby/NestedQueryPushDownTest.java:
##########
@@ -700,17 +702,20 @@
{
ResponseContext context = ResponseContext.createEmpty();
QueryToolChest<ResultRow, GroupByQuery> toolChest = groupByFactory.getToolchest();
+ QueryToolChest<ResultRow, GroupByQuery> toolChest2 = groupByFactory2.getToolchest();
GroupByQuery pushDownQuery = nestedQuery;
QueryRunner<ResultRow> segment1Runner = new FinalizeResultsQueryRunner<ResultRow>(
toolChest.mergeResults(
- groupByFactory.mergeRunners(executorService, getQueryRunnerForSegment1())
+ groupByFactory.mergeRunners(executorService, getQueryRunnerForSegment1()),
Review Comment:
## Deprecated method or constructor invocation
Invoking [QueryRunnerFactory.mergeRunners](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/druid/security/code-scanning/6750)
##########
processing/src/test/java/org/apache/druid/query/groupby/NestedQueryPushDownTest.java:
##########
@@ -700,17 +702,20 @@
{
ResponseContext context = ResponseContext.createEmpty();
QueryToolChest<ResultRow, GroupByQuery> toolChest = groupByFactory.getToolchest();
+ QueryToolChest<ResultRow, GroupByQuery> toolChest2 = groupByFactory2.getToolchest();
GroupByQuery pushDownQuery = nestedQuery;
QueryRunner<ResultRow> segment1Runner = new FinalizeResultsQueryRunner<ResultRow>(
toolChest.mergeResults(
- groupByFactory.mergeRunners(executorService, getQueryRunnerForSegment1())
+ groupByFactory.mergeRunners(executorService, getQueryRunnerForSegment1()),
+ true
),
(QueryToolChest) toolChest
);
QueryRunner<ResultRow> segment2Runner = new FinalizeResultsQueryRunner<ResultRow>(
- toolChest.mergeResults(
- groupByFactory2.mergeRunners(executorService, getQueryRunnerForSegment2())
+ toolChest2.mergeResults(
+ groupByFactory2.mergeRunners(executorService, getQueryRunnerForSegment2()),
Review Comment:
## Deprecated method or constructor invocation
Invoking [QueryRunnerFactory.mergeRunners](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/druid/security/code-scanning/6751)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org