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

Enforce optimal IndexedInts iteration (#5456) 

* Enforce optimal IndexedInts iteration

* Fix remaining suboptimal usages
This commit is contained in:
Roman Leventov 2018-03-09 18:42:40 +01:00 committed by Gian Merlino
parent d159a4fa01
commit 6b158abe3f
20 changed files with 64 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.idea/inspectionProfiles/Druid.xml
View File

@ -103,6 +103,13 @@
<option name="m_reportCollectionMethods" value="true" />
<option name="m_ignorePrivateMethods" value="false" />
</inspection_tool>
<inspection_tool class="SSBasedInspection" enabled="true" level="ERROR" enabled_by_default="true">
<searchConfiguration name="Suboptimal IndexedInts iteration" text="$x$ &lt; $y$.size()" recursive="false" caseInsensitive="true" type="JAVA">
<constraint name="__context__" target="true" within="" contains="" />
<constraint name="x" within="" contains="" />
<constraint name="y" nameOfExprType="IndexedInts" exprTypeWithinHierarchy="true" within="" contains="" />
</searchConfiguration>
</inspection_tool>
<inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
<option name="processCode" value="true" />
<option name="processLiterals" value="true" />

4
benchmarks/src/main/java/io/druid/benchmark/CompressedVSizeColumnarMultiIntsBenchmark.java
View File

@ -152,7 +152,7 @@ public class CompressedVSizeColumnarMultiIntsBenchmark
{
for (int i = filter.nextSetBit(0); i >= 0; i = filter.nextSetBit(i + 1)) {
IndexedInts row = uncompressed.get(i);
for (int j = 0; j < row.size(); j++) {
for (int j = 0, rowSize = row.size(); j < rowSize; j++) {
blackhole.consume(row.get(j));
}
}
@ -165,7 +165,7 @@ public class CompressedVSizeColumnarMultiIntsBenchmark
{
for (int i = filter.nextSetBit(0); i >= 0; i = filter.nextSetBit(i + 1)) {
IndexedInts row = compressed.get(i);
for (int j = 0; j < row.size(); j++) {
for (int j = 0, rowSize = row.size(); j < rowSize; j++) {
blackhole.consume(row.get(j));
}
}

2
extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountAggregator.java
View File

@ -43,7 +43,7 @@ public class DistinctCountAggregator implements Aggregator
public void aggregate()
{
IndexedInts row = selector.getRow();
for (int i = 0; i < row.size(); i++) {
for (int i = 0, rowSize = row.size(); i < rowSize; i++) {
int index = row.get(i);
mutableBitmap.add(index);
}

2
extensions-contrib/distinctcount/src/main/java/io/druid/query/aggregation/distinctcount/DistinctCountBufferAggregator.java
View File

@ -53,7 +53,7 @@ public class DistinctCountBufferAggregator implements BufferAggregator
{
MutableBitmap mutableBitmap = getMutableBitmap(position);
IndexedInts row = selector.getRow();
for (int i = 0; i < row.size(); i++) {
for (int i = 0, rowSize = row.size(); i < rowSize; i++) {
int index = row.get(i);
mutableBitmap.add(index);
}

2
processing/src/main/java/io/druid/query/aggregation/cardinality/types/StringCardinalityAggregatorColumnSelectorStrategy.java
View File

@ -62,7 +62,7 @@ public class StringCardinalityAggregatorColumnSelectorStrategy implements Cardin
public void hashValues(DimensionSelector dimSelector, HyperLogLogCollector collector)
{
IndexedInts row = dimSelector.getRow();
for (int i = 0; i < row.size(); i++) {
for (int i = 0, rowSize = row.size(); i < rowSize; i++) {
int index = row.get(i);
final String value = dimSelector.lookupName(index);
collector.add(CardinalityAggregator.hashFn.hashUnencodedChars(nullToSpecial(value)).asBytes());

5
processing/src/main/java/io/druid/query/groupby/GroupByQueryEngine.java
View File

@ -190,12 +190,13 @@ public class GroupByQueryEngine
final DimensionSelector dimSelector = dims.get(0);
final IndexedInts row = dimSelector.getRow();
if (row == null || row.size() == 0) {
final int rowSize = row.size();
if (rowSize == 0) {
ByteBuffer newKey = key.duplicate();
newKey.putInt(MISSING_VALUE);
unaggregatedBuffers = updateValues(newKey, dims.subList(1, dims.size()));
} else {
for (int i = 0; i < row.size(); i++) {
for (int i = 0; i < rowSize; i++) {
ByteBuffer newKey = key.duplicate();
int dimValue = row.get(i);
newKey.putInt(dimValue);

5
processing/src/main/java/io/druid/query/groupby/epinephelinae/GroupByQueryEngineV2.java
View File

@ -639,12 +639,13 @@ public class GroupByQueryEngineV2
}
while (!cursor.isDone()) {
if (multiValues.size() == 0) {
int multiValuesSize = multiValues.size();
if (multiValuesSize == 0) {
if (!grouper.aggregate(GroupByColumnSelectorStrategy.GROUP_BY_MISSING_VALUE).isOk()) {
return;
}
} else {
for (; nextValIndex < multiValues.size(); nextValIndex++) {
for (; nextValIndex < multiValuesSize; nextValIndex++) {
if (!grouper.aggregate(multiValues.get(nextValIndex)).isOk()) {
return;
}

2
processing/src/main/java/io/druid/query/groupby/epinephelinae/column/DictionaryBuildingStringGroupByColumnSelectorStrategy.java
View File

@ -75,7 +75,7 @@ public class DictionaryBuildingStringGroupByColumnSelectorStrategy extends Strin
}
int rowSize = row.size();
newRow.ensureSize(rowSize);
for (int i = 0; i < row.size(); i++) {
for (int i = 0; i < rowSize; i++) {
final String value = dimSelector.lookupName(row.get(i));
final int dictId = reverseDictionary.getInt(value);
if (dictId < 0) {

6
processing/src/main/java/io/druid/query/metadata/SegmentAnalyzer.java
View File

@ -276,9 +276,9 @@ public class SegmentAnalyzer
}
long current = accumulated;
while (!cursor.isDone()) {
final IndexedInts vals = selector.getRow();
for (int i = 0; i < vals.size(); ++i) {
final String dimVal = selector.lookupName(vals.get(i));
final IndexedInts row = selector.getRow();
for (int i = 0, rowSize = row.size(); i < rowSize; ++i) {
final String dimVal = selector.lookupName(row.get(i));
if (dimVal != null && !dimVal.isEmpty()) {
current += StringUtils.estimatedBinaryLengthAsUTF8(dimVal);
}

6
processing/src/main/java/io/druid/query/search/SearchQueryRunner.java
View File

@ -127,9 +127,9 @@ public class SearchQueryRunner implements QueryRunner<Result<SearchResultValue>>
)
{
if (selector != null && !isNilSelector(selector)) {
final IndexedInts vals = selector.getRow();
for (int i = 0; i < vals.size(); ++i) {
final String dimVal = selector.lookupName(vals.get(i));
final IndexedInts row = selector.getRow();
for (int i = 0, rowSize = row.size(); i < rowSize; ++i) {
final String dimVal = selector.lookupName(row.get(i));
if (searchQuerySpec.accept(dimVal)) {
set.addTo(new SearchHit(outputName, Strings.nullToEmpty(dimVal)), 1);
if (set.size() >= limit) {

26
processing/src/main/java/io/druid/query/select/SelectQueryEngine.java
View File

@ -111,21 +111,19 @@ public class SelectQueryEngine
@Override
public void addRowValuesToSelectResult(String outputName, DimensionSelector selector, Map<String, Object> resultMap)
{
if (selector == null) {
final IndexedInts row = selector.getRow();
int rowSize = row.size();
if (rowSize == 0) {
resultMap.put(outputName, null);
} else if (rowSize == 1) {
final String dimVal = selector.lookupName(row.get(0));
resultMap.put(outputName, dimVal);
} else {
final IndexedInts vals = selector.getRow();
if (vals.size() == 1) {
final String dimVal = selector.lookupName(vals.get(0));
resultMap.put(outputName, dimVal);
} else {
List<String> dimVals = new ArrayList<>(vals.size());
for (int i = 0; i < vals.size(); ++i) {
dimVals.add(selector.lookupName(vals.get(i)));
}
resultMap.put(outputName, dimVals);
List<String> dimVals = new ArrayList<>(rowSize);
for (int i = 0; i < rowSize; ++i) {
dimVals.add(selector.lookupName(row.get(i)));
}
resultMap.put(outputName, dimVals);
}
}
}
@ -300,7 +298,9 @@ public class SelectQueryEngine
theEvent.put(timestampKey, DateTimes.utc(timestampColumnSelector.getLong()));
for (ColumnSelectorPlus<SelectColumnSelectorStrategy> selectorPlus : selectorPlusList) {
selectorPlus.getColumnSelectorStrategy().addRowValuesToSelectResult(selectorPlus.getOutputName(), selectorPlus.getSelector(), theEvent);
selectorPlus
.getColumnSelectorStrategy()
.addRowValuesToSelectResult(selectorPlus.getOutputName(), selectorPlus.getSelector(), theEvent);
}
for (Map.Entry<String, BaseObjectColumnValueSelector<?>> metSelector : metSelectors.entrySet()) {

4
processing/src/main/java/io/druid/query/topn/types/StringTopNColumnSelectorStrategy.java
View File

@ -132,7 +132,7 @@ public class StringTopNColumnSelectorStrategy
long processedRows = 0;
while (!cursor.isDone()) {
final IndexedInts dimValues = selector.getRow();
for (int i = 0; i < dimValues.size(); ++i) {
for (int i = 0, size = dimValues.size(); i < size; ++i) {
final int dimIndex = dimValues.get(i);
Aggregator[] theAggregators = rowSelector[dimIndex];
if (theAggregators == null) {
@ -165,7 +165,7 @@ public class StringTopNColumnSelectorStrategy
long processedRows = 0;
while (!cursor.isDone()) {
final IndexedInts dimValues = selector.getRow();
for (int i = 0; i < dimValues.size(); ++i) {
for (int i = 0, size = dimValues.size(); i < size; ++i) {
final int dimIndex = dimValues.get(i);
final String key = selector.lookupName(dimIndex);

17
processing/src/main/java/io/druid/segment/DimensionSelector.java
View File

@ -167,16 +167,17 @@ public interface DimensionSelector extends ColumnValueSelector, HotLoopCallee
default Object defaultGetObject()
{
IndexedInts row = getRow();
if (row.size() == 0) {
int rowSize = row.size();
if (rowSize == 0) {
return null;
}
if (row.size() == 1) {
} else if (rowSize == 1) {
return lookupName(row.get(0));
} else {
final String[] strings = new String[rowSize];
for (int i = 0; i < rowSize; i++) {
strings[i] = lookupName(row.get(i));
}
return strings;
}
final String[] strings = new String[row.size()];
for (int i = 0; i < row.size(); i++) {
strings[i] = lookupName(row.get(i));
}
return strings;
}
}

2
processing/src/main/java/io/druid/segment/data/CompressedVSizeColumnarMultiIntsSupplier.java
View File

@ -109,7 +109,7 @@ public class CompressedVSizeColumnarMultiIntsSupplier implements WritableSupplie
while (objects.hasNext()) {
IndexedInts next = objects.next();
offsetList.add(offset);
for (int i = 0; i < next.size(); i++) {
for (int i = 0, size = next.size(); i < size; i++) {
values.add(next.get(i));
}
offset += next.size();

2
processing/src/main/java/io/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSupplier.java
View File

@ -91,7 +91,7 @@ public class V3CompressedVSizeColumnarMultiIntsSupplier implements WritableSuppl
while (objects.hasNext()) {
IndexedInts next = objects.next();
offsetList.add(offset);
for (int i = 0; i < next.size(); i++) {
for (int i = 0, size = next.size(); i < size; i++) {
values.add(next.get(i));
}
offset += next.size();

4
processing/src/test/java/io/druid/segment/data/CompressedColumnarIntsSupplierTest.java
View File

@ -205,7 +205,7 @@ public class CompressedColumnarIntsSupplierTest extends CompressionStrategyTest
try {
for (int i = 0; i < numRuns; ++i) {
for (int j = 0; j < columnarInts.size(); ++j) {
for (int j = 0, size = columnarInts.size(); j < size; ++j) {
final long val = vals[j];
final long indexedVal = columnarInts.get(j);
if (Longs.compare(val, indexedVal) != 0) {
@ -285,7 +285,7 @@ public class CompressedColumnarIntsSupplierTest extends CompressionStrategyTest
// sequential access
int[] indices = new int[vals.length];
for (int i = 0; i < columnarInts.size(); ++i) {
for (int i = 0, size = columnarInts.size(); i < size; ++i) {
Assert.assertEquals(vals[i], columnarInts.get(i), 0.0);
indices[i] = i;
}

4
processing/src/test/java/io/druid/segment/data/CompressedVSizeColumnarIntsSupplierTest.java
View File

@ -282,7 +282,7 @@ public class CompressedVSizeColumnarIntsSupplierTest extends CompressionStrategy
try {
for (int i = 0; i < numRuns; ++i) {
for (int j = 0; j < columnarInts.size(); ++j) {
for (int j = 0, size = columnarInts.size(); j < size; ++j) {
final long val = vals[j];
final long indexedVal = columnarInts.get(j);
if (Longs.compare(val, indexedVal) != 0) {
@ -362,7 +362,7 @@ public class CompressedVSizeColumnarIntsSupplierTest extends CompressionStrategy
// sequential access of every element
int[] indices = new int[vals.length];
for (int i = 0; i < columnarInts.size(); ++i) {
for (int i = 0, size = columnarInts.size(); i < size; ++i) {
final int expected = vals[i];
final int actual = columnarInts.get(i);
Assert.assertEquals(expected, actual);

2
processing/src/test/java/io/druid/segment/data/CompressedVSizeColumnarMultiIntsSupplierTest.java
View File

@ -107,7 +107,7 @@ public class CompressedVSizeColumnarMultiIntsSupplierTest
final IndexedInts vSizeIndexedInts = iterator.next();
Assert.assertEquals(ints.length, vSizeIndexedInts.size());
for (int i = 0; i < vSizeIndexedInts.size(); i++) {
for (int i = 0, size = vSizeIndexedInts.size(); i < size; i++) {
Assert.assertEquals(ints[i], vSizeIndexedInts.get(i));
}
row++;

4
processing/src/test/java/io/druid/segment/data/V3CompressedVSizeColumnarMultiIntsSerializerTest.java
View File

@ -155,7 +155,7 @@ public class V3CompressedVSizeColumnarMultiIntsSerializerTest
for (int i = 0; i < vals.size(); ++i) {
IndexedInts subVals = columnarMultiInts.get(i);
assertEquals(subVals.size(), vals.get(i).length);
for (int j = 0; j < subVals.size(); ++j) {
for (int j = 0, size = subVals.size(); j < size; ++j) {
assertEquals(subVals.get(j), vals.get(i)[j]);
}
}
@ -278,7 +278,7 @@ public class V3CompressedVSizeColumnarMultiIntsSerializerTest
for (int i = 0; i < vals.size(); ++i) {
IndexedInts subVals = columnarMultiInts.get(i);
assertEquals(subVals.size(), vals.get(i).length);
for (int j = 0; j < subVals.size(); ++j) {
for (int j = 0, size = subVals.size(); j < size; ++j) {
assertEquals(subVals.get(j), vals.get(i)[j]);
}
}

11
server/src/main/java/io/druid/segment/realtime/firehose/IngestSegmentFirehose.java
View File

@ -21,7 +21,6 @@ package io.druid.segment.realtime.firehose;
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import io.druid.data.input.Firehose;
import io.druid.data.input.InputRow;
@ -49,6 +48,7 @@ import io.druid.utils.Runnables;
import javax.annotation.Nullable;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@ -139,12 +139,13 @@ public class IngestSegmentFirehose implements Firehose
final DimensionSelector selector = dimSelector.getValue();
final IndexedInts vals = selector.getRow();
if (vals.size() == 1) {
int valsSize = vals.size();
if (valsSize == 1) {
final String dimVal = selector.lookupName(vals.get(0));
theEvent.put(dim, dimVal);
} else {
List<String> dimVals = Lists.newArrayList();
for (int i = 0; i < vals.size(); ++i) {
} else if (valsSize > 1) {
List<String> dimVals = new ArrayList<>(valsSize);
for (int i = 0; i < valsSize; ++i) {
dimVals.add(selector.lookupName(vals.get(i)));
}
theEvent.put(dim, dimVals);