Modifications after master merge

Author: mayya-sharipova

x-pack/plugin/mapper-unsigned-long/src/main/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongFieldMapper.java

@@ -378,7 +378,8 @@ protected static Long parseUpperRangeTerm(Object value, boolean include) {
 
     private Explicit<Boolean> ignoreMalformed;
     private final String nullValue;
-    private final Long nullValueNumeric;
+    private final Long nullValueIndexed; // null value to use for indexing, represented as shifted to signed long range
+    private final Number nullValueFormatted; // null value to use in place of a {@code null} value in the document source
 
     private UnsignedLongFieldMapper(
         String simpleName,
@@ -391,7 +392,15 @@ private UnsignedLongFieldMapper(
     ) {
         super(simpleName, fieldType, mappedFieldType, multiFields, copyTo);
         this.nullValue = nullValue;
-        this.nullValueNumeric = nullValue == null ? null : convertToSignedLong(parseUnsignedLong(nullValue));
+        if (nullValue == null) {
+            this.nullValueIndexed = null;
+            this.nullValueFormatted = null;
+        } else {
+            long parsed = parseUnsignedLong(nullValue);
+            this.nullValueIndexed = convertToSignedLong(parsed);
+            this.nullValueFormatted = parsed >= 0 ? parsed : BigInteger.valueOf(parsed).and(BIGINTEGER_2_64_MINUS_ONE);
+        }
+
         this.ignoreMalformed = ignoreMalformed;
     }
 
@@ -410,6 +419,11 @@ protected UnsignedLongFieldMapper clone() {
         return (UnsignedLongFieldMapper) super.clone();
     }
 
+    @Override
+    protected Number nullValue() {
+        return nullValueFormatted;
+    }
+
     @Override
     protected void parseCreateField(ParseContext context) throws IOException {
         XContentParser parser = context.parser();
@@ -437,7 +451,7 @@ protected void parseCreateField(ParseContext context) throws IOException {
             }
         }
         if (numericValue == null) {
-            numericValue = nullValueNumeric;
+            numericValue = nullValueIndexed;
             if (numericValue == null) return;
         } else {
             numericValue = convertToSignedLong(numericValue);
@@ -454,6 +468,23 @@ protected void parseCreateField(ParseContext context) throws IOException {
         }
     }
 
+    @Override
+    protected Number parseSourceValue(Object value, String format) {
+        if (format != null) {
+            throw new IllegalArgumentException("Field [" + name() + "] of type [" + typeName() + "] doesn't support formats.");
+        }
+
+        if (value.equals("")) {
+            return nullValueFormatted;
+        }
+        long ulValue = parseUnsignedLong(value);
+        if (ulValue >= 0) {
+            return ulValue;
+        } else {
+            return BigInteger.valueOf(ulValue).and(BIGINTEGER_2_64_MINUS_ONE);
+        }
+    }
+
     @Override
     protected void mergeOptions(FieldMapper other, List<String> conflicts) {
         UnsignedLongFieldMapper mergeWith = (UnsignedLongFieldMapper) other;

x-pack/plugin/mapper-unsigned-long/src/main/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongIndexFieldData.java

@@ -43,11 +43,6 @@ protected boolean sortRequiresCustomComparator() {
         return true;
     }
 
-    @Override
-    public void clear() {
-        signedLongIFD.clear();
-    }
-
     @Override
     public NumericType getNumericType() {
         return NumericType.LONG;