Skip to content

Commit fbe8a2b

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent b0c959d commit fbe8a2b

File tree

2 files changed

+84
-52
lines changed
  • x-pack/plugin/esql/src
    • main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue
    • test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue

2 files changed

+84
-52
lines changed

‎x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvContains.java‎

Lines changed: 56 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public ExpressionEvaluator.Factory toEvaluator(ToEvaluator toEvaluator) {
174174
right()
175175
);
176176
}
177-
if(supersetType == ElementType.NULL || subsetType == ElementType.NULL) {
177+
if (supersetType == ElementType.NULL || subsetType == ElementType.NULL) {
178178
return new MvContainsNullEvaluator(toEvaluator.apply(right()));
179179
}
180180
return switch (supersetType) {
@@ -342,9 +342,11 @@ public static class MvContainsBooleanEvaluator implements EvalOperator.Expressio
342342
private final EvalOperator.ExpressionEvaluator field2;
343343
private final DriverContext driverContext;
344344

345-
public MvContainsBooleanEvaluator(EvalOperator.ExpressionEvaluator field1,
346-
EvalOperator.ExpressionEvaluator field2,
347-
DriverContext driverContext) {
345+
public MvContainsBooleanEvaluator(
346+
EvalOperator.ExpressionEvaluator field1,
347+
EvalOperator.ExpressionEvaluator field2,
348+
DriverContext driverContext
349+
) {
348350
this.field1 = field1;
349351
this.field2 = field2;
350352
this.driverContext = driverContext;
@@ -360,7 +362,7 @@ public Block eval(Page page) {
360362
}
361363

362364
public BooleanBlock eval(int positionCount, BooleanBlock field1Block, BooleanBlock field2Block) {
363-
try(BooleanBlock.Builder result = driverContext.blockFactory().newBooleanBlockBuilder(positionCount)) {
365+
try (BooleanBlock.Builder result = driverContext.blockFactory().newBooleanBlockBuilder(positionCount)) {
364366
for (int p = 0; p < positionCount; p++) {
365367
MvContains.process(result, p, field1Block, field2Block);
366368
}
@@ -383,8 +385,11 @@ public static class Factory implements EvalOperator.ExpressionEvaluator.Factory
383385
private final EvalOperator.ExpressionEvaluator.Factory field1;
384386
private final EvalOperator.ExpressionEvaluator.Factory field2;
385387

386-
public Factory(Source source, EvalOperator.ExpressionEvaluator.Factory field1,
387-
EvalOperator.ExpressionEvaluator.Factory field2) {
388+
public Factory(
389+
Source source,
390+
EvalOperator.ExpressionEvaluator.Factory field1,
391+
EvalOperator.ExpressionEvaluator.Factory field2
392+
) {
388393
this.source = source;
389394
this.field1 = field1;
390395
this.field2 = field2;
@@ -417,9 +422,11 @@ public static class MvContainsBytesRefEvaluator implements EvalOperator.Expressi
417422
private final EvalOperator.ExpressionEvaluator field2;
418423
private final DriverContext driverContext;
419424

420-
public MvContainsBytesRefEvaluator(EvalOperator.ExpressionEvaluator field1,
421-
EvalOperator.ExpressionEvaluator field2,
422-
DriverContext driverContext) {
425+
public MvContainsBytesRefEvaluator(
426+
EvalOperator.ExpressionEvaluator field1,
427+
EvalOperator.ExpressionEvaluator field2,
428+
DriverContext driverContext
429+
) {
423430
this.field1 = field1;
424431
this.field2 = field2;
425432
this.driverContext = driverContext;
@@ -435,7 +442,7 @@ public Block eval(Page page) {
435442
}
436443

437444
public BooleanBlock eval(int positionCount, BytesRefBlock field1Block, BytesRefBlock field2Block) {
438-
try(BooleanBlock.Builder result = driverContext.blockFactory().newBooleanBlockBuilder(positionCount)) {
445+
try (BooleanBlock.Builder result = driverContext.blockFactory().newBooleanBlockBuilder(positionCount)) {
439446
for (int p = 0; p < positionCount; p++) {
440447
MvContains.process(result, p, field1Block, field2Block);
441448
}
@@ -458,8 +465,11 @@ public static class Factory implements EvalOperator.ExpressionEvaluator.Factory
458465
private final EvalOperator.ExpressionEvaluator.Factory field1;
459466
private final EvalOperator.ExpressionEvaluator.Factory field2;
460467

461-
public Factory(Source source, EvalOperator.ExpressionEvaluator.Factory field1,
462-
EvalOperator.ExpressionEvaluator.Factory field2) {
468+
public Factory(
469+
Source source,
470+
EvalOperator.ExpressionEvaluator.Factory field1,
471+
EvalOperator.ExpressionEvaluator.Factory field2
472+
) {
463473
this.source = source;
464474
this.field1 = field1;
465475
this.field2 = field2;
@@ -492,9 +502,11 @@ public static class MvContainsDoubleEvaluator implements EvalOperator.Expression
492502
private final EvalOperator.ExpressionEvaluator field2;
493503
private final DriverContext driverContext;
494504

495-
public MvContainsDoubleEvaluator(EvalOperator.ExpressionEvaluator field1,
496-
EvalOperator.ExpressionEvaluator field2,
497-
DriverContext driverContext) {
505+
public MvContainsDoubleEvaluator(
506+
EvalOperator.ExpressionEvaluator field1,
507+
EvalOperator.ExpressionEvaluator field2,
508+
DriverContext driverContext
509+
) {
498510
this.field1 = field1;
499511
this.field2 = field2;
500512
this.driverContext = driverContext;
@@ -510,7 +522,7 @@ public Block eval(Page page) {
510522
}
511523

512524
public BooleanBlock eval(int positionCount, DoubleBlock field1Block, DoubleBlock field2Block) {
513-
try(BooleanBlock.Builder result = driverContext.blockFactory().newBooleanBlockBuilder(positionCount)) {
525+
try (BooleanBlock.Builder result = driverContext.blockFactory().newBooleanBlockBuilder(positionCount)) {
514526
for (int p = 0; p < positionCount; p++) {
515527
MvContains.process(result, p, field1Block, field2Block);
516528
}
@@ -533,8 +545,11 @@ public static class Factory implements EvalOperator.ExpressionEvaluator.Factory
533545
private final EvalOperator.ExpressionEvaluator.Factory field1;
534546
private final EvalOperator.ExpressionEvaluator.Factory field2;
535547

536-
public Factory(Source source, EvalOperator.ExpressionEvaluator.Factory field1,
537-
EvalOperator.ExpressionEvaluator.Factory field2) {
548+
public Factory(
549+
Source source,
550+
EvalOperator.ExpressionEvaluator.Factory field1,
551+
EvalOperator.ExpressionEvaluator.Factory field2
552+
) {
538553
this.source = source;
539554
this.field1 = field1;
540555
this.field2 = field2;
@@ -567,9 +582,11 @@ public static class MvContainsIntEvaluator implements EvalOperator.ExpressionEva
567582
private final EvalOperator.ExpressionEvaluator field2;
568583
private final DriverContext driverContext;
569584

570-
public MvContainsIntEvaluator(EvalOperator.ExpressionEvaluator field1,
571-
EvalOperator.ExpressionEvaluator field2,
572-
DriverContext driverContext) {
585+
public MvContainsIntEvaluator(
586+
EvalOperator.ExpressionEvaluator field1,
587+
EvalOperator.ExpressionEvaluator field2,
588+
DriverContext driverContext
589+
) {
573590
this.field1 = field1;
574591
this.field2 = field2;
575592
this.driverContext = driverContext;
@@ -585,7 +602,7 @@ public Block eval(Page page) {
585602
}
586603

587604
public BooleanBlock eval(int positionCount, IntBlock field1Block, IntBlock field2Block) {
588-
try(BooleanBlock.Builder result = driverContext.blockFactory().newBooleanBlockBuilder(positionCount)) {
605+
try (BooleanBlock.Builder result = driverContext.blockFactory().newBooleanBlockBuilder(positionCount)) {
589606
for (int p = 0; p < positionCount; p++) {
590607
MvContains.process(result, p, field1Block, field2Block);
591608
}
@@ -608,8 +625,11 @@ public static class Factory implements EvalOperator.ExpressionEvaluator.Factory
608625
private final EvalOperator.ExpressionEvaluator.Factory field1;
609626
private final EvalOperator.ExpressionEvaluator.Factory field2;
610627

611-
public Factory(Source source, EvalOperator.ExpressionEvaluator.Factory field1,
612-
EvalOperator.ExpressionEvaluator.Factory field2) {
628+
public Factory(
629+
Source source,
630+
EvalOperator.ExpressionEvaluator.Factory field1,
631+
EvalOperator.ExpressionEvaluator.Factory field2
632+
) {
613633
this.source = source;
614634
this.field1 = field1;
615635
this.field2 = field2;
@@ -642,9 +662,11 @@ public static class MvContainsLongEvaluator implements EvalOperator.ExpressionEv
642662
private final EvalOperator.ExpressionEvaluator field2;
643663
private final DriverContext driverContext;
644664

645-
public MvContainsLongEvaluator(EvalOperator.ExpressionEvaluator field1,
646-
EvalOperator.ExpressionEvaluator field2,
647-
DriverContext driverContext) {
665+
public MvContainsLongEvaluator(
666+
EvalOperator.ExpressionEvaluator field1,
667+
EvalOperator.ExpressionEvaluator field2,
668+
DriverContext driverContext
669+
) {
648670
this.field1 = field1;
649671
this.field2 = field2;
650672
this.driverContext = driverContext;
@@ -660,7 +682,7 @@ public Block eval(Page page) {
660682
}
661683

662684
public BooleanBlock eval(int positionCount, LongBlock field1Block, LongBlock field2Block) {
663-
try(BooleanBlock.Builder result = driverContext.blockFactory().newBooleanBlockBuilder(positionCount)) {
685+
try (BooleanBlock.Builder result = driverContext.blockFactory().newBooleanBlockBuilder(positionCount)) {
664686
for (int p = 0; p < positionCount; p++) {
665687
MvContains.process(result, p, field1Block, field2Block);
666688
}
@@ -683,8 +705,11 @@ public static class Factory implements EvalOperator.ExpressionEvaluator.Factory
683705
private final EvalOperator.ExpressionEvaluator.Factory field1;
684706
private final EvalOperator.ExpressionEvaluator.Factory field2;
685707

686-
public Factory(Source source, EvalOperator.ExpressionEvaluator.Factory field1,
687-
EvalOperator.ExpressionEvaluator.Factory field2) {
708+
public Factory(
709+
Source source,
710+
EvalOperator.ExpressionEvaluator.Factory field1,
711+
EvalOperator.ExpressionEvaluator.Factory field2
712+
) {
688713
this.source = source;
689714
this.field1 = field1;
690715
this.field2 = field2;

‎x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/multivalue/MvContainsTests.java‎

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,13 @@ public static Iterable<Object[]> parameters() {
5252
doubles(suppliers);
5353
bytesRefs(suppliers);
5454

55-
return parameterSuppliersFromTypedData(anyNullIsNull(
56-
suppliers,
57-
(nullPosition, nullValueDataType, original) -> original.expectedType(),
58-
(nullPosition, nullData, original) -> original
59-
));
55+
return parameterSuppliersFromTypedData(
56+
anyNullIsNull(
57+
suppliers,
58+
(nullPosition, nullValueDataType, original) -> original.expectedType(),
59+
(nullPosition, nullData, original) -> original
60+
)
61+
);
6062
}
6163

6264
@Override
@@ -326,21 +328,26 @@ protected static List<TestCaseSupplier> anyNullIsNull(
326328
typesWithNull.set(nullPosition, DataType.NULL);
327329
boolean newSignature = uniqueSignatures.add(typesWithNull);
328330
if (newSignature) {
329-
suppliers.add(new TestCaseSupplier(
330-
"G2: " + toSpaceSeparatedString(typesWithNull) + " null in " + nullPosition,
331-
typesWithNull,
332-
() -> {
333-
TestCaseSupplier.TestCase originalTestCase = original.get();
334-
var typeDataWithNull = new ArrayList<>(originalTestCase.getData());
335-
typeDataWithNull.set(nullPosition, typeDataWithNull.get(nullPosition).isMultiRow() ? MULTI_ROW_NULL : NULL);
336-
return new TestCaseSupplier.TestCase(
337-
typeDataWithNull,
338-
"MvContainsNullEvaluator[subsetField=Attribute[channel=1]]",
339-
expectedType.expectedType(nullPosition, DataType.BOOLEAN, originalTestCase),
340-
equalTo(nullPosition == 1)
341-
);
342-
}
343-
));
331+
suppliers.add(
332+
new TestCaseSupplier(
333+
"G2: " + toSpaceSeparatedString(typesWithNull) + " null in " + nullPosition,
334+
typesWithNull,
335+
() -> {
336+
TestCaseSupplier.TestCase originalTestCase = original.get();
337+
var typeDataWithNull = new ArrayList<>(originalTestCase.getData());
338+
typeDataWithNull.set(
339+
nullPosition,
340+
typeDataWithNull.get(nullPosition).isMultiRow() ? MULTI_ROW_NULL : NULL
341+
);
342+
return new TestCaseSupplier.TestCase(
343+
typeDataWithNull,
344+
"MvContainsNullEvaluator[subsetField=Attribute[channel=1]]",
345+
expectedType.expectedType(nullPosition, DataType.BOOLEAN, originalTestCase),
346+
equalTo(nullPosition == 1)
347+
);
348+
}
349+
)
350+
);
344351
}
345352
}
346353
}
@@ -356,6 +363,6 @@ private static String toSpaceSeparatedString(ArrayList<DataType> typesWithNull)
356363
// We always return a boolean.
357364
@Override
358365
protected Matcher<Object> allNullsMatcher() {
359-
return anyOf(equalTo(false),equalTo(true));
366+
return anyOf(equalTo(false), equalTo(true));
360367
}
361368
}

0 commit comments

Comments
 (0)