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-code-scanning[bot] (via GitHub)" <gi...@apache.org> on 2023/04/19 06:26:52 UTC
[GitHub] [druid] github-code-scanning[bot] commented on a diff in pull request #14112: Updating segment map function for QueryDataSource to ensure group by …
github-code-scanning[bot] commented on code in PR #14112:
URL: https://github.com/apache/druid/pull/14112#discussion_r1170861158
##########
sql/src/test/java/org/apache/druid/sql/calcite/CalciteJoinQueryTest.java:
##########
@@ -3143,6 +3143,90 @@
);
}
+ @Test
+ @Parameters(source = QueryContextForJoinProvider.class)
+ public void testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources(Map<String, Object> queryContext)
+ {
+ skipVectorize();
+ cannotVectorize();
+ testQuery(
+ "with abc as\n"
+ + "(\n"
+ + " SELECT dim1, \"__time\", m1 from foo WHERE \"dim1\" = '10.1'\n"
+ + ")\n"
+ + "SELECT dim1 from (SELECT dim1,__time FROM (SELECT t1.dim1, t1.\"__time\" from abc as t1 INNER JOIN abc as t2 on t1.dim1 = t2.dim1) GROUP BY 1,2) GROUP BY dim1\n",
+ queryContext,
+ ImmutableList.of(
+ new GroupByQuery.Builder()
+ .setDataSource(
+ new QueryDataSource(
+ GroupByQuery.builder()
+ .setDataSource(
+ join(
+ new QueryDataSource(
+ newScanQueryBuilder()
+ .dataSource(CalciteTests.DATASOURCE1)
+ .intervals(querySegmentSpec(Filtration.eternity()))
+ .filters(new SelectorDimFilter("dim1", "10.1", null))
+ .virtualColumns(expressionVirtualColumn(
+ "v0",
+ "\'10.1\'",
+ ColumnType.STRING
+ ))
+ .columns(ImmutableList.of("__time", "v0"))
+ .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
+ .context(queryContext)
+ .build()
+ ),
+ new QueryDataSource(
+ newScanQueryBuilder()
+ .dataSource(CalciteTests.DATASOURCE1)
+ .intervals(querySegmentSpec(Filtration.eternity()))
+ .filters(new SelectorDimFilter("dim1", "10.1", null))
+ .columns(ImmutableList.of("dim1"))
+ .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
+ .context(queryContext)
+ .build()
+ ),
+ "j0.",
+ equalsCondition(
+ makeColumnExpression("v0"),
Review Comment:
## Deprecated method or constructor invocation
Invoking [CalciteTestBase.makeColumnExpression](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/druid/security/code-scanning/4833)
##########
sql/src/test/java/org/apache/druid/sql/calcite/CalciteJoinQueryTest.java:
##########
@@ -3143,6 +3143,90 @@
);
}
+ @Test
+ @Parameters(source = QueryContextForJoinProvider.class)
+ public void testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources(Map<String, Object> queryContext)
+ {
+ skipVectorize();
+ cannotVectorize();
+ testQuery(
+ "with abc as\n"
+ + "(\n"
+ + " SELECT dim1, \"__time\", m1 from foo WHERE \"dim1\" = '10.1'\n"
+ + ")\n"
+ + "SELECT dim1 from (SELECT dim1,__time FROM (SELECT t1.dim1, t1.\"__time\" from abc as t1 INNER JOIN abc as t2 on t1.dim1 = t2.dim1) GROUP BY 1,2) GROUP BY dim1\n",
+ queryContext,
+ ImmutableList.of(
+ new GroupByQuery.Builder()
+ .setDataSource(
+ new QueryDataSource(
+ GroupByQuery.builder()
+ .setDataSource(
+ join(
+ new QueryDataSource(
+ newScanQueryBuilder()
+ .dataSource(CalciteTests.DATASOURCE1)
+ .intervals(querySegmentSpec(Filtration.eternity()))
+ .filters(new SelectorDimFilter("dim1", "10.1", null))
+ .virtualColumns(expressionVirtualColumn(
+ "v0",
+ "\'10.1\'",
+ ColumnType.STRING
+ ))
+ .columns(ImmutableList.of("__time", "v0"))
+ .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
+ .context(queryContext)
+ .build()
+ ),
+ new QueryDataSource(
+ newScanQueryBuilder()
+ .dataSource(CalciteTests.DATASOURCE1)
+ .intervals(querySegmentSpec(Filtration.eternity()))
+ .filters(new SelectorDimFilter("dim1", "10.1", null))
+ .columns(ImmutableList.of("dim1"))
+ .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
+ .context(queryContext)
+ .build()
+ ),
+ "j0.",
+ equalsCondition(
+ makeColumnExpression("v0"),
+ makeColumnExpression("j0.dim1")
Review Comment:
## Deprecated method or constructor invocation
Invoking [CalciteTestBase.makeColumnExpression](1) should be avoided because it has been deprecated.
[Show more details](https://github.com/apache/druid/security/code-scanning/4834)
--
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