Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix logical merge conflict in SuperSorterTest. (#16993) 

Logical merge conflict between #16911 and #16914.
This commit is contained in:
Gian Merlino 2024-09-03 13:14:59 -07:00 committed by GitHub
parent 2ef936be40
commit 57c4b552d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
processing/src/test/java/org/apache/druid/frame/processor/SuperSorterTest.java
View File

@ -200,6 +200,7 @@ public class SuperSorterTest
Collections.emptyList(), Collections.emptyList(),
Futures.immediateFuture(ClusterByPartitions.oneUniversalPartition()), Futures.immediateFuture(ClusterByPartitions.oneUniversalPartition()),
exec, exec,
FrameProcessorDecorator.NONE,
new FileOutputChannelFactory(tempFolder, FRAME_SIZE, null), new FileOutputChannelFactory(tempFolder, FRAME_SIZE, null),
new FileOutputChannelFactory(tempFolder, FRAME_SIZE, null), new FileOutputChannelFactory(tempFolder, FRAME_SIZE, null),
2, 2,