Fix bug handle empty mappings when removing mapping types (#1178)

* Fix bug handle empty mappings when removing mapping types * Capture exceptions during transformation and log errors Signed-off-by: Peter Nied <[email protected]>
opensearch-project · Dec 4, 2024 · 36098eb · 36098eb
1 parent d7889c3
commit 36098eb
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/...n/java/org/opensearch/migrations/bulkload/transformers/Transformer_ES_6_8_to_OS_2_11.java b/...n/java/org/opensearch/migrations/bulkload/transformers/Transformer_ES_6_8_to_OS_2_11.java
@@ -38,8 +38,16 @@ public GlobalMetadata transformGlobalMetadata(GlobalMetadata globalData) {
             templatesRoot.fields().forEachRemaining(template -> {
                 var templateCopy = (ObjectNode) template.getValue().deepCopy();
                 var indexTemplate = (Index) () -> templateCopy;
-                transformIndex(indexTemplate, IndexType.TEMPLATE);
-                templates.set(template.getKey(), indexTemplate.getRawJson());
+                try {
+                    transformIndex(indexTemplate, IndexType.TEMPLATE);
+                    templates.set(template.getKey(), indexTemplate.getRawJson());
+                }  catch (Exception e) {
+                    log.atError()
+                        .setMessage("Unable to transform object: {}")
+                        .addArgument(indexTemplate::getRawJson)
+                        .setCause(e)
+                        .log();
+                }
             });
             newRoot.set("templates", templates);
         }

diff --git a/...src/main/java/org/opensearch/migrations/transformation/rules/IndexMappingTypeRemoval.java b/...src/main/java/org/opensearch/migrations/transformation/rules/IndexMappingTypeRemoval.java
@@ -45,7 +45,7 @@ public class IndexMappingTypeRemoval implements TransformationRule<Index> {
     public CanApplyResult canApply(final Index index) {
         final var mappingNode = index.getRawJson().get(MAPPINGS_KEY);
 
-        if (mappingNode == null) {
+        if (mappingNode == null || mappingNode.size() == 0) {
             return CanApplyResult.NO;
         }
 

diff --git a/...test/java/org/opensearch/migrations/transformation/rules/IndexMappingTypeRemovalTest.java b/...test/java/org/opensearch/migrations/transformation/rules/IndexMappingTypeRemovalTest.java
@@ -120,6 +120,21 @@ private boolean applyTransformation(final ObjectNode indexJson) {
         return wasChanged;
     }
 
+    @Test
+    void testApplyTransformation_emptyMappingArray() {
+        // Setup
+        var originalJson = indexSettingJson("\"mappings\": [],");
+        var indexJson = originalJson.deepCopy();
+
+        // Action
+        var wasChanged = applyTransformation(indexJson);
+        assertThat(canApply(originalJson), equalTo(CanApplyResult.NO));
+
+        // Verification
+        assertThat(wasChanged, equalTo(false));
+        assertThat(indexJson.toPrettyString(), equalTo(originalJson.toPrettyString()));
+    }
+
     @Test
     void testApplyTransformation_noMappingNode() {
         // Setup