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

Merge branch 'offheap-incremental-index' of github.com:metamx/druid into offheap-incremental-index

This commit is contained in:
fjy 2014-08-18 11:14:49 -07:00
parent 77e514688a 4dd01d4eae
commit 38014fa964
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
processing/src/main/java/io/druid/segment/incremental/IncrementalIndex.java
View File

@ -81,7 +81,7 @@ public class IncrementalIndex implements Iterable<Row>, Closeable
private final long minTimestamp; private final long minTimestamp;
private final QueryGranularity gran; private final QueryGranularity gran;
private final Set<Function<InputRow, InputRow>> rowTransformers; private final List<Function<InputRow, InputRow>> rowTransformers;
private final AggregatorFactory[] metrics; private final AggregatorFactory[] metrics;
private final Map<String, Integer> metricIndexes; private final Map<String, Integer> metricIndexes;
@ -120,7 +120,7 @@ public class IncrementalIndex implements Iterable<Row>, Closeable
this.minTimestamp = incrementalIndexSchema.getMinTimestamp(); this.minTimestamp = incrementalIndexSchema.getMinTimestamp();
this.gran = incrementalIndexSchema.getGran(); this.gran = incrementalIndexSchema.getGran();
this.metrics = incrementalIndexSchema.getMetrics(); this.metrics = incrementalIndexSchema.getMetrics();
this.rowTransformers = Sets.newHashSet(); this.rowTransformers = Lists.newCopyOnWriteArrayList();
final ImmutableList.Builder<String> metricNamesBuilder = ImmutableList.builder(); final ImmutableList.Builder<String> metricNamesBuilder = ImmutableList.builder();
final ImmutableMap.Builder<String, Integer> metricIndexesBuilder = ImmutableMap.builder(); final ImmutableMap.Builder<String, Integer> metricIndexesBuilder = ImmutableMap.builder();
@ -447,13 +447,12 @@ public class IncrementalIndex implements Iterable<Row>, Closeable
if (!facts.containsKey(key)) { if (!facts.containsKey(key)) {
int rowOffset = totalAggSize * numEntries.getAndIncrement(); int rowOffset = totalAggSize * numEntries.getAndIncrement();
if (rowOffset + totalAggSize > bufferHolder.get().limit()) { if (rowOffset + totalAggSize > bufferHolder.get().limit()) {
throw new ISE("Buffer Full cannot add more rows current rowSize : %d", numEntries.get()); throw new ISE("Buffer full, cannot add more rows! Current rowSize[%,d].", numEntries.get());
} }
for (int i = 0; i < aggs.length; i++) { for (int i = 0; i < aggs.length; i++) {
aggs[i].init(bufferHolder.get(), getMetricPosition(rowOffset, i)); aggs[i].init(bufferHolder.get(), getMetricPosition(rowOffset, i));
} }
facts.put(key, rowOffset); facts.put(key, rowOffset);
} }
} }
in.set(row); in.set(row);