kgyrtkirk commented on code in PR #16046:
URL: https://github.com/apache/druid/pull/16046#discussion_r1516786952
##########
sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java:
##########
@@ -7581,47 +7573,48 @@ public void testAvgDailyCountDistinct()
@Test
public void testHighestMaxNumericInFilter()
{
- expectedException.expect(UOE.class);
- expectedException.expectMessage("Expected parameter[maxNumericInFilters]
cannot exceed system set value of [100]");
+ Throwable exception = assertThrows(UOE.class, () -> {
- testQuery(
- PLANNER_CONFIG_MAX_NUMERIC_IN_FILTER,
- ImmutableMap.of(QueryContexts.MAX_NUMERIC_IN_FILTERS, 20000),
- "SELECT COUNT(*)\n"
- + "FROM druid.numfoo\n"
- + "WHERE dim6 IN (\n"
- + "1,2,3\n"
- + ")\n",
- CalciteTests.REGULAR_USER_AUTH_RESULT,
- ImmutableList.of(),
- ImmutableList.of()
- );
+ testQuery(
+ PLANNER_CONFIG_MAX_NUMERIC_IN_FILTER,
+ ImmutableMap.of(QueryContexts.MAX_NUMERIC_IN_FILTERS, 20000),
+ "SELECT COUNT(*)\n"
+ + "FROM druid.numfoo\n"
+ + "WHERE dim6 IN (\n"
+ + "1,2,3\n"
+ + ")\n",
+ CalciteTests.REGULAR_USER_AUTH_RESULT,
+ ImmutableList.of(),
+ ImmutableList.of()
+ );
+ });
+ assertTrue(exception.getMessage().contains("Expected
parameter[maxNumericInFilters] cannot exceed system set value of [100]"));
}
@Test
public void testQueryWithMoreThanMaxNumericInFilter()
{
- if (NullHandling.sqlCompatible()) {
- // skip in sql compatible mode, this plans to an OR filter with equality
filter children...
- return;
- }
+ assumeFalse(
+ "skip in sql compatible mode, this plans to an OR filter with equality
filter children",
+ NullHandling.sqlCompatible()
+ );
msqIncompatible();
- expectedException.expect(UOE.class);
- expectedException.expectMessage(
- "The number of values in the IN clause for [dim6] in query exceeds
configured maxNumericFilter limit of [2] for INs. Cast [3] values of IN clause
to String");
- testQuery(
- PLANNER_CONFIG_MAX_NUMERIC_IN_FILTER,
- ImmutableMap.of(QueryContexts.MAX_NUMERIC_IN_FILTERS, 2),
- "SELECT COUNT(*)\n"
- + "FROM druid.numfoo\n"
- + "WHERE dim6 IN (\n"
- + "1,2,3\n"
- + ")\n",
- CalciteTests.REGULAR_USER_AUTH_RESULT,
- ImmutableList.of(),
- ImmutableList.of()
- );
+ Throwable exception = assertThrows(UOE.class, () -> {
+ testQuery(
+ PLANNER_CONFIG_MAX_NUMERIC_IN_FILTER,
+ ImmutableMap.of(QueryContexts.MAX_NUMERIC_IN_FILTERS, 2),
+ "SELECT COUNT(*)\n"
+ + "FROM druid.numfoo\n"
+ + "WHERE dim6 IN (\n"
+ + "1,2,3\n"
+ + ")\n",
+ CalciteTests.REGULAR_USER_AUTH_RESULT,
+ ImmutableList.of(),
+ ImmutableList.of()
+ );
+ });
+ assertTrue(exception.getMessage().contains("The number of values in the IN
clause for [dim6] in query exceeds configured maxNumericFilter limit of [2] for
INs. Cast [3] values of IN clause to String"));
Review Comment:
I think its better to use static imports than write out the class the actual
assert/assume/etc comes from;
if the usecase would require to use 2 of those static imported methods from
2 different sources at the same time I would see differently - but if there is
only one then I think it as something which reduces the readability with no
added benefit
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
