diff --git a/core/src/main/java/org/elasticsearch/index/translog/MultiSnapshot.java b/core/src/main/java/org/elasticsearch/index/translog/MultiSnapshot.java index e162e2d35aca3..ad9d93843717f 100644 --- a/core/src/main/java/org/elasticsearch/index/translog/MultiSnapshot.java +++ b/core/src/main/java/org/elasticsearch/index/translog/MultiSnapshot.java @@ -20,7 +20,6 @@ package org.elasticsearch.index.translog; import com.carrotsearch.hppc.LongObjectHashMap; -import com.carrotsearch.hppc.cursors.ObjectCursor; import org.apache.lucene.util.BitSet; import org.elasticsearch.common.util.CountedBitSet; import org.elasticsearch.index.seqno.SequenceNumbers; @@ -104,21 +103,5 @@ boolean getAndSet(long value) { bitset.set(index); return wasOn; } - - // For testing - long completeSetsSize() { - int completedBitSets = 0; - for (ObjectCursor bitset : bitSets.values()) { - if (bitset.value.cardinality() == bitset.value.length()) { - completedBitSets++; - } - } - return completedBitSets; - } - - // For testing - long ongoingSetsSize() { - return bitSets.size() - completeSetsSize(); - } } } diff --git a/core/src/test/java/org/elasticsearch/index/translog/MultiSnapshotTests.java b/core/src/test/java/org/elasticsearch/index/translog/MultiSnapshotTests.java index 7ee2a6c3366e3..31dda2cb921ec 100644 --- a/core/src/test/java/org/elasticsearch/index/translog/MultiSnapshotTests.java +++ b/core/src/test/java/org/elasticsearch/index/translog/MultiSnapshotTests.java @@ -30,7 +30,6 @@ import java.util.stream.LongStream; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.Matchers.lessThanOrEqualTo; public class MultiSnapshotTests extends ESTestCase { @@ -40,14 +39,8 @@ public void testTrackSeqNoSimpleRange() throws Exception { Randomness.shuffle(values); for (int i = 0; i < 1023; i++) { assertThat(bitSet.getAndSet(values.get(i)), equalTo(false)); - assertThat(bitSet.ongoingSetsSize(), equalTo(1L)); - assertThat(bitSet.completeSetsSize(), equalTo(0L)); } - assertThat(bitSet.getAndSet(values.get(1023)), equalTo(false)); - assertThat(bitSet.ongoingSetsSize(), equalTo(0L)); - assertThat(bitSet.completeSetsSize(), equalTo(1L)); - assertThat(bitSet.getAndSet(between(0, 1023)), equalTo(true)); assertThat(bitSet.getAndSet(between(1024, Integer.MAX_VALUE)), equalTo(false)); } @@ -59,7 +52,6 @@ public void testTrackSeqNoDenseRanges() throws Exception { long seq = between(0, 5000); boolean existed = normalSet.add(seq) == false; assertThat("SeqNoSet != Set" + seq, bitSet.getAndSet(seq), equalTo(existed)); - assertThat(bitSet.ongoingSetsSize() + bitSet.completeSetsSize(), lessThanOrEqualTo(5L)); }); } @@ -78,12 +70,8 @@ public void testTrackSeqNoMimicTranslogRanges() throws Exception { final LongSet normalSet = new LongHashSet(); long currentSeq = between(10_000_000, 1_000_000_000); final int iterations = scaledRandomIntBetween(100, 2000); - assertThat(bitSet.completeSetsSize(), equalTo(0L)); - assertThat(bitSet.ongoingSetsSize(), equalTo(0L)); - long totalDocs = 0; for (long i = 0; i < iterations; i++) { int batchSize = between(1, 1500); - totalDocs += batchSize; currentSeq -= batchSize; List batch = LongStream.range(currentSeq, currentSeq + batchSize) .boxed() @@ -92,11 +80,7 @@ public void testTrackSeqNoMimicTranslogRanges() throws Exception { batch.forEach(seq -> { boolean existed = normalSet.add(seq) == false; assertThat("SeqNoSet != Set", bitSet.getAndSet(seq), equalTo(existed)); - assertThat(bitSet.ongoingSetsSize(), lessThanOrEqualTo(4L)); }); - assertThat(bitSet.ongoingSetsSize(), lessThanOrEqualTo(2L)); } - assertThat(bitSet.completeSetsSize(), lessThanOrEqualTo(totalDocs / 1024)); - assertThat(bitSet.ongoingSetsSize(), lessThanOrEqualTo(2L)); } }