Skip to content

Commit 988d892

Browse files
limotovalimotova
committed
spotless apply and other changes
1 parent c6d8f48 commit 988d892

File tree

13 files changed

+78
-20
lines changed

13 files changed

+78
-20
lines changed

‎x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/TypeResolutions.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,11 @@ public static TypeResolution isDate(Expression e, String operationName, ParamOrd
7878
/**
7979
* @see DataType#isRepresentable(DataType)
8080
*/
81-
public static TypeResolution isRepresentableExceptCountersDenseVectorAndAggregateMetricDouble(Expression e, String operationName, ParamOrdinal paramOrd) {
81+
public static TypeResolution isRepresentableExceptCountersDenseVectorAndAggregateMetricDouble(
82+
Expression e,
83+
String operationName,
84+
ParamOrdinal paramOrd
85+
) {
8286
return isType(
8387
e,
8488
dt -> isRepresentable(dt) && dt != DENSE_VECTOR && dt != AGGREGATE_METRIC_DOUBLE,
@@ -95,7 +99,7 @@ public static TypeResolution isRepresentableExceptCountersSpatialDenseVectorAndA
9599
) {
96100
return isType(
97101
e,
98-
(t) -> isSpatialOrGrid(t) == false && DataType.isRepresentable(t) && t != DENSE_VECTOR,
102+
(t) -> isSpatialOrGrid(t) == false && DataType.isRepresentable(t) && t != DENSE_VECTOR && t != AGGREGATE_METRIC_DOUBLE,
99103
operationName,
100104
paramOrd,
101105
"any type except counter, spatial types, dense_vector, or aggregate_metric_double"

‎x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/plugin/EsqlCorePlugin.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
package org.elasticsearch.xpack.esql.core.plugin;
99

10-
import org.elasticsearch.common.util.FeatureFlag;
1110
import org.elasticsearch.plugins.ExtensiblePlugin;
1211
import org.elasticsearch.plugins.Plugin;
1312

‎x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/type/DataType.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,7 @@ public enum DataType implements Writeable {
342342
* </li>
343343
* </ul>
344344
*/
345-
public static final Map<DataType, FeatureFlag> UNDER_CONSTRUCTION = Map.ofEntries(
346-
);
345+
public static final Map<DataType, FeatureFlag> UNDER_CONSTRUCTION = Map.ofEntries();
347346

348347
private final String typeName;
349348

‎x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/aggregate/Sample.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,9 @@ protected TypeResolution resolveType() {
126126
if (childrenResolved() == false) {
127127
return new TypeResolution("Unresolved children");
128128
}
129-
var typeResolution = isRepresentableExceptCountersDenseVectorAndAggregateMetricDouble(field(), sourceText(), FIRST).and(isNotNull(limitField(), sourceText(), SECOND))
130-
.and(isType(limitField(), dt -> dt == DataType.INTEGER, sourceText(), SECOND, "integer"));
129+
var typeResolution = isRepresentableExceptCountersDenseVectorAndAggregateMetricDouble(field(), sourceText(), FIRST).and(
130+
isNotNull(limitField(), sourceText(), SECOND)
131+
).and(isType(limitField(), dt -> dt == DataType.INTEGER, sourceText(), SECOND, "integer"));
131132
if (typeResolution.unresolved()) {
132133
return typeResolution;
133134
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.FIRST;
5454
import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.ParamOrdinal.SECOND;
55-
import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentableExceptCountersAndDenseVector;
55+
import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isRepresentableExceptCountersDenseVectorAndAggregateMetricDouble;
5656
import static org.elasticsearch.xpack.esql.core.expression.TypeResolutions.isString;
5757
import static org.elasticsearch.xpack.esql.expression.Validations.isFoldable;
5858

@@ -127,7 +127,7 @@ protected TypeResolution resolveType() {
127127
return new TypeResolution("Unresolved children");
128128
}
129129

130-
TypeResolution resolution = isRepresentableExceptCountersAndDenseVector(field, sourceText(), FIRST);
130+
TypeResolution resolution = isRepresentableExceptCountersDenseVectorAndAggregateMetricDouble(field, sourceText(), FIRST);
131131

132132
if (resolution.unresolved()) {
133133
return resolution;

‎x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/aggregate/ValuesErrorTests.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,12 @@ protected Expression build(Source source, List<Expression> args) {
3333
@Override
3434
protected Matcher<String> expectedTypeErrorMatcher(List<Set<DataType>> validPerPosition, List<DataType> signature) {
3535
return equalTo(
36-
typeErrorMessage(false, validPerPosition, signature, (v, p) -> "any type except counter types, dense_vector, or aggregate_metric_double")
36+
typeErrorMessage(
37+
false,
38+
validPerPosition,
39+
signature,
40+
(v, p) -> "any type except counter types, dense_vector, or aggregate_metric_double"
41+
)
3742
);
3843
}
3944

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,12 @@ protected Matcher<String> expectedTypeErrorMatcher(List<Set<DataType>> validPerP
3737
if (unsupportedTypes.contains(signature.getFirst())
3838
|| signature.getFirst() == DataType.NULL && unsupportedTypes.contains(signature.get(1))) {
3939
return containsString(
40-
typeErrorMessage(false, validPerPosition, signature, (v, p) -> "any type except counter types, dense_vector, or aggregate_metric_double")
40+
typeErrorMessage(
41+
false,
42+
validPerPosition,
43+
signature,
44+
(v, p) -> "any type except counter types, dense_vector, or aggregate_metric_double"
45+
)
4146
);
4247
} else {
4348
return equalTo(

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,23 @@ protected Matcher<String> expectedTypeErrorMatcher(List<Set<DataType>> validPerP
3737
if (unsupportedTypes.contains(signature.getFirst())
3838
|| signature.getFirst() == DataType.NULL && unsupportedTypes.contains(signature.get(1))) {
3939
return containsString(
40-
typeErrorMessage(false, validPerPosition, signature, (v, p) -> "any type except counter types, dense_vector, or aggregate_metric_double")
40+
typeErrorMessage(
41+
false,
42+
validPerPosition,
43+
signature,
44+
(v, p) -> "any type except counter types, dense_vector, or aggregate_metric_double"
45+
)
4146
);
4247
} else {
43-
return equalTo("second argument of [" + sourceForSignature(signature) + "] must be [" + signature.get(0).noText().typeName()
44-
+ "], found value [] type [" + signature.get(1).typeName() + "]");
45-
}
48+
return equalTo(
49+
"second argument of ["
50+
+ sourceForSignature(signature)
51+
+ "] must be ["
52+
+ signature.get(0).noText().typeName()
53+
+ "], found value [] type ["
54+
+ signature.get(1).typeName()
55+
+ "]"
56+
);
57+
}
4658
}
4759
}

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,14 @@ protected Expression build(Source source, List<Expression> args) {
3232

3333
@Override
3434
protected Matcher<String> expectedTypeErrorMatcher(List<Set<DataType>> validPerPosition, List<DataType> signature) {
35-
return equalTo(typeErrorMessage(false, validPerPosition, signature, (v, p) -> "any type except counter types, dense_vector, or aggregate_metric_double"));
35+
return equalTo(
36+
typeErrorMessage(
37+
false,
38+
validPerPosition,
39+
signature,
40+
(v, p) -> "any type except counter types, dense_vector, or aggregate_metric_double"
41+
)
42+
);
3643
}
3744

3845
@Override

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,14 @@ protected Expression build(Source source, List<Expression> args) {
3232

3333
@Override
3434
protected Matcher<String> expectedTypeErrorMatcher(List<Set<DataType>> validPerPosition, List<DataType> signature) {
35-
return equalTo(typeErrorMessage(false, validPerPosition, signature, (v, p) -> "any type except counter types, dense_vector, or aggregate_metric_double"));
35+
return equalTo(
36+
typeErrorMessage(
37+
false,
38+
validPerPosition,
39+
signature,
40+
(v, p) -> "any type except counter types, dense_vector, or aggregate_metric_double"
41+
)
42+
);
3643
}
3744

3845
@Override

0 commit comments

Comments
 (0)