Spotless

Author: carlosdelest

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

@@ -53,10 +53,7 @@ public record ShardConfig(Query query, IndexSearcher searcher) {}
 
     private final List<ShardState> perShardState;
 
-    protected LuceneQueryEvaluator(
-        BlockFactory blockFactory,
-        ShardConfig[] shards
-    ) {
+    protected LuceneQueryEvaluator(BlockFactory blockFactory, ShardConfig[] shards) {
         this.blockFactory = blockFactory;
         this.shards = shards;
         this.perShardState = new ArrayList<>(Collections.nCopies(shards.length, null));
@@ -165,8 +162,7 @@ private Vector evalSlow(DocVector docs) throws IOException {
     }
 
     @Override
-    public void close() {
-    }
+    public void close() {}
 
     private ShardState shardState(int shard) throws IOException {
         ShardState shardState = perShardState.get(shard);
@@ -255,9 +251,15 @@ Vector scoreDense(T scoreBuilder, int min, int max) throws IOException {
                     return createNoMatchVector(blockFactory, max - min + 1);
                 }
             }
-            try (DenseCollector<T> collector = new DenseCollector<>(min, max,  scoreBuilder,
-                LuceneQueryEvaluator.this::appendNoMatch,
-                LuceneQueryEvaluator.this::appendMatch)) {
+            try (
+                DenseCollector<T> collector = new DenseCollector<>(
+                    min,
+                    max,
+                    scoreBuilder,
+                    LuceneQueryEvaluator.this::appendNoMatch,
+                    LuceneQueryEvaluator.this::appendMatch
+                )
+            ) {
                 bulkScorer.score(collector, ctx.reader().getLiveDocs(), min, max + 1);
                 return collector.build();
             }

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

@@ -31,10 +31,7 @@ public class LuceneQueryExpressionEvaluator extends LuceneQueryEvaluator<Boolean
     implements
         EvalOperator.ExpressionEvaluator {
 
-    LuceneQueryExpressionEvaluator(
-        BlockFactory blockFactory,
-        ShardConfig[] shards
-    ) {
+    LuceneQueryExpressionEvaluator(BlockFactory blockFactory, ShardConfig[] shards) {
         super(blockFactory, shards);
     }
 

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

@@ -29,7 +29,6 @@
 import org.elasticsearch.compute.data.BytesRefVector;
 import org.elasticsearch.compute.data.DocBlock;
 import org.elasticsearch.compute.data.DoubleBlock;
-import org.elasticsearch.compute.data.DoubleVector;
 import org.elasticsearch.compute.data.ElementType;
 import org.elasticsearch.compute.data.Page;
 import org.elasticsearch.compute.data.Vector;
@@ -192,10 +191,7 @@ private List<Page> runQuery(Set<String> values, Query query, boolean shuffleDocs
         BlockFactory blockFactory = driverContext.blockFactory();
         return withReader(values, reader -> {
             IndexSearcher searcher = new IndexSearcher(reader);
-            LuceneQueryEvaluator.ShardConfig shard = new LuceneQueryEvaluator.ShardConfig(
-                searcher.rewrite(query),
-                searcher
-            );
+            LuceneQueryEvaluator.ShardConfig shard = new LuceneQueryEvaluator.ShardConfig(searcher.rewrite(query), searcher);
             List<Operator> operators = new ArrayList<>();
             if (shuffleDocs) {
                 operators.add(new ShuffleDocsOperator(blockFactory));
@@ -216,16 +212,13 @@ private List<Page> runQuery(Set<String> values, Query query, boolean shuffleDocs
                     0
                 )
             );
-            LuceneQueryEvaluator.ShardConfig[] shards = new LuceneQueryEvaluator.ShardConfig[] { new LuceneQueryEvaluator.ShardConfig(
-                searcher.rewrite(query),
-                searcher
-            ) };
+            LuceneQueryEvaluator.ShardConfig[] shards = new LuceneQueryEvaluator.ShardConfig[] {
+                new LuceneQueryEvaluator.ShardConfig(searcher.rewrite(query), searcher) };
             operators.add(createOperator(blockFactory, shards));
             List<Page> results = new ArrayList<>();
             Driver driver = TestDriverFactory.create(
                 driverContext,
-                LuceneQueryEvaluatorTests.luceneOperatorFactory(reader, new MatchAllDocsQuery(), usesScoring())
-                    .get(driverContext),
+                LuceneQueryEvaluatorTests.luceneOperatorFactory(reader, new MatchAllDocsQuery(), usesScoring()).get(driverContext),
                 operators,
                 new TestResultPageSinkOperator(results::add)
             );

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

@@ -28,7 +28,8 @@ protected DenseCollector<BooleanVector.Builder> createDenseCollector(int min, in
             max,
             blockFactory().newBooleanVectorFixedBuilder(max - min + 1),
             b -> b.appendBoolean(false),
-            (b, s) -> b.appendBoolean(true));
+            (b, s) -> b.appendBoolean(true)
+        );
     }
 
     @Override
@@ -38,10 +39,7 @@ protected Scorable getScorer() {
 
     @Override
     protected Operator createOperator(BlockFactory blockFactory, LuceneQueryEvaluator.ShardConfig[] shards) {
-        return new EvalOperator(blockFactory,  new LuceneQueryExpressionEvaluator(
-            blockFactory,
-            shards
-        ));
+        return new EvalOperator(blockFactory, new LuceneQueryExpressionEvaluator(blockFactory, shards));
     }
 
     @Override

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

@@ -32,7 +32,8 @@ protected LuceneQueryEvaluator.DenseCollector<DoubleVector.Builder> createDenseC
             max,
             blockFactory().newDoubleVectorFixedBuilder(max - min + 1),
             b -> b.appendDouble(NO_MATCH_SCORE),
-            (b, s) -> b.appendDouble(s.score()));
+            (b, s) -> b.appendDouble(s.score())
+        );
     }
 
     @Override
@@ -64,14 +65,14 @@ protected int resultsBlockIndex(Page page) {
     @Override
     protected void assertCollectedResultMatch(DoubleVector resultVector, int position, boolean isMatch) {
         if (isMatch) {
-            assertThat(resultVector.getDouble(position), equalTo((double)TEST_SCORE));
+            assertThat(resultVector.getDouble(position), equalTo((double) TEST_SCORE));
         } else {
             // All docs have a default score coming from Lucene
             assertThat(resultVector.getDouble(position), equalTo(NO_MATCH_SCORE));
         }
     }
 
-        @Override
+    @Override
     protected void assertTermResultMatch(DoubleVector resultVector, int position, boolean isMatch) {
         if (isMatch) {
             assertThat(resultVector.getDouble(position), greaterThan(DEFAULT_SCORE));

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

@@ -18,11 +18,7 @@
 import java.util.List;
 
 import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
-import static org.elasticsearch.xpack.esql.EsqlTestUtils.getValuesList;
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.greaterThan;
-import static org.hamcrest.Matchers.lessThan;
 
 //@TestLogging(value = "org.elasticsearch.xpack.esql:TRACE,org.elasticsearch.compute:TRACE", reason = "debug")
 public class MatchFunctionIT extends AbstractEsqlIntegTestCase {

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

@@ -24,7 +24,6 @@
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.core.expression.FoldContext;
 import org.elasticsearch.xpack.esql.core.expression.MetadataAttribute;
-import org.elasticsearch.xpack.esql.core.tree.Node;
 import org.elasticsearch.xpack.esql.core.tree.Source;
 import org.elasticsearch.xpack.esql.core.type.DataType;
 import org.elasticsearch.xpack.esql.core.util.Holder;