Skip to content

Commit 118c6a1

Browse files
asce0705dnhatn
authored andcommitted
Fix constructors of NoOpResult (#66269)
1 parent f27e7c6 commit 118c6a1

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

server/src/main/java/org/elasticsearch/index/engine/Engine.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -595,11 +595,11 @@ public boolean isFound() {
595595
public static class NoOpResult extends Result {
596596

597597
NoOpResult(long term, long seqNo) {
598-
super(Operation.TYPE.NO_OP, term, 0, seqNo);
598+
super(Operation.TYPE.NO_OP, 0, term, seqNo);
599599
}
600600

601601
NoOpResult(long term, long seqNo, Exception failure) {
602-
super(Operation.TYPE.NO_OP, failure, term, 0, seqNo);
602+
super(Operation.TYPE.NO_OP, failure, 0, term, seqNo);
603603
}
604604

605605
}

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4313,11 +4313,15 @@ protected long doGenerateSeqNoForOperation(Operation operation) {
43134313
* Verifies that a segment containing only no-ops can be used to look up _version and _seqno.
43144314
*/
43154315
public void testSegmentContainsOnlyNoOps() throws Exception {
4316-
Engine.NoOpResult noOpResult = engine.noOp(new Engine.NoOp(1, primaryTerm.get(),
4316+
final long seqNo = randomLongBetween(0, 1000);
4317+
final long term = this.primaryTerm.get();
4318+
Engine.NoOpResult noOpResult = engine.noOp(new Engine.NoOp(seqNo, term,
43174319
randomFrom(Engine.Operation.Origin.values()), randomNonNegativeLong(), "test"));
43184320
assertThat(noOpResult.getFailure(), nullValue());
4321+
assertThat(noOpResult.getSeqNo(), equalTo(seqNo));
4322+
assertThat(noOpResult.getTerm(), equalTo(term));
43194323
engine.refresh("test");
4320-
Engine.DeleteResult deleteResult = engine.delete(replicaDeleteForDoc("id", 1, 2, randomNonNegativeLong()));
4324+
Engine.DeleteResult deleteResult = engine.delete(replicaDeleteForDoc("id", 1, seqNo + between(1, 1000), randomNonNegativeLong()));
43214325
assertThat(deleteResult.getFailure(), nullValue());
43224326
engine.refresh("test");
43234327
}
@@ -4343,8 +4347,11 @@ public void testRandomOperations() throws Exception {
43434347
assertThat(delete.getFailure(), nullValue());
43444348
break;
43454349
case NO_OP:
4346-
Engine.NoOpResult noOp = engine.noOp(new Engine.NoOp(i, primaryTerm.get(),
4350+
long seqNo = i;
4351+
Engine.NoOpResult noOp = engine.noOp(new Engine.NoOp(seqNo, primaryTerm.get(),
43474352
randomFrom(Engine.Operation.Origin.values()), randomNonNegativeLong(), ""));
4353+
assertThat(noOp.getTerm(), equalTo(primaryTerm.get()));
4354+
assertThat(noOp.getSeqNo(), equalTo(seqNo));
43484355
assertThat(noOp.getFailure(), nullValue());
43494356
break;
43504357
default:

0 commit comments

Comments
 (0)