From 075501c7cb863b5a2afd24f98383675cb17d00c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Cea=20Fontenla?= Date: Tue, 4 Feb 2025 13:58:46 +0100 Subject: [PATCH 1/2] ESQL: Fix AggregatorFunctionSupplierImplementer warnings import --- .../compute/gen/AggregatorFunctionSupplierImplementer.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorFunctionSupplierImplementer.java b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorFunctionSupplierImplementer.java index 15fc75a990c42..99e7e6849f1b4 100644 --- a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorFunctionSupplierImplementer.java +++ b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorFunctionSupplierImplementer.java @@ -33,6 +33,7 @@ import static org.elasticsearch.compute.gen.Types.DRIVER_CONTEXT; import static org.elasticsearch.compute.gen.Types.LIST_INTEGER; import static org.elasticsearch.compute.gen.Types.STRING; +import static org.elasticsearch.compute.gen.Types.WARNINGS; /** * Implements "AggregationFunctionSupplier" from a class annotated with both @@ -140,7 +141,8 @@ private MethodSpec aggregator() { if (hasWarnings) { builder.addStatement( "var warnings = Warnings.createWarnings(driverContext.warningsMode(), " - + "warningsLineNumber, warningsColumnNumber, warningsSourceText)" + + "warningsLineNumber, warningsColumnNumber, warningsSourceText)", + WARNINGS ); } @@ -165,7 +167,8 @@ private MethodSpec groupingAggregator() { if (hasWarnings) { builder.addStatement( "var warnings = Warnings.createWarnings(driverContext.warningsMode(), " - + "warningsLineNumber, warningsColumnNumber, warningsSourceText)" + + "warningsLineNumber, warningsColumnNumber, warningsSourceText)", + WARNINGS ); } From 851f06230680b2af2dc7db5603281be5e8342e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Cea=20Fontenla?= Date: Tue, 4 Feb 2025 14:06:31 +0100 Subject: [PATCH 2/2] Add missing placeholder --- .../compute/gen/AggregatorFunctionSupplierImplementer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorFunctionSupplierImplementer.java b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorFunctionSupplierImplementer.java index 99e7e6849f1b4..9c70b7f4cac74 100644 --- a/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorFunctionSupplierImplementer.java +++ b/x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/AggregatorFunctionSupplierImplementer.java @@ -140,7 +140,7 @@ private MethodSpec aggregator() { if (hasWarnings) { builder.addStatement( - "var warnings = Warnings.createWarnings(driverContext.warningsMode(), " + "var warnings = $T.createWarnings(driverContext.warningsMode(), " + "warningsLineNumber, warningsColumnNumber, warningsSourceText)", WARNINGS ); @@ -166,7 +166,7 @@ private MethodSpec groupingAggregator() { if (hasWarnings) { builder.addStatement( - "var warnings = Warnings.createWarnings(driverContext.warningsMode(), " + "var warnings = $T.createWarnings(driverContext.warningsMode(), " + "warningsLineNumber, warningsColumnNumber, warningsSourceText)", WARNINGS );