use docId directly

dnhatn · dnhatn · commit 6bf3f1de97b8 · 2018-10-16T14:44:29.000-04:00
diff --git a/server/src/main/java/org/elasticsearch/common/lucene/uid/VersionsAndSeqNoResolver.java b/server/src/main/java/org/elasticsearch/common/lucene/uid/VersionsAndSeqNoResolver.java
@@ -229,7 +229,7 @@ public static long lookupPrimaryTerm(final DirectoryReader directoryReader, fina
             int docId;
             while ((docId = docIdSetIterator.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) {
                 // make sure to skip the non-root nested documents
-                if (primaryTermDV.advanceExact(docId - leaf.docBase) && primaryTermDV.longValue() > 0) {
+                if (primaryTermDV.advanceExact(docId) && primaryTermDV.longValue() > 0) {
                     return primaryTermDV.longValue();
                 }
             }
diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngineTests.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngineTests.java
@@ -574,17 +574,21 @@ public void testProcessOnceOnPrimary() throws Exception {
             }
         }
         Randomness.shuffle(operations);
+        final long oldTerm = randomLongBetween(1, Integer.MAX_VALUE);
+        primaryTerm.set(oldTerm);
         try (Store store = createStore(shardId, indexSettings, newDirectory())) {
             final EngineConfig engineConfig = engineConfig(shardId, indexSettings, threadPool, store, logger, xContentRegistry());
             try (FollowingEngine followingEngine = createEngine(store, engineConfig)) {
                 followingEngine.advanceMaxSeqNoOfUpdatesOrDeletes(operations.size() - 1L);
-                final long oldTerm = randomLongBetween(1, Integer.MAX_VALUE);
                 final Map<Long,Long> operationWithTerms = new HashMap<>();
                 for (Engine.Operation op : operations) {
                     long term = randomLongBetween(1, oldTerm);
                     Engine.Result result = applyOperation(followingEngine, op, term, randomFrom(Engine.Operation.Origin.values()));
                     assertThat(result.getResultType(), equalTo(Engine.Result.Type.SUCCESS));
                     operationWithTerms.put(op.seqNo(), term);
+                    if (rarely()) {
+                        followingEngine.refresh("test");
+                    }
                 }
                 // Primary should reject duplicates
                 final long newTerm = randomLongBetween(oldTerm + 1, Long.MAX_VALUE);

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ public static long lookupPrimaryTerm(final DirectoryReader directoryReader, fina`
`229`	`229`	`int docId;`
`230`	`230`	`while ((docId = docIdSetIterator.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) {`
`231`	`231`	`// make sure to skip the non-root nested documents`
`232`		`- if (primaryTermDV.advanceExact(docId - leaf.docBase) && primaryTermDV.longValue() > 0) {`
	`232`	`+ if (primaryTermDV.advanceExact(docId) && primaryTermDV.longValue() > 0) {`
`233`	`233`	`return primaryTermDV.longValue();`
`234`	`234`	`}`
`235`	`235`	`}`