Skip to content

Commit dd39e94

Browse files
authored
Remove hppc from o.e.index tests (#85297)
This commit removes hppc uses from a few tests. relates #84735
1 parent 5d331d2 commit dd39e94

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

server/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
package org.elasticsearch.index.engine;
1010

11-
import com.carrotsearch.hppc.LongArrayList;
12-
1311
import org.apache.lucene.index.IndexCommit;
1412
import org.apache.lucene.store.Directory;
1513
import org.elasticsearch.index.seqno.RetentionLeases;
@@ -50,7 +48,7 @@ public void testKeepCommitsAfterGlobalCheckpoint() throws Exception {
5048
TranslogDeletionPolicy translogPolicy = new TranslogDeletionPolicy();
5149
CombinedDeletionPolicy indexPolicy = newCombinedDeletionPolicy(translogPolicy, softDeletesPolicy, globalCheckpoint);
5250

53-
final LongArrayList maxSeqNoList = new LongArrayList();
51+
final List<Long> maxSeqNoList = new ArrayList<>();
5452
final List<IndexCommit> commitList = new ArrayList<>();
5553
int totalCommits = between(2, 20);
5654
long lastMaxSeqNo = 0;

server/src/test/java/org/elasticsearch/index/translog/MultiSnapshotTests.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@
88

99
package org.elasticsearch.index.translog;
1010

11-
import com.carrotsearch.hppc.LongHashSet;
12-
import com.carrotsearch.hppc.LongSet;
13-
1411
import org.elasticsearch.common.Randomness;
1512
import org.elasticsearch.test.ESTestCase;
1613

1714
import java.util.ArrayList;
15+
import java.util.HashSet;
1816
import java.util.List;
17+
import java.util.Set;
1918
import java.util.stream.Collectors;
2019
import java.util.stream.IntStream;
2120
import java.util.stream.LongStream;
@@ -38,7 +37,7 @@ public void testTrackSeqNoSimpleRange() throws Exception {
3837

3938
public void testTrackSeqNoDenseRanges() throws Exception {
4039
final MultiSnapshot.SeqNoSet bitSet = new MultiSnapshot.SeqNoSet();
41-
final LongSet normalSet = new LongHashSet();
40+
final Set<Long> normalSet = new HashSet<>();
4241
IntStream.range(0, scaledRandomIntBetween(5_000, 10_000)).forEach(i -> {
4342
long seq = between(0, 5000);
4443
boolean existed = normalSet.add(seq) == false;
@@ -48,7 +47,7 @@ public void testTrackSeqNoDenseRanges() throws Exception {
4847

4948
public void testTrackSeqNoSparseRanges() throws Exception {
5049
final MultiSnapshot.SeqNoSet bitSet = new MultiSnapshot.SeqNoSet();
51-
final LongSet normalSet = new LongHashSet();
50+
final Set<Long> normalSet = new HashSet<>();
5251
IntStream.range(0, scaledRandomIntBetween(5_000, 10_000)).forEach(i -> {
5352
long seq = between(i * 10_000, i * 30_000);
5453
boolean existed = normalSet.add(seq) == false;
@@ -58,7 +57,7 @@ public void testTrackSeqNoSparseRanges() throws Exception {
5857

5958
public void testTrackSeqNoMimicTranslogRanges() throws Exception {
6059
final MultiSnapshot.SeqNoSet bitSet = new MultiSnapshot.SeqNoSet();
61-
final LongSet normalSet = new LongHashSet();
60+
final Set<Long> normalSet = new HashSet<>();
6261
long currentSeq = between(10_000_000, 1_000_000_000);
6362
final int iterations = scaledRandomIntBetween(100, 2000);
6463
for (long i = 0; i < iterations; i++) {

server/src/test/java/org/elasticsearch/index/translog/SnapshotMatchers.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88

99
package org.elasticsearch.index.translog;
1010

11-
import com.carrotsearch.hppc.LongHashSet;
12-
import com.carrotsearch.hppc.LongSet;
13-
1411
import org.elasticsearch.ElasticsearchException;
1512
import org.hamcrest.Description;
1613
import org.hamcrest.Matcher;
@@ -19,7 +16,9 @@
1916
import java.io.IOException;
2017
import java.util.ArrayList;
2118
import java.util.Collection;
19+
import java.util.HashSet;
2220
import java.util.List;
21+
import java.util.Set;
2322

2423
public final class SnapshotMatchers {
2524
private SnapshotMatchers() {
@@ -193,7 +192,7 @@ static class ContainingSeqNoRangeMatcher extends TypeSafeMatcher<Translog.Snapsh
193192
@Override
194193
protected boolean matchesSafely(Translog.Snapshot snapshot) {
195194
try {
196-
final LongSet seqNoList = new LongHashSet();
195+
final Set<Long> seqNoList = new HashSet<>();
197196
Translog.Operation op;
198197
while ((op = snapshot.next()) != null) {
199198
seqNoList.add(op.seqNo());

0 commit comments

Comments
 (0)