Skip to content

Commit 685c7a9

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent bf7451f commit 685c7a9

File tree

6 files changed

+28
-14
lines changed

6 files changed

+28
-14
lines changed

x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/DenseVectorEvaluatorImplementer.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import static org.elasticsearch.compute.gen.Types.DRIVER_CONTEXT;
3737
import static org.elasticsearch.compute.gen.Types.EXPRESSION_EVALUATOR;
3838
import static org.elasticsearch.compute.gen.Types.EXPRESSION_EVALUATOR_FACTORY;
39-
import static org.elasticsearch.compute.gen.Types.FLOAT_BLOCK;
4039
import static org.elasticsearch.compute.gen.Types.PAGE;
4140
import static org.elasticsearch.compute.gen.Types.RAM_USAGE_ESIMATOR;
4241
import static org.elasticsearch.compute.gen.Types.SOURCE;
@@ -167,7 +166,6 @@ private MethodSpec realEval(boolean blockStyle /*true*/) {
167166
builder.addModifiers(Modifier.PUBLIC).returns(resultDataType);
168167
builder.addParameter(TypeName.INT, "positionCount");
169168

170-
171169
TypeName builderType = builderType(resultDataType);
172170
builder.beginControlFlow(
173171
"try($T result = driverContext.blockFactory().$L(positionCount))",

x-pack/plugin/esql/compute/gen/src/main/java/org/elasticsearch/compute/gen/EvaluatorProcessor.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,12 @@ public Set<String> getSupportedOptions() {
4040

4141
@Override
4242
public Set<String> getSupportedAnnotationTypes() {
43-
return Set.of(Evaluator.class.getName(), MvEvaluator.class.getName(), ConvertEvaluator.class.getName(),
44-
DenseVectorEvaluator.class.getName());
43+
return Set.of(
44+
Evaluator.class.getName(),
45+
MvEvaluator.class.getName(),
46+
ConvertEvaluator.class.getName(),
47+
DenseVectorEvaluator.class.getName()
48+
);
4549
}
4650

4751
@Override

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/DenseVectorArithmeticOperation.java

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,13 @@ public abstract class DenseVectorArithmeticOperation extends EsqlArithmeticOpera
2828
/** Arithmetic (quad) function. */
2929
@FunctionalInterface
3030
public interface DenseVectorBinaryEvaluator {
31-
EvalOperator.ExpressionEvaluator.Factory apply(Source source, DataType lhsType, DataType rhsType, EvalOperator.ExpressionEvaluator.Factory lhs, EvalOperator.ExpressionEvaluator.Factory rhs);
31+
EvalOperator.ExpressionEvaluator.Factory apply(
32+
Source source,
33+
DataType lhsType,
34+
DataType rhsType,
35+
EvalOperator.ExpressionEvaluator.Factory lhs,
36+
EvalOperator.ExpressionEvaluator.Factory rhs
37+
);
3238
}
3339

3440
protected DenseVectorArithmeticOperation(
@@ -89,7 +95,13 @@ protected TypeResolution checkCompatibility() {
8995
public EvalOperator.ExpressionEvaluator.Factory toEvaluator(ToEvaluator toEvaluator) {
9096
var commonType = dataType();
9197
if (commonType == DENSE_VECTOR) {
92-
return denseVectors.apply(source(), left().dataType(), right().dataType(), toEvaluator.apply(left()), toEvaluator.apply(right()));
98+
return denseVectors.apply(
99+
source(),
100+
left().dataType(),
101+
right().dataType(),
102+
toEvaluator.apply(left()),
103+
toEvaluator.apply(right())
104+
);
93105
}
94106
return super.toEvaluator(toEvaluator);
95107
}

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/DenseVectorDoubleOpEvaluator.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@
1111
import org.elasticsearch.compute.data.Block;
1212
import org.elasticsearch.compute.data.DoubleBlock;
1313
import org.elasticsearch.compute.data.FloatBlock;
14-
import org.elasticsearch.compute.data.IntBlock;
1514
import org.elasticsearch.compute.data.Page;
1615
import org.elasticsearch.compute.operator.DriverContext;
1716
import org.elasticsearch.compute.operator.EvalOperator;
1817
import org.elasticsearch.compute.operator.Warnings;
1918
import org.elasticsearch.core.Releasables;
2019
import org.elasticsearch.xpack.esql.core.tree.Source;
2120
import org.elasticsearch.xpack.esql.core.util.NumericUtils;
22-
import org.elasticsearch.xpack.esql.expression.function.scalar.convert.ToDenseVector;
2321

2422
import static org.elasticsearch.xpack.esql.expression.predicate.operator.arithmetic.EsqlArithmeticOperation.OperationSymbol.ADD;
2523
import static org.elasticsearch.xpack.esql.expression.predicate.operator.arithmetic.EsqlArithmeticOperation.OperationSymbol.DIV;

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/predicate/operator/arithmetic/DenseVectorsEvaluator.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -276,13 +276,13 @@ public String toString() {
276276
}
277277
}
278278

279-
280279
public static ExpressionEvaluator.Factory getAddFactory(
281280
Source source,
282281
DataType lhsType,
283282
DataType rhsType,
284283
ExpressionEvaluator.Factory lhsfactory,
285-
ExpressionEvaluator.Factory rhsFactory) {
284+
ExpressionEvaluator.Factory rhsFactory
285+
) {
286286
if (lhsType == DENSE_VECTOR && rhsType == DENSE_VECTOR) {
287287
return new DenseVectorsEvaluator.AddFactory(source, lhsfactory, rhsFactory);
288288
} else {
@@ -321,7 +321,8 @@ public static ExpressionEvaluator.Factory getSubFactory(
321321
DataType lhsType,
322322
DataType rhsType,
323323
ExpressionEvaluator.Factory lhsfactory,
324-
ExpressionEvaluator.Factory rhsFactory) {
324+
ExpressionEvaluator.Factory rhsFactory
325+
) {
325326
if (lhsType == DENSE_VECTOR && rhsType == DENSE_VECTOR) {
326327
return new DenseVectorsEvaluator.SubFactory(source, lhsfactory, rhsFactory);
327328
} else {
@@ -360,7 +361,8 @@ public static ExpressionEvaluator.Factory getMulFactory(
360361
DataType lhsType,
361362
DataType rhsType,
362363
ExpressionEvaluator.Factory lhsfactory,
363-
ExpressionEvaluator.Factory rhsFactory) {
364+
ExpressionEvaluator.Factory rhsFactory
365+
) {
364366
if (lhsType == DENSE_VECTOR && rhsType == DENSE_VECTOR) {
365367
return new DenseVectorsEvaluator.MulFactory(source, lhsfactory, rhsFactory);
366368
} else {
@@ -399,7 +401,8 @@ public static ExpressionEvaluator.Factory getDivFactory(
399401
DataType lhsType,
400402
DataType rhsType,
401403
ExpressionEvaluator.Factory lhsfactory,
402-
ExpressionEvaluator.Factory rhsFactory) {
404+
ExpressionEvaluator.Factory rhsFactory
405+
) {
403406
if (lhsType == DENSE_VECTOR && rhsType == DENSE_VECTOR) {
404407
return new DenseVectorsEvaluator.DivFactory(source, lhsfactory, rhsFactory);
405408
} else {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/type/EsqlDataTypeConverter.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@
121121
import static org.elasticsearch.xpack.esql.core.type.DataType.isDateTime;
122122
import static org.elasticsearch.xpack.esql.core.type.DataType.isDateTimeOrNanosOrTemporal;
123123
import static org.elasticsearch.xpack.esql.core.type.DataType.isNullOrDatePeriod;
124-
import static org.elasticsearch.xpack.esql.core.type.DataType.isNullOrNumeric;
125124
import static org.elasticsearch.xpack.esql.core.type.DataType.isNullOrTemporalAmount;
126125
import static org.elasticsearch.xpack.esql.core.type.DataType.isNullOrTimeDuration;
127126
import static org.elasticsearch.xpack.esql.core.type.DataType.isString;

0 commit comments

Comments
 (0)