Skip to content

Commit a3994f8

Browse files
dnhatndnhatn
committed
SeqNum -> SeqNo
1 parent 7d3482b commit a3994f8

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎core/src/main/java/org/elasticsearch/index/translog/MultiSnapshot.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ final class MultiSnapshot implements Translog.Snapshot {
3939
private int overriddenOperations;
4040
private final Closeable onClose;
4141
private int index;
42-
private final SeqNumSet seenSeqNo;
42+
private final SeqNoSet seenSeqNo;
4343

4444
/**
4545
* Creates a new point in time snapshot of the given snapshots. Those snapshots are always iterated in-order.
@@ -49,7 +49,7 @@ final class MultiSnapshot implements Translog.Snapshot {
4949
this.totalOperations = Arrays.stream(translogs).mapToInt(TranslogSnapshot::totalOperations).sum();
5050
this.overriddenOperations = 0;
5151
this.onClose = onClose;
52-
this.seenSeqNo = new SeqNumSet();
52+
this.seenSeqNo = new SeqNoSet();
5353
this.index = translogs.length - 1;
5454
}
5555

@@ -115,7 +115,7 @@ boolean hasAllBitsOn() {
115115
* Sequence numbers from translog are likely to form contiguous ranges,
116116
* thus collapsing a completed bitset into a single entry will reduce memory usage.
117117
*/
118-
static final class SeqNumSet {
118+
static final class SeqNoSet {
119119
static final short BIT_SET_SIZE = 1024;
120120
private final LongSet completedSets = new LongHashSet();
121121
private final LongObjectHashMap<CountedBitSet> ongoingSets = new LongObjectHashMap<>();

‎core/src/test/java/org/elasticsearch/index/translog/MultiSnapshotTests.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434

3535
public class MultiSnapshotTests extends ESTestCase {
3636

37-
public void testTrackSimpleSeqNoRanges() throws Exception {
38-
final MultiSnapshot.SeqNumSet bitSet = new MultiSnapshot.SeqNumSet();
37+
public void testTrackSeqNoSimpleRange() throws Exception {
38+
final MultiSnapshot.SeqNoSet bitSet = new MultiSnapshot.SeqNoSet();
3939
final List<Long> values = LongStream.range(0, 1024).boxed().collect(Collectors.toList());
4040
Randomness.shuffle(values);
4141
for (int i = 0; i < 1023; i++) {
@@ -52,29 +52,29 @@ public void testTrackSimpleSeqNoRanges() throws Exception {
5252
assertThat(bitSet.getAndSet(between(1024, Integer.MAX_VALUE)), equalTo(false));
5353
}
5454

55-
public void testTrackSeqNumDenseRanges() throws Exception {
56-
final MultiSnapshot.SeqNumSet bitSet = new MultiSnapshot.SeqNumSet();
55+
public void testTrackSeqNoDenseRanges() throws Exception {
56+
final MultiSnapshot.SeqNoSet bitSet = new MultiSnapshot.SeqNoSet();
5757
final LongSet normalSet = new LongHashSet();
5858
IntStream.range(0, scaledRandomIntBetween(5_000, 10_000)).forEach(i -> {
5959
long seq = between(0, 5000);
6060
boolean existed = normalSet.add(seq) == false;
61-
assertThat("SeqNumSet != Set" + seq, bitSet.getAndSet(seq), equalTo(existed));
61+
assertThat("SeqNoSet != Set" + seq, bitSet.getAndSet(seq), equalTo(existed));
6262
assertThat(bitSet.ongoingSetsSize() + bitSet.completeSetsSize(), lessThanOrEqualTo(5L));
6363
});
6464
}
6565

66-
public void testTrackSeqNumSparseRanges() throws Exception {
67-
final MultiSnapshot.SeqNumSet bitSet = new MultiSnapshot.SeqNumSet();
66+
public void testTrackSeqNoSparseRanges() throws Exception {
67+
final MultiSnapshot.SeqNoSet bitSet = new MultiSnapshot.SeqNoSet();
6868
final LongSet normalSet = new LongHashSet();
6969
IntStream.range(0, scaledRandomIntBetween(5_000, 10_000)).forEach(i -> {
7070
long seq = between(i * 10_000, i * 30_000);
7171
boolean existed = normalSet.add(seq) == false;
72-
assertThat("SeqNumSet != Set", bitSet.getAndSet(seq), equalTo(existed));
72+
assertThat("SeqNoSet != Set", bitSet.getAndSet(seq), equalTo(existed));
7373
});
7474
}
7575

76-
public void testSequenceNumMimicTranslog() throws Exception {
77-
final MultiSnapshot.SeqNumSet bitSet = new MultiSnapshot.SeqNumSet();
76+
public void testTrackSeqNoMimicTranslogRanges() throws Exception {
77+
final MultiSnapshot.SeqNoSet bitSet = new MultiSnapshot.SeqNoSet();
7878
final LongSet normalSet = new LongHashSet();
7979
long currentSeq = between(10_000_000, 1_000_000_000);
8080
final int iterations = scaledRandomIntBetween(100, 2000);
@@ -91,7 +91,7 @@ public void testSequenceNumMimicTranslog() throws Exception {
9191
Randomness.shuffle(batch);
9292
batch.forEach(seq -> {
9393
boolean existed = normalSet.add(seq) == false;
94-
assertThat("SeqNumSet != Set", bitSet.getAndSet(seq), equalTo(existed));
94+
assertThat("SeqNoSet != Set", bitSet.getAndSet(seq), equalTo(existed));
9595
assertThat(bitSet.ongoingSetsSize(), lessThanOrEqualTo(4L));
9696
});
9797
assertThat(bitSet.ongoingSetsSize(), lessThanOrEqualTo(2L));

0 commit comments

Comments
 (0)