You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by "gargvishesh (via GitHub)" <gi...@apache.org> on 2024/10/10 04:58:02 UTC
[PR] Support non time order in MSQ compaction (druid)
gargvishesh opened a new pull request, #17318:
URL: https://github.com/apache/druid/pull/17318
### Description
https://github.com/apache/druid/pull/16849 added support for sorting segments with non-time columns. This PR extends that support to MSQ compaction. Specifically, if `forceSegmentSortByTime` is set in the data schema -- either in the user-supplied compaction config or in the inferred schema -- the following steps are taken:
- Skip adding `__time` explicitly as the first column to the dimension schema since it already comes as part of the schema
- Ensure column mappings propagate `__time` in the order specified by the schema
- Set `forceSegmentSortByTime` in the MSQ context.
Also, the PR adds (missing) unit tests for verifying MSQ spec generated with nested and auto-type columns
This PR has:
- [x] been self-reviewed.
- [ ] using the [concurrency checklist](https://github.com/apache/druid/blob/master/dev/code-review/concurrency.md) (Remove this item if the PR doesn't have any relation to concurrency.)
- [ ] added documentation for new or modified features or behaviors.
- [ ] a release note entry in the PR description.
- [ ] added Javadocs for most classes and all non-trivial methods. Linked related entities via Javadoc links.
- [ ] added or updated version, license, or notice information in [licenses.yaml](https://github.com/apache/druid/blob/master/dev/license.md)
- [ ] added comments explaining the "why" and the intent of the code wherever would not be obvious for an unfamiliar reader.
- [x] added unit tests or modified existing tests to cover new code paths, ensuring the threshold for [code coverage](https://github.com/apache/druid/blob/master/dev/code-review/code-coverage.md) is met.
- [] added integration tests.
- [x] been tested in a test Druid cluster.
--
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
Re: [PR] Support non time order in MSQ compaction (druid)
Posted by "kfaraz (via GitHub)" <gi...@apache.org>.
kfaraz commented on code in PR #17318:
URL: https://github.com/apache/druid/pull/17318#discussion_r1860115209
##########
extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/indexing/MSQCompactionRunner.java:
##########
@@ -359,25 +362,31 @@ private static List<DimensionSpec> getAggregateDimensions(
private static ColumnMappings getColumnMappings(DataSchema dataSchema)
{
- List<ColumnMapping> columnMappings = dataSchema.getDimensionsSpec()
- .getDimensions()
- .stream()
- .map(dim -> new ColumnMapping(
- dim.getName(), dim.getName()))
- .collect(Collectors.toList());
+ List<ColumnMapping> columnMappings = new ArrayList<>();
+ // For scan queries, a virtual column is created from __time if a custom query granularity is provided. For
+ // group-by queries, as insert needs __time, it will always be one of the dimensions. Since dimensions in groupby
+ // aren't allowed to have time column as the output name, we map time dimension to TIME_VIRTUAL_COLUMN in
+ // dimensions, and map it back to the time column here.
+ String timeColumn = (isGroupBy(dataSchema) || !isQueryGranularityEmptyOrNone(dataSchema))
+ ? TIME_VIRTUAL_COLUMN
+ : ColumnHolder.TIME_COLUMN_NAME;
+ ColumnMapping timeColumnMapping = new ColumnMapping(timeColumn, ColumnHolder.TIME_COLUMN_NAME);
+ if (dataSchema.getDimensionsSpec().isForceSegmentSortByTime()) {
+ // When not sorted by time, the __time column is missing from dimensionsSpec
Review Comment:
```suggestion
// When sorted by time, the __time column is missing from dimensionsSpec
```
--
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
Re: [PR] Support non time order in MSQ compaction (druid)
Posted by "kfaraz (via GitHub)" <gi...@apache.org>.
kfaraz merged PR #17318:
URL: https://github.com/apache/druid/pull/17318
--
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