Unnest now works on MSQ #14886
+732
−27
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -114,7 +114,6 @@ public boolean featureAvailable(EngineFeature feature, PlannerContext plannerCon | |
| case TIME_BOUNDARY_QUERY: | ||
| case GROUPING_SETS: | ||
| case WINDOW_FUNCTIONS: | ||
| return false; | ||
| case CAN_SELECT: | ||
| case CAN_INSERT: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -51,6 +51,7 @@ | |
| import org.apache.druid.query.Query; | ||
| import org.apache.druid.query.QueryDataSource; | ||
| import org.apache.druid.query.TableDataSource; | ||
| import org.apache.druid.query.UnnestDataSource; | ||
| import org.apache.druid.query.aggregation.CountAggregatorFactory; | ||
| import org.apache.druid.query.aggregation.DoubleSumAggregatorFactory; | ||
| import org.apache.druid.query.aggregation.FilteredAggregatorFactory; | ||
|
|
@@ -136,6 +137,7 @@ public static Collection<Object[]> data() | |
| {QUERY_RESULTS_WITH_DURABLE_STORAGE, QUERY_RESULTS_WITH_DURABLE_STORAGE_CONTEXT}, | ||
| {QUERY_RESULTS_WITH_DEFAULT, QUERY_RESULTS_WITH_DEFAULT_CONTEXT} | ||
| }; | ||
|
|
||
| return Arrays.asList(data); | ||
| } | ||
|
|
||
|
|
@@ -2119,6 +2121,207 @@ public void testJoinUsesDifferentAlgorithm() | |
| .verifyResults(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testSelectUnnestOnInlineFoo() | ||
somu-imply marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| { | ||
| RowSignature resultSignature = RowSignature.builder() | ||
| .add("EXPR$0", ColumnType.LONG) | ||
| .build(); | ||
| RowSignature outputSignature = RowSignature.builder() | ||
| .add("d", ColumnType.LONG) | ||
| .build(); | ||
|
|
||
| final ColumnMappings expectedColumnMappings = new ColumnMappings( | ||
| ImmutableList.of( | ||
| new ColumnMapping("EXPR$0", "d") | ||
| ) | ||
| ); | ||
|
|
||
| testSelectQuery() | ||
| .setSql("select d from UNNEST(ARRAY[1,2,3]) as unnested(d)") | ||
| .setExpectedMSQSpec( | ||
| MSQSpec.builder() | ||
| .query(newScanQueryBuilder() | ||
| .dataSource( | ||
| InlineDataSource.fromIterable( | ||
| ImmutableList.of( | ||
| new Object[]{1L}, | ||
| new Object[]{2L}, | ||
| new Object[]{3L} | ||
| ), | ||
| resultSignature | ||
| ) | ||
| ) | ||
| .intervals(querySegmentSpec(Filtration.eternity())) | ||
| .columns("EXPR$0") | ||
| .context(defaultScanQueryContext( | ||
| context, | ||
| resultSignature | ||
| )) | ||
| .build()) | ||
| .columnMappings(expectedColumnMappings) | ||
| .tuningConfig(MSQTuningConfig.defaultConfig()) | ||
| .destination(isDurableStorageDestination() | ||
| ? DurableStorageMSQDestination.INSTANCE | ||
| : TaskReportMSQDestination.INSTANCE) | ||
| .build() | ||
| ) | ||
| .setExpectedRowSignature(outputSignature) | ||
| .setQueryContext(context) | ||
| .setExpectedResultRows(ImmutableList.of( | ||
| new Object[]{1}, | ||
| new Object[]{2}, | ||
| new Object[]{3} | ||
| )) | ||
| .verifyResults(); | ||
| } | ||
|
|
||
|
|
||
| @Test | ||
| public void testSelectUnnestOnFoo() | ||
| { | ||
| RowSignature resultSignature = RowSignature.builder() | ||
| .add("j0.unnest", ColumnType.STRING) | ||
| .build(); | ||
|
|
||
| RowSignature outputSignature = RowSignature.builder() | ||
| .add("d3", ColumnType.STRING) | ||
| .build(); | ||
|
|
||
| final ColumnMappings expectedColumnMappings = new ColumnMappings( | ||
| ImmutableList.of( | ||
| new ColumnMapping("j0.unnest", "d3") | ||
| ) | ||
| ); | ||
|
|
||
| testSelectQuery() | ||
| .setSql("SELECT d3 FROM foo, UNNEST(MV_TO_ARRAY(dim3)) as unnested (d3)") | ||
| .setExpectedMSQSpec( | ||
| MSQSpec.builder() | ||
| .query(newScanQueryBuilder() | ||
| .dataSource(UnnestDataSource.create( | ||
| new TableDataSource(CalciteTests.DATASOURCE1), | ||
| expressionVirtualColumn("j0.unnest", "\"dim3\"", ColumnType.STRING), | ||
| null | ||
| )) | ||
| .intervals(querySegmentSpec(Filtration.eternity())) | ||
| .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST) | ||
| .legacy(false) | ||
| .context(defaultScanQueryContext( | ||
| context, | ||
| resultSignature | ||
| )) | ||
| .columns(ImmutableList.of("j0.unnest")) | ||
| .build()) | ||
| .columnMappings(expectedColumnMappings) | ||
| .tuningConfig(MSQTuningConfig.defaultConfig()) | ||
| .destination(isDurableStorageDestination() | ||
| ? DurableStorageMSQDestination.INSTANCE | ||
| : TaskReportMSQDestination.INSTANCE) | ||
| .build() | ||
| ) | ||
| .setExpectedRowSignature(outputSignature) | ||
| .setQueryContext(context) | ||
| .setExpectedResultRows( | ||
| useDefault ? ImmutableList.of( | ||
| new Object[]{"a"}, | ||
| new Object[]{"b"}, | ||
| new Object[]{"b"}, | ||
| new Object[]{"c"}, | ||
| new Object[]{"d"}, | ||
| new Object[]{""}, | ||
| new Object[]{""}, | ||
| new Object[]{""} | ||
| ) : ImmutableList.of( | ||
| new Object[]{"a"}, | ||
| new Object[]{"b"}, | ||
| new Object[]{"b"}, | ||
| new Object[]{"c"}, | ||
| new Object[]{"d"}, | ||
| new Object[]{""}, | ||
| new Object[]{null}, | ||
| new Object[]{null} | ||
| )) | ||
| .verifyResults(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testSelectUnnestOnQueryFoo() | ||
| { | ||
| RowSignature resultSignature = RowSignature.builder() | ||
| .add("j0.unnest", ColumnType.STRING) | ||
| .build(); | ||
|
|
||
| RowSignature resultSignature1 = RowSignature.builder() | ||
| .add("dim3", ColumnType.STRING) | ||
| .build(); | ||
|
|
||
| RowSignature outputSignature = RowSignature.builder() | ||
| .add("d3", ColumnType.STRING) | ||
| .build(); | ||
|
|
||
| final ColumnMappings expectedColumnMappings = new ColumnMappings( | ||
| ImmutableList.of( | ||
| new ColumnMapping("j0.unnest", "d3") | ||
| ) | ||
| ); | ||
|
|
||
| testSelectQuery() | ||
| .setSql("SELECT d3 FROM (select * from druid.foo where dim2='a' LIMIT 10), UNNEST(MV_TO_ARRAY(dim3)) as unnested (d3)") | ||
| .setExpectedMSQSpec( | ||
| MSQSpec.builder() | ||
| .query(newScanQueryBuilder() | ||
| .dataSource(UnnestDataSource.create( | ||
| new QueryDataSource( | ||
| newScanQueryBuilder() | ||
| .dataSource( | ||
| new TableDataSource(CalciteTests.DATASOURCE1) | ||
| ) | ||
| .intervals(querySegmentSpec(Filtration.eternity())) | ||
| .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST) | ||
| .legacy(false) | ||
| .filters(equality("dim2", "a", ColumnType.STRING)) | ||
| .columns("dim3") | ||
| .context(defaultScanQueryContext( | ||
| context, | ||
| resultSignature1 | ||
| )) | ||
| .limit(10) | ||
| .build() | ||
| ), | ||
| expressionVirtualColumn("j0.unnest", "\"dim3\"", ColumnType.STRING), | ||
| null | ||
| )) | ||
| .intervals(querySegmentSpec(Filtration.eternity())) | ||
| .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST) | ||
| .legacy(false) | ||
| .context(defaultScanQueryContext( | ||
| context, | ||
| resultSignature | ||
| )) | ||
| .columns(ImmutableList.of("j0.unnest")) | ||
| .build()) | ||
| .columnMappings(expectedColumnMappings) | ||
| .tuningConfig(MSQTuningConfig.defaultConfig()) | ||
| .destination(isDurableStorageDestination() | ||
| ? DurableStorageMSQDestination.INSTANCE | ||
| : TaskReportMSQDestination.INSTANCE) | ||
| .build() | ||
| ) | ||
| .setExpectedRowSignature(outputSignature) | ||
| .setQueryContext(context) | ||
| .setExpectedResultRows( | ||
| useDefault ? ImmutableList.of( | ||
| new Object[]{"a"}, | ||
| new Object[]{"b"} | ||
| ) : ImmutableList.of( | ||
| new Object[]{"a"}, | ||
| new Object[]{"b"}, | ||
| new Object[]{""} | ||
| )) | ||
| .verifyResults(); | ||
| } | ||
|
|
||
| @Nonnull | ||
| private List<Object[]> expectedMultiValueFooRowsGroup() | ||
| { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Re-confirm if this check is required here. I think it should be removed unless UNNEST on a table cannot have a time filter.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Were you able to confirm if the check is required?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have asked around, I'll update it once I get back the comments. I have removed it as the base data source types should take care of it, but will add it back otherwise
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Any updates on this? I wanted to get a final check on this before the approval