andreachild commented on code in PR #3153:
URL: https://github.com/apache/tinkerpop/pull/3153#discussion_r2241259616
##########
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/NumberHelper.java:
##########
@@ -687,26 +689,71 @@ public static Integer compare(final Number a, final
Number b) {
* @throws IllegalArgumentException if the specified numeric type is
unsupported
*/
public static Number coerceTo(final Number a, final Class<? extends
Number> clazz) {
+ try {
+ return performConversion(a, clazz);
+ } catch (ArithmeticException e) {
+ // return as-is since it didn't fit the type we wanted to coerce to
+ return a;
+ }
+ }
+
+ /**
+ * Casts the given number to the specified numeric type if it can fit into
it.
+ * Otherwise, throw.
+ *
+ * @param a the number to be cast
+ * @param numberToken the number token denoting the desired type to cast
+ * @return the number cast to the specified type
+ * @throws IllegalArgumentException if the specified numeric type is
unsupported
+ * @throws ArithmeticException if the number overflows
+ */
+ public static Number castTo(final Number a, final N numberToken) {
+ Class<? extends Number> clazz = numberToken.getType();
+ return performConversion(a, clazz);
+ }
+
+ /**
+ * Core conversion logic.
+ * Throws ArithmeticException when conversion would overflow.
+ */
+ private static Number performConversion(final Number a, final Class<?
extends Number> clazz) {
if (a.getClass().equals(clazz)) {
return a;
- } else if (clazz.equals(Integer.class)) {
- if (a.longValue() >= Integer.MIN_VALUE && a.longValue() <=
Integer.MAX_VALUE) {
+ }
+ if (clazz.equals(Integer.class)) {
+ Long val = getLong(a, clazz);
+ if (val >= Integer.MIN_VALUE && val <= Integer.MAX_VALUE) {
return a.intValue();
}
} else if (clazz.equals(Long.class)) {
- return a.longValue();
+ return getLong(a, clazz);
} else if (clazz.equals(Float.class)) {
+ // BigDecimal to double will overflow into Infinity, we want to
handle this
+ if (!a.getClass().equals(BigDecimal.class) &&
+ (Double.isInfinite(a.doubleValue()) ||
Double.isNaN(a.doubleValue()))) {
+ return a.floatValue();
+ }
if (a.doubleValue() >= -Float.MAX_VALUE && a.doubleValue() <=
Float.MAX_VALUE) {
return a.floatValue();
}
} else if (clazz.equals(Double.class)) {
- return a.doubleValue();
+ // BigDecimal to double will overflow into Infinity, we want to
handle this
+ if (!a.getClass().equals(BigDecimal.class) &&
Review Comment:
Same check is done for Float casting. Suggest to extract a common method for
infinity/NaN check like:
```
private boolean isInfinityOrNaN(Number num) {
return (!num.getClass().equals(BigDecimal.class) &&
!num.getClass().equals(BigInteger.class) &&
(Double.isInfinite(num.doubleValue()) ||
Double.isNaN(num.doubleValue())));
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
