fix(isthmus): adding support for new proto and deprecated form in AggregateRel #1507
vbaruapr.yml
on: pull_request
Build and Test Java
3m 31s
Check editorconfig
6s
Lint commits for semantic-release
21s
Security validation
4s
Build Examples
4m 21s
Dry-run release
29s
Matrix: osv-scanner
Matrix: Build Isthmus Native Image
Annotations
4 errors
|
Lint commits for semantic-release
Process completed with exit code 1.
|
|
Build and Test Java
Process completed with exit code 1.
|
|
Build and Test Java:
:core:pmdMain#L0
Execution failed for task ':core:pmdMain'.
Caused by:
A failure occurred while executing org.gradle.api.plugins.quality.internal.PmdAction
Caused by:
1 PMD rule violations were found. See the report at: file:///home/runner/work/substrait-java/substrait-java/core/build/reports/pmd/main.html
|
|
Build and Test Java:
:core:spotlessJavaCheck#L0
Execution failed for task ':core:spotlessJavaCheck'.
Caused by:
The following files had format violations:
src/main/java/io/substrait/relation/ProtoRelConverter.java
@@ -630,16 +630,19 @@
····//······new·proto·form·is·used
····if·(!rel.getGroupingExpressionsList().isEmpty())·{
-········List<io.substrait.proto.Expression>·allGroupingKeys·=·rel.getGroupingExpressionsList();
+······List<io.substrait.proto.Expression>·allGroupingKeys·=·rel.getGroupingExpressionsList();
-········for·(int·i·=·0;·i·<·rel.getGroupingsList().size();·i++)·{
-············//······put·all·groupingExpressions·into·the·group
-············Aggregate.Grouping·group·=·Aggregate.Grouping.builder()
-····················.expressions(allGroupingKeys.stream()
-····························.map(protoExprConverter::from)
-····························.collect(java.util.stream.Collectors.toList())).build();
-············groupings.add(group);
-········}
+······for·(int·i·=·0;·i·<·rel.getGroupingsList().size();·i++)·{
+········//······put·all·groupingExpressions·into·the·group
+········Aggregate.Grouping·group·=
+············Aggregate.Grouping.builder()
+················.expressions(
+····················allGroupingKeys.stream()
+························.map(protoExprConverter::from)
+························.collect(java.util.stream.Collectors.toList()))
+················.build();
+········groupings.add(group);
+······}
····}·else·{
······//········using·the·deprecated·form·of·Grouping·and·Aggregate
src/main/java/io/substrait/relation/RelProtoConverter.java
@@ -64,7 +64,7 @@
··protected·final·ExtensionCollector·extensionCollector;
-····public·RelProtoConverter(ExtensionCollector·extensionCollector)·{
+··public·RelProtoConverter(ExtensionCollector·extensionCollector)·{
····this.extensionCollector·=·extensionCollector;
····this.exprProtoConverter·=·new·ExpressionProtoConverter(extensionCollector,·this);
····this.typeProtoConverter·=·new·TypeProtoConverter(extensionCollector);
@@ -123,37 +123,41 @@
····List<io.substrait.proto.Expression>·groupingExpressions·=·new·ArrayList<>();
····Map<Expression,·Integer>·map·=·new·HashMap<>();
-····int·i·=·0;//·unique·reference·values·for·each·expression
+····int·i·=·0;·//·unique·reference·values·for·each·expression
····List<AggregateRel.Grouping>·newGroupings·=·new·ArrayList<>();
-····for(Aggregate.Grouping·gp·:·aggregate.getGroupings())·{
... (48 more lines that didn't fit)
Violations also present in:
src/test/java/io/substrait/relation/AggregateRelTest.java
Run './gradlew spotlessApply' to fix all violations.
|