Skip to content

Commit 96284cc

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 7d7fedf commit 96284cc

File tree

3 files changed

+13
-36
lines changed

3 files changed

+13
-36
lines changed

server/src/main/java/org/elasticsearch/index/mapper/IdLoader.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ final class TsIdLoader implements IdLoader {
7474
this.indexRouting = indexRouting;
7575
}
7676

77-
public IdLoader.Leaf leaf(
78-
SourceLoader.Leaf leafSourceLoader, LeafStoredFieldLoader loader, LeafReader reader, int[] docIdsInLeaf) throws IOException {
77+
public IdLoader.Leaf leaf(SourceLoader.Leaf leafSourceLoader, LeafStoredFieldLoader loader, LeafReader reader, int[] docIdsInLeaf)
78+
throws IOException {
7979
IndexRouting.ExtractFromSource.Builder[] builders = null;
8080
if (indexRouting != null) {
8181
builders = new IndexRouting.ExtractFromSource.Builder[docIdsInLeaf.length];
@@ -134,9 +134,8 @@ public IdLoader.Leaf leaf(
134134
}
135135

136136
final class LogsdbLoader implements IdLoader {
137-
public IdLoader.Leaf leaf(
138-
SourceLoader.Leaf leafSourceLoader, LeafStoredFieldLoader loader, LeafReader reader, int[] docIdsInLeaf
139-
) throws IOException {
137+
public IdLoader.Leaf leaf(SourceLoader.Leaf leafSourceLoader, LeafStoredFieldLoader loader, LeafReader reader, int[] docIdsInLeaf)
138+
throws IOException {
140139
try {
141140
SortedDocValues idDocValues = DocValues.getSorted(reader, IdFieldMapper.NAME);
142141
return loadDocValues(idDocValues, docIdsInLeaf);
@@ -164,8 +163,8 @@ final class StoredIdLoader implements IdLoader {
164163
public StoredIdLoader() {}
165164

166165
@Override
167-
public Leaf leaf(
168-
SourceLoader.Leaf leafSourceLoader, LeafStoredFieldLoader loader, LeafReader reader, int[] docIdsInLeaf) throws IOException {
166+
public Leaf leaf(SourceLoader.Leaf leafSourceLoader, LeafStoredFieldLoader loader, LeafReader reader, int[] docIdsInLeaf)
167+
throws IOException {
169168
return new StoredLeaf(loader);
170169
}
171170
}

server/src/main/java/org/elasticsearch/index/mapper/LogsdbIdFieldMapper.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import java.util.Collection;
1919
import java.util.Collections;
20-
import java.util.List;
2120

2221
/**
2322
* A mapper for the _id field.
@@ -73,9 +72,7 @@ public boolean isSearchable() {
7372

7473
@Override
7574
public Query termsQuery(Collection<?> values, SearchExecutionContext context) {
76-
var bytesRefs = values.stream()
77-
.map(LogsdbIdFieldType::encode)
78-
.map(this::indexedValueForSearch).toList();
75+
var bytesRefs = values.stream().map(LogsdbIdFieldType::encode).map(this::indexedValueForSearch).toList();
7976
return SortedDocValuesField.newSlowSetQuery(name(), bytesRefs);
8077
}
8178

x-pack/plugin/logsdb/src/internalClusterTest/java/org/elasticsearch/xpack/logsdb/LogsIdIT.java

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,13 @@
1717
import org.elasticsearch.action.get.GetRequest;
1818
import org.elasticsearch.action.index.IndexRequest;
1919
import org.elasticsearch.action.search.SearchRequest;
20-
import org.elasticsearch.action.search.SearchResponse;
21-
import org.elasticsearch.client.Request;
2220
import org.elasticsearch.cluster.metadata.ComposableIndexTemplate;
2321
import org.elasticsearch.cluster.metadata.Template;
2422
import org.elasticsearch.common.compress.CompressedXContent;
2523
import org.elasticsearch.common.settings.Settings;
2624
import org.elasticsearch.common.time.DateFormatter;
2725
import org.elasticsearch.common.time.FormatNames;
2826
import org.elasticsearch.datastreams.DataStreamsPlugin;
29-
import org.elasticsearch.index.query.MatchAllQueryBuilder;
3027
import org.elasticsearch.index.query.TermQueryBuilder;
3128
import org.elasticsearch.license.LicenseSettings;
3229
import org.elasticsearch.plugins.Plugin;
@@ -40,14 +37,11 @@
4037

4138
import java.io.IOException;
4239
import java.time.Instant;
43-
import java.util.Arrays;
4440
import java.util.Collection;
45-
import java.util.Comparator;
4641
import java.util.List;
4742
import java.util.UUID;
4843
import java.util.concurrent.ExecutionException;
4944

50-
import static org.elasticsearch.index.query.QueryBuilders.matchQuery;
5145
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertResponse;
5246
import static org.hamcrest.Matchers.*;
5347

@@ -120,9 +114,7 @@ public void testGetByGeneratedId() throws Exception {
120114
for (int j = 0; j < numDocs; j++) {
121115
var indexRequest = new IndexRequest(dataStreamName).opType(DocWriteRequest.OpType.CREATE);
122116
indexRequest.source(
123-
DOC.replace("$time", formatInstant(time))
124-
.replace("$uuid", UUID.randomUUID().toString())
125-
.replace("$pod", "pod-" + j),
117+
DOC.replace("$time", formatInstant(time)).replace("$uuid", UUID.randomUUID().toString()).replace("$pod", "pod-" + j),
126118
XContentType.JSON
127119
);
128120
bulkRequest.add(indexRequest);
@@ -160,13 +152,9 @@ public void testGetByProvidedID() throws Exception {
160152
BulkRequest bulkRequest = new BulkRequest(indexName);
161153
int numDocs = randomIntBetween(16, 256);
162154
for (int j = 0; j < numDocs; j++) {
163-
var indexRequest = new IndexRequest(indexName)
164-
.opType(DocWriteRequest.OpType.INDEX)
165-
.id("id-" + j);
155+
var indexRequest = new IndexRequest(indexName).opType(DocWriteRequest.OpType.INDEX).id("id-" + j);
166156
indexRequest.source(
167-
DOC.replace("$time", formatInstant(time))
168-
.replace("$uuid", UUID.randomUUID().toString())
169-
.replace("$pod", "pod-" + j),
157+
DOC.replace("$time", formatInstant(time)).replace("$uuid", UUID.randomUUID().toString()).replace("$pod", "pod-" + j),
170158
XContentType.JSON
171159
);
172160
bulkRequest.add(indexRequest);
@@ -215,13 +203,9 @@ public void testMatchByProvidedID() throws Exception {
215203
BulkRequest bulkRequest = new BulkRequest(indexName);
216204
int numDocs = randomIntBetween(16, 256);
217205
for (int j = 0; j < numDocs; j++) {
218-
var indexRequest = new IndexRequest(indexName)
219-
.opType(DocWriteRequest.OpType.INDEX)
220-
.id("id-" + j);
206+
var indexRequest = new IndexRequest(indexName).opType(DocWriteRequest.OpType.INDEX).id("id-" + j);
221207
indexRequest.source(
222-
DOC.replace("$time", formatInstant(time))
223-
.replace("$uuid", UUID.randomUUID().toString())
224-
.replace("$pod", "pod-" + j),
208+
DOC.replace("$time", formatInstant(time)).replace("$uuid", UUID.randomUUID().toString()).replace("$pod", "pod-" + j),
225209
XContentType.JSON
226210
);
227211
bulkRequest.add(indexRequest);
@@ -259,7 +243,6 @@ private void createTemplate(String dataStreamName) throws IOException {
259243
client().execute(TransportPutComposableIndexTemplateAction.TYPE, putTemplateRequest).actionGet();
260244
}
261245

262-
263246
private void checkIndexSearchAndRetrieval(String dataStreamName, boolean routeOnSortFields) throws Exception {
264247
String[] uuis = {
265248
UUID.randomUUID().toString(),
@@ -331,9 +314,7 @@ static String formatInstant(Instant instant) {
331314
public void flush(String index, boolean force) throws IOException, ExecutionException, InterruptedException {
332315
logger.info("flushing index {} force={}", index, force);
333316
FlushRequest flushRequest = new FlushRequest(index).force(force);
334-
assertResponse(client().admin().indices().flush(flushRequest), response -> {
335-
assertEquals(0, response.getFailedShards());
336-
});
317+
assertResponse(client().admin().indices().flush(flushRequest), response -> { assertEquals(0, response.getFailedShards()); });
337318
}
338319

339320
}

0 commit comments

Comments
 (0)