jubins commented on code in PR #59214:
URL: https://github.com/apache/spark/pull/59214#discussion_r4255305044
##########
python/pyspark/sql/variant_utils.py:
##########
@@ -413,10 +417,127 @@ def handle_array(value_pos_list: List[int]) -> str:
if isinstance(value, bytes):
# decoding simply converts byte array to string
return '"' + base64.b64encode(value).decode("utf-8") + '"'
- if isinstance(value, (datetime.date, datetime.datetime)):
+ if isinstance(value, float):
+ return cls._float_to_json(value, is_float32)
+ if isinstance(value, decimal.Decimal):
+ return cls._decimal_to_json(value)
+ if isinstance(value, datetime.datetime):
+ return '"' + cls._timestamp_to_json(value) + '"'
+ if isinstance(value, datetime.date):
return '"' + str(value) + '"'
return str(value)
+ # The helpers below format scalars the same way as the JVM
`Variant.toJson` on JDK 19+, so
+ # that `VariantVal.toJson` and the `to_json` SQL function produce the same
output. On older
+ # JDKs, `to_json` can print a longer, still round-tripping digit string
for some doubles and
+ # floats (see `_float_to_json`).
+
+ @classmethod
+ def _float_to_json(cls, f: float, is_float32: bool) -> str:
+ """
+ Formats a double or float like Java's `Double.toString` and
`Float.toString` on JDK 19+,
+ which print the shortest digits (JDK-4511638). Older JDKs can print a
longer, still
+ round-tripping digit string for some values, e.g. 2^-24 as
5.9604644775390625E-8 instead
+ of 5.960464477539063E-8. Non-finite values are quoted because they are
not valid JSON
+ numbers.
+ """
+ if math.isnan(f):
+ return '"NaN"'
+ if math.isinf(f):
+ return '"Infinity"' if f > 0 else '"-Infinity"'
+
+ def round_trips(s: str) -> bool:
+ x = float(s)
+ if not is_float32:
+ return x == f
+ try:
+ rounded = struct.unpack("<f", struct.pack("<f", x))[0]
+ except OverflowError:
+ return False
+ if rounded != x:
+ # Rounding the decimal to a double first can change which
float32 it rounds to
+ # only when the double is exactly the midpoint between two
float32 values. Every
+ # such midpoint is an exact double, so resolve that tie with
the exact decimal.
+ bits = struct.unpack("<I", struct.pack("<f", abs(rounded)))[0]
+ bits = bits + 1 if abs(x) > abs(rounded) else bits - 1
+ other = math.copysign(struct.unpack("<f", struct.pack("<I",
bits))[0], rounded)
+ midpoint = (rounded + other) / 2
+ if x == midpoint:
+ exact, exact_midpoint = decimal.Decimal(s),
decimal.Decimal(midpoint)
Review Comment:
Fixed, it now uses `Decimal.from_float`, and the test runs every case with
the `FloatOperation` trap on.
--
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]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
