Skip to content

Commit eaabdee

Browse files
committed
Merge cleanup
1 parent 00e6c3b commit eaabdee

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

server/src/test/java/org/elasticsearch/index/mapper/AbstractShapeGeometryFieldMapperTests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,7 @@ private static void testBoundsBlockLoaderAux(
125125
for (int j : array) {
126126
expected.add(visitor.apply(geometries.get(j + currentIndex)).get());
127127
}
128-
try (
129-
var block = (TestBlock) loader.reader(leaf).read(TestBlock.factory(), TestBlock.docs(array), 0)
130-
) {
128+
try (var block = (TestBlock) loader.reader(leaf).read(TestBlock.factory(), TestBlock.docs(array), 0)) {
131129
for (int i = 0; i < block.size(); i++) {
132130
intArrayResults.add(block.get(i));
133131
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,7 @@ void run(int offset) throws IOException {
7575
builders[f] = new Block.Builder[operator.shardContexts.size()];
7676
converters[f] = new BlockLoader[operator.shardContexts.size()];
7777
}
78-
try (
79-
ComputeBlockLoaderFactory loaderBlockFactory = new ComputeBlockLoaderFactory(operator.blockFactory)
80-
) {
78+
try (ComputeBlockLoaderFactory loaderBlockFactory = new ComputeBlockLoaderFactory(operator.blockFactory)) {
8179
int p = forwards[offset];
8280
int shard = docs.shards().getInt(p);
8381
int segment = docs.segments().getInt(p);

0 commit comments

Comments
 (0)