Skip to content

Commit 25d9d25

Browse files
author
elasticsearchmachine
committed
Spotless
1 parent edc3592 commit 25d9d25

File tree

5 files changed

+50
-62
lines changed

5 files changed

+50
-62
lines changed

‎x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneTopNSourceOperator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ private Page emit() {
275275

276276
int extractSortCount = (int) sorts.stream().filter(s -> s instanceof ScriptSortBuilder).count();
277277
DoubleBlock.Builder[] sortValuesBlockBuilders = new DoubleBlock.Builder[extractSortCount];
278-
for(int i = 0; i < sortValuesBlockBuilders.length; i++) {
278+
for (int i = 0; i < sortValuesBlockBuilders.length; i++) {
279279
sortValuesBlockBuilders[i] = blockFactory.newDoubleBlockBuilder(size);
280280
}
281281
try (
@@ -331,7 +331,7 @@ private Page emit() {
331331
scores = currentScoresBuilder.build().asBlock();
332332
page = new Page(size, docBlock, scores);
333333
}
334-
for(int i = 0; i < extractSortCount; i++) {
334+
for (int i = 0; i < extractSortCount; i++) {
335335
page = page.appendBlock(sortValuesBlockBuilders[i].build());
336336
}
337337
} finally {

‎x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/vector/VectorSimilarityFunctionsIT.java‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
import org.elasticsearch.xpack.esql.action.AbstractEsqlIntegTestCase;
2727
import org.elasticsearch.xpack.esql.action.EsqlCapabilities;
2828
import org.elasticsearch.xpack.esql.expression.function.vector.CosineSimilarity;
29-
import org.elasticsearch.xpack.esql.expression.function.vector.DotProduct;
30-
import org.elasticsearch.xpack.esql.expression.function.vector.Hamming;
31-
import org.elasticsearch.xpack.esql.expression.function.vector.L1Norm;
32-
import org.elasticsearch.xpack.esql.expression.function.vector.L2Norm;
3329
import org.elasticsearch.xpack.esql.expression.function.vector.VectorSimilarityFunction.SimilarityEvaluatorFunction;
3430
import org.junit.Before;
3531

@@ -51,20 +47,20 @@ public static Iterable<Object[]> parameters() throws Exception {
5147
List<Object[]> params = new ArrayList<>();
5248

5349
if (EsqlCapabilities.Cap.COSINE_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
54-
params.add(new Object[] { "v_cosine", (SimilarityEvaluatorFunction) CosineSimilarity::calculateSimilarity});
50+
params.add(new Object[] { "v_cosine", (SimilarityEvaluatorFunction) CosineSimilarity::calculateSimilarity });
5551
}
56-
// if (EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
57-
// params.add(new Object[] { "v_dot_product", (SimilarityEvaluatorFunction) DotProduct::calculateSimilarity });
58-
// }
59-
// if (EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
60-
// params.add(new Object[] { "v_l1_norm", (SimilarityEvaluatorFunction) L1Norm::calculateSimilarity });
61-
// }
62-
// if (EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
63-
// params.add(new Object[] { "v_l2_norm", (SimilarityEvaluatorFunction) L2Norm::calculateSimilarity });
64-
// }
65-
// if (EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
66-
// params.add(new Object[] { "v_hamming", (SimilarityEvaluatorFunction) Hamming::calculateSimilarity });
67-
// }
52+
// if (EsqlCapabilities.Cap.DOT_PRODUCT_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
53+
// params.add(new Object[] { "v_dot_product", (SimilarityEvaluatorFunction) DotProduct::calculateSimilarity });
54+
// }
55+
// if (EsqlCapabilities.Cap.L1_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
56+
// params.add(new Object[] { "v_l1_norm", (SimilarityEvaluatorFunction) L1Norm::calculateSimilarity });
57+
// }
58+
// if (EsqlCapabilities.Cap.L2_NORM_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
59+
// params.add(new Object[] { "v_l2_norm", (SimilarityEvaluatorFunction) L2Norm::calculateSimilarity });
60+
// }
61+
// if (EsqlCapabilities.Cap.HAMMING_VECTOR_SIMILARITY_FUNCTION.isEnabled()) {
62+
// params.add(new Object[] { "v_hamming", (SimilarityEvaluatorFunction) Hamming::calculateSimilarity });
63+
// }
6864

6965
return params;
7066
}

‎x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/physical/local/PushTopNToSource.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public PhysicalPlan rewrite(TopNExec topNExec) {
133133
for (EsQueryExec.Sort pushableSort : pushableSorts) {
134134
if (pushableSort instanceof EsQueryExec.ScriptSort scriptSort) {
135135
// Change eval alias to the script sort field
136-
for(int i = 0; i < evalExecAlias.size(); i++) {
136+
for (int i = 0; i < evalExecAlias.size(); i++) {
137137
Alias alias = evalExecAlias.get(i);
138138
if (alias.id().equals(scriptSort.alias().id())) {
139139
evalExecAlias.set(i, alias.replaceChild(scriptSort.field()));
@@ -224,11 +224,7 @@ && canPushLimit(topNExec, plannerSettings)) {
224224
Script script = new Script(scriptText);
225225

226226
// Create a script sort that computes the value
227-
EsQueryExec.ScriptSort scriptSort = new EsQueryExec.ScriptSort(
228-
expressionAlias,
229-
script,
230-
order.direction()
231-
);
227+
EsQueryExec.ScriptSort scriptSort = new EsQueryExec.ScriptSort(expressionAlias, script, order.direction());
232228
pushableSorts.add(scriptSort);
233229
} else {
234230
// If the SORT refers to a non-pushable reference function, the EVAL must remain before the SORT,

‎x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/physical/EsQueryExec.java‎

Lines changed: 32 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -144,20 +144,8 @@ public ScriptSort(Alias alias, Script script, Order.OrderDirection direction) {
144144
this.alias = alias;
145145
this.script = script;
146146
this.direction = direction;
147-
EsField esField = new EsField(
148-
alias.name(),
149-
alias.dataType(),
150-
Map.of(),
151-
false,
152-
EsField.TimeSeriesFieldType.NONE
153-
);
154-
this.field = new FieldAttribute(
155-
alias.source(),
156-
null,
157-
null,
158-
alias.name() + "_script",
159-
esField
160-
);
147+
EsField esField = new EsField(alias.name(), alias.dataType(), Map.of(), false, EsField.TimeSeriesFieldType.NONE);
148+
this.field = new FieldAttribute(alias.source(), null, null, alias.name() + "_script", esField);
161149
}
162150

163151
@Override
@@ -166,19 +154,19 @@ public FieldAttribute field() {
166154
}
167155

168156
@Override
169-
public SortBuilder<?> sortBuilder() {
170-
ScriptSortBuilder.ScriptSortType sortType = field.dataType().isNumeric()
171-
? ScriptSortBuilder.ScriptSortType.NUMBER
172-
: ScriptSortBuilder.ScriptSortType.STRING;
173-
ScriptSortBuilder builder = new ScriptSortBuilder(script, sortType);
174-
builder.order(Direction.from(direction).asOrder());
175-
return builder;
176-
}
157+
public SortBuilder<?> sortBuilder() {
158+
ScriptSortBuilder.ScriptSortType sortType = field.dataType().isNumeric()
159+
? ScriptSortBuilder.ScriptSortType.NUMBER
160+
: ScriptSortBuilder.ScriptSortType.STRING;
161+
ScriptSortBuilder builder = new ScriptSortBuilder(script, sortType);
162+
builder.order(Direction.from(direction).asOrder());
163+
return builder;
164+
}
177165

178-
@Override
179-
public DataType resulType() {
180-
return field.dataType();
181-
}
166+
@Override
167+
public DataType resulType() {
168+
return field.dataType();
169+
}
182170

183171
public Alias alias() {
184172
return alias;
@@ -198,10 +186,10 @@ public boolean equals(Object obj) {
198186
if (obj == this) return true;
199187
if (obj == null || obj.getClass() != this.getClass()) return false;
200188
var that = (ScriptSort) obj;
201-
return Objects.equals(this.alias, that.alias) &&
202-
Objects.equals(this.field, that.field) &&
203-
Objects.equals(this.script, that.script) &&
204-
Objects.equals(this.direction, that.direction);
189+
return Objects.equals(this.alias, that.alias)
190+
&& Objects.equals(this.field, that.field)
191+
&& Objects.equals(this.script, that.script)
192+
&& Objects.equals(this.direction, that.direction);
205193
}
206194

207195
@Override
@@ -211,14 +199,22 @@ public int hashCode() {
211199

212200
@Override
213201
public String toString() {
214-
return "ScriptSort[" +
215-
"alias=" + alias + ", " +
216-
"field=" + field + ", " +
217-
"script=" + script + ", " +
218-
"direction=" + direction + ']';
202+
return "ScriptSort["
203+
+ "alias="
204+
+ alias
205+
+ ", "
206+
+ "field="
207+
+ field
208+
+ ", "
209+
+ "script="
210+
+ script
211+
+ ", "
212+
+ "direction="
213+
+ direction
214+
+ ']';
219215
}
220216

221-
}
217+
}
222218

223219
public record QueryBuilderAndTags(QueryBuilder query, List<Object> tags) {
224220
@Override

‎x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/PhysicalPlanOptimizerTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
import static org.hamcrest.Matchers.nullValue;
218218
import static org.hamcrest.Matchers.startsWith;
219219

220-
@TestLogging(value = "org.elasticsearch.xpack.esql:TRACE", reason = "debug")
220+
@TestLogging(value = "org.elasticsearch.xpack.esql:TRACE", reason = "debug")
221221
public class PhysicalPlanOptimizerTests extends ESTestCase {
222222

223223
private static final String PARAM_FORMATTING = "%1$s";

0 commit comments

Comments
 (0)