Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,10 @@ public void testConfigEquals()
"hostname", "port", "protocol", "trustStoreType", "databaseName",
"maxQueueSize", "flushPeriod", "flushDelay", "influxdbUserName",
"influxdbPassword", "dimensionWhitelist"
).withPrefabValues(
com.google.common.collect.ImmutableSet.class,
com.google.common.collect.ImmutableSet.of("a"),
com.google.common.collect.ImmutableSet.of("b")
).usingGetClass().verify();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,15 @@ public void serializesDeserializes()
@Test
public void abidesEqualsContract()
{
ItemsSketch<StringTuple> red = ItemsSketch.getInstance(StringTuple.class, StringSketch.SKETCH_K, StringSketch.STRING_TUPLE_COMPARATOR);
red.update(StringTuple.create("a"));
ItemsSketch<StringTuple> blue = ItemsSketch.getInstance(StringTuple.class, StringSketch.SKETCH_K, StringSketch.STRING_TUPLE_COMPARATOR);
blue.update(StringTuple.create("b"));

EqualsVerifier.forClass(StringSketch.class)
.usingGetClass()
.withNonnullFields("delegate")
.withPrefabValues(ItemsSketch.class, red, blue)
.verify();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,14 @@
import nl.jqno.equalsverifier.EqualsVerifier;
import org.apache.druid.frame.key.ClusterByPartitions;
import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec;
import org.apache.druid.timeline.partition.NumberedShardSpec;
import org.joda.time.Interval;
import org.joda.time.chrono.ISOChronology;
import org.junit.Test;

import java.util.Collections;
import java.util.Map;

import static org.easymock.EasyMock.mock;

public class MSQPartitionAssignmentTest
{

Expand All @@ -42,7 +43,13 @@ public void testNullPartition()
@Test(expected = IllegalArgumentException.class)
public void testInvalidPartition()
{
Map<Integer, SegmentIdWithShardSpec> allocations = ImmutableMap.of(-1, mock(SegmentIdWithShardSpec.class));
SegmentIdWithShardSpec segmentId = new SegmentIdWithShardSpec(
"ds",
new Interval(0, 1, ISOChronology.getInstanceUTC()),
"v1",
new NumberedShardSpec(0, 1)
);
Map<Integer, SegmentIdWithShardSpec> allocations = ImmutableMap.of(-1, segmentId);
new MSQPartitionAssignment(ClusterByPartitions.oneUniversalPartition(), allocations);
}

Expand Down
14 changes: 10 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<scala.library.version>2.13.14</scala.library.version>
<avatica.version>1.27.0</avatica.version>
<avro.version>1.11.5</avro.version>
<bytebuddy.version>1.18.3</bytebuddy.version>
<bytebuddy.version>1.18.5</bytebuddy.version>
<!--
The base calcite parser was copied into the project; when updating Calcite run dev/upgrade-calcite-parser to adopt upstream changes
-->
Expand Down Expand Up @@ -118,7 +118,7 @@
<jna-platform.version>5.18.1</jna-platform.version>
<hadoop.compile.version>3.3.6</hadoop.compile.version>
<graaljs.version>22.3.5</graaljs.version>
<mockito.version>5.14.2</mockito.version>
<mockito.version>5.23.0</mockito.version>
<!-- AWS SDK v1 is still used as a transitive dependency by Hadoop and Ranger extensions.
It should be removed once those extensions are upgraded or dropped (see #19109). -->
<aws.sdk.v1.version>1.12.793</aws.sdk.v1.version>
Expand Down Expand Up @@ -1227,7 +1227,7 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>5.2.0</version>
<version>5.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -1449,9 +1449,15 @@
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
<version>3.15.8</version>
<version>4.4.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<version>3.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.stefanbirkner</groupId>
<artifactId>system-rules</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import nl.jqno.equalsverifier.EqualsVerifier;
import nl.jqno.equalsverifier.Mode;
import org.apache.druid.error.DruidException;
import org.apache.druid.guice.BuiltInTypesModule;
import org.apache.druid.jackson.DefaultObjectMapper;
Expand Down Expand Up @@ -1086,11 +1087,7 @@ public void test_equals()
.withNonnullFields(
"column",
"elementMatchValueType",
"elementMatchValueEval",
"elementMatchValue",
"predicateFactory",
"optimizedFilterIncludeUnknown",
"optimizedFilterNoIncludeUnknown"
"elementMatchValueEval"
)
.withPrefabValues(ColumnType.class, ColumnType.STRING, ColumnType.DOUBLE)
.withIgnoredFields(
Expand All @@ -1099,6 +1096,7 @@ public void test_equals()
"optimizedFilterNoIncludeUnknown",
"elementMatchValue"
)
.set(Mode.skipMockito())
.verify();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import com.google.common.collect.RangeSet;
import com.google.common.collect.TreeRangeSet;
import nl.jqno.equalsverifier.EqualsVerifier;
import nl.jqno.equalsverifier.Mode;
import org.apache.druid.data.input.InputRow;
import org.apache.druid.error.DruidException;
import org.apache.druid.jackson.DefaultObjectMapper;
Expand Down Expand Up @@ -2061,6 +2062,7 @@ public void test_equals()
)
.withPrefabValues(ColumnType.class, ColumnType.STRING, ColumnType.DOUBLE)
.usingGetClass()
.set(Mode.skipMockito())
.verify();
}
}
Expand Down
Loading