Skip to content

Commit 3515909

Browse files
committed
fixed compile error after merging in #59076
(a change got in after I merged in master into this pr, but didn't notice it until I merged this pr)
1 parent cb6b05d commit 3515909

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,7 +1070,7 @@ public void testUnreferencedDataStreamsWhenAddingTemplate() throws Exception {
10701070
state = ClusterState.builder(state)
10711071
.metadata(Metadata.builder(state.metadata())
10721072
.put(new DataStream("unreferenced",
1073-
new DataStream.TimestampField("@timestamp", Collections.singletonMap("type", "date")),
1073+
new DataStream.TimestampField("@timestamp"),
10741074
Collections.singletonList(new Index(".ds-unreferenced-000001", "uuid2"))))
10751075
.put(IndexMetadata.builder(".ds-unreferenced-000001")
10761076
.settings(Settings.builder()
@@ -1082,15 +1082,23 @@ public void testUnreferencedDataStreamsWhenAddingTemplate() throws Exception {
10821082
.build())
10831083
.build();
10841084

1085-
ComposableIndexTemplate template = new ComposableIndexTemplate(Collections.singletonList("logs-*-*"), null, null,
1086-
100L, null, null, new ComposableIndexTemplate.DataStreamTemplate("@timestamp"));
1085+
String mapping = "{\n" +
1086+
" \"properties\": {\n" +
1087+
" \"@timestamp\": {\n" +
1088+
" \"type\": \"date\"\n" +
1089+
" }\n" +
1090+
" }\n" +
1091+
" }";
1092+
Template mappingTemplate = new Template(null, new CompressedXContent(mapping), null);
1093+
ComposableIndexTemplate template = new ComposableIndexTemplate(Collections.singletonList("logs-*-*"),
1094+
mappingTemplate, null, 100L, null, null, new ComposableIndexTemplate.DataStreamTemplate("@timestamp"));
10871095

10881096
state = service.addIndexTemplateV2(state, false, "logs", template);
10891097

10901098
ClusterState stateWithDS = ClusterState.builder(state)
10911099
.metadata(Metadata.builder(state.metadata())
10921100
.put(new DataStream("logs-mysql-default",
1093-
new DataStream.TimestampField("@timestamp", Collections.singletonMap("type", "date")),
1101+
new DataStream.TimestampField("@timestamp"),
10941102
Collections.singletonList(new Index(".ds-logs-mysql-default-000001", "uuid"))))
10951103
.put(IndexMetadata.builder(".ds-logs-mysql-default-000001")
10961104
.settings(Settings.builder()
@@ -1126,8 +1134,8 @@ public void testUnreferencedDataStreamsWhenAddingTemplate() throws Exception {
11261134

11271135
// Change the pattern to one that doesn't match the data stream
11281136
e = expectThrows(IllegalArgumentException.class, () -> {
1129-
ComposableIndexTemplate newTemplate = new ComposableIndexTemplate(Collections.singletonList("logs-postgres-*"), null, null,
1130-
100L, null, null, new ComposableIndexTemplate.DataStreamTemplate("@timestamp"));
1137+
ComposableIndexTemplate newTemplate = new ComposableIndexTemplate(Collections.singletonList("logs-postgres-*"), mappingTemplate,
1138+
null, 100L, null, null, new ComposableIndexTemplate.DataStreamTemplate("@timestamp"));
11311139
service.addIndexTemplateV2(stateWithDS, false, "logs", newTemplate);
11321140
});
11331141

@@ -1136,8 +1144,8 @@ public void testUnreferencedDataStreamsWhenAddingTemplate() throws Exception {
11361144
"cause data streams [unreferenced, logs-mysql-default] to no longer match a data stream template"));
11371145

11381146
// Add an additional template that matches our data stream at a lower priority
1139-
ComposableIndexTemplate mysqlTemplate = new ComposableIndexTemplate(Collections.singletonList("logs-mysql-*"), null, null,
1140-
50L, null, null, new ComposableIndexTemplate.DataStreamTemplate("@timestamp"));
1147+
ComposableIndexTemplate mysqlTemplate = new ComposableIndexTemplate(Collections.singletonList("logs-mysql-*"), mappingTemplate,
1148+
null, 50L, null, null, new ComposableIndexTemplate.DataStreamTemplate("@timestamp"));
11411149
ClusterState stateWithDSAndTemplate = service.addIndexTemplateV2(stateWithDS, false, "logs-mysql", mysqlTemplate);
11421150

11431151
// We should be able to replace the "logs" template, because we have the "logs-mysql" template that can handle the data stream

0 commit comments

Comments
 (0)