mirror of https://github.com/apache/druid.git
TimeAndDims equals/hashCode implementation. (#2870)
Adapted from #2692, thanks @navis for original implementation.
This commit is contained in:
parent
3cfd9c64c9
commit
6dc7688a29
|
@ -1220,6 +1220,42 @@ public abstract class IncrementalIndex<AggregatorType> implements Iterable<Row>,
|
||||||
}
|
}
|
||||||
) + '}';
|
) + '}';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object o)
|
||||||
|
{
|
||||||
|
if (this == o) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (o == null || getClass() != o.getClass()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
TimeAndDims that = (TimeAndDims) o;
|
||||||
|
|
||||||
|
if (timestamp != that.timestamp) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (dims.length != that.dims.length) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
for (int i = 0; i < dims.length; i++) {
|
||||||
|
if (!Arrays.equals(dims[i], that.dims[i])) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode()
|
||||||
|
{
|
||||||
|
int hash = (int) timestamp;
|
||||||
|
for (int i = 0; i < dims.length; i++) {
|
||||||
|
hash = 31 * hash + Arrays.hashCode(dims[i]);
|
||||||
|
}
|
||||||
|
return hash;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected final Comparator<TimeAndDims> dimsComparator()
|
protected final Comparator<TimeAndDims> dimsComparator()
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
package io.druid.segment.incremental;
|
package io.druid.segment.incremental;
|
||||||
|
|
||||||
import com.google.common.base.Supplier;
|
import com.google.common.base.Supplier;
|
||||||
|
import com.google.common.collect.ImmutableList;
|
||||||
import com.google.common.collect.ImmutableMap;
|
import com.google.common.collect.ImmutableMap;
|
||||||
import com.google.common.collect.Lists;
|
import com.google.common.collect.Lists;
|
||||||
import com.metamx.common.ISE;
|
import com.metamx.common.ISE;
|
||||||
|
@ -47,6 +48,7 @@ import java.io.IOException;
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
|
@ -91,26 +93,30 @@ public class IncrementalIndexTest
|
||||||
dimensions,
|
dimensions,
|
||||||
metrics
|
metrics
|
||||||
);
|
);
|
||||||
return Arrays.asList(
|
|
||||||
new Object[][]{
|
final List<Object[]> constructors = Lists.newArrayList();
|
||||||
{
|
for (final Boolean sortFacts : ImmutableList.of(false, true)) {
|
||||||
|
constructors.add(
|
||||||
|
new Object[]{
|
||||||
new IndexCreator()
|
new IndexCreator()
|
||||||
{
|
{
|
||||||
@Override
|
@Override
|
||||||
public IncrementalIndex createIndex()
|
public IncrementalIndex createIndex()
|
||||||
{
|
{
|
||||||
return new OnheapIncrementalIndex(schema, true, 1000);
|
return new OnheapIncrementalIndex(schema, false, true, sortFacts, 1000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
{
|
);
|
||||||
|
constructors.add(
|
||||||
|
new Object[]{
|
||||||
new IndexCreator()
|
new IndexCreator()
|
||||||
{
|
{
|
||||||
@Override
|
@Override
|
||||||
public IncrementalIndex createIndex()
|
public IncrementalIndex createIndex()
|
||||||
{
|
{
|
||||||
return new OffheapIncrementalIndex(
|
return new OffheapIncrementalIndex(
|
||||||
schema, true, true, true, 1000000, new StupidPool<ByteBuffer>(
|
schema, true, true, sortFacts, 1000000, new StupidPool<ByteBuffer>(
|
||||||
new Supplier<ByteBuffer>()
|
new Supplier<ByteBuffer>()
|
||||||
{
|
{
|
||||||
@Override
|
@Override
|
||||||
|
@ -124,10 +130,12 @@ public class IncrementalIndexTest
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return constructors;
|
||||||
|
}
|
||||||
|
|
||||||
@Test(expected = ISE.class)
|
@Test(expected = ISE.class)
|
||||||
public void testDuplicateDimensions() throws IndexSizeExceededException
|
public void testDuplicateDimensions() throws IndexSizeExceededException
|
||||||
{
|
{
|
||||||
|
@ -199,7 +207,8 @@ public class IncrementalIndexTest
|
||||||
ImmutableMap.<String, Object>of(
|
ImmutableMap.<String, Object>of(
|
||||||
"string", Arrays.asList("A", null, ""),
|
"string", Arrays.asList("A", null, ""),
|
||||||
"float", Arrays.asList(Float.MAX_VALUE, null, ""),
|
"float", Arrays.asList(Float.MAX_VALUE, null, ""),
|
||||||
"long", Arrays.asList(Long.MIN_VALUE, null, ""))
|
"long", Arrays.asList(Long.MIN_VALUE, null, "")
|
||||||
|
)
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -209,4 +218,20 @@ public class IncrementalIndexTest
|
||||||
Assert.assertArrayEquals(new Float[]{null, null, Float.MAX_VALUE}, (Object[]) row.getRaw("float"));
|
Assert.assertArrayEquals(new Float[]{null, null, Float.MAX_VALUE}, (Object[]) row.getRaw("float"));
|
||||||
Assert.assertArrayEquals(new Long[]{null, null, Long.MIN_VALUE}, (Object[]) row.getRaw("long"));
|
Assert.assertArrayEquals(new Long[]{null, null, Long.MIN_VALUE}, (Object[]) row.getRaw("long"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void sameRow() throws IndexSizeExceededException
|
||||||
|
{
|
||||||
|
MapBasedInputRow row = new MapBasedInputRow(
|
||||||
|
new DateTime().minus(1).getMillis(),
|
||||||
|
Lists.newArrayList("billy", "joe"),
|
||||||
|
ImmutableMap.<String, Object>of("billy", "A", "joe", "B")
|
||||||
|
);
|
||||||
|
IncrementalIndex index = closer.closeLater(indexCreator.createIndex());
|
||||||
|
index.add(row);
|
||||||
|
index.add(row);
|
||||||
|
index.add(row);
|
||||||
|
|
||||||
|
Assert.assertEquals(1, index.size());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue