Solves #4002, ignoring all malformed objects when ignore_malformed is…

… set to true; Signed-off-by: Hauck <joaoh14@gmail.com>
opensearch-project · Sep 13, 2022 · bcd7016 · bcd7016
1 parent 763a89f
commit bcd7016
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/server/src/main/java/org/opensearch/index/mapper/FieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/FieldMapper.java
@@ -34,6 +34,7 @@
 
 import com.carrotsearch.hppc.cursors.ObjectCursor;
 import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
+
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.FieldType;
 import org.apache.lucene.index.IndexOptions;
@@ -265,6 +266,7 @@ public boolean parsesArrayValue() {
      * Parse the field value using the provided {@link ParseContext}.
      */
     public void parse(ParseContext context) throws IOException {
+        boolean ignore_malformed = IGNORE_MALFORMED_SETTING.get(context.indexSettings().getSettings());
         try {
             parseCreateField(context);
         } catch (Exception e) {
@@ -278,23 +280,27 @@ public void parse(ParseContext context) throws IOException {
                     valuePreview = complexValue.toString();
                 }
             } catch (Exception innerException) {
+                if (!ignore_malformed) {
+                    throw new MapperParsingException(
+                        "failed to parse field [{}] of type [{}] in document with id '{}'. " + "Could not parse field value preview,",
+                        e,
+                        fieldType().name(),
+                        fieldType().typeName(),
+                        context.sourceToParse().id()
+                    );
+                }
+            }
+
+            if (!ignore_malformed) {
                 throw new MapperParsingException(
-                    "failed to parse field [{}] of type [{}] in document with id '{}'. " + "Could not parse field value preview,",
+                    "failed to parse field [{}] of type [{}] in document with id '{}'. " + "Preview of field's value: '{}'",
                     e,
                     fieldType().name(),
                     fieldType().typeName(),
-                    context.sourceToParse().id()
+                    context.sourceToParse().id(),
+                    valuePreview
                 );
             }
-
-            throw new MapperParsingException(
-                "failed to parse field [{}] of type [{}] in document with id '{}'. " + "Preview of field's value: '{}'",
-                e,
-                fieldType().name(),
-                fieldType().typeName(),
-                context.sourceToParse().id(),
-                valuePreview
-            );
         }
         multiFields.parse(this, context);
     }