Skip to content

Commit ef3decc

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 0008559 commit ef3decc

File tree

7 files changed

+21
-35
lines changed

7 files changed

+21
-35
lines changed

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,7 @@ public record ShardConfig(Query query, IndexSearcher searcher) {}
5353

5454
private final List<ShardState> perShardState;
5555

56-
protected LuceneQueryEvaluator(
57-
BlockFactory blockFactory,
58-
ShardConfig[] shards
59-
) {
56+
protected LuceneQueryEvaluator(BlockFactory blockFactory, ShardConfig[] shards) {
6057
this.blockFactory = blockFactory;
6158
this.shards = shards;
6259
this.perShardState = new ArrayList<>(Collections.nCopies(shards.length, null));
@@ -165,8 +162,7 @@ private Vector evalSlow(DocVector docs) throws IOException {
165162
}
166163

167164
@Override
168-
public void close() {
169-
}
165+
public void close() {}
170166

171167
private ShardState shardState(int shard) throws IOException {
172168
ShardState shardState = perShardState.get(shard);
@@ -255,9 +251,15 @@ Vector scoreDense(T scoreBuilder, int min, int max) throws IOException {
255251
return createNoMatchVector(blockFactory, max - min + 1);
256252
}
257253
}
258-
try (DenseCollector<T> collector = new DenseCollector<>(min, max, scoreBuilder,
259-
LuceneQueryEvaluator.this::appendNoMatch,
260-
LuceneQueryEvaluator.this::appendMatch)) {
254+
try (
255+
DenseCollector<T> collector = new DenseCollector<>(
256+
min,
257+
max,
258+
scoreBuilder,
259+
LuceneQueryEvaluator.this::appendNoMatch,
260+
LuceneQueryEvaluator.this::appendMatch
261+
)
262+
) {
261263
bulkScorer.score(collector, ctx.reader().getLiveDocs(), min, max + 1);
262264
return collector.build();
263265
}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ public class LuceneQueryExpressionEvaluator extends LuceneQueryEvaluator<Boolean
3131
implements
3232
EvalOperator.ExpressionEvaluator {
3333

34-
LuceneQueryExpressionEvaluator(
35-
BlockFactory blockFactory,
36-
ShardConfig[] shards
37-
) {
34+
LuceneQueryExpressionEvaluator(BlockFactory blockFactory, ShardConfig[] shards) {
3835
super(blockFactory, shards);
3936
}
4037

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/lucene/LuceneQueryEvaluatorTests.java

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -197,21 +197,15 @@ private void testTermsQuery(boolean shuffleDocs) throws IOException {
197197
}
198198

199199
protected Operator createOperator(BlockFactory blockFactory, LuceneQueryEvaluator.ShardConfig[] shards) {
200-
return new EvalOperator(blockFactory, new LuceneQueryExpressionEvaluator(
201-
blockFactory,
202-
shards
203-
));
200+
return new EvalOperator(blockFactory, new LuceneQueryExpressionEvaluator(blockFactory, shards));
204201
}
205202

206203
private List<Page> runQuery(Set<String> values, Query query, boolean shuffleDocs) throws IOException {
207204
DriverContext driverContext = driverContext();
208205
BlockFactory blockFactory = driverContext.blockFactory();
209206
return withReader(values, reader -> {
210207
IndexSearcher searcher = new IndexSearcher(reader);
211-
LuceneQueryEvaluator.ShardConfig shard = new LuceneQueryEvaluator.ShardConfig(
212-
searcher.rewrite(query),
213-
searcher
214-
);
208+
LuceneQueryEvaluator.ShardConfig shard = new LuceneQueryEvaluator.ShardConfig(searcher.rewrite(query), searcher);
215209
List<Operator> operators = new ArrayList<>();
216210
if (shuffleDocs) {
217211
operators.add(new ShuffleDocsOperator(blockFactory));
@@ -232,16 +226,13 @@ private List<Page> runQuery(Set<String> values, Query query, boolean shuffleDocs
232226
0
233227
)
234228
);
235-
LuceneQueryEvaluator.ShardConfig[] shards = new LuceneQueryEvaluator.ShardConfig[] { new LuceneQueryEvaluator.ShardConfig(
236-
searcher.rewrite(query),
237-
searcher
238-
) };
229+
LuceneQueryEvaluator.ShardConfig[] shards = new LuceneQueryEvaluator.ShardConfig[] {
230+
new LuceneQueryEvaluator.ShardConfig(searcher.rewrite(query), searcher) };
239231
operators.add(createOperator(blockFactory, shards));
240232
List<Page> results = new ArrayList<>();
241233
Driver driver = TestDriverFactory.create(
242234
driverContext,
243-
LuceneQueryEvaluatorTests.luceneOperatorFactory(reader, new MatchAllDocsQuery(), useScoring)
244-
.get(driverContext),
235+
LuceneQueryEvaluatorTests.luceneOperatorFactory(reader, new MatchAllDocsQuery(), useScoring).get(driverContext),
245236
operators,
246237
new TestResultPageSinkOperator(results::add)
247238
);

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/lucene/LuceneQueryExpressionEvaluatorTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ protected DenseCollector<BooleanVector.Builder> createDensecollector(int min, in
2020
max,
2121
blockFactory().newBooleanVectorFixedBuilder(max - min + 1),
2222
b -> b.appendBoolean(false),
23-
(b, s) -> b.appendBoolean(true));
23+
(b, s) -> b.appendBoolean(true)
24+
);
2425
}
2526

2627
@Override
@@ -43,5 +44,4 @@ protected Object valueForNoMatch() {
4344
return false;
4445
}
4546

46-
4747
}

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/lucene/LuceneQueryScoreEvaluatorTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ protected LuceneQueryEvaluator.DenseCollector<DoubleVector.Builder> createDensec
3131
max,
3232
blockFactory().newDoubleVectorFixedBuilder(max - min + 1),
3333
b -> b.appendDouble(NO_MATCH_SCORE),
34-
(b, s) -> b.appendDouble(s.score()));
34+
(b, s) -> b.appendDouble(s.score())
35+
);
3536
}
3637

3738
@Override

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/MatchFunctionIT.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@
1818
import java.util.List;
1919

2020
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
21-
import static org.elasticsearch.xpack.esql.EsqlTestUtils.getValuesList;
2221
import static org.hamcrest.CoreMatchers.containsString;
23-
import static org.hamcrest.Matchers.equalTo;
24-
import static org.hamcrest.Matchers.greaterThan;
25-
import static org.hamcrest.Matchers.lessThan;
2622

2723
//@TestLogging(value = "org.elasticsearch.xpack.esql:TRACE,org.elasticsearch.compute:TRACE", reason = "debug")
2824
public class MatchFunctionIT extends AbstractEsqlIntegTestCase {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/PlannerUtils.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.elasticsearch.xpack.esql.core.expression.Expression;
2525
import org.elasticsearch.xpack.esql.core.expression.FoldContext;
2626
import org.elasticsearch.xpack.esql.core.expression.MetadataAttribute;
27-
import org.elasticsearch.xpack.esql.core.tree.Node;
2827
import org.elasticsearch.xpack.esql.core.tree.Source;
2928
import org.elasticsearch.xpack.esql.core.type.DataType;
3029
import org.elasticsearch.xpack.esql.core.util.Holder;

0 commit comments

Comments
 (0)