Skip to content

Commit cabc562

Browse files
committed
Enable synthetic _id randomly in TSDBIndexingIT
Relates ES-13605
1 parent 132feff commit cabc562

File tree

1 file changed

+24
-5
lines changed
  • modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams

1 file changed

+24
-5
lines changed

modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/TSDBIndexingIT.java

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,9 @@ public void testTimeRanges() throws Exception {
134134
if (randomBoolean()) {
135135
templateSettings.put("index.routing_path", "metricset");
136136
}
137+
if (IndexSettings.TSDB_SYNTHETIC_ID_FEATURE_FLAG && randomBoolean()) {
138+
templateSettings.put(IndexSettings.USE_SYNTHETIC_ID.getKey(), true);
139+
}
137140
var mapping = new CompressedXContent(randomBoolean() ? MAPPING_TEMPLATE : MAPPING_TEMPLATE.replace("date", "date_nanos"));
138141

139142
if (randomBoolean()) {
@@ -331,6 +334,9 @@ public void testTsdbTemplatesNoKeywordFieldType() throws Exception {
331334
if (randomBoolean()) {
332335
settingsBuilder.put("index.routing_path", "metricset");
333336
}
337+
if (IndexSettings.TSDB_SYNTHETIC_ID_FEATURE_FLAG && randomBoolean()) {
338+
settingsBuilder.put(IndexSettings.USE_SYNTHETIC_ID.getKey(), true);
339+
}
334340
request.indexTemplate(
335341
ComposableIndexTemplate.builder()
336342
.indexPatterns(List.of("k8s*"))
@@ -378,12 +384,15 @@ public void testSkippingShards() throws Exception {
378384
Instant time = Instant.now();
379385
var mapping = new CompressedXContent(randomBoolean() ? MAPPING_TEMPLATE : MAPPING_TEMPLATE.replace("date", "date_nanos"));
380386
{
381-
var templateSettings = Settings.builder().put("index.mode", "time_series").put("index.routing_path", "metricset").build();
387+
var templateSettings = Settings.builder().put("index.mode", "time_series").put("index.routing_path", "metricset");
388+
if (IndexSettings.TSDB_SYNTHETIC_ID_FEATURE_FLAG && randomBoolean()) {
389+
templateSettings.put(IndexSettings.USE_SYNTHETIC_ID.getKey(), true);
390+
}
382391
var request = new TransportPutComposableIndexTemplateAction.Request("id1");
383392
request.indexTemplate(
384393
ComposableIndexTemplate.builder()
385394
.indexPatterns(List.of("pattern-1"))
386-
.template(new Template(templateSettings, mapping, null))
395+
.template(new Template(templateSettings.build(), mapping, null))
387396
.dataStreamTemplate(new ComposableIndexTemplate.DataStreamTemplate(false, false))
388397
.build()
389398
);
@@ -585,7 +594,10 @@ public void testReindexing() throws Exception {
585594
.indexPatterns(List.of(dataStreamName, reindexedDataStreamName))
586595
.template(
587596
new Template(
588-
Settings.builder().put("index.mode", "time_series").build(),
597+
Settings.builder()
598+
.put("index.mode", "time_series")
599+
.put(IndexSettings.USE_SYNTHETIC_ID.getKey(), IndexSettings.TSDB_SYNTHETIC_ID_FEATURE_FLAG && randomBoolean())
600+
.build(),
589601
new CompressedXContent(MAPPING_TEMPLATE),
590602
null
591603
)
@@ -646,6 +658,7 @@ public void testAddDimensionToMapping() throws Exception {
646658
Settings.builder()
647659
.put("index.mode", "time_series")
648660
.put("index.dimensions_tsid_strategy_enabled", indexDimensionsTsidStrategyEnabled)
661+
.put(IndexSettings.USE_SYNTHETIC_ID.getKey(), IndexSettings.TSDB_SYNTHETIC_ID_FEATURE_FLAG && randomBoolean())
649662
.build(),
650663
new CompressedXContent(MAPPING_TEMPLATE),
651664
null
@@ -731,7 +744,10 @@ public void testDynamicStringDimensions() throws Exception {
731744
putTemplateRequest.indexTemplate(
732745
ComposableIndexTemplate.builder()
733746
.indexPatterns(List.of(dataStreamName))
734-
.template(new Template(Settings.builder().put("index.mode", "time_series").build(), new CompressedXContent("""
747+
.template(new Template(Settings.builder()
748+
.put("index.mode", "time_series")
749+
.put(IndexSettings.USE_SYNTHETIC_ID.getKey(), IndexSettings.TSDB_SYNTHETIC_ID_FEATURE_FLAG && randomBoolean())
750+
.build(), new CompressedXContent("""
735751
{
736752
"_doc": {
737753
"dynamic_templates": [
@@ -793,7 +809,10 @@ public void testDynamicDimensions() throws Exception {
793809
putTemplateRequest.indexTemplate(
794810
ComposableIndexTemplate.builder()
795811
.indexPatterns(List.of(dataStreamName))
796-
.template(new Template(Settings.builder().put("index.mode", "time_series").build(), new CompressedXContent("""
812+
.template(new Template(Settings.builder()
813+
.put("index.mode", "time_series")
814+
.put(IndexSettings.USE_SYNTHETIC_ID.getKey(), IndexSettings.TSDB_SYNTHETIC_ID_FEATURE_FLAG && randomBoolean())
815+
.build(), new CompressedXContent("""
797816
798817
{
799818
"_doc": {

0 commit comments

Comments
 (0)