Skip to content

Fix assertion error in sql planning for latest aggregators #13151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abhishekagarwal87 merged 4 commits into from
Sep 28, 2022
Merged

Fix assertion error in sql planning for latest aggregators #13151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
32f644c
Fix sql planning bug for latest aggregators
abhishekagarwal87 Sep 28, 2022
13df8fe
change test name
abhishekagarwal87 Sep 28, 2022
26fa7c4
Fix error messages
abhishekagarwal87 Sep 28, 2022
a6a8f04
fix error message again
abhishekagarwal87 Sep 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion ...java/org/apache/druid/sql/calcite/aggregation/builtin/EarliestLatestAnySqlAggregator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,20 @@ public Aggregation toDruidAggregation(
theAggFactory = aggregatorType.createAggregatorFactory(aggregatorName, fieldName, null, outputType, -1);
break;
case 2:
int maxStringBytes;
try {
maxStringBytes = RexLiteral.intValue(rexNodes.get(1));
}
catch (AssertionError ae) {
plannerContext.setPlanningError("The second argument '%s' to function '%s' is not a number", rexNodes.get(1), aggregateCall.getName());
return null;
}
theAggFactory = aggregatorType.createAggregatorFactory(
aggregatorName,
fieldName,
null,
outputType,
RexLiteral.intValue(rexNodes.get(1))
maxStringBytes
);
break;
default:
Expand Down
10 changes: 9 additions & 1 deletion .../java/org/apache/druid/sql/calcite/aggregation/builtin/EarliestLatestBySqlAggregator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,20 @@ public Aggregation toDruidAggregation(
);
break;
case 3:
int maxStringBytes;
try {
maxStringBytes = RexLiteral.intValue(rexNodes.get(2));
Copy link
Copy Markdown
Contributor

@kfaraz kfaraz Sep 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From the docs, it seems that maxBytesPerString is always the second argument, i.e. rexNodes.get(1)

Copy link
Copy Markdown
Contributor Author

@abhishekagarwal87 abhishekagarwal87 Sep 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For EARLIEST_BY/LATEST_BY, it's the third argument. For non _BY aggregators, it's second argument.

Copy link
Copy Markdown
Contributor Author

@abhishekagarwal87 abhishekagarwal87 Sep 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fixed the error message though.

Copy link
Copy Markdown
Contributor

@kfaraz kfaraz Sep 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the clarification, I was looking at an older doc in the original PR.

}
catch (AssertionError ae) {
plannerContext.setPlanningError("The third argument '%s' to function '%s' is not a number", rexNodes.get(2), aggregateCall.getName());
return null;
}
theAggFactory = aggregatorType.createAggregatorFactory(
aggregatorName,
fieldName,
EarliestLatestAnySqlAggregator.getColumnName(plannerContext, virtualColumnRegistry, args.get(1), rexNodes.get(1)),
outputType,
RexLiteral.intValue(rexNodes.get(2))
maxStringBytes
);
break;
default:
Expand Down
50 changes: 50 additions & 0 deletions sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -998,6 +998,56 @@ public void testStringLatestGroupBy()
);
}

@Test
public void testStringLatestGroupByWithAlwaysFalseCondition()
{
testQuery(
"SELECT LATEST(dim4, 10),dim2 FROM numfoo WHERE (dim1 = 'something' AND dim1 IN( 'something else') ) GROUP BY dim2",
ImmutableList.of(
Druids.newScanQueryBuilder()
.dataSource(InlineDataSource.fromIterable(
ImmutableList.of(),
RowSignature.builder()
.add("EXPR$0", ColumnType.STRING)
.add("dim2", ColumnType.STRING)
.build()
))
.intervals(querySegmentSpec(Filtration.eternity()))
.columns("EXPR$0", "dim2")
.context(QUERY_CONTEXT_DEFAULT)
.resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
.legacy(false)
.build()
),
ImmutableList.of()
);
}

@Test
public void testStringLatestByGroupByWithAlwaysFalseCondition()
Copy link
Copy Markdown
Contributor

@kfaraz kfaraz Sep 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Maybe also add a test case to verify error message?

Copy link
Copy Markdown
Contributor Author

@abhishekagarwal87 abhishekagarwal87 Sep 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was not able to figure out a query that gets me that error message. This query is not an invalid query. It just goes through a bad stage and doesn't recover before this fix. Now it can.

Copy link
Copy Markdown
Contributor

@kfaraz kfaraz Sep 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps a LATEST(dim4, "100") but it's not essential, we can do it later.

Copy link
Copy Markdown
Contributor Author

@abhishekagarwal87 abhishekagarwal87 Sep 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that SQL will generate a different error and fails even before reaching the SqlAggregagtor.

{
testQuery(
"SELECT LATEST_BY(dim4, __time, 10),dim2 FROM numfoo WHERE (dim1 = 'something' AND dim1 IN( 'something else') ) GROUP BY dim2",
ImmutableList.of(
Druids.newScanQueryBuilder()
.dataSource(InlineDataSource.fromIterable(
ImmutableList.of(),
RowSignature.builder()
.add("EXPR$0", ColumnType.STRING)
.add("dim2", ColumnType.STRING)
.build()
))
.intervals(querySegmentSpec(Filtration.eternity()))
.columns("EXPR$0", "dim2")
.context(QUERY_CONTEXT_DEFAULT)
.resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
.legacy(false)
.build()
),
ImmutableList.of()
);
}

// This test the off-heap (buffer) version of the EarliestAggregator (Double/Float/Long)
@Test
public void testPrimitiveEarliestInSubquery()
Expand Down