Skip to content

Commit 55802e9

Browse files
committed
simplify several usages
1 parent 4364f9f commit 55802e9

File tree

3 files changed

+7
-46
lines changed

3 files changed

+7
-46
lines changed

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1521,22 +1521,15 @@ public static void runDriver(List<Driver> drivers) {
15211521
int dummyDrivers = between(0, 10);
15221522
for (int i = 0; i < dummyDrivers; i++) {
15231523
drivers.add(
1524-
new Driver(
1525-
"test",
1526-
"dummy-session",
1527-
0,
1528-
0,
1524+
TestDriverFactory.create(
15291525
new DriverContext(BigArrays.NON_RECYCLING_INSTANCE, TestBlockFactory.getNonBreakingInstance()),
1530-
() -> "dummy-driver",
15311526
new SequenceLongBlockSourceOperator(
15321527
TestBlockFactory.getNonBreakingInstance(),
15331528
LongStream.range(0, between(1, 100)),
15341529
between(1, 100)
15351530
),
15361531
List.of(),
1537-
new PageConsumerOperator(Page::releaseBlocks),
1538-
Driver.DEFAULT_STATUS_INTERVAL,
1539-
() -> {}
1532+
new PageConsumerOperator(Page::releaseBlocks)
15401533
)
15411534
);
15421535
}

x-pack/plugin/esql/compute/src/test/java/org/elasticsearch/compute/operator/exchange/ExchangeServiceTests.java

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.elasticsearch.compute.operator.SinkOperator;
3838
import org.elasticsearch.compute.operator.SourceOperator;
3939
import org.elasticsearch.compute.test.MockBlockFactory;
40+
import org.elasticsearch.compute.test.TestDriverFactory;
4041
import org.elasticsearch.core.ReleasableRef;
4142
import org.elasticsearch.core.TimeValue;
4243
import org.elasticsearch.tasks.Task;
@@ -300,41 +301,15 @@ Set<Integer> runConcurrentTest(
300301
int numSources = randomIntBetween(1, 8);
301302
List<Driver> drivers = new ArrayList<>(numSinks + numSources);
302303
for (int i = 0; i < numSinks; i++) {
303-
String description = "sink-" + i;
304304
ExchangeSinkOperator sinkOperator = new ExchangeSinkOperator(exchangeSink.get(), Function.identity());
305305
DriverContext dc = driverContext();
306-
Driver d = new Driver(
307-
"test-session:1",
308-
"test",
309-
0,
310-
0,
311-
dc,
312-
() -> description,
313-
seqNoGenerator.get(dc),
314-
List.of(),
315-
sinkOperator,
316-
Driver.DEFAULT_STATUS_INTERVAL,
317-
() -> {}
318-
);
306+
Driver d = TestDriverFactory.create(dc, seqNoGenerator.get(dc), List.of(), sinkOperator, () -> {});
319307
drivers.add(d);
320308
}
321309
for (int i = 0; i < numSources; i++) {
322-
String description = "source-" + i;
323310
ExchangeSourceOperator sourceOperator = new ExchangeSourceOperator(exchangeSource.get());
324311
DriverContext dc = driverContext();
325-
Driver d = new Driver(
326-
"test-session:2",
327-
"test",
328-
0,
329-
0,
330-
dc,
331-
() -> description,
332-
sourceOperator,
333-
List.of(),
334-
seqNoCollector.get(dc),
335-
Driver.DEFAULT_STATUS_INTERVAL,
336-
() -> {}
337-
);
312+
Driver d = TestDriverFactory.create(dc, sourceOperator, List.of(), seqNoCollector.get(dc));
338313
drivers.add(d);
339314
}
340315
PlainActionFuture<Void> future = new PlainActionFuture<>();

x-pack/plugin/esql/compute/test/src/main/java/org/elasticsearch/compute/test/OperatorTestCase.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -287,22 +287,15 @@ public static void runDriver(List<Driver> drivers) {
287287
int dummyDrivers = between(0, 10);
288288
for (int i = 0; i < dummyDrivers; i++) {
289289
drivers.add(
290-
new Driver(
291-
"test",
292-
"dummy-session",
293-
0,
294-
0,
290+
TestDriverFactory.create(
295291
new DriverContext(BigArrays.NON_RECYCLING_INSTANCE, TestBlockFactory.getNonBreakingInstance()),
296-
() -> "dummy-driver",
297292
new SequenceLongBlockSourceOperator(
298293
TestBlockFactory.getNonBreakingInstance(),
299294
LongStream.range(0, between(1, 100)),
300295
between(1, 100)
301296
),
302297
List.of(),
303-
new PageConsumerOperator(page -> page.releaseBlocks()),
304-
Driver.DEFAULT_STATUS_INTERVAL,
305-
() -> {}
298+
new PageConsumerOperator(Page::releaseBlocks)
306299
)
307300
);
308301
}

0 commit comments

Comments
 (0)