Skip to content

Commit 0a4b26c

Browse files
authored
Apply Spotless formatting (#54644)
1 parent 6e7a5e0 commit 0a4b26c

File tree

35 files changed

+1285
-620
lines changed

35 files changed

+1285
-620
lines changed

gradle/formatting.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,6 @@ def projectPathsToExclude = [
142142
':x-pack:plugin:monitoring',
143143
':x-pack:plugin:ql',
144144
':x-pack:plugin:rollup',
145-
':x-pack:plugin:searchable-snapshots',
146-
':x-pack:plugin:searchable-snapshots:qa',
147145
':x-pack:plugin:search-business-rules',
148146
':x-pack:plugin:security',
149147
':x-pack:plugin:security:cli',

x-pack/plugin/searchable-snapshots/qa/azure/src/test/java/org/elasticsearch/xpack/searchablesnapshots/AzureSearchableSnapshotsIT.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ protected Settings repositorySettings() {
2626
final String basePath = System.getProperty("test.azure.base_path");
2727
assertThat(basePath, not(blankOrNullString()));
2828

29-
return Settings.builder()
30-
.put("client", "searchable_snapshots")
31-
.put("container", container)
32-
.put("base_path", basePath)
33-
.build();
29+
return Settings.builder().put("client", "searchable_snapshots").put("container", container).put("base_path", basePath).build();
3430
}
3531
}
36-

x-pack/plugin/searchable-snapshots/qa/s3/src/test/java/org/elasticsearch/xpack/searchablesnapshots/s3/S3SearchableSnapshotsIT.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ protected Settings repositorySettings() {
2626
final String basePath = System.getProperty("test.s3.base_path");
2727
assertThat(basePath, not(blankOrNullString()));
2828

29-
return Settings.builder()
30-
.put("client", "searchable_snapshots")
31-
.put("bucket", bucket)
32-
.put("base_path", basePath)
33-
.build();
29+
return Settings.builder().put("client", "searchable_snapshots").put("bucket", bucket).put("base_path", basePath).build();
3430
}
3531
}

x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/index/store/BaseSearchableSnapshotIndexInput.java

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,11 @@ public BaseSearchableSnapshotIndexInput(
4444
this.blobContainer = Objects.requireNonNull(blobContainer);
4545
this.fileInfo = Objects.requireNonNull(fileInfo);
4646
this.context = Objects.requireNonNull(context);
47-
assert fileInfo.metadata().hashEqualsContents() == false
48-
: "this method should only be used with blobs that are NOT stored in metadata's hash field (fileInfo: " + fileInfo + ')';
47+
assert fileInfo.metadata()
48+
.hashEqualsContents() == false : "this method should only be used with blobs that are NOT stored in metadata's hash field "
49+
+ "(fileInfo: "
50+
+ fileInfo
51+
+ ')';
4952
this.stats = Objects.requireNonNull(stats);
5053
this.offset = offset;
5154
this.length = length;
@@ -101,8 +104,13 @@ public final void close() throws IOException {
101104
protected InputStream openInputStream(final long position, final long length) throws IOException {
102105
assert assertCurrentThreadMayAccessBlobStore();
103106
if (fileInfo.numberOfParts() == 1L) {
104-
assert position + length <= fileInfo.partBytes(0)
105-
: "cannot read [" + position + "-" + (position + length) + "] from [" + fileInfo + "]";
107+
assert position + length <= fileInfo.partBytes(0) : "cannot read ["
108+
+ position
109+
+ "-"
110+
+ (position + length)
111+
+ "] from ["
112+
+ fileInfo
113+
+ "]";
106114
return blobContainer.readBlob(fileInfo.partName(0L), position, length);
107115
} else {
108116
final long startPart = getPartNumberForPosition(position);
@@ -112,8 +120,9 @@ protected InputStream openInputStream(final long position, final long length) th
112120
protected InputStream openSlice(long slice) throws IOException {
113121
final long currentPart = startPart + slice;
114122
final long startInPart = (currentPart == startPart) ? getRelativePositionInPart(position) : 0L;
115-
final long endInPart
116-
= (currentPart == endPart) ? getRelativePositionInPart(position + length) : getLengthOfPart(currentPart);
123+
final long endInPart = (currentPart == endPart)
124+
? getRelativePositionInPart(position + length)
125+
: getLengthOfPart(currentPart);
117126
return blobContainer.readBlob(fileInfo.partName(currentPart), startInPart, endInPart - startInPart);
118127
}
119128
};
@@ -137,8 +146,7 @@ protected final boolean assertCurrentThreadMayAccessBlobStore() {
137146

138147
// Unit tests access the blob store on the main test thread; simplest just to permit this rather than have them override this
139148
// method somehow.
140-
|| threadName.startsWith("TEST-")
141-
: "current thread [" + Thread.currentThread() + "] may not read " + fileInfo;
149+
|| threadName.startsWith("TEST-") : "current thread [" + Thread.currentThread() + "] may not read " + fileInfo;
142150
return true;
143151
}
144152

x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/index/store/InMemoryNoOpCommitDirectory.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,10 @@ public long fileLength(String name) throws IOException {
6767
}
6868

6969
@Override
70-
public void sync(Collection<String> names) {
71-
}
70+
public void sync(Collection<String> names) {}
7271

7372
@Override
74-
public void syncMetaData() {
75-
}
73+
public void syncMetaData() {}
7674

7775
@Override
7876
public IndexOutput createOutput(String name, IOContext context) throws IOException {

x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/index/store/SearchableSnapshotDirectory.java

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,13 @@ public IndexInput openInput(final String name, final IOContext context) throws I
249249
return new CachedBlobContainerIndexInput(this, fileInfo, context, inputStats);
250250
} else {
251251
return new DirectBlobContainerIndexInput(
252-
blobContainer(), fileInfo, context, inputStats, getUncachedChunkSize(), bufferSize(context));
252+
blobContainer(),
253+
fileInfo,
254+
context,
255+
inputStats,
256+
getUncachedChunkSize(),
257+
bufferSize(context)
258+
);
253259
}
254260
}
255261

@@ -271,11 +277,13 @@ public String toString() {
271277
return this.getClass().getSimpleName() + "@" + snapshot().snapshot() + " lockFactory=" + lockFactory;
272278
}
273279

274-
public static Directory create(RepositoriesService repositories,
275-
CacheService cache,
276-
IndexSettings indexSettings,
277-
ShardPath shardPath,
278-
LongSupplier currentTimeNanosSupplier) throws IOException {
280+
public static Directory create(
281+
RepositoriesService repositories,
282+
CacheService cache,
283+
IndexSettings indexSettings,
284+
ShardPath shardPath,
285+
LongSupplier currentTimeNanosSupplier
286+
) throws IOException {
279287

280288
final Repository repository = repositories.repository(SNAPSHOT_REPOSITORY_SETTING.get(indexSettings.getSettings()));
281289
if (repository instanceof BlobStoreRepository == false) {
@@ -289,10 +297,12 @@ public static Directory create(RepositoriesService repositories,
289297
SNAPSHOT_SNAPSHOT_ID_SETTING.get(indexSettings.getSettings())
290298
);
291299

292-
final LazyInitializable<BlobContainer, RuntimeException> lazyBlobContainer
293-
= new LazyInitializable<>(() -> blobStoreRepository.shardContainer(indexId, shardPath.getShardId().id()));
294-
final LazyInitializable<BlobStoreIndexShardSnapshot, RuntimeException> lazySnapshot
295-
= new LazyInitializable<>(() -> blobStoreRepository.loadShardSnapshot(lazyBlobContainer.getOrCompute(), snapshotId));
300+
final LazyInitializable<BlobContainer, RuntimeException> lazyBlobContainer = new LazyInitializable<>(
301+
() -> blobStoreRepository.shardContainer(indexId, shardPath.getShardId().id())
302+
);
303+
final LazyInitializable<BlobStoreIndexShardSnapshot, RuntimeException> lazySnapshot = new LazyInitializable<>(
304+
() -> blobStoreRepository.loadShardSnapshot(lazyBlobContainer.getOrCompute(), snapshotId)
305+
);
296306

297307
final Path cacheDir = shardPath.getDataPath().resolve("snapshots").resolve(snapshotId.getUUID());
298308
Files.createDirectories(cacheDir);

x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/index/store/cache/CacheFile.java

Lines changed: 34 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ public interface EvictionListener {
3434
void onEviction(CacheFile evictedCacheFile);
3535
}
3636

37-
private static final StandardOpenOption[] OPEN_OPTIONS = new StandardOpenOption[]{
38-
StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE, StandardOpenOption.SPARSE
39-
};
37+
private static final StandardOpenOption[] OPEN_OPTIONS = new StandardOpenOption[] {
38+
StandardOpenOption.READ,
39+
StandardOpenOption.WRITE,
40+
StandardOpenOption.CREATE,
41+
StandardOpenOption.SPARSE };
4042

4143
private final AbstractRefCounted refCounter = new AbstractRefCounted("CacheFile") {
4244
@Override
@@ -218,15 +220,22 @@ private boolean invariant() {
218220

219221
@Override
220222
public String toString() {
221-
return "CacheFile{" +
222-
"desc='" + description + '\'' +
223-
", file=" + file +
224-
", length=" + tracker.getLength() +
225-
", channel=" + (channel != null ? "yes" : "no") +
226-
", listeners=" + listeners.size() +
227-
", evicted=" + evicted +
228-
", tracker=" + tracker +
229-
'}';
223+
return "CacheFile{"
224+
+ "desc='"
225+
+ description
226+
+ "', file="
227+
+ file
228+
+ ", length="
229+
+ tracker.getLength()
230+
+ ", channel="
231+
+ (channel != null ? "yes" : "no")
232+
+ ", listeners="
233+
+ listeners.size()
234+
+ ", evicted="
235+
+ evicted
236+
+ ", tracker="
237+
+ tracker
238+
+ '}';
230239
}
231240

232241
private void ensureOpen() {
@@ -235,9 +244,11 @@ private void ensureOpen() {
235244
}
236245
}
237246

238-
CompletableFuture<Integer> fetchRange(long position,
239-
CheckedBiFunction<Long, Long, Integer, IOException> onRangeAvailable,
240-
CheckedBiConsumer<Long, Long, IOException> onRangeMissing) {
247+
CompletableFuture<Integer> fetchRange(
248+
long position,
249+
CheckedBiFunction<Long, Long, Integer, IOException> onRangeAvailable,
250+
CheckedBiConsumer<Long, Long, IOException> onRangeMissing
251+
) {
241252
final CompletableFuture<Integer> future = new CompletableFuture<>();
242253
try {
243254
if (position < 0 || position > tracker.getLength()) {
@@ -248,18 +259,20 @@ CompletableFuture<Integer> fetchRange(long position,
248259
final long rangeStart = (position / rangeSize) * rangeSize;
249260
final long rangeEnd = Math.min(rangeStart + rangeSize, tracker.getLength());
250261

251-
final List<SparseFileTracker.Gap> gaps = tracker.waitForRange(rangeStart, rangeEnd,
262+
final List<SparseFileTracker.Gap> gaps = tracker.waitForRange(
263+
rangeStart,
264+
rangeEnd,
252265
ActionListener.wrap(
253266
rangeReady -> future.complete(onRangeAvailable.apply(rangeStart, rangeEnd)),
254-
rangeFailure -> future.completeExceptionally(rangeFailure)));
267+
rangeFailure -> future.completeExceptionally(rangeFailure)
268+
)
269+
);
255270

256271
if (gaps.size() > 0) {
257272
final SparseFileTracker.Gap range = gaps.get(0);
258273
assert gaps.size() == 1 : "expected 1 range to fetch but got " + gaps.size();
259-
assert range.start == rangeStart
260-
: "range/gap start mismatch (" + range.start + ',' + rangeStart + ')';
261-
assert range.end == rangeEnd
262-
: "range/gap end mismatch (" + range.end + ',' + rangeEnd + ')';
274+
assert range.start == rangeStart : "range/gap start mismatch (" + range.start + ',' + rangeStart + ')';
275+
assert range.end == rangeEnd : "range/gap end mismatch (" + range.end + ',' + rangeEnd + ')';
263276

264277
try {
265278
ensureOpen();

x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/index/store/cache/CacheKey.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,7 @@ public int hashCode() {
6363

6464
@Override
6565
public String toString() {
66-
return "[" +
67-
"snapshotId=" + snapshotId +
68-
", indexId=" + indexId +
69-
", shardId=" + shardId +
70-
", fileName='" + fileName + '\'' +
71-
']';
66+
return "[" + "snapshotId=" + snapshotId + ", indexId=" + indexId + ", shardId=" + shardId + ", fileName='" + fileName + "']";
7267
}
7368

7469
public boolean belongsTo(SnapshotId snapshotId, IndexId indexId, ShardId shardId) {

0 commit comments

Comments
 (0)