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

bug fix: merge results of group by limit push down (#11969)

This commit is contained in:
mchades 2022-03-12 01:04:34 +08:00 committed by GitHub
parent db91961af7
commit 3de1272926
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 75 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
processing/src/main/java/org/apache/druid/query/groupby/GroupByQuery.java
View File

@ -592,7 +592,11 @@ public class GroupByQuery extends BaseQuery<ResultRow>
needsReverseList.add(false);
final ColumnType type = dimensions.get(i).getOutputType();
dimensionTypes.add(type);
comparators.add(StringComparators.LEXICOGRAPHIC);
if (type.isNumeric()) {
comparators.add(StringComparators.NUMERIC);
} else {
comparators.add(StringComparators.LEXICOGRAPHIC);
}
}
}

70
processing/src/test/java/org/apache/druid/query/groupby/GroupByQueryRunnerTest.java
View File

@ -11176,6 +11176,76 @@ public class GroupByQueryRunnerTest extends InitializedNullHandlingTest
TestHelper.assertExpectedObjects(expectedResults, results, "order-limit");
}
@Test
public void testMergeLimitPushDownResultsWithLongDimensionNotInLimitSpec()
{
// Cannot vectorize due to extraction dimension spec.
cannotVectorize();
if (!config.getDefaultStrategy().equals(GroupByStrategySelector.STRATEGY_V2)) {
return;
}
GroupByQuery.Builder builder = makeQueryBuilder()
.setDataSource(QueryRunnerTestHelper.DATA_SOURCE)
.setInterval("2011-04-02/2011-04-04")
.setDimensions(new ExtractionDimensionSpec("quality", "qualityLen", ColumnType.LONG, StrlenExtractionFn.instance()))
.setAggregatorSpecs(QueryRunnerTestHelper.ROWS_COUNT)
.setLimitSpec(
new DefaultLimitSpec(
Collections.emptyList(),
20
)
)
.overrideContext(ImmutableMap.of(GroupByQueryConfig.CTX_KEY_FORCE_LIMIT_PUSH_DOWN, true))
.setGranularity(Granularities.ALL);
final GroupByQuery allGranQuery = builder.build();
QueryRunner mergedRunner = factory.getToolchest().mergeResults(
(queryPlus, responseContext) -> {
// simulate two daily segments
final QueryPlus<ResultRow> queryPlus1 = queryPlus.withQuery(
queryPlus.getQuery().withQuerySegmentSpec(
new MultipleIntervalSegmentSpec(Collections.singletonList(Intervals.of("2011-04-02/2011-04-03")))
)
);
final QueryPlus<ResultRow> queryPlus2 = queryPlus.withQuery(
queryPlus.getQuery().withQuerySegmentSpec(
new MultipleIntervalSegmentSpec(Collections.singletonList(Intervals.of("2011-04-03/2011-04-04")))
)
);
return factory.getToolchest().mergeResults(
(queryPlus3, responseContext1) -> new MergeSequence<>(
queryPlus3.getQuery().getResultOrdering(),
Sequences.simple(
Arrays.asList(
runner.run(queryPlus1, responseContext1),
runner.run(queryPlus2, responseContext1)
)
)
)
).run(queryPlus, responseContext);
}
);
Map<String, Object> context = new HashMap<>();
List<ResultRow> allGranExpectedResults = Arrays.asList(
makeRow(allGranQuery, "2011-04-02", "qualityLen", 4L, "rows", 2L),
makeRow(allGranQuery, "2011-04-02", "qualityLen", 6L, "rows", 4L),
makeRow(allGranQuery, "2011-04-02", "qualityLen", 7L, "rows", 6L),
makeRow(allGranQuery, "2011-04-02", "qualityLen", 8L, "rows", 2L),
makeRow(allGranQuery, "2011-04-02", "qualityLen", 9L, "rows", 6L),
makeRow(allGranQuery, "2011-04-02", "qualityLen", 10L, "rows", 4L),
makeRow(allGranQuery, "2011-04-02", "qualityLen", 13L, "rows", 2L)
);
TestHelper.assertExpectedObjects(
allGranExpectedResults,
mergedRunner.run(QueryPlus.wrap(allGranQuery)),
"merged"
);
}
@Test
public void testMergeResultsWithLimitPushDown()
{