|
@@ -11,6 +11,7 @@ import org.elasticsearch.Version;
|
|
|
import org.elasticsearch.cluster.metadata.IndexMetadata;
|
|
|
import org.elasticsearch.common.settings.Settings;
|
|
|
import org.elasticsearch.index.MapperTestUtils;
|
|
|
+import org.elasticsearch.index.mapper.DataStreamTimestampFieldMapper;
|
|
|
import org.elasticsearch.index.mapper.MapperService;
|
|
|
import org.elasticsearch.index.mapper.MappingLookup;
|
|
|
import org.elasticsearch.indices.IndicesModule;
|
|
@@ -34,9 +35,11 @@ public class MetadataCreateDataStreamServiceTests extends ESTestCase {
|
|
|
|
|
|
public void testValidateTimestampFieldMappingNoFieldMapping() {
|
|
|
Exception e = expectThrows(IllegalStateException.class, () -> validateTimestampFieldMapping(createMappingLookup("{}")));
|
|
|
- assertThat(e.getMessage(), equalTo("[_data_stream_timestamp] meta field has been disabled"));
|
|
|
+ assertThat(e.getMessage(), equalTo("[" + DataStreamTimestampFieldMapper.NAME + "] meta field has been disabled"));
|
|
|
String mapping1 = "{\n"
|
|
|
- + " \"_data_stream_timestamp\": {\n"
|
|
|
+ + " \""
|
|
|
+ + DataStreamTimestampFieldMapper.NAME
|
|
|
+ + "\": {\n"
|
|
|
+ " \"enabled\": false\n"
|
|
|
+ " },"
|
|
|
+ " \"properties\": {\n"
|
|
@@ -46,7 +49,7 @@ public class MetadataCreateDataStreamServiceTests extends ESTestCase {
|
|
|
+ " }\n"
|
|
|
+ " }";
|
|
|
e = expectThrows(IllegalStateException.class, () -> validateTimestampFieldMapping(createMappingLookup(mapping1)));
|
|
|
- assertThat(e.getMessage(), equalTo("[_data_stream_timestamp] meta field has been disabled"));
|
|
|
+ assertThat(e.getMessage(), equalTo("[" + DataStreamTimestampFieldMapper.NAME + "] meta field has been disabled"));
|
|
|
|
|
|
String mapping2 = generateMapping("@timestamp2", "date");
|
|
|
e = expectThrows(IllegalArgumentException.class, () -> validateTimestampFieldMapping(createMappingLookup(mapping2)));
|