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

Fix collision between #10689 and #10593. (#10738)

This commit is contained in:
Gian Merlino 2021-01-08 09:52:27 -08:00 committed by GitHub
parent 26bcd47e51
commit 6eef0e4c9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
processing/src/test/java/org/apache/druid/segment/IndexMergerTestBase.java
View File

@ -2725,24 +2725,24 @@ public class IndexMergerTestBase extends InitializedNullHandlingTest
.withRollup(true) .withRollup(true)
.build(); .build();
IncrementalIndex toPersistA = new IncrementalIndex.Builder() IncrementalIndex toPersistA = new OnheapIncrementalIndex.Builder()
.setIndexSchema(indexSchema) .setIndexSchema(indexSchema)
.setMaxRowCount(1000) .setMaxRowCount(1000)
.buildOnheap(); .build();
toPersistA.add(getRowForTestMaxColumnsToMerge(10000, "a", "b", "c", "d", "e")); toPersistA.add(getRowForTestMaxColumnsToMerge(10000, "a", "b", "c", "d", "e"));
toPersistA.add(getRowForTestMaxColumnsToMerge(99999, "1", "2", "3", "4", "5")); toPersistA.add(getRowForTestMaxColumnsToMerge(99999, "1", "2", "3", "4", "5"));
IncrementalIndex toPersistB = new IncrementalIndex.Builder() IncrementalIndex toPersistB = new OnheapIncrementalIndex.Builder()
.setIndexSchema(indexSchema) .setIndexSchema(indexSchema)
.setMaxRowCount(1000) .setMaxRowCount(1000)
.buildOnheap(); .build();
toPersistB.add(getRowForTestMaxColumnsToMerge(20000, "aa", "bb", "cc", "dd", "ee")); toPersistB.add(getRowForTestMaxColumnsToMerge(20000, "aa", "bb", "cc", "dd", "ee"));
toPersistB.add(getRowForTestMaxColumnsToMerge(99999, "1", "2", "3", "4", "5")); toPersistB.add(getRowForTestMaxColumnsToMerge(99999, "1", "2", "3", "4", "5"));
IncrementalIndex toPersistC = new IncrementalIndex.Builder() IncrementalIndex toPersistC = new OnheapIncrementalIndex.Builder()
.setIndexSchema(indexSchema) .setIndexSchema(indexSchema)
.setMaxRowCount(1000) .setMaxRowCount(1000)
.buildOnheap(); .build();
toPersistC.add(getRowForTestMaxColumnsToMerge(30000, "aaa", "bbb", "ccc", "ddd", "eee")); toPersistC.add(getRowForTestMaxColumnsToMerge(30000, "aaa", "bbb", "ccc", "ddd", "eee"));
toPersistC.add(getRowForTestMaxColumnsToMerge(99999, "1", "2", "3", "4", "5")); toPersistC.add(getRowForTestMaxColumnsToMerge(99999, "1", "2", "3", "4", "5"));