From a8ac68580f793361b753c9aaf7f9a60839e89f80 Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Tue, 3 Sep 2024 09:08:33 -0700 Subject: [PATCH] Fix logical merge conflict in SuperSorterTest. Logical merge conflict between #16911 and #16914. --- .../java/org/apache/druid/frame/processor/SuperSorterTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/processing/src/test/java/org/apache/druid/frame/processor/SuperSorterTest.java b/processing/src/test/java/org/apache/druid/frame/processor/SuperSorterTest.java index ab5b1c8197fb..b40fde04a9a9 100644 --- a/processing/src/test/java/org/apache/druid/frame/processor/SuperSorterTest.java +++ b/processing/src/test/java/org/apache/druid/frame/processor/SuperSorterTest.java @@ -200,6 +200,7 @@ public void testLimitHint() throws Exception Collections.emptyList(), Futures.immediateFuture(ClusterByPartitions.oneUniversalPartition()), exec, + FrameProcessorDecorator.NONE, new FileOutputChannelFactory(tempFolder, FRAME_SIZE, null), new FileOutputChannelFactory(tempFolder, FRAME_SIZE, null), 2,