Skip to content

Fix FollowingEngineTests#testProcessOnceOnPrimary for synthetic ids #143577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fcofdez merged 6 commits into from
Mar 5, 2026
Merged

Fix FollowingEngineTests#testProcessOnceOnPrimary for synthetic ids #143577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eb09b7e
Fix FollowingEngineTests#testProcessOnceOnPrimary for synthetic ids
fcofdez Mar 4, 2026
1affcee
Use a real timestamp and non-negative routing hash
fcofdez Mar 4, 2026
325f840
Merge remote-tracking branch 'origin/main' into follower-test
fcofdez Mar 4, 2026
a497811
Guard with feature flag
fcofdez Mar 5, 2026
a2eab8b
Merge remote-tracking branch 'origin/main' into follower-test
fcofdez Mar 5, 2026
c54647f
Merge branch 'main' into follower-test
elasticmachine Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 45 additions & 4 deletions test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.document.SortedDocValuesField;
import org.apache.lucene.document.SortedNumericDocValuesField;
import org.apache.lucene.document.StoredField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
Expand Down Expand Up @@ -78,13 +80,17 @@
import org.elasticsearch.index.VersionType;
import org.elasticsearch.index.codec.CodecService;
import org.elasticsearch.index.mapper.DocumentMapper;
import org.elasticsearch.index.mapper.IdFieldMapper;
import org.elasticsearch.index.mapper.LuceneDocument;
import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.index.mapper.MappingLookup;
import org.elasticsearch.index.mapper.ParsedDocument;
import org.elasticsearch.index.mapper.SeqNoFieldMapper;
import org.elasticsearch.index.mapper.SourceFieldMapper;
import org.elasticsearch.index.mapper.SourceToParse;
import org.elasticsearch.index.mapper.TimeSeriesIdFieldMapper;
import org.elasticsearch.index.mapper.TimeSeriesRoutingHashFieldMapper;
import org.elasticsearch.index.mapper.TsidExtractingIdFieldMapper;
import org.elasticsearch.index.mapper.Uid;
import org.elasticsearch.index.seqno.LocalCheckpointTracker;
import org.elasticsearch.index.seqno.ReplicationTracker;
Expand Down Expand Up @@ -461,17 +467,22 @@ protected static LuceneDocument testDocument() {
}

public static ParsedDocument createParsedDoc(String id, String routing) {
return testParsedDocument(id, routing, testDocumentWithTextField(), new BytesArray("{ \"value\" : \"test\" }"), null, false);
return testParsedDocument(id, routing, testDocumentWithTextField(), new BytesArray("{ \"value\" : \"test\" }"), null, false, false);
}

public static ParsedDocument createParsedDoc(String id, String routing, boolean recoverySource) {
return createParsedDoc(id, routing, recoverySource, false);
}

public static ParsedDocument createParsedDoc(String id, String routing, boolean recoverySource, boolean syntheticId) {
return testParsedDocument(
id,
routing,
testDocumentWithTextField(),
new BytesArray("{ \"value\" : \"test\" }"),
null,
recoverySource
recoverySource,
syntheticId
);
}

Expand All @@ -482,7 +493,7 @@ protected ParsedDocument testParsedDocument(
BytesReference source,
CompressedXContent mappingUpdate
) {
return testParsedDocument(id, routing, document, source, mappingUpdate, false);
return testParsedDocument(id, routing, document, source, mappingUpdate, false, false);
}

protected static ParsedDocument testParsedDocument(
Expand All @@ -493,7 +504,37 @@ protected static ParsedDocument testParsedDocument(
CompressedXContent mappingUpdate,
boolean recoverySource
) {
Field idField = new StringField("_id", Uid.encodeId(id), Field.Store.YES);
return testParsedDocument(id, routing, document, source, mappingUpdate, recoverySource, false);
}

protected static ParsedDocument testParsedDocument(
String id,
String routing,
LuceneDocument document,
BytesReference source,
CompressedXContent mappingUpdate,
boolean recoverySource,
boolean syntheticId
) {
var uid = Uid.encodeId(id);
final Field idField;
if (syntheticId) {
idField = IdFieldMapper.syntheticIdField(uid);
var timeSeriesId = TsidExtractingIdFieldMapper.extractTimeSeriesIdFromSyntheticId(uid);
var timestamp = TsidExtractingIdFieldMapper.extractTimestampFromSyntheticId(uid);
int routingHash = TsidExtractingIdFieldMapper.extractRoutingHashFromSyntheticId(uid);

document.add(SortedDocValuesField.indexedField(TimeSeriesIdFieldMapper.NAME, timeSeriesId));
document.add(SortedNumericDocValuesField.indexedField("@timestamp", timestamp));
document.add(
new SortedDocValuesField(
TimeSeriesRoutingHashFieldMapper.NAME,
Uid.encodeId(TimeSeriesRoutingHashFieldMapper.encode(routingHash))
)
);
} else {
idField = new StringField("_id", Uid.encodeId(id), Field.Store.YES);
}
Field versionField = new NumericDocValuesField("_version", 0);
var seqID = SeqNoFieldMapper.SequenceIDFields.emptySeqID(seqNoIndexOptions);
document.add(idField);
Expand Down
24 changes: 20 additions & 4 deletions ...ugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngineTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.index.mapper.ParsedDocument;
import org.elasticsearch.index.mapper.SourceToParse;
import org.elasticsearch.index.mapper.TsidExtractingIdFieldMapper;
import org.elasticsearch.index.seqno.RetentionLeases;
import org.elasticsearch.index.seqno.SequenceNumbers;
import org.elasticsearch.index.shard.EngineResetLock;
Expand All @@ -64,6 +65,7 @@

import java.io.IOException;
import java.nio.file.Path;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
Expand Down Expand Up @@ -251,7 +253,7 @@ private EngineConfig engineConfig(
indexSettings,
BigArrays.NON_RECYCLING_INSTANCE
);
final MapperService mapperService = EngineTestCase.createMapperService();
final MapperService mapperService = EngineTestCase.createMapperService(indexSettings.getSettings(), "{}");
return new EngineConfig(
shardIdValue,
threadPool,
Expand All @@ -262,7 +264,7 @@ private EngineConfig engineConfig(
newMergePolicy(),
indexWriterConfig.getAnalyzer(),
indexWriterConfig.getSimilarity(),
new CodecService(null, BigArrays.NON_RECYCLING_INSTANCE, null),
new CodecService(mapperService, BigArrays.NON_RECYCLING_INSTANCE, null),
new Engine.EventListener() {
@Override
public void onFailedEngine(String reason, Exception e) {
Expand Down Expand Up @@ -779,12 +781,16 @@ private CheckedBiFunction<String, Integer, ParsedDocument, IOException> nestedPa

public void testProcessOnceOnPrimary() throws Exception {
final Settings.Builder settingsBuilder = indexSettings(IndexVersion.current(), 1, 0).put("index.xpack.ccr.following_index", true);
boolean useSyntheticId = IndexSettings.TSDB_SYNTHETIC_ID_FEATURE_FLAG && indexMode == IndexMode.TIME_SERIES && randomBoolean();
switch (indexMode) {
case STANDARD:
break;
case TIME_SERIES:
settingsBuilder.put("index.mode", "time_series").put("index.routing_path", "foo");
settingsBuilder.put("index.seq_no.index_options", "points_and_doc_values");
if (IndexSettings.TSDB_SYNTHETIC_ID_FEATURE_FLAG) {
settingsBuilder.put(IndexSettings.SYNTHETIC_ID.getKey(), useSyntheticId);
}
break;
case LOGSDB:
settingsBuilder.put("index.mode", IndexMode.LOGSDB.getName());
Expand All @@ -803,8 +809,18 @@ public void testProcessOnceOnPrimary() throws Exception {
int numOps = between(10, 100);
List<Engine.Operation> operations = new ArrayList<>(numOps);
for (int i = 0; i < numOps; i++) {
String docId = Integer.toString(between(1, 100));
ParsedDocument doc = randomBoolean() ? EngineTestCase.createParsedDoc(docId, null) : nestedDocFunc.apply(docId, randomInt(3));
String docId = useSyntheticId
? TsidExtractingIdFieldMapper.createSyntheticId(
new BytesRef(Integer.toString(i)),
Instant.now().toEpochMilli(),
randomNonNegativeInt()
)
: Integer.toString(i);
ParsedDocument doc = randomBoolean() || useSyntheticId
? EngineTestCase.createParsedDoc(docId, null, false, useSyntheticId)
// The nested docs uses the default mapper to create the document, and that doesn't include all the necessary
// fields for the synthetic id. Hence we just skip using nested docs if the synthetic id is enabled.
: nestedDocFunc.apply(docId, randomInt(3));
if (randomBoolean()) {
operations.add(
new Engine.Index(
Expand Down