Apache/druid
1
0
Fork 0
mirror of https://github.com/apache/druid.git synced 2025-02-17 07:25:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade fastutil to 8.1.0 (#4988)

Browse Source 
* Upgrade failutil to 8.1.0

* unused import
This commit is contained in:
Jihoon Son 2017-10-20 13:37:43 +09:00 committed by Roman Leventov
parent ef4a8cb724
commit d7024f22e1
9 changed files with 40 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -671,7 +671,7 @@
<dependency>
<groupId>it.unimi.dsi</groupId>
<artifactId>fastutil</artifactId>
<version>7.2.0</version>
<version>8.1.0</version>
</dependency>
<dependency>
<groupId>net.sf.opencsv</groupId>

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

@ -68,7 +68,6 @@ import io.druid.segment.column.ColumnCapabilities;
import io.druid.segment.column.ValueType;
import io.druid.segment.data.IndexedInts;
import it.unimi.dsi.fastutil.ints.IntArrays;
import it.unimi.dsi.fastutil.ints.IntComparator;
import it.unimi.dsi.fastutil.objects.Object2IntMap;
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
import org.joda.time.DateTime;
@ -1028,20 +1027,7 @@ public class RowBasedGrouperHelper
rankOfDictionaryIds = IntStream.range(0, dictionarySize).toArray();
IntArrays.quickSort(
rankOfDictionaryIds,
new IntComparator()
{
@Override
public int compare(int i1, int i2)
{
return dictionary.get(i1).compareTo(dictionary.get(i2));
}
@Override
public int compare(Integer o1, Integer o2)
{
return compare(o1.intValue(), o2.intValue());
}
}
(i1, i2) -> dictionary.get(i1).compareTo(dictionary.get(i2))
);
IntArrayUtils.inverse(rankOfDictionaryIds);

68
processing/src/main/java/io/druid/query/search/CursorOnlyStrategy.java
View File

@ -20,7 +20,6 @@
package io.druid.query.search;
import com.google.common.collect.ImmutableList;
import io.druid.java.util.common.guava.Accumulator;
import io.druid.java.util.common.guava.Sequence;
import io.druid.query.ColumnSelectorPlus;
import io.druid.query.dimension.DimensionSpec;
@ -103,43 +102,38 @@ public class CursorOnlyStrategy extends SearchStrategy
cursors.accumulate(
retVal,
new Accumulator<Object2IntRBTreeMap<SearchHit>, Cursor>()
{
@Override
public Object2IntRBTreeMap<SearchHit> accumulate(Object2IntRBTreeMap<SearchHit> set, Cursor cursor)
{
if (set.size() >= limit) {
return set;
}
final List<ColumnSelectorPlus<SearchColumnSelectorStrategy>> selectorPlusList = Arrays.asList(
DimensionHandlerUtils.createColumnSelectorPluses(
SearchQueryRunner.SEARCH_COLUMN_SELECTOR_STRATEGY_FACTORY,
dimsToSearch,
cursor.getColumnSelectorFactory()
)
);
while (!cursor.isDone()) {
for (ColumnSelectorPlus<SearchColumnSelectorStrategy> selectorPlus : selectorPlusList) {
selectorPlus.getColumnSelectorStrategy().updateSearchResultSet(
selectorPlus.getOutputName(),
selectorPlus.getSelector(),
searchQuerySpec,
limit,
set
);
if (set.size() >= limit) {
return set;
}
}
cursor.advance();
}
return set;
(map, cursor) -> {
if (map.size() >= limit) {
return map;
}
final List<ColumnSelectorPlus<SearchColumnSelectorStrategy>> selectorPlusList = Arrays.asList(
DimensionHandlerUtils.createColumnSelectorPluses(
SearchQueryRunner.SEARCH_COLUMN_SELECTOR_STRATEGY_FACTORY,
dimsToSearch,
cursor.getColumnSelectorFactory()
)
);
while (!cursor.isDone()) {
for (ColumnSelectorPlus<SearchColumnSelectorStrategy> selectorPlus : selectorPlusList) {
selectorPlus.getColumnSelectorStrategy().updateSearchResultSet(
selectorPlus.getOutputName(),
selectorPlus.getSelector(),
searchQuerySpec,
limit,
map
);
if (map.size() >= limit) {
return map;
}
}
cursor.advance();
}
return map;
}
);

5
processing/src/main/java/io/druid/segment/IntIteratorUtils.java
View File

@ -20,7 +20,6 @@
package io.druid.segment;
import io.druid.java.util.common.IAE;
import it.unimi.dsi.fastutil.ints.AbstractIntIterator;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntIterator;
import it.unimi.dsi.fastutil.ints.IntIterators;
@ -84,7 +83,7 @@ public final class IntIteratorUtils
* level, to avoid heap array shuffling on each iteration with dequeue and than enqueue, when merged iterators tend
* to stay in the head of the heap for at least several iterations.
*/
static final class MergeIntIterator extends AbstractIntIterator
static final class MergeIntIterator implements IntIterator
{
private final IntIterator[] iterators;
@ -169,7 +168,7 @@ public final class IntIteratorUtils
return new RoaringBitmapDelegatingIntIterator(iterator);
}
private static class RoaringBitmapDelegatingIntIterator extends AbstractIntIterator
private static class RoaringBitmapDelegatingIntIterator implements IntIterator
{
private final org.roaringbitmap.IntIterator delegate;

3
processing/src/main/java/io/druid/segment/StringDimensionMergerV9.java
View File

@ -54,7 +54,6 @@ import io.druid.segment.data.IndexedRTree;
import io.druid.segment.data.VSizeIndexedIntsWriter;
import io.druid.segment.data.VSizeIndexedWriter;
import io.druid.segment.serde.DictionaryEncodedColumnPartSerde;
import it.unimi.dsi.fastutil.ints.AbstractIntIterator;
import it.unimi.dsi.fastutil.ints.IntIterable;
import it.unimi.dsi.fastutil.ints.IntIterator;
@ -555,7 +554,7 @@ public class StringDimensionMergerV9 implements DimensionMergerV9<int[]>
public IntIterator iterator()
{
final IntIterator baseIterator = baseValues.iterator();
return new AbstractIntIterator()
return new IntIterator()
{
@Override
public boolean hasNext()

3
processing/src/main/java/io/druid/segment/filter/Filters.java
View File

@ -50,7 +50,6 @@ import io.druid.segment.column.Column;
import io.druid.segment.column.ColumnCapabilities;
import io.druid.segment.column.ValueType;
import io.druid.segment.data.Indexed;
import it.unimi.dsi.fastutil.ints.AbstractIntIterator;
import it.unimi.dsi.fastutil.ints.IntIterable;
import it.unimi.dsi.fastutil.ints.IntIterator;
import it.unimi.dsi.fastutil.ints.IntList;
@ -385,7 +384,7 @@ public class Filters
@Override
public IntIterator iterator()
{
return new AbstractIntIterator()
return new IntIterator()
{
private final int bitmapIndexCardinality = bitmapIndex.getCardinality();
private int nextIndex = 0;

3
processing/src/main/java/io/druid/segment/filter/InFilter.java
View File

@ -36,7 +36,6 @@ import io.druid.segment.ColumnSelector;
import io.druid.segment.ColumnSelectorFactory;
import io.druid.segment.IntIteratorUtils;
import io.druid.segment.column.BitmapIndex;
import it.unimi.dsi.fastutil.ints.AbstractIntIterator;
import it.unimi.dsi.fastutil.ints.IntIterable;
import it.unimi.dsi.fastutil.ints.IntIterator;
@ -118,7 +117,7 @@ public class InFilter implements Filter
@Override
public IntIterator iterator()
{
return new AbstractIntIterator()
return new IntIterator()
{
Iterator<String> iterator = values.iterator();

3
processing/src/main/java/io/druid/segment/filter/LikeFilter.java
View File

@ -32,7 +32,6 @@ import io.druid.segment.ColumnSelector;
import io.druid.segment.ColumnSelectorFactory;
import io.druid.segment.column.BitmapIndex;
import io.druid.segment.data.Indexed;
import it.unimi.dsi.fastutil.ints.AbstractIntIterator;
import it.unimi.dsi.fastutil.ints.IntIterable;
import it.unimi.dsi.fastutil.ints.IntIterator;
@ -157,7 +156,7 @@ public class LikeFilter implements Filter
@Override
public IntIterator iterator()
{
return new AbstractIntIterator()
return new IntIterator()
{
int currIndex = startIndex;
int found = -1;

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

@ -31,7 +31,7 @@ public class IntListUtilsTest
{
final IntList list = IntListUtils.fromTo(10, 10);
assertEquals(0, list.size());
list.get(0);
list.getInt(0);
}
@Test(expected = IllegalArgumentException.class)