Apache Solr open-source search software
Revert "SOLR-14767 : Fix NumberFormatException when int/long field value is floating num"
Munendra S N274a3d69d29a
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 5d44fd7ef6a..5242359f0dd 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -251,9 +251,6 @@ Bug Fixes* SOLR-14850: Fix ExactStatsCache NullPointerException when shards.tolerant=true.(Yevhen Tienkaiev via ab)-* SOLR-14767: Fix NumberFormatException when integer/long field value is specified as floating number- (Apoorv Bhawsar, Munendra S N)-* SOLR-14897: Fix unlimited number of forwarding the request from one node to another node. (hossman, Munendra S N)* SOLR-14898: Stop returning duplicate HTTP response headers when requests are forward to another node. (hossman)diff --git a/solr/core/src/java/org/apache/solr/schema/IntPointField.java b/solr/core/src/java/org/apache/solr/schema/IntPointField.javaindex d1493cddcb4..84a9a781153 100644--- a/solr/core/src/java/org/apache/solr/schema/IntPointField.java+++ b/solr/core/src/java/org/apache/solr/schema/IntPointField.java@@ -51,7 +51,8 @@ public class IntPointField extends PointField implements IntValueFieldType {try {if (val instanceof CharSequence) return Integer.parseInt( val.toString());} catch (NumberFormatException e) {- return (int)Float.parseFloat(val.toString());+ Float v = Float.parseFloat(val.toString());+ return v.intValue();}return super.toNativeType(val);}@@ -145,16 +146,7 @@ public class IntPointField extends PointField implements IntValueFieldType {@Overridepublic IndexableField createField(SchemaField field, Object value) {- int intValue;- if (value instanceof Number) {- intValue = ((Number) value).intValue();- } else {- try {- intValue = Integer.parseInt(value.toString());- } catch (NumberFormatException e) {- intValue = (int) Float.parseFloat(value.toString());- }- }+ int intValue = (value instanceof Number) ? ((Number) value).intValue() : Integer.parseInt(value.toString());return new IntPoint(field.getName(), intValue);}diff --git a/solr/core/src/java/org/apache/solr/schema/LongPointField.java b/solr/core/src/java/org/apache/solr/schema/LongPointField.javaindex 6fd011da525..83a6ed3cefb 100644--- a/solr/core/src/java/org/apache/solr/schema/LongPointField.java+++ b/solr/core/src/java/org/apache/solr/schema/LongPointField.java@@ -50,7 +50,8 @@ public class LongPointField extends PointField implements LongValueFieldType {try {if (val instanceof CharSequence) return Long.parseLong(val.toString());} catch (NumberFormatException e) {- return (long)Double.parseDouble(val.toString());+ Double v = Double.parseDouble(val.toString());+ return v.longValue();}return super.toNativeType(val);}@@ -150,16 +151,7 @@ public class LongPointField extends PointField implements LongValueFieldType {@Overridepublic IndexableField createField(SchemaField field, Object value) {- long longValue;- if (value instanceof Number) {- longValue = ((Number) value).longValue();- } else {- try {- longValue = Long.parseLong(value.toString());- } catch (NumberFormatException e) {- longValue = (long) Double.parseDouble(value.toString());- }- }+ long longValue = (value instanceof Number) ? ((Number) value).longValue() : Long.parseLong(value.toString());return new LongPoint(field.getName(), longValue);}diff --git a/solr/core/src/java/org/apache/solr/schema/TrieField.java b/solr/core/src/java/org/apache/solr/schema/TrieField.javaindex c0f04de9b00..a80cae79835 100644--- a/solr/core/src/java/org/apache/solr/schema/TrieField.java+++ b/solr/core/src/java/org/apache/solr/schema/TrieField.java@@ -553,16 +553,9 @@ public class TrieField extends NumericFieldType {switch (type) {case INTEGER:- int i;- if (value instanceof Number) {- i = ((Number) value).intValue();- } else {- try {- i = Integer.parseInt(value.toString());- } catch (NumberFormatException e) {- i = (int) Float.parseFloat(value.toString());- }- }+ int i = (value instanceof Number)+ ? ((Number)value).intValue()+ : Integer.parseInt(value.toString());f = new LegacyIntField(field.getName(), i, ft);break;case FLOAT:@@ -572,16 +565,9 @@ public class TrieField extends NumericFieldType {f = new LegacyFloatField(field.getName(), fl, ft);break;case LONG:- long l;- if (value instanceof Number) {- l = ((Number) value).longValue();- } else {- try {- l = Long.parseLong(value.toString());- } catch (NumberFormatException e) {- l = (long) Double.parseDouble(value.toString());- }- }+ long l = (value instanceof Number)+ ? ((Number)value).longValue()+ : Long.parseLong(value.toString());f = new LegacyLongField(field.getName(), l, ft);break;case DOUBLE:diff --git a/solr/core/src/test/org/apache/solr/update/TestUpdate.java b/solr/core/src/test/org/apache/solr/update/TestUpdate.javaindex 04b8c405c7b..d93b844a0ec 100644--- a/solr/core/src/test/org/apache/solr/update/TestUpdate.java+++ b/solr/core/src/test/org/apache/solr/update/TestUpdate.java@@ -238,14 +238,4 @@ public class TestUpdate extends SolrTestCaseJ4 {fail();}- @Test // SOLR-14767- public void testStringUpdateOnLongAndIntFields() throws Exception {- clearIndex();-- addAndGetVersion(sdoc("id","1", "val_is", "42.0", "val_is", 12, "val_i", "12.1", "val_l",- "42.0", "val_ll", "12.1", "val_ll", "32"), null);- assertJQ(req("qt","/get", "id","1", "fl","id,val*")- ,"=={'doc':{'id':'1', 'val_i':12, 'val_is':[42,12], 'val_l':42, 'val_ll':[12,32]}}"- );- }}