singhpk234 commented on code in PR #14882:
URL: https://github.com/apache/iceberg/pull/14882#discussion_r2630780528
##########
core/src/main/java/org/apache/iceberg/SingleValueParser.java:
##########
@@ -119,40 +119,60 @@ public static Object fromJson(Type type, JsonNode
defaultValue) {
}
return uuid;
case DATE:
- Preconditions.checkArgument(
- defaultValue.isTextual(), "Cannot parse default as a %s value:
%s", type, defaultValue);
- return DateTimeUtil.isoDateToDays(defaultValue.textValue());
+ if (defaultValue.isTextual()) {
+ return DateTimeUtil.isoDateToDays(defaultValue.textValue());
+ } else if (defaultValue.isIntegralNumber() &&
defaultValue.canConvertToInt()) {
+ return defaultValue.intValue();
+ } else {
+ throw new IllegalArgumentException(
+ String.format("Cannot parse default as a %s value: %s", type,
defaultValue));
+ }
case TIME:
- Preconditions.checkArgument(
- defaultValue.isTextual(), "Cannot parse default as a %s value:
%s", type, defaultValue);
- return DateTimeUtil.isoTimeToMicros(defaultValue.textValue());
+ if (defaultValue.isTextual()) {
+ return DateTimeUtil.isoTimeToMicros(defaultValue.textValue());
+ } else if (defaultValue.isIntegralNumber() &&
defaultValue.canConvertToLong()) {
+ return defaultValue.longValue();
+ } else {
+ throw new IllegalArgumentException(
+ String.format("Cannot parse default as a %s value: %s", type,
defaultValue));
+ }
case TIMESTAMP:
- Preconditions.checkArgument(
- defaultValue.isTextual(), "Cannot parse default as a %s value:
%s", type, defaultValue);
- if (((Types.TimestampType) type).shouldAdjustToUTC()) {
- String timestampTz = defaultValue.textValue();
- Preconditions.checkArgument(
- DateTimeUtil.isUTCTimestamptz(timestampTz),
- "Cannot parse default as a %s value: %s, offset must be +00:00",
- type,
- defaultValue);
- return DateTimeUtil.isoTimestamptzToMicros(timestampTz);
+ if (defaultValue.isTextual()) {
+ if (((Types.TimestampType) type).shouldAdjustToUTC()) {
+ String timestampTz = defaultValue.textValue();
+ Preconditions.checkArgument(
+ DateTimeUtil.isUTCTimestamptz(timestampTz),
+ "Cannot parse default as a %s value: %s, offset must be
+00:00",
+ type,
+ defaultValue);
+ return DateTimeUtil.isoTimestamptzToMicros(timestampTz);
+ } else {
+ return DateTimeUtil.isoTimestampToMicros(defaultValue.textValue());
+ }
+ } else if (defaultValue.isIntegralNumber() &&
defaultValue.canConvertToLong()) {
+ return defaultValue.longValue();
} else {
- return DateTimeUtil.isoTimestampToMicros(defaultValue.textValue());
+ throw new IllegalArgumentException(
+ String.format("Cannot parse default as a %s value: %s", type,
defaultValue));
}
case TIMESTAMP_NANO:
- Preconditions.checkArgument(
- defaultValue.isTextual(), "Cannot parse default as a %s value:
%s", type, defaultValue);
- if (((Types.TimestampNanoType) type).shouldAdjustToUTC()) {
- String timestampTzNano = defaultValue.textValue();
- Preconditions.checkArgument(
- DateTimeUtil.isUTCTimestamptz(timestampTzNano),
- "Cannot parse default as a %s value: %s, offset must be +00:00",
- type,
- defaultValue);
- return DateTimeUtil.isoTimestamptzToNanos(timestampTzNano);
+ if (defaultValue.isTextual()) {
+ if (((Types.TimestampNanoType) type).shouldAdjustToUTC()) {
+ String timestampTzNano = defaultValue.textValue();
+ Preconditions.checkArgument(
+ DateTimeUtil.isUTCTimestamptz(timestampTzNano),
+ "Cannot parse default as a %s value: %s, offset must be
+00:00",
+ type,
+ defaultValue);
+ return DateTimeUtil.isoTimestamptzToNanos(timestampTzNano);
+ } else {
+ return DateTimeUtil.isoTimestampToNanos(defaultValue.textValue());
+ }
+ } else if (defaultValue.isIntegralNumber() &&
defaultValue.canConvertToLong()) {
+ return defaultValue.longValue();
Review Comment:
this is mostly required now since we are now binding with schema, need to
think this through
--
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]
