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

use correct ObjectMapper in Index[IO/Merger] in AggregationTestHelper and minor fix in theta sketch SketchMergeAggregatorFactory.getMergingFactory(..) (#2943)

This commit is contained in:
Himanshu 2016-05-12 23:36:31 -05:00 committed by Nishant
parent e3ea842cd3
commit d3e9c47a5f
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions-core/datasketches/src/main/java/io/druid/query/aggregation/datasketches/theta/SketchMergeAggregatorFactory.java
View File

@ -86,7 +86,7 @@ public class SketchMergeAggregatorFactory extends SketchAggregatorFactory
name,
Math.max(size, castedOther.size),
shouldFinalize,
true,
false,
errorBoundsStdDev
);
} else {

34
processing/src/test/java/io/druid/query/aggregation/AggregationTestHelper.java
View File

@ -69,7 +69,7 @@ import io.druid.segment.IndexSpec;
import io.druid.segment.QueryableIndex;
import io.druid.segment.QueryableIndexSegment;
import io.druid.segment.Segment;
import io.druid.segment.TestHelper;
import io.druid.segment.column.ColumnConfig;
import io.druid.segment.incremental.IncrementalIndex;
import io.druid.segment.incremental.OnheapIncrementalIndex;
import org.apache.commons.io.IOUtils;
@ -164,10 +164,22 @@ public class AggregationTestHelper
pool
);
IndexIO indexIO = new IndexIO(
mapper,
new ColumnConfig()
{
@Override
public int columnCacheSizeBytes()
{
return 0;
}
}
);
return new AggregationTestHelper(
mapper,
TestHelper.getTestIndexMerger(),
TestHelper.getTestIndexIO(),
new IndexMerger(mapper, indexIO),
indexIO,
toolchest,
factory,
tempFolder,
@ -196,10 +208,22 @@ public class AggregationTestHelper
QueryRunnerTestHelper.NOOP_QUERYWATCHER
);
IndexIO indexIO = new IndexIO(
mapper,
new ColumnConfig()
{
@Override
public int columnCacheSizeBytes()
{
return 0;
}
}
);
return new AggregationTestHelper(
mapper,
TestHelper.getTestIndexMerger(),
TestHelper.getTestIndexIO(),
new IndexMerger(mapper, indexIO),
indexIO,
toolchest,
factory,
tempFolder,