From fcbae7867600609f8d97809377c71ba7f07a9ced Mon Sep 17 00:00:00 2001 From: Gian Merlino Date: Thu, 7 Jan 2021 22:35:10 -0800 Subject: [PATCH] Fix collision between #10689 and #10593. --- .../apache/druid/segment/IndexMergerTestBase.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/processing/src/test/java/org/apache/druid/segment/IndexMergerTestBase.java b/processing/src/test/java/org/apache/druid/segment/IndexMergerTestBase.java index 124554ee52ec..9f3d59ac50aa 100644 --- a/processing/src/test/java/org/apache/druid/segment/IndexMergerTestBase.java +++ b/processing/src/test/java/org/apache/druid/segment/IndexMergerTestBase.java @@ -2725,24 +2725,24 @@ public void testMaxColumnsToMerge() throws Exception .withRollup(true) .build(); - IncrementalIndex toPersistA = new IncrementalIndex.Builder() + IncrementalIndex toPersistA = new OnheapIncrementalIndex.Builder() .setIndexSchema(indexSchema) .setMaxRowCount(1000) - .buildOnheap(); + .build(); toPersistA.add(getRowForTestMaxColumnsToMerge(10000, "a", "b", "c", "d", "e")); toPersistA.add(getRowForTestMaxColumnsToMerge(99999, "1", "2", "3", "4", "5")); - IncrementalIndex toPersistB = new IncrementalIndex.Builder() + IncrementalIndex toPersistB = new OnheapIncrementalIndex.Builder() .setIndexSchema(indexSchema) .setMaxRowCount(1000) - .buildOnheap(); + .build(); toPersistB.add(getRowForTestMaxColumnsToMerge(20000, "aa", "bb", "cc", "dd", "ee")); toPersistB.add(getRowForTestMaxColumnsToMerge(99999, "1", "2", "3", "4", "5")); - IncrementalIndex toPersistC = new IncrementalIndex.Builder() + IncrementalIndex toPersistC = new OnheapIncrementalIndex.Builder() .setIndexSchema(indexSchema) .setMaxRowCount(1000) - .buildOnheap(); + .build(); toPersistC.add(getRowForTestMaxColumnsToMerge(30000, "aaa", "bbb", "ccc", "ddd", "eee")); toPersistC.add(getRowForTestMaxColumnsToMerge(99999, "1", "2", "3", "4", "5"));