SOLR-13539: Fix mv update of UUID, enum, bool and binary fields

Co-Authored-By: Thomas Wockinger
apache · Jul 1, 2019 · 8242e6c · 8242e6c
1 parent 6799ca6
commit 8242e6c
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 3 deletions.
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
@@ -249,6 +249,8 @@ Bug Fixes
 
 * SOLR-13566: REINDEXCOLLECTION does not work with (basic) authentication. (Colvin Cowie, ab)
 
+* SOLR-13159: Fix atomic update encoding issue for UUID, enum, bool, and binary fields (Thomas Wockinger via Jason Gerlowski)
+
 ==================  8.1.1 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.

diff --git a/solr/core/src/java/org/apache/solr/schema/AbstractEnumField.java b/solr/core/src/java/org/apache/solr/schema/AbstractEnumField.java
@@ -29,6 +29,7 @@
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
+import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.queries.function.valuesource.EnumFieldSource;
@@ -315,11 +316,18 @@ public String toExternal(IndexableField f) {
   public Object toNativeType(Object val) {
     if (val instanceof CharSequence || val instanceof String) {
       final String str = val.toString();
-      return new EnumFieldValue(enumMapping.enumStringToIntMap.get(str), str);
-    } else if(val instanceof Number) {
-      final int num = ((Number)val).intValue();
+      final Integer entry = enumMapping.enumStringToIntMap.get(str);
+      if (entry != null) {
+        return new EnumFieldValue(entry, str);
+      } else if (NumberUtils.isCreatable(str)) {
+        final int num = Integer.parseInt(str);
+        return new EnumFieldValue(num, enumMapping.enumIntToStringMap.get(num));
+      }
+    } else if (val instanceof Number) {
+      final int num = ((Number) val).intValue();
       return new EnumFieldValue(num, enumMapping.enumIntToStringMap.get(num));
     }
+
     return super.toNativeType(val);
   }
 }
diff --git a/solr/core/src/java/org/apache/solr/schema/BinaryField.java b/solr/core/src/java/org/apache/solr/schema/BinaryField.java
@@ -105,4 +105,12 @@ public IndexableField createField(SchemaField field, Object val) {
 
     return new org.apache.lucene.document.StoredField(field.getName(), buf, offset, len);
   }
+
+  @Override
+  public Object toNativeType(Object val) {
+    if (val instanceof byte[]) {
+      return ByteBuffer.wrap((byte[]) val);
+    }
+    return super.toNativeType(val);
+  }
 }
diff --git a/solr/core/src/java/org/apache/solr/schema/BoolField.java b/solr/core/src/java/org/apache/solr/schema/BoolField.java
@@ -207,6 +207,13 @@ public List<IndexableField> createFields(SchemaField field, Object value) {
     return Collections.singletonList(fval);
   }
 
+  @Override
+  public Object toNativeType(Object val) {
+    if (val instanceof CharSequence) {
+      return Boolean.valueOf(val.toString());
+    }
+    return super.toNativeType(val);
+  }
 }
 
 // TODO - this can be much more efficient - use FixedBitSet or Bits

diff --git a/solr/core/src/java/org/apache/solr/schema/UUIDField.java b/solr/core/src/java/org/apache/solr/schema/UUIDField.java
@@ -101,4 +101,12 @@ public String toInternal(UUID uuid) {
   public UUID toObject(IndexableField f) {
     return UUID.fromString(f.stringValue());
   }
+
+  @Override
+  public Object toNativeType(Object val) {
+    if (val instanceof CharSequence) {
+      return UUID.fromString(val.toString());
+    }
+    return val;
+  }
 }