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

Merge pull request #1108 from metamx/improve-groupby-perf 

Improve groupby by removing conversion to case insensitive row
This commit is contained in:
Fangjin Yang 2015-02-12 11:45:20 -08:00
parent 9bcbf0993a 15cf432b74
commit 90bc62eb5c
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
processing/src/main/java/io/druid/query/groupby/GroupByQueryHelper.java
View File

@ -23,6 +23,8 @@ import com.metamx.common.ISE;
import com.metamx.common.Pair; import com.metamx.common.Pair;
import com.metamx.common.guava.Accumulator; import com.metamx.common.guava.Accumulator;
import io.druid.collections.StupidPool; import io.druid.collections.StupidPool;
import io.druid.data.input.MapBasedInputRow;
import io.druid.data.input.MapBasedRow;
import io.druid.data.input.Row; import io.druid.data.input.Row;
import io.druid.data.input.Rows; import io.druid.data.input.Rows;
import io.druid.granularity.QueryGranularity; import io.druid.granularity.QueryGranularity;
@ -104,10 +106,18 @@ public class GroupByQueryHelper
public IncrementalIndex accumulate(IncrementalIndex accumulated, T in) public IncrementalIndex accumulate(IncrementalIndex accumulated, T in)
{ {
if (in instanceof Row) { if (in instanceof MapBasedRow) {
try { try {
accumulated.add(Rows.toCaseInsensitiveInputRow((Row) in, dimensions)); MapBasedRow row = (MapBasedRow) in;
} catch(IndexSizeExceededException e) { accumulated.add(
new MapBasedInputRow(
row.getTimestamp(),
dimensions,
row.getEvent()
)
);
}
catch (IndexSizeExceededException e) {
throw new ISE(e.getMessage()); throw new ISE(e.getMessage());
} }
} else { } else {

3
server/src/main/java/io/druid/segment/realtime/firehose/EventReceiverFirehoseFactory.java
View File

@ -131,8 +131,7 @@ public class EventReceiverFirehoseFactory implements FirehoseFactory<MapInputRow
final List<InputRow> rows = Lists.newArrayList(); final List<InputRow> rows = Lists.newArrayList();
for (final Map<String, Object> event : events) { for (final Map<String, Object> event : events) {
// Might throw an exception. We'd like that to happen now, instead of while adding to the row buffer. // Might throw an exception. We'd like that to happen now, instead of while adding to the row buffer.
InputRow row = parser.parse(event); rows.add(parser.parse(event));
rows.add(Rows.toCaseInsensitiveInputRow(row, row.getDimensions()));
} }
try { try {