From a2581dbd30ace908549d474e9479f9eecef91e78 Mon Sep 17 00:00:00 2001 From: Chris Helma Date: Fri, 27 Sep 2024 13:05:33 -0500 Subject: [PATCH 1/2] Fixed bug in mapping parsing; added tests Signed-off-by: Chris Helma --- .../transformers/TransformFunctions.java | 19 ++-- .../transformers/TransformFunctionsTest.java | 99 ++++++++++++++++++ .../Transformer_ES_7_10_OS_2_11Test.java | 16 ++- RFS/test-resources/inventory.md | 31 +++++- .../snapshots/ES_7_10_BWC_Check/index-0 | 2 +- .../0/__67c_vZhQSvW4em6Cxfh2lQ} | Bin 479 -> 479 bytes .../0/__XZWNr4iFS0OndjXNhMWtOg | Bin 0 -> 2740 bytes .../0/index-tGRrEPUKTuWK_eyviXSHvg | Bin 0 -> 1245 bytes .../0/snap-KhcpVj8aRMek0oLMUSPHeg.dat | Bin 0 -> 1154 bytes .../meta-4FiaNJIBxXZFvc_xLY-F.dat | Bin 0 -> 535 bytes .../0/__xdhJGeuxSAGPk5gBj8PlfA | Bin 2742 -> 0 bytes .../0/index-73ZKrS4iTc6nKzY0E4kC1w | Bin 1245 -> 0 bytes .../0/snap-rNzQqxl5Qrm99ZzB44Yz0w.dat | Bin 1154 -> 0 bytes .../meta-AzJBKpIBKBXpMe1tfd-g.dat | Bin 525 -> 0 bytes .../0/index-cbs2bGwwSy66JeQOO9vNbQ | Bin 0 -> 491 bytes .../0/snap-KhcpVj8aRMek0oLMUSPHeg.dat | Bin 0 -> 475 bytes .../meta-31iaNJIBxXZFvc_xLY-F.dat | Bin 0 -> 473 bytes .../0/__q7cUOllVStaQMJVUtgWEPQ | Bin 2740 -> 0 bytes .../0/index-OSYnb8w3SKmTqQ_p7m84JA | Bin 1245 -> 0 bytes .../0/snap-rNzQqxl5Qrm99ZzB44Yz0w.dat | Bin 1154 -> 0 bytes .../meta-AjJBKpIBKBXpMe1tfd-g.dat | Bin 535 -> 0 bytes .../0/__VpJYHno2ROCuG6vyVjvD4g | Bin 0 -> 2742 bytes .../0/__gHQYvOH6Rp-cJKmVReWxuQ} | Bin 479 -> 479 bytes .../0/index-yaxW_gAlTNqirWlIIoil8A | Bin 0 -> 1248 bytes .../0/snap-KhcpVj8aRMek0oLMUSPHeg.dat | Bin 0 -> 1157 bytes .../meta-3ViaNJIBxXZFvc_xLY-F.dat | Bin 0 -> 525 bytes .../0/index-C7dK_wyqSUuDyKkefOXUUQ | Bin 0 -> 492 bytes .../0/snap-KhcpVj8aRMek0oLMUSPHeg.dat | Bin 0 -> 476 bytes .../meta-3liaNJIBxXZFvc_xLY-F.dat | Bin 0 -> 488 bytes .../meta-KhcpVj8aRMek0oLMUSPHeg.dat | Bin 0 -> 717 bytes .../meta-rNzQqxl5Qrm99ZzB44Yz0w.dat | Bin 717 -> 0 bytes .../snap-KhcpVj8aRMek0oLMUSPHeg.dat | Bin 0 -> 330 bytes .../snap-rNzQqxl5Qrm99ZzB44Yz0w.dat | Bin 287 -> 0 bytes 33 files changed, 153 insertions(+), 14 deletions(-) create mode 100644 RFS/src/test/java/org/opensearch/migrations/bulkload/transformers/TransformFunctionsTest.java rename RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/{rtO3hIcQREynKwRVke75sQ/0/__d3rngFHgRnOiALrbvS6Odg => 0edrmuSPR1CIr2B6BZbMJA/0/__67c_vZhQSvW4em6Cxfh2lQ} (80%) create mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/0edrmuSPR1CIr2B6BZbMJA/0/__XZWNr4iFS0OndjXNhMWtOg create mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/0edrmuSPR1CIr2B6BZbMJA/0/index-tGRrEPUKTuWK_eyviXSHvg create mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/0edrmuSPR1CIr2B6BZbMJA/0/snap-KhcpVj8aRMek0oLMUSPHeg.dat create mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/0edrmuSPR1CIr2B6BZbMJA/meta-4FiaNJIBxXZFvc_xLY-F.dat delete mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/6f5_qLyfQu-MKqe5IEJGuQ/0/__xdhJGeuxSAGPk5gBj8PlfA delete mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/6f5_qLyfQu-MKqe5IEJGuQ/0/index-73ZKrS4iTc6nKzY0E4kC1w delete mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/6f5_qLyfQu-MKqe5IEJGuQ/0/snap-rNzQqxl5Qrm99ZzB44Yz0w.dat delete mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/6f5_qLyfQu-MKqe5IEJGuQ/meta-AzJBKpIBKBXpMe1tfd-g.dat create mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/a5ONDmS2RmmN1GEZMRCJRg/0/index-cbs2bGwwSy66JeQOO9vNbQ create mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/a5ONDmS2RmmN1GEZMRCJRg/0/snap-KhcpVj8aRMek0oLMUSPHeg.dat create mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/a5ONDmS2RmmN1GEZMRCJRg/meta-31iaNJIBxXZFvc_xLY-F.dat delete mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/rtO3hIcQREynKwRVke75sQ/0/__q7cUOllVStaQMJVUtgWEPQ delete mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/rtO3hIcQREynKwRVke75sQ/0/index-OSYnb8w3SKmTqQ_p7m84JA delete mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/rtO3hIcQREynKwRVke75sQ/0/snap-rNzQqxl5Qrm99ZzB44Yz0w.dat delete mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/rtO3hIcQREynKwRVke75sQ/meta-AjJBKpIBKBXpMe1tfd-g.dat create mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/s_FgCb4gREmddVPRW-EtWw/0/__VpJYHno2ROCuG6vyVjvD4g rename RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/{6f5_qLyfQu-MKqe5IEJGuQ/0/__7d8i9c5gTH62_a-mtjnh1g => s_FgCb4gREmddVPRW-EtWw/0/__gHQYvOH6Rp-cJKmVReWxuQ} (80%) create mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/s_FgCb4gREmddVPRW-EtWw/0/index-yaxW_gAlTNqirWlIIoil8A create mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/s_FgCb4gREmddVPRW-EtWw/0/snap-KhcpVj8aRMek0oLMUSPHeg.dat create mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/s_FgCb4gREmddVPRW-EtWw/meta-3ViaNJIBxXZFvc_xLY-F.dat create mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/zUFSBaZgSdKCPAS2xEfCww/0/index-C7dK_wyqSUuDyKkefOXUUQ create mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/zUFSBaZgSdKCPAS2xEfCww/0/snap-KhcpVj8aRMek0oLMUSPHeg.dat create mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/zUFSBaZgSdKCPAS2xEfCww/meta-3liaNJIBxXZFvc_xLY-F.dat create mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/meta-KhcpVj8aRMek0oLMUSPHeg.dat delete mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/meta-rNzQqxl5Qrm99ZzB44Yz0w.dat create mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/snap-KhcpVj8aRMek0oLMUSPHeg.dat delete mode 100644 RFS/test-resources/snapshots/ES_7_10_BWC_Check/snap-rNzQqxl5Qrm99ZzB44Yz0w.dat diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/transformers/TransformFunctions.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/transformers/TransformFunctions.java index 80a5e7004..9c50f5a5e 100644 --- a/RFS/src/main/java/org/opensearch/migrations/bulkload/transformers/TransformFunctions.java +++ b/RFS/src/main/java/org/opensearch/migrations/bulkload/transformers/TransformFunctions.java @@ -10,6 +10,7 @@ public class TransformFunctions { private static final ObjectMapper mapper = new ObjectMapper(); public static final String MAPPINGS_KEY_STR = "mappings"; + public static final String PROPERTIES_KEY_STR = "properties"; public static final String SETTINGS_KEY_STR = "settings"; public static final String NUMBER_OF_REPLICAS_KEY_STR = "number_of_replicas"; public static final String INDEX_KEY_STR = "index"; @@ -75,17 +76,21 @@ public static void removeIntermediateMappingsLevels(ObjectNode root) { * - [{"doc":{"properties":{"address":{"type":"text"}}}}] * - [{"audit_message":{"properties":{"address":{"type":"text"}}}}] * - * It's not impossible that the intermediate key is not present, in which case we should just extract the mappings: + * It's also possible for this list to be empty, in which case we should set the mappings to an empty node. + * + * Finally, it may be possible that the intermediate key is not present, in which case we should just extract the mappings: * - [{"properties":{"address":{"type":"text"}}}] */ if (val instanceof ArrayNode) { ArrayNode mappingsList = (ArrayNode) val; - if (mappingsList.size() != 1) { + if (mappingsList.size() > 1) { throw new IllegalArgumentException("Mappings list contains more than one member; this is unexpected: " + val.toString()); + } else if (mappingsList.size() == 1) { + ObjectNode actualMappingsRoot = (ObjectNode) mappingsList.get(0); + root.set(MAPPINGS_KEY_STR, getMappingsFromBeneathIntermediate(actualMappingsRoot)); + } else { + root.set(MAPPINGS_KEY_STR, mapper.createObjectNode()); } - ObjectNode actualMappingsRoot = (ObjectNode) mappingsList.get(0); - - root.set(MAPPINGS_KEY_STR, getMappingsFromBeneathIntermediate(actualMappingsRoot)); } /** @@ -113,9 +118,9 @@ else if (val instanceof ObjectNode) { * it regardless of what it is named. */ public static ObjectNode getMappingsFromBeneathIntermediate(ObjectNode mappingsRoot) { - if (mappingsRoot.has("properties")) { + if (mappingsRoot.has(PROPERTIES_KEY_STR)) { return mappingsRoot; - } else if (!mappingsRoot.has("properties")) { + } else if (!mappingsRoot.has(PROPERTIES_KEY_STR)) { return (ObjectNode) mappingsRoot.get(mappingsRoot.fieldNames().next()).deepCopy(); } diff --git a/RFS/src/test/java/org/opensearch/migrations/bulkload/transformers/TransformFunctionsTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/transformers/TransformFunctionsTest.java new file mode 100644 index 000000000..24a2ed9bd --- /dev/null +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/transformers/TransformFunctionsTest.java @@ -0,0 +1,99 @@ +package org.opensearch.migrations.bulkload.transformers; + +import org.junit.jupiter.api.Test; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; + +import lombok.extern.slf4j.Slf4j; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +@Slf4j +public class TransformFunctionsTest { + + @Test + public void removeIntermediateMappingsLevels_AsExpected() throws Exception { + // Extract from {"mappings":[{"_doc":{"properties":{"address":{"type":"text"}}}}]) + ObjectNode testNode1 = new ObjectMapper().createObjectNode(); + ArrayNode mappingsNode1 = new ObjectMapper().createArrayNode(); + ObjectNode docNode1 = new ObjectMapper().createObjectNode(); + ObjectNode propertiesNode1 = new ObjectMapper().createObjectNode(); + ObjectNode addressNode1 = new ObjectMapper().createObjectNode(); + addressNode1.put("type", "text"); + propertiesNode1.set("address", addressNode1); + docNode1.set(TransformFunctions.PROPERTIES_KEY_STR, propertiesNode1); + ObjectNode intermediateNode1 = new ObjectMapper().createObjectNode(); + intermediateNode1.set("_doc", docNode1); + mappingsNode1.add(intermediateNode1); + testNode1.set(TransformFunctions.MAPPINGS_KEY_STR, mappingsNode1); + + TransformFunctions.removeIntermediateMappingsLevels(testNode1); + assertEquals(docNode1.toString(), testNode1.get(TransformFunctions.MAPPINGS_KEY_STR).toString()); + + // Extract from {"mappings":[{"properties":{"address":{"type":"text"}}}]) + ObjectNode testNode2 = new ObjectMapper().createObjectNode(); + ArrayNode mappingsNode2 = new ObjectMapper().createArrayNode(); + ObjectNode propertiesNode2 = new ObjectMapper().createObjectNode(); + ObjectNode addressNode2 = new ObjectMapper().createObjectNode(); + addressNode2.put("type", "text"); + propertiesNode2.set("address", addressNode2); + ObjectNode intermediateNode2 = new ObjectMapper().createObjectNode(); + intermediateNode2.set(TransformFunctions.PROPERTIES_KEY_STR, propertiesNode2); + mappingsNode2.add(intermediateNode2); + testNode2.set(TransformFunctions.MAPPINGS_KEY_STR, mappingsNode2); + + TransformFunctions.removeIntermediateMappingsLevels(testNode2); + assertEquals(intermediateNode2.toString(), testNode2.get(TransformFunctions.MAPPINGS_KEY_STR).toString()); + + // Extract from {"mappings":[]) + ObjectNode testNode3 = new ObjectMapper().createObjectNode(); + ArrayNode mappingsNode3 = new ObjectMapper().createArrayNode(); + testNode3.set(TransformFunctions.MAPPINGS_KEY_STR, mappingsNode3); + + TransformFunctions.removeIntermediateMappingsLevels(testNode3); + assertEquals(new ObjectMapper().createObjectNode().toString(), testNode3.get(TransformFunctions.MAPPINGS_KEY_STR).toString()); + } + + @Test + public void getMappingsFromBeneathIntermediate_AsExpected() throws Exception { + // Extract from {"_doc":{"properties":{"address":{"type":"text"}}}} + ObjectNode testNode1 = new ObjectMapper().createObjectNode(); + ObjectNode docNode1 = new ObjectMapper().createObjectNode(); + ObjectNode propertiesNode1 = new ObjectMapper().createObjectNode(); + ObjectNode addressNode1 = new ObjectMapper().createObjectNode(); + addressNode1.put("type", "text"); + propertiesNode1.set("address", addressNode1); + docNode1.set(TransformFunctions.PROPERTIES_KEY_STR, propertiesNode1); + testNode1.set("_doc", docNode1); + + ObjectNode result1 = TransformFunctions.getMappingsFromBeneathIntermediate(testNode1); + assertEquals(docNode1.toString(), result1.toString()); + + // Extract from {"arbitrary_type":{"properties":{"address":{"type":"text"}}}} + ObjectNode testNode2 = new ObjectMapper().createObjectNode(); + ObjectNode docNode2 = new ObjectMapper().createObjectNode(); + ObjectNode propertiesNode2 = new ObjectMapper().createObjectNode(); + ObjectNode addressNode2 = new ObjectMapper().createObjectNode(); + addressNode2.put("type", "text"); + propertiesNode2.set("address", addressNode2); + docNode2.set(TransformFunctions.PROPERTIES_KEY_STR, propertiesNode2); + testNode2.set("arbitrary_type", docNode2); + + ObjectNode result2 = TransformFunctions.getMappingsFromBeneathIntermediate(testNode2); + assertEquals(docNode2.toString(), result2.toString()); + + // Extract from {"properties":{"address":{"type":"text"}} + ObjectNode testNode3 = new ObjectMapper().createObjectNode(); + ObjectNode propertiesNode3 = new ObjectMapper().createObjectNode(); + ObjectNode addressNode3 = new ObjectMapper().createObjectNode(); + addressNode3.put("type", "text"); + propertiesNode3.set("address", addressNode3); + testNode3.set(TransformFunctions.PROPERTIES_KEY_STR, propertiesNode3); + + ObjectNode result3 = TransformFunctions.getMappingsFromBeneathIntermediate(testNode3); + assertEquals(testNode3.toString(), result3.toString()); + } + +} diff --git a/RFS/src/test/java/org/opensearch/migrations/bulkload/transformers/Transformer_ES_7_10_OS_2_11Test.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/transformers/Transformer_ES_7_10_OS_2_11Test.java index bed907250..2bd61b4fc 100644 --- a/RFS/src/test/java/org/opensearch/migrations/bulkload/transformers/Transformer_ES_7_10_OS_2_11Test.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/transformers/Transformer_ES_7_10_OS_2_11Test.java @@ -59,10 +59,22 @@ public void transformIndexMetadata_AsExpected() throws Exception { IndexMetadata transformedIndexFwc = transformer.transformIndexMetadata(indexMetadataFwc); IndexMetadataData_OS_2_11 finalIndexFwc =new IndexMetadataData_OS_2_11(transformedIndexFwc.getRawJson(), transformedIndexFwc.getId(), transformedIndexFwc.getName()); - String expectedIndexBwc = "{\"version\":3,\"mapping_version\":1,\"settings_version\":1,\"aliases_version\":1,\"routing_num_shards\":1024,\"state\":\"open\",\"settings\":{\"creation_date\":\"1727285787498\",\"number_of_replicas\":1,\"number_of_shards\":\"1\",\"provided_name\":\"bwc_index_1\",\"uuid\":\"P4PDS4fFSECIprHxpKSoiQ\",\"version\":{\"created\":\"7100299\"}},\"mappings\":{\"properties\":{\"content\":{\"type\":\"text\"},\"title\":{\"type\":\"text\"}}},\"aliases\":{\"bwc_alias\":{}},\"primary_terms\":[1],\"in_sync_allocations\":{\"0\":[\"0M-gMXkNQFC02lnWJN4BVQ\"]},\"rollover_info\":{},\"system\":false}"; - String expectedIndexFwc = "{\"version\":3,\"mapping_version\":1,\"settings_version\":1,\"aliases_version\":1,\"routing_num_shards\":1024,\"state\":\"open\",\"settings\":{\"creation_date\":\"1727285787822\",\"number_of_replicas\":1,\"number_of_shards\":\"1\",\"provided_name\":\"fwc_index_1\",\"uuid\":\"riC1gLlrR2eh_uAh9Zdpiw\",\"version\":{\"created\":\"7100299\"}},\"mappings\":{\"properties\":{\"content\":{\"type\":\"text\"},\"title\":{\"type\":\"text\"}}},\"aliases\":{\"fwc_alias\":{}},\"primary_terms\":[1],\"in_sync_allocations\":{\"0\":[\"8sKrVCEaSxy4yP3cx8kcYQ\"]},\"rollover_info\":{},\"system\":false}"; + IndexMetadata indexMetadataNoMappingNoDocs = sourceResourceProvider.getIndexMetadata().fromRepo(snapshot.name, "no_mappings_no_docs"); + IndexMetadata transformedIndexNoMappingNoDocs = transformer.transformIndexMetadata(indexMetadataNoMappingNoDocs); + IndexMetadataData_OS_2_11 finalIndexNoMappingNoDocs = new IndexMetadataData_OS_2_11(transformedIndexNoMappingNoDocs.getRawJson(), transformedIndexNoMappingNoDocs.getId(), transformedIndexNoMappingNoDocs.getName()); + + IndexMetadata indexMetadataEmptyMappingNoDocs = sourceResourceProvider.getIndexMetadata().fromRepo(snapshot.name, "empty_mappings_no_docs"); + IndexMetadata transformedIndexEmptyMappingNoDocs = transformer.transformIndexMetadata(indexMetadataEmptyMappingNoDocs); + IndexMetadataData_OS_2_11 finalIndexEmptyMappingNoDocs = new IndexMetadataData_OS_2_11(transformedIndexEmptyMappingNoDocs.getRawJson(), transformedIndexEmptyMappingNoDocs.getId(), transformedIndexEmptyMappingNoDocs.getName()); + + String expectedIndexBwc = "{\"version\":3,\"mapping_version\":1,\"settings_version\":1,\"aliases_version\":1,\"routing_num_shards\":1024,\"state\":\"open\",\"settings\":{\"creation_date\":\"1727459371883\",\"number_of_replicas\":1,\"number_of_shards\":\"1\",\"provided_name\":\"bwc_index_1\",\"uuid\":\"tBmFXxGhTeiDlznQiKfNCA\",\"version\":{\"created\":\"7100299\"}},\"mappings\":{\"properties\":{\"content\":{\"type\":\"text\"},\"title\":{\"type\":\"text\"}}},\"aliases\":{\"bwc_alias\":{}},\"primary_terms\":[1],\"in_sync_allocations\":{\"0\":[\"jSYEePXYTka3EJ0vvdPGJA\"]},\"rollover_info\":{},\"system\":false}"; + String expectedIndexFwc = "{\"version\":3,\"mapping_version\":1,\"settings_version\":1,\"aliases_version\":1,\"routing_num_shards\":1024,\"state\":\"open\",\"settings\":{\"creation_date\":\"1727459372123\",\"number_of_replicas\":1,\"number_of_shards\":\"1\",\"provided_name\":\"fwc_index_1\",\"uuid\":\"BI3xMNgnRe6HldftNpfxzQ\",\"version\":{\"created\":\"7100299\"}},\"mappings\":{\"properties\":{\"content\":{\"type\":\"text\"},\"title\":{\"type\":\"text\"}}},\"aliases\":{\"fwc_alias\":{}},\"primary_terms\":[1],\"in_sync_allocations\":{\"0\":[\"SvHX-4xPTZWt0sYMTiFGYw\"]},\"rollover_info\":{},\"system\":false}"; + String expectedIndexNoMappingNoDocs = "{\"version\":3,\"mapping_version\":1,\"settings_version\":1,\"aliases_version\":1,\"routing_num_shards\":1024,\"state\":\"open\",\"settings\":{\"creation_date\":\"1727459372205\",\"number_of_replicas\":1,\"number_of_shards\":\"1\",\"provided_name\":\"no_mappings_no_docs\",\"uuid\":\"S0lxKX7vSLS7jzquAnNzdg\",\"version\":{\"created\":\"7100299\"}},\"mappings\":{},\"aliases\":{},\"primary_terms\":[1],\"in_sync_allocations\":{\"0\":[\"McFl7a21QZKeB7HLHo6eMQ\"]},\"rollover_info\":{},\"system\":false}"; + String expectedIndexEmptyMappingNoDocs = "{\"version\":3,\"mapping_version\":1,\"settings_version\":1,\"aliases_version\":1,\"routing_num_shards\":1024,\"state\":\"open\",\"settings\":{\"creation_date\":\"1727459372264\",\"number_of_replicas\":1,\"number_of_shards\":\"1\",\"provided_name\":\"empty_mappings_no_docs\",\"uuid\":\"ndSIWVDSQpuC8xY2DieX7g\",\"version\":{\"created\":\"7100299\"}},\"mappings\":{},\"aliases\":{},\"primary_terms\":[1],\"in_sync_allocations\":{\"0\":[\"yr1xkacYT42MjPGjAzQhHg\"]},\"rollover_info\":{},\"system\":false}"; assertEquals(expectedIndexBwc, finalIndexBwc.getRawJson().toString()); assertEquals(expectedIndexFwc, finalIndexFwc.getRawJson().toString()); + assertEquals(expectedIndexNoMappingNoDocs, finalIndexNoMappingNoDocs.getRawJson().toString()); + assertEquals(expectedIndexEmptyMappingNoDocs, finalIndexEmptyMappingNoDocs.getRawJson().toString()); } } diff --git a/RFS/test-resources/inventory.md b/RFS/test-resources/inventory.md index e690b5f76..9ded7e5cc 100644 --- a/RFS/test-resources/inventory.md +++ b/RFS/test-resources/inventory.md @@ -345,7 +345,7 @@ curl -X PUT "localhost:19200/test_updates_deletes" -H "Content-Type: application ``` #### ES_7_10_BWC_Check -An Elastic 7.10 snapshot repo designed to exercise backwards compatibility across a couple different features. It contains two indices; one is created using pre-ES 7.8 templates and pre-ES 7.0 type declarations, and the other is created using forward-compatible index/component templates and no type declarations. Both indices contain a single document. +An Elastic 7.10 snapshot repo designed to exercise backwards compatibility across a couple different features. It contains two indices; one is created using pre-ES 7.8 templates and pre-ES 7.0 type declarations, and the other is created using forward-compatible index/component templates and no type declarations. Both indices contain a single document. It also contains two indices with either no mappings or an empty mapping entry and no documents; this exercises an edge case where there will be a mappings entry in the snapshot with no contents. ``` curl -X PUT "localhost:19200/_template/bwc_template?include_type_name=true" -H "Content-Type: application/json" -d ' @@ -426,12 +426,36 @@ curl -X PUT "localhost:19200/_index_template/fwc_template" -H "Content-Type: app curl -X PUT "localhost:19200/fwc_index_1" -H "Content-Type: application/json" -curl -X PUT "localhost:19200/fwc_alias/_doc/bwc_doc" -H "Content-Type: application/json" -d ' +curl -X PUT "localhost:19200/fwc_alias/_doc/fwc_doc" -H "Content-Type: application/json" -d ' { "title": "This is a doc in a forward compatible index", "content": "Life, the Universe, and Everything" }' +curl -X PUT "localhost:19200/no_mappings_no_docs" -H "Content-Type: application/json" -d ' +{ + "settings": { + "index": { + "number_of_shards": 1, + "number_of_replicas": 0 + } + } +}' + +curl -X PUT "localhost:19200/empty_mappings_no_docs" -H "Content-Type: application/json" -d ' +{ + "settings": { + "index": { + "number_of_shards": 1, + "number_of_replicas": 0 + } + }, + "mappings": { + "properties":{ + } + } +}' + curl -X PUT "localhost:19200/_snapshot/test_repository" -H "Content-Type: application/json" -d '{ "type": "fs", "settings": { @@ -441,9 +465,8 @@ curl -X PUT "localhost:19200/_snapshot/test_repository" -H "Content-Type: applic }' curl -X PUT "localhost:19200/_snapshot/test_repository/rfs-snapshot" -H "Content-Type: application/json" -d '{ - "indices": "bwc_index_1,fwc_index_1", + "indices": "bwc_index_1,fwc_index_1,no_mappings_no_docs,empty_mappings_no_docs", "ignore_unavailable": true, "include_global_state": true }' - ``` \ No newline at end of file diff --git a/RFS/test-resources/snapshots/ES_7_10_BWC_Check/index-0 b/RFS/test-resources/snapshots/ES_7_10_BWC_Check/index-0 index 5d1e24f27..1f1586d8a 100644 --- a/RFS/test-resources/snapshots/ES_7_10_BWC_Check/index-0 +++ b/RFS/test-resources/snapshots/ES_7_10_BWC_Check/index-0 @@ -1 +1 @@ -{"snapshots":[{"name":"rfs-snapshot","uuid":"rNzQqxl5Qrm99ZzB44Yz0w","state":1,"index_metadata_lookup":{"rtO3hIcQREynKwRVke75sQ":"P4PDS4fFSECIprHxpKSoiQ-_na_-1-1-1","6f5_qLyfQu-MKqe5IEJGuQ":"riC1gLlrR2eh_uAh9Zdpiw-_na_-1-1-1"},"version":"7.10.2"}],"indices":{"bwc_index_1":{"id":"rtO3hIcQREynKwRVke75sQ","snapshots":["rNzQqxl5Qrm99ZzB44Yz0w"],"shard_generations":["OSYnb8w3SKmTqQ_p7m84JA"]},"fwc_index_1":{"id":"6f5_qLyfQu-MKqe5IEJGuQ","snapshots":["rNzQqxl5Qrm99ZzB44Yz0w"],"shard_generations":["73ZKrS4iTc6nKzY0E4kC1w"]}},"min_version":"7.9.0","index_metadata_identifiers":{"riC1gLlrR2eh_uAh9Zdpiw-_na_-1-1-1":"AzJBKpIBKBXpMe1tfd-g","P4PDS4fFSECIprHxpKSoiQ-_na_-1-1-1":"AjJBKpIBKBXpMe1tfd-g"}} \ No newline at end of file +{"snapshots":[{"name":"rfs-snapshot","uuid":"KhcpVj8aRMek0oLMUSPHeg","state":1,"index_metadata_lookup":{"zUFSBaZgSdKCPAS2xEfCww":"ndSIWVDSQpuC8xY2DieX7g-_na_-1-1-1","s_FgCb4gREmddVPRW-EtWw":"BI3xMNgnRe6HldftNpfxzQ-_na_-1-1-1","a5ONDmS2RmmN1GEZMRCJRg":"S0lxKX7vSLS7jzquAnNzdg-_na_-1-1-1","0edrmuSPR1CIr2B6BZbMJA":"tBmFXxGhTeiDlznQiKfNCA-_na_-1-1-1"},"version":"7.10.2"}],"indices":{"empty_mappings_no_docs":{"id":"zUFSBaZgSdKCPAS2xEfCww","snapshots":["KhcpVj8aRMek0oLMUSPHeg"],"shard_generations":["C7dK_wyqSUuDyKkefOXUUQ"]},"bwc_index_1":{"id":"0edrmuSPR1CIr2B6BZbMJA","snapshots":["KhcpVj8aRMek0oLMUSPHeg"],"shard_generations":["tGRrEPUKTuWK_eyviXSHvg"]},"fwc_index_1":{"id":"s_FgCb4gREmddVPRW-EtWw","snapshots":["KhcpVj8aRMek0oLMUSPHeg"],"shard_generations":["yaxW_gAlTNqirWlIIoil8A"]},"no_mappings_no_docs":{"id":"a5ONDmS2RmmN1GEZMRCJRg","snapshots":["KhcpVj8aRMek0oLMUSPHeg"],"shard_generations":["cbs2bGwwSy66JeQOO9vNbQ"]}},"min_version":"7.9.0","index_metadata_identifiers":{"ndSIWVDSQpuC8xY2DieX7g-_na_-1-1-1":"3liaNJIBxXZFvc_xLY-F","S0lxKX7vSLS7jzquAnNzdg-_na_-1-1-1":"31iaNJIBxXZFvc_xLY-F","BI3xMNgnRe6HldftNpfxzQ-_na_-1-1-1":"3ViaNJIBxXZFvc_xLY-F","tBmFXxGhTeiDlznQiKfNCA-_na_-1-1-1":"4FiaNJIBxXZFvc_xLY-F"}} \ No newline at end of file diff --git a/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/rtO3hIcQREynKwRVke75sQ/0/__d3rngFHgRnOiALrbvS6Odg b/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/0edrmuSPR1CIr2B6BZbMJA/0/__67c_vZhQSvW4em6Cxfh2lQ similarity index 80% rename from RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/rtO3hIcQREynKwRVke75sQ/0/__d3rngFHgRnOiALrbvS6Odg rename to RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/0edrmuSPR1CIr2B6BZbMJA/0/__67c_vZhQSvW4em6Cxfh2lQ index ec18821bfb5f050596de467e86f6ebbb5161818b..035cc726e0dd3ea08c8d1f58139a1a8e1dd14870 100644 GIT binary patch delta 32 ocmcc5e4lxOf7%Q6rLZi?U)#mgiFsqyW@6MdpFr# zCk+J2LP8*pR0WB0gQ`6NLIQ4RPgRkCW05LUIB@8R3kNt6-kY6C#*Q6vNS|!a8_#>+ z%zNLPw>$kyYwx3{I-Ur{F=sYvFGZcupL0`}fV_VH`CAu1I`H@E!-*44{JEb@gZ1ON z^@+)aCr}pJuQZK018DfKJ)S%=p&SN3uW2`6{RbG!Guz!9aiI!4G^WHBg!k; zb64)?Dk1#MFP9N`pE}Obg(yjb@Ivxx9Hb(K8CcT(2rAmT;aH4NUSPaf;&38jVxJzr z{hf*36Y6~Ei_3V5er$5s#JKkECq82ARXZN52cqRC(pzPVZ$s#2&oVqVd@Jxp9mUB9 zLZ-V~+Zy%ah}+3r;H3al><`l*fgg-Y(<|?Bi&C~usy|ZqLga>iGwQ^N7sVnGDBUAYjvR7 zmRx5xFmFr7?X|Cva~rCmR(abDY^K;ff`RF4??9=Zb6Xve;HC2O#x=BXod#YAO0c=0 zz(mTHO3lCZvK~)r1&vT(&i*f$?r<7o5LjW?!0>ct-j=Uky@`3-qpNx|Z>kb@%9#oD z#y`J)gFtA(vgj0K5WXTD(i3Pq{JJ6PuSMQVoxoISUTy)a{iuhs3~6;%DN1O znI)ZOGq_A0Qfee(xe-PXkGz@~342+l|*6@Yc{q%5}1K zZySsP+MFjikfGtB3>qsUPJ$>bJeXZA*{ChTH}~8?Cyv3y?Ue0;QpKOF|ewaRnRJ1OGc}hK#rE#s97<4=~>h2FkFQ;5N=tZ z$kiHpWFu1NR%H6~%oF^6f&bv6R;RRT$1hPQ2E$Yw^Tp+sp0?mK%iFb`Xca zg3S6Ge0R-HadyG0B7&}H2C6%V@I0weKiRxU~F_(%bWAS9_*!V!UV85;dgGuLy^-3C?y2#97WScBUT?ca6 zp(YBav&ITA?qsui;LF7qzeKsj(7(OoGm**ny1tH;RO^s1 z^M8+j6!M2g1b>U+1DY45cxa+8x=3JBh%WiS7*Gy4Mna>a{2LBI7|lmtfk_9LcLf+2 zKV?&KR{E!+NipG)a?XJpz#|OS5P%-10GnV>sIjPelDm*Fo7REnVe^c6I}a)}zqsOc z)SE?f<(|H-&9`SAOn~cmJSNBl46Oq~C1uLO%ondSV3H_FRMd5{tZQCL<7t}gWWZ8b zEI%Ub*KzF4<)6LX?Y)bk`_!$m=*a9|-#PM5IQr-w*%X3uxYE1NnFU=xCk{FCYg0Zv TjVOUprPu52&*15YPh0;1Ap*36 literal 0 HcmV?d00001 diff --git a/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/0edrmuSPR1CIr2B6BZbMJA/0/snap-KhcpVj8aRMek0oLMUSPHeg.dat b/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/0edrmuSPR1CIr2B6BZbMJA/0/snap-KhcpVj8aRMek0oLMUSPHeg.dat new file mode 100644 index 0000000000000000000000000000000000000000..a97be2e544e619b4dd8ec2d375d944d2755d3f6b GIT binary patch literal 1154 zcmZuwJ#5oJ7>x^Q)AR?VB3O`+P>`sqSay;+gav4mwC-PM-H=d*lM|ogYwWw!cTSov z41j1QgpiQfkl3iif|y`IOb9WsvazsqVqpMUA@Df~swz&hec!u#-+g}XyDOjVGZBjQ z2DJzag+jvR@o0Ge4%Qtw@0v8;TY7-70XIPtx)c%oeupyMWq=_EUJ%rgvGeP@cX;sb zA@-aKbOAAeiEKze>@dP~8&I?bW9`>>1Muhm)e-ie_U&&(z#{GPTw6<_;yB z@1)pvAk%@RQ|ov5G)aKK|B+DB-30by@*XkBmWViRJ6xWm^B(qM%K#B@N}_zCgE{{G z0FHFviOi@Sl-0w-!T%2sD(Y_48qoP$Nu3JVu7|m4y{-RJ^i$%wRTwsHk6KZm+CAfh zBFd5|#cf_~9kD^q_B+98jL7LkIyIR|rW46@=2(Bnws4?pC!oT)u3l-45f>VH1Z{)n ziR%jlu{;PRo3bni?2-@)1+8*&8gaqN;@u6kerPTzEZOr zNXj(-lV;)f@i*N5NRQx`7(L>7Nk~Qp0@L{q406*2ALs+pk&UrPPn191!3n*2@5?da z2=fL9L;WXh!tY9OD;fl0CP-%;eG_Lvub#|S`1a8U!J`r`5kb9GE@QUjicjMK)V z3MxchTJ_rUT*+9yncYxkT4N5v!1X&GVQ2sfHvlGrG;AU2o7e6zaU7>A@&;bXDqdM( fQzYG<2Fp=?e2;M0$G+ziUk`pA9EQF>`tss0yPB3e literal 0 HcmV?d00001 diff --git a/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/0edrmuSPR1CIr2B6BZbMJA/meta-4FiaNJIBxXZFvc_xLY-F.dat b/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/0edrmuSPR1CIr2B6BZbMJA/meta-4FiaNJIBxXZFvc_xLY-F.dat new file mode 100644 index 0000000000000000000000000000000000000000..2f1c7677c21a224fbf9536c384109b1f185bff9b GIT binary patch literal 535 zcmZ8exlSWN5H$e_0qLd)5kSCd27_#q0Ba7(AjD64H#AMAGndC(WemJ2#MOG(pO_62S*Ai zLQzD(Pd+sCZEX16lR(kh5jzpAxw)y_^h_a}bMyJ^pM+thY9NWI6A4kkJgVlMhp(-~ zYu-&&BPp892cK{nLg`byv*cr=!Td7*2$w6ZmAxHci@|Tc$yV#@#fAHXk%ms@1AjT^ zI?hy~U{2DlsII=Gvc^zS*(TVIK%ZIH2qZF4y5k9sz)>IeTSbHxnj>TwfZj?fV@$7; z?oXfgM~n+?%ta(w7^{K|Rrjf9LlM>HeMTU>cwI^#INkEk?dlS2RH{4sG`m!CnoWOW lrL@p97gAWJjbN`@7up=Fwn7L;jd>iud$o6u-`~}@&O7I_6pCJa`q>%KOO&>9McM)trIlX6gi@s)QsZN{K$MP- zC?_sGeEyeACFJj@)Ii_^YB`4&qC^JaspO?NkRpaVu%x{a*xK52d5%!Vc!B3(LBxdq z=GfYgCUjS%b757i;v#yX$srTt!&eXfgczf0!XvYRs8^HJTP2HcLug%kh~cW?Z^IvT z6gL|PnQCcmYt%2tkB@9U)S7;|NpBU*)%|s2-@9gnJ;|GiDuA$4^5#vn{qo>>MB6)E zk1D4ZV<8qr+(>4EiUgQ^Zxdf%G2Q?v=L^BNF zQ6g+^=XjBp_Nvd6$Dzzwn(~qk`7+{@(1b~vesLcz^VmZ#} z(C|8$rcC?eXohn0?6*H)D8s63?(;zJWZ-@4su=@k{Y0vGwiA#rwnm2Nomwo?rdC>_1IzXq z+i5#x8OXXQA9Ko!OYI(_cbsueUsfqV9U!E}Su82!L z{C@6b^yzyh4(u8LS!^k|t}1=>$)~>}T&GHD_c55g{m=mz3yY1SAdy6%>V=aM+~iY( z!8R#|8QDKy{oBH&?9D1R?xx*iF07^JD(mg(q`0F%tHG2Ji5=FSPQz1L9P*aqpy9`B9(*@6 zu;e;fyEhF+5jEqA;7|+=4>a)bWDBA&cY9{F(r#@L-kEdv%96J7Q08w3xXHwkm5;l= KtTs-3e(^u|xpuJt diff --git a/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/6f5_qLyfQu-MKqe5IEJGuQ/0/index-73ZKrS4iTc6nKzY0E4kC1w b/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/6f5_qLyfQu-MKqe5IEJGuQ/0/index-73ZKrS4iTc6nKzY0E4kC1w deleted file mode 100644 index 47c99188c4b742bccf9553f0688a2b951c8ee691..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1245 zcmZ`(&rcIU6z+nBQcz4VdNDB)OhnVowy@pBi?+1ohZU*?MK0smo$gM%JG1W0Lh)jv z7%}L<_z!s3gYl#uP>!BF`UiM1UOXyojPCRYAp|Db-Fe@>@6DU{zM0G4>{ES=K$lsR zvrs4`T^fys>+5A~Blf5Mh(HG|tpG4@nfmqdWv%G?H9QAvlV1L&X+CqUHHJ&j2Es1` z6q(`2HX+J-ersxmE*PF*HNR6D8GLm`)}Dj5)kQthm{ZfhI?eZDq0* z+aoY}a0nr~ML(h5*YisYiw;l5^czd7_pq~?o?$H^FfcYb()TWtU4e=XwFBZz{XOzQ zNGQ@_1lx@6)6E5GEYjN)jwnK(5RMc8T|n9AI2`E|_FsDlLTBFj3QXF^92H=w=eSM9 zQE8qEmtw*t<+KB9z$Xlr5r96Y02^Sp*tQSL#)Y-$4E$HvK|h6~fxYqQ1byfJax zH4_P7#!^ELCcq0$4JOC{4BZ2SO3HwRSs;M578A~a<)v$Ud|?hN`ApvBxpX0UJt~&( z5cX=p{rKWjV`pRcVyJI=Wftq0^(%h@l^opR!!L_Ng>`tVcb+o~dcmGJfgM7;XmLx-z~r1Q#R(DiR-Rl$NE*xIjm{wp+J#bc4agn8r!mCU%IOu0ujd zdnLF*n}WXTQp5rO5*pipVx1m=k=M-&Vd9Y&|@~` zu~ z5j7NnA~#HQ*FnVMc52t!y@rh%Ef%=NrsETsyYGoQME0ZGZuZ97>aveHM+975Dd@5$ zD;w))m)Zc#*_J*(c3G=?K?l#m&N;t&!Lmw)@DPT}sU1%$Mb#$MX-;iQHr-8e-$fh( z8#4QM{MngMwb5$OKm_TzICer3W z#8PsAvUnAfptGY1+fZ&JVo-l1Z%~iVd5BCErbl`Uk@SNZRaWH8?k?tr`y)8fg-?#} za-y>Ocs%<5Ay1H$!>smb0wHq+$P){$d&Z&=#NsJtWO;X>5Tz08} zk`u-H0;t!D#X{`uvBzJ8Tw;uVd{+wn3mc|m*i$7Gbn5w1t)*HMO}*xr`BJw>SUI)$ zv@)4dR5GUO|1q%F1B*dcy{=c678YHeOY7&Cmak!Vxm00Y7a2HJP7Ob=6x&d7p!T0U z)!*A+3jY&*Mp$EVi|Hq%Q;DI-b@2zo!gVPG27t0<#Pl|Q{92>p5gD==vb^SA(G zgL@n*?n-nkJc9 zTXV+vCC|!cftAjWx|jezY_3Y0Ewgi=5e?siwZbGENTf|xk6 zK#)ZFI}t_xLjFR2g1y^heRq6_?dHwfdGF1v|4pAQaKT{kG6STHB5gDpb8E}=2k!Qqosb=QI^OG}! z6rn8@i1XVS_PP{YNiP4=-5?61Fn%4yQ5=T9Duy5R88nd{qCurRp=P7`^Kq-v z+6d~YO3NN+z=)t3>^z7!sy^m9X9t?MgQMM4?}gAM`DVBEi7DRyQ8DV!l|NwHQP6CL zt(H5lw_+ytlrWjtk=Ih7k%O_rL<$6f_7n>RZG-{3Gvt_p-K#3++;muP&3>I3D+}w~ zSZSV7T@VDFnaR!6M>6mA;IVK`4=MLVCzU{27zYl zkYkhN_7Tb~uV#d{mC2HwjTt;A_^x!<-E)gpfoa%4ow-#YMU!v|X!_V7yeR2-_sxk$ ziM9uhxolCbX4L8ywj}~qBNKsxuev>TZ6+n*NUf&gQ_-nt-6Rqtih;fbE)yPO=sVj( z4CfoMdwLytaR(sEhn|xD=}?a^ a=F)O4<>hO5GzV$uZeQ(`)+oqQe6(vLj zLFZ1=X* zLE=w3VZ2Iq(GIbI34YfGi7kmFGe|sG=!=ciulK#8bINT)Ar=xE(wI)*wk?IkIs(=r zqurMWe)H{PuCjwrX`xUO>RPExHkPOGwBVc4S#nNH+61P$9uJ}bq-GE<0Zkt2gx4f> zryQx2sM}y03no=tdh6KqV7wLa(B5y{v>l5{NjOrPxpXp>OdT6UVni{}uh3b>zx#K# zdv|o}Y2uz ziRUriP&oQiVXL6m1gV(dAH%eT)57>cfz~lQs|<<5hywMCJWApJAej3uR#!w)wYJi| zRhnox5+3mWOd}Y@rnYPeL`UOr7%Q6rLZi?YOa2r_fUIw-}H(RA^h$G>KG2G?5`~fk=(o0|&F+9fwuy-LSjP zj|h^fkPu3_&?0dMaj1k;4oHa8azaQTP6(+;ITeI@pb{63<-PGtGIs2UL;7TU-gw^o zX5RbWyxp1Kn#Ufw*!DyyPCK(vYb9!j{+ye-1mv0It#AK*`Cf7P)sxrmfB(xNG6U9+ zb*(2S7NQ_blUfwF-1Idu!~;+$dhv4?=0G2zw392+4yY&{`3okLD(#dSUwQzdbaX^{ zBYWY-UtN`uH@{?`Bk*x`obiPyNrP}Hxe^Ddh+zhnv_FE9wyrxCBb4VD&lfnHh?v;V zRmSg|*gc`nhrU?HQ}kn#QznM{@u#;DA+wjQi`r12Cs+ZknTO@d?{BGkKTDVRfF9apn zTu@*lWml!<-+Eb(Q(8eI6qvLB3#L1q#ux;aJ1{Ujotd}w=0Dq*w?}nV@8nHY!hSh3 zf!2P#HI6`icU`r#{Yo6Y9#`A<^&8nPATdJ^F=9GFHhddx6kF%j__LXcd*{De zLZ5+8#GwrXAd4LZ*F(|d7Wn|-b|{jK$0+N)PaJ@;kZBYJi4_E@J~$bHNnRQZw~^~+ zWPe{ddkc>;)}?F0k&Ru>0!!0Ule*zUz*PcDd9I_bx9_dVgohJ0Np>M|H+ zmb4pJf+2QeI*WBZoE;4w}uu{u9J0e z+h7#X<~+fH3=I!uP+t{s5=3F{;p}S3Mr{$kv**FlqFQ+VVSt;Jcwy}N*XI2F>Ce9V E587{T0RR91 diff --git a/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/rtO3hIcQREynKwRVke75sQ/0/index-OSYnb8w3SKmTqQ_p7m84JA b/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/rtO3hIcQREynKwRVke75sQ/0/index-OSYnb8w3SKmTqQ_p7m84JA deleted file mode 100644 index 2a58d7c0b7141a9c7f24e86068433f9c7398c702..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1245 zcmZ`(&2JMq6wj1Ro2KPMVzql&X|+<3Kq$kcflT1SrpcsDDJ1Fi3lK8yj5Fh8#-7@q zH0h<%E{Lvn_ryQIkt5;+7X$~+t37ezj<|57q(U&xM^#m=4<5hYyx)7z?`Qk^JMZUl zPGG=YDtIgwQ?6Y|#=8&d*h74``zL`uT5ACy(yIk?9&gmv3$?aoZeA@0;bQ)u!0m8s zK@Uj3GDnV&h~Oae&_l!#?$r46N0y7MCJ+5mI%v=g$?OD>3Bd6dI(K4wFkbz&$*>TJ zfb~u>r|PP<<0Aoq3%UFChnLr*A``>lQH{yp`2823^B)tlD9(6z%V*96HHH%SosZy(&Yjx*l-3SYs@0|590W8`w zCddXHZ2&?QZPLYDP}b=)+lxYDntscin_X)#Tfec<&Q>>*GX0S7`uyV$y+Whu{r{Kf zUNcRAS$dwvrs7JidTQ*q&&>7F1h^*pyA?Z5oJ5fXICD z#^m4!#)?%PPVRRHV^BTi|~ zStJ#lUtsGkGh4Bp8Ka-AFm>ux(P+Yk+uAxpwtk2W-CC}A-ij$;?dJT-vT#<7YHbjL z7p9hO3_xyT9)qTi@~LEutJ<&++femw&knS#%);6ezk_ WcaFXTDFRd4-rnB9KHlCrf9*TQ5V_z0 diff --git a/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/rtO3hIcQREynKwRVke75sQ/0/snap-rNzQqxl5Qrm99ZzB44Yz0w.dat b/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/rtO3hIcQREynKwRVke75sQ/0/snap-rNzQqxl5Qrm99ZzB44Yz0w.dat deleted file mode 100644 index 3c0ed3e72cb63d5cdc0192880d63bd6d9228cc32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1154 zcmZuwL2uhO7`4(lcATUc&|+Ec6x883jp2lYyBGTG>tyH?^k&nAJj_jN+mvo<7$5L$C`0q>791CdLh}` zAjPu)2?#vMz4P?X3$bd~)*}lMR4$pw4G$l5y^>SG&-nlY9a4ntaItaM($xtud6qF%*86)53 z%ajFBr~$Q6?!IAe0kdHkmDI^+Km0A_lHh^TF!FZQ-_z zMssD*BfOg5{wek^5#cU>VUH-v@bX|#oF`!-AIGG)(@^&~RVKg6o zC8k_r&Pgye{-IChT}f_5NHGzL_Hh7vAR-((2*5~CfbHa>CQgmb6{ZD)g!|M5QH1S} z!d3~R##X)AFn1jHfn!8VTHsy_Faa!Xc}$QEINAe*D%zBXdF)<)!0c@bjcNLZSzXy_ gGh1KV>y;Y&IeGkuaM8%W{8V5{-y9ndJ5h5!Hn diff --git a/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/rtO3hIcQREynKwRVke75sQ/meta-AjJBKpIBKBXpMe1tfd-g.dat b/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/rtO3hIcQREynKwRVke75sQ/meta-AjJBKpIBKBXpMe1tfd-g.dat deleted file mode 100644 index 314252e1623f8be81bee78ccdae6c64d8ec9e764..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 535 zcmZ8e%T60H6b(phSg>V_P#1JTHHm^IVFMyGYAGN>L}6z+GdEx{V_WtOO?F6y@DLBt zhxiRX0kPl%*zgPd08(OaaAu|y;oUv=_?&z0oqLSN#~2TxJsktmkRr|HaznEpM@P(Q z<3~V}9?6^T9w^NOzrTp7l#Fka47j`0fan1Iid@i$Q4RlrDNk?N7?cLZ|aV zSoQOsS16b5QMMJ`Gv`z_7%Hkd1UnMUiF1{pkbyScKyU<(=I5YQL1?2rK!y>R^|Z3q z_Pg2s%<*8vq%hW=NyXws6;!NycYPO%=nfw+A`v9((q`Z5ZFnow+bdhUtF>yyD@1&A oX|=fUz1Fv9N;syA;I7&f#vba9Mu;b^y`B2~qRzaxe%-*}XyV(ssq=((PXJ*d% z?mg#x_uQHPxjFUla=R*gG3%ZVT5Cbuua&&mBOtHcdFs2y$A|A-*c-Y2#9z;ld9Z$@ zYkgvFC6Im`Ee2uBi(e2UJOG8F7hib31bTteP9{$~prUlrE0|EKw4-V~b{|CP=!o*t z^(Qai>8ga3u4X3@_<&l@%t{c&(qE0vg)$Z)+<_$>jKJ2`6_;lSWsK)|78XQI=)#W^ z2Tka{NSFMYSjR;SLX)E=#^)bglZY{;CY)WAqFIYlZ*4WV=W35KhNzYTxXQQYo8 z$b3g@TcdtCcY6QUL#^qTH|hPHxw`1aZ^z6C2a;C`s(`Rl@|I1s&whCC3Zm^>Xa?0c z%b^fu5w@a|ti}M79SqZ~!Sp-1`SX{!MJd}Pdw!=LWcR!XH{u4AvMK8#Ziu!o;ZY=P zZfAI&7WQnCQ$Uzh#y?_S6CWot6zMIp^U4txi12}qmlc;bp3TI{0Chp`m><V9g?Zin# zI4`RbPdf=Pz&WES@a$^QzStMqnUzm4G`;Ixpz14Lvn?XrRJCs38cAHYf*XPo>@6s8 zlggG#&Byw+9#3iojZom8{a-NM;55cCu*|N3;p)u1eLs8Sbszp2yM*jsk0UByJX;3u9Od*D z^h}zy*oVxrCYZwVG)Y312%UdU7GWw244?6={!(MA>QIW^uiv+=DgpF*FZ zXX41N0g(BQg6pf&<*&c|1L1mAO1qE2?CpmRz*typ6a|SS0#z@Z6yPSC8jQ9{G0ey= z9en>AT*|&~#pc|!do20&^ju|wJ)PuuMb-%0+FR_g6%nRR`e5#UDI9?o0Ur!`&4f{A zQM+E3>(nK=N+jN@_yNR|?oNz^J+8rfJRXYfjzoCb0pYF=L;wH) delta 32 ocmcc5e4lxOf`DRi!jA8buQ;+j44d8`Jg>CTU^OF)+Y0`90OFPnjsO4v diff --git a/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/s_FgCb4gREmddVPRW-EtWw/0/index-yaxW_gAlTNqirWlIIoil8A b/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/s_FgCb4gREmddVPRW-EtWw/0/index-yaxW_gAlTNqirWlIIoil8A new file mode 100644 index 0000000000000000000000000000000000000000..690d2b5758ab94d5e1d3e00e6aa3ecbfc1ea71d0 GIT binary patch literal 1248 zcmZ`(y>AmS6wejXCZV)QMX(^T6p0GubeE<{3qxtXTGB#D(=WA>PBb|#UXgalNl6otZ@mCQfJ$dGBCTH@U2Xl_h9*UOh#n^X{gaAW< z{|4XB`#Damcow2)Hc>)V2T^&8R+yh{;QkNu3w}NIt2HJJI`Q*{!b1Ktq9)p5L)ltn zh>73|q2BJ98f-$niD;Se(SpIIL5|KNf!I&9A9hHj4cFvs`r!l52~ZEno& zZfk%Cy9F3wLWkVKBT&5)@$+3a_oyTe8n_;W7#7Uq77A8uPvD48?XNMO&`m=(qPE&? zoyf3a3kel8mErjv%`%a*R7r>JBTT zNGe-e1Ess!Y$ove>Z>2BTxxt@*m>d$=(kLDsd%qhSW2wAQ7gafY^2o(zBR1I6m1I%^*j zXz}mqkE#Je1B$=N$Pv}=Ytx~TuIws>u##Q#fgxZVal8>4l;vN4D8gVq_$o|0!rWG1 zVECNP)N$z^43`lqHRF;4cY#L*tRMhA$p9&X1F43h=2^)h6*j8^&m-jv+tlFeS$StQ zfs!6BG;G_#usGom3b^0%grYJKr~xR`j8RO4FW+8|nOIK87w@D|$!^TLPQl7m`R(0e zL@hrc99HsqI6Bk$vwv_mw4d{ehz`v5&EF?#eDdi%@g`A}$ literal 0 HcmV?d00001 diff --git a/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/s_FgCb4gREmddVPRW-EtWw/0/snap-KhcpVj8aRMek0oLMUSPHeg.dat b/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/s_FgCb4gREmddVPRW-EtWw/0/snap-KhcpVj8aRMek0oLMUSPHeg.dat new file mode 100644 index 0000000000000000000000000000000000000000..076a6460c611c754be9942195c73d3b09bc1ec53 GIT binary patch literal 1157 zcmZuwO>fgm6pdTbrlBoJMX*6aLO}wdSazBwEi8cMvq>SODJ>t1(bOKtlh`xP%s3xx z-hzi{1!9B5nk9?3cw&cy5G%w#;1951^|tT5RtP*!f~u+`*`9l5&YkOX?%eq5oQrV+ zJ#JGGiA0oZSK`tACj`2v$}FB7FTKFTM19ajjAKeZ?{NW{00O({lCn0paIy9Fi3~oy zB)+?Y7@!ugu!H!QJwXL@0LPC}V({V55d3fd<~9J$a{WQKR?cjANuyGAw>Hpr-><*$ z>;cC{K#?^RfTkK2dg>t36n0|%<1@oXMw|O?QSU7ot#oVGlZD9imnQ!hjgNahhJ`=` z>~*0*xSbcWemNw)1$!6_rET zs>2++E)o#fklR0^f8PjnTUhrEM9^}kftoHNVvSfdkTCM-yZ+gJedXWYJlDv=Ki4G| z3!Z5?Q4R+(R^k(sN7pg&`zKql3)LDlzPd8+gk_EKXehumaY`H90l(EgA|t47hS(q*t~fC_`ouBgf=L z%3LT^mzpTPT4-#7#@#|8ANh3o)pseE9N%v3JPiyCT4u|uJSY>I+NkCHQl>lDYIXDJ zW@*?ZyqviAS72aAqwTDJjDe#j=vb|lPM+W2w6_a(1tu$uS$40q#)mF)uvkvaybBVg z+Pt~!9Fu7M$BFl{0b*lHP-Ogw>yMPh*mP*S{Dm25yAl8sKs&PWdTcDq&(V;C@qGN1 zm~w>qP=b-E(+-u_CA=6O#Y8CDc^CG9PdKy?fWDvro8eszt(r*cbAmy_9ohuGkIl0W ziN@{~#GQ={%KCP#<2Z&5>kBR>fCW8|2{Hjk9YCm}&Dxj;_6>&2Of{D--N~Vb(^>Z1 gno(@B+x>c69zP}=cJld5a_QjzgTv6bGv{}I0ZmMmEdT%j literal 0 HcmV?d00001 diff --git a/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/s_FgCb4gREmddVPRW-EtWw/meta-3ViaNJIBxXZFvc_xLY-F.dat b/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/s_FgCb4gREmddVPRW-EtWw/meta-3ViaNJIBxXZFvc_xLY-F.dat new file mode 100644 index 0000000000000000000000000000000000000000..5f5e09b6bcdc279562e444a863f2a7b6c1138c31 GIT binary patch literal 525 zcmZ8eJx?4l5WN&>DAJ~l5CtiScJCmkqX`0u5EKxf3eZ^2dX`w)wJm$@*h_^393Mg; z0udGe1yN8SdOGU-ggd*zx4V!i?&i(&y!U24JtS}6aKRuONdYONNGp}ftMT^(ukBI1 z6_LD0LfdJ9He8C^lawmO#U?3%n^Oab9xyM+2~9XP@E17Kve~B)(M*Z?K{Yc&@3wah zQiLg~K!V|hTD=-pYnKJXkNOUp$e3tQ36H3m2!8+H zDzqlTa;nm@#ThUnXbQ9c#5*iLHk+KSPJXFnbMu>G2|mswEXH{iXFnG&3Pu^a@CR(V z9tJ_R(Qy0aR!rCK5GEsg=(QARMRbtyyv{<;jBFIsUZ;91Zqg|cs$Sm)- zZcKNTEdXl-VOtuARgh#l0f}|f^&jT0T0JPYJrC=5o%iO?%iCv`2FkZ=ufF~N?e`0y c*s35mRucC{>2EegU`0_oozCyG;oGwB6P~TIfB*mh literal 0 HcmV?d00001 diff --git a/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/zUFSBaZgSdKCPAS2xEfCww/0/snap-KhcpVj8aRMek0oLMUSPHeg.dat b/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/zUFSBaZgSdKCPAS2xEfCww/0/snap-KhcpVj8aRMek0oLMUSPHeg.dat new file mode 100644 index 0000000000000000000000000000000000000000..53d3caf3149e8612e4fd9d79ba3d5e669b9d3d6c GIT binary patch literal 476 zcmYk2Jxen|5XX~8eGKshLD0rZ6tqxsnkS-76oM!LMU5a@ESqF6yN~;F-t6WsX)IJU zAR-9XmR5cQ5fQ(Fowb#%Z;0NV3QjRF^XEVFo5|ks-ULYO0985`i^ZpglP#}15(|=d zZ5a8H4w)`FZq$5!onEUVlrGTKbyiteDrYk3#k%eLblrG|4y^$z1)dOM9!NzHsR51caUv_4 z22=J+l$18Xh*`_wzE@=jPDm5(7;M`9j?0GUGOdY3#aeD+G&Pz!5JY1{G0^v><7{;J z_weBG+_OHYTNyiQ2T?#Fz5EYTWE1WFh!U%5lOSOQlSWDG0!jL*%g1v4?TG>MIq zTbZGmLQ#5MT!r)zqobJAe@3i!%0Mf(_T|HKwl%r3R#>KsoUdB-Tsr^H^O6Gl2*?(a tDsc3Lm63pLg0RsFv2yh8;PJu<^sAwhhX^W2_if_h?d9!vt2z6z{0Rh$tZD!N literal 0 HcmV?d00001 diff --git a/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/zUFSBaZgSdKCPAS2xEfCww/meta-3liaNJIBxXZFvc_xLY-F.dat b/RFS/test-resources/snapshots/ES_7_10_BWC_Check/indices/zUFSBaZgSdKCPAS2xEfCww/meta-3liaNJIBxXZFvc_xLY-F.dat new file mode 100644 index 0000000000000000000000000000000000000000..5a53247e0306d26cd5bc66d18eb1e7c56fbaed29 GIT binary patch literal 488 zcmZvZy-or_6os*{v9Pr@#zG4Xtmul37>GZKCK5!Ynv6Ra9NeAR%*+zjibRE&5R5;> z*D)0O2)+U>9qcwPyNiW!%6q?@d(N5NZ*yUuG6Ib?3lt_;;Y1=av$Hxk>-E60m5VHF z+mux$VjK}}NUv1~At`5{-FSuKLH|jDQXxB?bg@aX1o?|R3+_x1#2gFBYb=OdUToe= zg%#wu4Xi!Y@Lob+>xKZVf^#S^2gfO0)6<)o4PDc=((e%wNL_(Iyn+PSCN;3kCVPKZ z(XDJMR<#AMQvw7rY(eS&q>qt?<4{s!qEz#5V+GY~dSZiJzw*G!H|u1Ga* yuu(osYbUkSgWBG0;rg&T_B(MMB4TnFFam_pc literal 0 HcmV?d00001 diff --git a/RFS/test-resources/snapshots/ES_7_10_BWC_Check/meta-KhcpVj8aRMek0oLMUSPHeg.dat b/RFS/test-resources/snapshots/ES_7_10_BWC_Check/meta-KhcpVj8aRMek0oLMUSPHeg.dat new file mode 100644 index 0000000000000000000000000000000000000000..1d93b5614c338ec58d0f29dd55849114e941319a GIT binary patch literal 717 zcmah{!HN?>5RC^x`~g3}iwX-yVFfQ{4I&|GG$zWr$WWQ-*=?AaZn`Vk#H%5R8&+AO z_$!`d@$T7+AK)iUsxMa0W+vY3Q`hU)^Y-j{zlL8#JHB8uqxs>DO3 zOe8Zv?nv*sTl(X30v5Mi-es{o%=@i}`sl8<&2C#x_Tp|6(#PTGc)cp<5Qai?=l`+4 zjugu5a6=2k*c)MOo3GshMXD1(VQD!y4ui6!DSH&={8VO<7zY}71j9F4o>XAB)^jV+ zH?}k_5c-r2(*cL0;=mq(iEN{OwuOw)i44IuZaX(mL2G|Cr&BNki3ZFhz=;<0K^vuo zLCKb;C@~S75g#;BjM2?F859{(|Dtxzt!I!(uuNZgb45XnyED#StBl#(vG!>hGpTYu zuLgcfR=Klk>WD_EsTI-nQyl6s}+t8(L+&TTTPI=#KnsOl$q%WG~@JD}IJ@O5SM tr0{9^Ayu5W{ZT1g6s6ZSOP%=d7+5p{Qi5X2^Bb!_{AY{x?fcJV~MH(1uWfkSu4$len6(jr~)SZX2Z`QH832 zSa6w&GazvVjxh7R;d@#q-Qku0`_JF+J^T5e{LZaH08csaMx$}#+5Ou$aUPI|0m9jl zuuf|Adzs`T2g0(^NT$8vR%V+3tefm~@=pgZcMsc79uK}>=deTNBdvPXJD#pxkvS8^%JCJJZL3Qc`guxD{ zHG*H&sOVETI%96gZR%Rh^9^K$$z{S_>yh`T1ve%fE%A)oz68tdgu%oJ{9>#&!h$48 zQ;?7g%7_}FYrA|f-dUDfRGgWg7oVA;!s}`?tt~SzB{Mm-_(y1JZb3<9d~RYv zL1tchaeQ8Wd`f_ciJ3X2ML Date: Fri, 27 Sep 2024 13:34:38 -0500 Subject: [PATCH 2/2] Spotless fix Signed-off-by: Chris Helma --- .../bulkload/transformers/TransformFunctionsTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/RFS/src/test/java/org/opensearch/migrations/bulkload/transformers/TransformFunctionsTest.java b/RFS/src/test/java/org/opensearch/migrations/bulkload/transformers/TransformFunctionsTest.java index 24a2ed9bd..19cfa94e5 100644 --- a/RFS/src/test/java/org/opensearch/migrations/bulkload/transformers/TransformFunctionsTest.java +++ b/RFS/src/test/java/org/opensearch/migrations/bulkload/transformers/TransformFunctionsTest.java @@ -1,10 +1,9 @@ package org.opensearch.migrations.bulkload.transformers; -import org.junit.jupiter.api.Test; - import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; +import org.junit.jupiter.api.Test; import lombok.extern.slf4j.Slf4j;