rzhang10 commented on code in PR #4871:
URL: https://github.com/apache/iceberg/pull/4871#discussion_r895231088
##########
core/src/main/java/org/apache/iceberg/util/DateTimeUtil.java:
##########
@@ -88,4 +88,38 @@ public static long microsFromTimestamptz(OffsetDateTime
dateTime) {
public static String formatTimestampMillis(long millis) {
return
DATE_FORMAT.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(millis),
ZoneOffset.UTC));
}
+
+ public static String formatEpochDays(int days) {
Review Comment:
@rdblue Yes I tried to do that, but the `Literals` class is in API module,
which can't call the util methods in `DateTImeUtil` since it's in the Core
module. Do you mean to move the `DateTImeUtil` to API?
##########
core/src/main/java/org/apache/iceberg/util/DateTimeUtil.java:
##########
@@ -88,4 +88,38 @@ public static long microsFromTimestamptz(OffsetDateTime
dateTime) {
public static String formatTimestampMillis(long millis) {
return
DATE_FORMAT.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(millis),
ZoneOffset.UTC));
}
+
+ public static String formatEpochDays(int days) {
+ return LocalDate.ofEpochDay(days).format(DateTimeFormatter.ISO_LOCAL_DATE);
+ }
+
+ public static String formatTimeOfDayMicros(long micros) {
+ return LocalTime.ofNanoOfDay(micros *
1000).format(DateTimeFormatter.ISO_LOCAL_TIME);
+ }
+
+ public static String formatEpochTimeMicros(long micros, boolean withUTCZone)
{
Review Comment:
done
##########
core/src/main/java/org/apache/iceberg/util/DateTimeUtil.java:
##########
@@ -88,4 +88,38 @@ public static long microsFromTimestamptz(OffsetDateTime
dateTime) {
public static String formatTimestampMillis(long millis) {
return
DATE_FORMAT.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(millis),
ZoneOffset.UTC));
}
+
+ public static String formatEpochDays(int days) {
+ return LocalDate.ofEpochDay(days).format(DateTimeFormatter.ISO_LOCAL_DATE);
+ }
+
+ public static String formatTimeOfDayMicros(long micros) {
Review Comment:
done
##########
core/src/main/java/org/apache/iceberg/DefaultValueParser.java:
##########
@@ -0,0 +1,307 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iceberg;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonNode;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.math.BigDecimal;
+import java.nio.ByteBuffer;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.iceberg.data.GenericRecord;
+import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
+import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
+import org.apache.iceberg.relocated.com.google.common.collect.Iterables;
+import org.apache.iceberg.relocated.com.google.common.collect.Lists;
+import org.apache.iceberg.relocated.com.google.common.io.BaseEncoding;
+import org.apache.iceberg.types.Type;
+import org.apache.iceberg.types.Types;
+import org.apache.iceberg.util.ByteBuffers;
+import org.apache.iceberg.util.DateTimeUtil;
+import org.apache.iceberg.util.JsonUtil;
+
+public class DefaultValueParser {
+ private DefaultValueParser() {
+ }
+
+ @SuppressWarnings("checkstyle:CyclomaticComplexity")
+ public static Object fromJson(Type type, JsonNode defaultValue) {
+
+ if (defaultValue == null || defaultValue.isNull()) {
+ return null;
+ }
+
+ switch (type.typeId()) {
+ case BOOLEAN:
+ Preconditions.checkArgument(defaultValue.isBoolean(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.booleanValue();
+ case INTEGER:
+ Preconditions.checkArgument(defaultValue.isIntegralNumber() &&
defaultValue.canConvertToInt(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.intValue();
+ case LONG:
+ Preconditions.checkArgument(defaultValue.isIntegralNumber() &&
defaultValue.canConvertToLong(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.longValue();
+ case FLOAT:
+ Preconditions.checkArgument(defaultValue.isFloatingPointNumber(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.floatValue();
+ case DOUBLE:
+ Preconditions.checkArgument(defaultValue.isNumber(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.doubleValue();
+ case DECIMAL:
+ Preconditions.checkArgument(defaultValue.isNumber(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ BigDecimal retDecimal = defaultValue.decimalValue();
+ Preconditions.checkArgument(
+ retDecimal.scale() == ((Types.DecimalType) type).scale(), "Cannot
parse default as a %s value: %s",
+ type,
+ defaultValue);
+ return retDecimal;
+ case STRING:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.textValue();
+ case UUID:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ try {
+ UUID.fromString(defaultValue.textValue());
+ } catch (IllegalArgumentException e) {
+ throw new IllegalArgumentException(String.format("Cannot parse
default as a %s value: %s", type,
+ defaultValue));
+ }
+ return UUID.fromString(defaultValue.textValue());
+ case DATE:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return DateTimeUtil.daysFromISODateString(defaultValue.textValue());
+ case TIME:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return DateTimeUtil.microsFromISOTimeString(defaultValue.textValue());
+ case TIMESTAMP:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ if (((Types.TimestampType) type).shouldAdjustToUTC()) {
+ return
DateTimeUtil.microsFromISOOffsetTsString(defaultValue.textValue());
+ } else {
+ return DateTimeUtil.microsFromISOTsString(defaultValue.textValue());
+ }
+ case FIXED:
+ Preconditions.checkArgument(
+ defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ int defaultLength = defaultValue.textValue().length();
+ int fixedLength = ((Types.FixedType) type).length();
+ Preconditions.checkArgument(defaultLength == fixedLength * 2,
+ "Default value %s is not compatible with the expected fixed type,
the fixed type is expected to store " +
+ "exactly %s bytes, which means the default value should be of
exactly 2 * %s length hex string",
+ defaultValue, fixedLength, fixedLength);
+ byte[] fixedBytes =
BaseEncoding.base16().decode(defaultValue.textValue().toUpperCase(Locale.ROOT));
+ return ByteBuffer.wrap(fixedBytes);
+ case BINARY:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ byte[] binaryBytes =
BaseEncoding.base16().decode(defaultValue.textValue().toUpperCase(Locale.ROOT));
+ return ByteBuffer.wrap(binaryBytes);
+ case LIST:
+ Preconditions.checkArgument(defaultValue.isArray(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ Type elementType = type.asListType().elementType();
+ return Lists.newArrayList(Iterables.transform(defaultValue, e ->
fromJson(elementType, e)));
+ case MAP:
+ Preconditions.checkArgument(
+ defaultValue.isObject() && defaultValue.has("keys") &&
defaultValue.has("values") &&
+ defaultValue.get("keys").isArray() &&
defaultValue.get("values").isArray(),
+ "Cannot parse %s to a %s value",
+ defaultValue, type);
+ JsonNode keys = defaultValue.get("keys");
+ JsonNode values = defaultValue.get("values");
+ Preconditions.checkArgument(keys.size() == values.size(), "Cannot
parse default as a %s value: %s", type,
+ defaultValue);
+
+ ImmutableMap.Builder<Object, Object> mapBuilder =
ImmutableMap.builder();
+
+ Iterator<JsonNode> keyIter = keys.iterator();
+ Type keyType = type.asMapType().keyType();
+ Iterator<JsonNode> valueIter = values.iterator();
+ Type valueType = type.asMapType().valueType();
+
+ while (keyIter.hasNext()) {
+ mapBuilder.put(fromJson(keyType, keyIter.next()),
fromJson(valueType, valueIter.next()));
+ }
+
+ return mapBuilder.build();
+ case STRUCT:
+ Preconditions.checkArgument(defaultValue.isObject(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ Types.StructType struct = type.asStructType();
+ StructLike defaultRecord = GenericRecord.create(struct);
+
+ List<Types.NestedField> fields = struct.fields();
+ for (int pos = 0; pos < fields.size(); pos += 1) {
+ Types.NestedField field = fields.get(pos);
+ String idString = String.valueOf(field.fieldId());
+ if (defaultValue.has(idString)) {
+ defaultRecord.set(pos, fromJson(field.type(),
defaultValue.get(idString)));
+ }
+ }
+ return defaultRecord;
+ default:
+ throw new IllegalArgumentException(String.format("Type: %s is not
supported", type));
+ }
+ }
+
+ public static Object fromJson(Type type, String defaultValue) {
+ try {
+ JsonNode defaultValueJN = JsonUtil.mapper().readTree(defaultValue);
+ return fromJson(type, defaultValueJN);
+ } catch (IOException e) {
+ throw new IllegalArgumentException("Failed to parse: " + defaultValue +
"; reason: " + e.getMessage(), e);
+ }
+ }
+
+ public static String toJson(Type type, Object defaultValue) {
+ return toJson(type, defaultValue, false);
+ }
+
+ public static String toJson(Type type, Object defaultValue, boolean pretty) {
+ try {
+ StringWriter writer = new StringWriter();
+ JsonGenerator generator = JsonUtil.factory().createGenerator(writer);
+ if (pretty) {
+ generator.useDefaultPrettyPrinter();
+ }
+ toJson(type, defaultValue, generator);
+ generator.flush();
+ return writer.toString();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static void toJson(Type type, Object javaDefaultValue, JsonGenerator
generator)
+ throws IOException {
+ switch (type.typeId()) {
+ case BOOLEAN:
+ generator.writeBoolean((boolean) javaDefaultValue);
+ break;
+ case INTEGER:
+ generator.writeNumber((int) javaDefaultValue);
+ break;
+ case LONG:
+ generator.writeNumber((long) javaDefaultValue);
+ break;
+ case FLOAT:
+ generator.writeNumber((float) javaDefaultValue);
+ break;
+ case DOUBLE:
+ generator.writeNumber((double) javaDefaultValue);
+ break;
+ case DATE:
+ generator.writeString(DateTimeUtil.formatEpochDays((int)
javaDefaultValue));
+ break;
+ case TIME:
+ generator.writeString(DateTimeUtil.formatTimeOfDayMicros((long)
javaDefaultValue));
+ break;
+ case TIMESTAMP:
+ generator.writeString(DateTimeUtil.formatEpochTimeMicros(
+ (long) javaDefaultValue,
+ ((Types.TimestampType) type).shouldAdjustToUTC()));
+ break;
+ case STRING:
+ generator.writeString((String) javaDefaultValue);
+ break;
+ case UUID:
+ generator.writeString(javaDefaultValue.toString());
+ break;
+ case FIXED:
+ case BINARY:
+
generator.writeString(BaseEncoding.base16().encode(ByteBuffers.toByteArray(((ByteBuffer)
javaDefaultValue))));
+ break;
+ case DECIMAL:
+ generator.writeNumber((BigDecimal) javaDefaultValue);
+ break;
+ case LIST:
+ List<Object> defaultList = (List<Object>) javaDefaultValue;
+ Type elementType = type.asListType().elementType();
+ generator.writeStartArray();
+ for (Object elementDefault : defaultList) {
Review Comment:
fixed
##########
core/src/test/java/org/apache/iceberg/TestInvalidDefaultValues.java:
##########
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iceberg;
+
+import org.apache.iceberg.types.Type;
+import org.apache.iceberg.types.Types;
+import org.junit.Assert;
+import org.junit.Test;
+
+import static
org.apache.iceberg.TestDefaultValuesParsingAndUnParsing.defaultValueParseAndUnParseRoundTrip;
+
+public class TestInvalidDefaultValues {
+
+ @Test
+ public void testInvalidFixed() {
Review Comment:
The `TestDefaultValuesParsingAndUnParsing` test is a Parameterized test
class, I think leaving them separate might achieve better clarity?
##########
core/src/main/java/org/apache/iceberg/DefaultValueParser.java:
##########
@@ -0,0 +1,307 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iceberg;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonNode;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.math.BigDecimal;
+import java.nio.ByteBuffer;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.iceberg.data.GenericRecord;
+import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
+import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
+import org.apache.iceberg.relocated.com.google.common.collect.Iterables;
+import org.apache.iceberg.relocated.com.google.common.collect.Lists;
+import org.apache.iceberg.relocated.com.google.common.io.BaseEncoding;
+import org.apache.iceberg.types.Type;
+import org.apache.iceberg.types.Types;
+import org.apache.iceberg.util.ByteBuffers;
+import org.apache.iceberg.util.DateTimeUtil;
+import org.apache.iceberg.util.JsonUtil;
+
+public class DefaultValueParser {
+ private DefaultValueParser() {
+ }
+
+ @SuppressWarnings("checkstyle:CyclomaticComplexity")
+ public static Object fromJson(Type type, JsonNode defaultValue) {
+
+ if (defaultValue == null || defaultValue.isNull()) {
+ return null;
+ }
+
+ switch (type.typeId()) {
+ case BOOLEAN:
+ Preconditions.checkArgument(defaultValue.isBoolean(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.booleanValue();
+ case INTEGER:
+ Preconditions.checkArgument(defaultValue.isIntegralNumber() &&
defaultValue.canConvertToInt(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.intValue();
+ case LONG:
+ Preconditions.checkArgument(defaultValue.isIntegralNumber() &&
defaultValue.canConvertToLong(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.longValue();
+ case FLOAT:
+ Preconditions.checkArgument(defaultValue.isFloatingPointNumber(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.floatValue();
+ case DOUBLE:
+ Preconditions.checkArgument(defaultValue.isNumber(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.doubleValue();
+ case DECIMAL:
+ Preconditions.checkArgument(defaultValue.isNumber(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ BigDecimal retDecimal = defaultValue.decimalValue();
+ Preconditions.checkArgument(
+ retDecimal.scale() == ((Types.DecimalType) type).scale(), "Cannot
parse default as a %s value: %s",
+ type,
+ defaultValue);
+ return retDecimal;
+ case STRING:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.textValue();
+ case UUID:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ try {
+ UUID.fromString(defaultValue.textValue());
+ } catch (IllegalArgumentException e) {
+ throw new IllegalArgumentException(String.format("Cannot parse
default as a %s value: %s", type,
+ defaultValue));
+ }
+ return UUID.fromString(defaultValue.textValue());
+ case DATE:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return DateTimeUtil.daysFromISODateString(defaultValue.textValue());
+ case TIME:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return DateTimeUtil.microsFromISOTimeString(defaultValue.textValue());
+ case TIMESTAMP:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ if (((Types.TimestampType) type).shouldAdjustToUTC()) {
+ return
DateTimeUtil.microsFromISOOffsetTsString(defaultValue.textValue());
+ } else {
+ return DateTimeUtil.microsFromISOTsString(defaultValue.textValue());
+ }
+ case FIXED:
+ Preconditions.checkArgument(
+ defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ int defaultLength = defaultValue.textValue().length();
+ int fixedLength = ((Types.FixedType) type).length();
+ Preconditions.checkArgument(defaultLength == fixedLength * 2,
+ "Default value %s is not compatible with the expected fixed type,
the fixed type is expected to store " +
+ "exactly %s bytes, which means the default value should be of
exactly 2 * %s length hex string",
+ defaultValue, fixedLength, fixedLength);
+ byte[] fixedBytes =
BaseEncoding.base16().decode(defaultValue.textValue().toUpperCase(Locale.ROOT));
+ return ByteBuffer.wrap(fixedBytes);
+ case BINARY:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ byte[] binaryBytes =
BaseEncoding.base16().decode(defaultValue.textValue().toUpperCase(Locale.ROOT));
+ return ByteBuffer.wrap(binaryBytes);
+ case LIST:
+ Preconditions.checkArgument(defaultValue.isArray(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ Type elementType = type.asListType().elementType();
+ return Lists.newArrayList(Iterables.transform(defaultValue, e ->
fromJson(elementType, e)));
+ case MAP:
+ Preconditions.checkArgument(
+ defaultValue.isObject() && defaultValue.has("keys") &&
defaultValue.has("values") &&
+ defaultValue.get("keys").isArray() &&
defaultValue.get("values").isArray(),
+ "Cannot parse %s to a %s value",
+ defaultValue, type);
+ JsonNode keys = defaultValue.get("keys");
+ JsonNode values = defaultValue.get("values");
+ Preconditions.checkArgument(keys.size() == values.size(), "Cannot
parse default as a %s value: %s", type,
+ defaultValue);
+
+ ImmutableMap.Builder<Object, Object> mapBuilder =
ImmutableMap.builder();
+
+ Iterator<JsonNode> keyIter = keys.iterator();
+ Type keyType = type.asMapType().keyType();
+ Iterator<JsonNode> valueIter = values.iterator();
+ Type valueType = type.asMapType().valueType();
+
+ while (keyIter.hasNext()) {
+ mapBuilder.put(fromJson(keyType, keyIter.next()),
fromJson(valueType, valueIter.next()));
+ }
+
+ return mapBuilder.build();
+ case STRUCT:
+ Preconditions.checkArgument(defaultValue.isObject(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ Types.StructType struct = type.asStructType();
+ StructLike defaultRecord = GenericRecord.create(struct);
+
+ List<Types.NestedField> fields = struct.fields();
+ for (int pos = 0; pos < fields.size(); pos += 1) {
+ Types.NestedField field = fields.get(pos);
+ String idString = String.valueOf(field.fieldId());
+ if (defaultValue.has(idString)) {
+ defaultRecord.set(pos, fromJson(field.type(),
defaultValue.get(idString)));
+ }
+ }
+ return defaultRecord;
+ default:
+ throw new IllegalArgumentException(String.format("Type: %s is not
supported", type));
+ }
+ }
+
+ public static Object fromJson(Type type, String defaultValue) {
+ try {
+ JsonNode defaultValueJN = JsonUtil.mapper().readTree(defaultValue);
+ return fromJson(type, defaultValueJN);
+ } catch (IOException e) {
+ throw new IllegalArgumentException("Failed to parse: " + defaultValue +
"; reason: " + e.getMessage(), e);
+ }
+ }
+
+ public static String toJson(Type type, Object defaultValue) {
+ return toJson(type, defaultValue, false);
+ }
+
+ public static String toJson(Type type, Object defaultValue, boolean pretty) {
+ try {
+ StringWriter writer = new StringWriter();
+ JsonGenerator generator = JsonUtil.factory().createGenerator(writer);
+ if (pretty) {
+ generator.useDefaultPrettyPrinter();
+ }
+ toJson(type, defaultValue, generator);
+ generator.flush();
+ return writer.toString();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static void toJson(Type type, Object javaDefaultValue, JsonGenerator
generator)
Review Comment:
fixed
##########
core/src/main/java/org/apache/iceberg/DefaultValueParser.java:
##########
@@ -0,0 +1,307 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iceberg;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonNode;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.math.BigDecimal;
+import java.nio.ByteBuffer;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.iceberg.data.GenericRecord;
+import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
+import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
+import org.apache.iceberg.relocated.com.google.common.collect.Iterables;
+import org.apache.iceberg.relocated.com.google.common.collect.Lists;
+import org.apache.iceberg.relocated.com.google.common.io.BaseEncoding;
+import org.apache.iceberg.types.Type;
+import org.apache.iceberg.types.Types;
+import org.apache.iceberg.util.ByteBuffers;
+import org.apache.iceberg.util.DateTimeUtil;
+import org.apache.iceberg.util.JsonUtil;
+
+public class DefaultValueParser {
+ private DefaultValueParser() {
+ }
+
+ @SuppressWarnings("checkstyle:CyclomaticComplexity")
+ public static Object fromJson(Type type, JsonNode defaultValue) {
+
+ if (defaultValue == null || defaultValue.isNull()) {
+ return null;
+ }
+
+ switch (type.typeId()) {
+ case BOOLEAN:
+ Preconditions.checkArgument(defaultValue.isBoolean(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.booleanValue();
+ case INTEGER:
+ Preconditions.checkArgument(defaultValue.isIntegralNumber() &&
defaultValue.canConvertToInt(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.intValue();
+ case LONG:
+ Preconditions.checkArgument(defaultValue.isIntegralNumber() &&
defaultValue.canConvertToLong(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.longValue();
+ case FLOAT:
+ Preconditions.checkArgument(defaultValue.isFloatingPointNumber(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.floatValue();
+ case DOUBLE:
+ Preconditions.checkArgument(defaultValue.isNumber(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.doubleValue();
+ case DECIMAL:
+ Preconditions.checkArgument(defaultValue.isNumber(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ BigDecimal retDecimal = defaultValue.decimalValue();
+ Preconditions.checkArgument(
+ retDecimal.scale() == ((Types.DecimalType) type).scale(), "Cannot
parse default as a %s value: %s",
+ type,
+ defaultValue);
+ return retDecimal;
+ case STRING:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.textValue();
+ case UUID:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ try {
+ UUID.fromString(defaultValue.textValue());
+ } catch (IllegalArgumentException e) {
+ throw new IllegalArgumentException(String.format("Cannot parse
default as a %s value: %s", type,
+ defaultValue));
+ }
+ return UUID.fromString(defaultValue.textValue());
+ case DATE:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return DateTimeUtil.daysFromISODateString(defaultValue.textValue());
+ case TIME:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return DateTimeUtil.microsFromISOTimeString(defaultValue.textValue());
+ case TIMESTAMP:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ if (((Types.TimestampType) type).shouldAdjustToUTC()) {
+ return
DateTimeUtil.microsFromISOOffsetTsString(defaultValue.textValue());
+ } else {
+ return DateTimeUtil.microsFromISOTsString(defaultValue.textValue());
+ }
+ case FIXED:
+ Preconditions.checkArgument(
+ defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ int defaultLength = defaultValue.textValue().length();
+ int fixedLength = ((Types.FixedType) type).length();
+ Preconditions.checkArgument(defaultLength == fixedLength * 2,
+ "Default value %s is not compatible with the expected fixed type,
the fixed type is expected to store " +
+ "exactly %s bytes, which means the default value should be of
exactly 2 * %s length hex string",
+ defaultValue, fixedLength, fixedLength);
+ byte[] fixedBytes =
BaseEncoding.base16().decode(defaultValue.textValue().toUpperCase(Locale.ROOT));
+ return ByteBuffer.wrap(fixedBytes);
+ case BINARY:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ byte[] binaryBytes =
BaseEncoding.base16().decode(defaultValue.textValue().toUpperCase(Locale.ROOT));
+ return ByteBuffer.wrap(binaryBytes);
+ case LIST:
+ Preconditions.checkArgument(defaultValue.isArray(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ Type elementType = type.asListType().elementType();
+ return Lists.newArrayList(Iterables.transform(defaultValue, e ->
fromJson(elementType, e)));
+ case MAP:
+ Preconditions.checkArgument(
+ defaultValue.isObject() && defaultValue.has("keys") &&
defaultValue.has("values") &&
+ defaultValue.get("keys").isArray() &&
defaultValue.get("values").isArray(),
+ "Cannot parse %s to a %s value",
+ defaultValue, type);
+ JsonNode keys = defaultValue.get("keys");
+ JsonNode values = defaultValue.get("values");
+ Preconditions.checkArgument(keys.size() == values.size(), "Cannot
parse default as a %s value: %s", type,
+ defaultValue);
+
+ ImmutableMap.Builder<Object, Object> mapBuilder =
ImmutableMap.builder();
+
+ Iterator<JsonNode> keyIter = keys.iterator();
+ Type keyType = type.asMapType().keyType();
+ Iterator<JsonNode> valueIter = values.iterator();
+ Type valueType = type.asMapType().valueType();
+
+ while (keyIter.hasNext()) {
+ mapBuilder.put(fromJson(keyType, keyIter.next()),
fromJson(valueType, valueIter.next()));
+ }
+
+ return mapBuilder.build();
+ case STRUCT:
+ Preconditions.checkArgument(defaultValue.isObject(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ Types.StructType struct = type.asStructType();
+ StructLike defaultRecord = GenericRecord.create(struct);
+
+ List<Types.NestedField> fields = struct.fields();
+ for (int pos = 0; pos < fields.size(); pos += 1) {
+ Types.NestedField field = fields.get(pos);
+ String idString = String.valueOf(field.fieldId());
+ if (defaultValue.has(idString)) {
+ defaultRecord.set(pos, fromJson(field.type(),
defaultValue.get(idString)));
+ }
+ }
+ return defaultRecord;
+ default:
+ throw new IllegalArgumentException(String.format("Type: %s is not
supported", type));
+ }
+ }
+
+ public static Object fromJson(Type type, String defaultValue) {
+ try {
+ JsonNode defaultValueJN = JsonUtil.mapper().readTree(defaultValue);
+ return fromJson(type, defaultValueJN);
+ } catch (IOException e) {
+ throw new IllegalArgumentException("Failed to parse: " + defaultValue +
"; reason: " + e.getMessage(), e);
+ }
+ }
+
+ public static String toJson(Type type, Object defaultValue) {
+ return toJson(type, defaultValue, false);
+ }
+
+ public static String toJson(Type type, Object defaultValue, boolean pretty) {
+ try {
+ StringWriter writer = new StringWriter();
+ JsonGenerator generator = JsonUtil.factory().createGenerator(writer);
+ if (pretty) {
+ generator.useDefaultPrettyPrinter();
+ }
+ toJson(type, defaultValue, generator);
+ generator.flush();
+ return writer.toString();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static void toJson(Type type, Object javaDefaultValue, JsonGenerator
generator)
+ throws IOException {
+ switch (type.typeId()) {
+ case BOOLEAN:
+ generator.writeBoolean((boolean) javaDefaultValue);
+ break;
+ case INTEGER:
+ generator.writeNumber((int) javaDefaultValue);
+ break;
+ case LONG:
+ generator.writeNumber((long) javaDefaultValue);
+ break;
+ case FLOAT:
+ generator.writeNumber((float) javaDefaultValue);
+ break;
+ case DOUBLE:
+ generator.writeNumber((double) javaDefaultValue);
+ break;
+ case DATE:
+ generator.writeString(DateTimeUtil.formatEpochDays((int)
javaDefaultValue));
+ break;
+ case TIME:
+ generator.writeString(DateTimeUtil.formatTimeOfDayMicros((long)
javaDefaultValue));
+ break;
+ case TIMESTAMP:
+ generator.writeString(DateTimeUtil.formatEpochTimeMicros(
+ (long) javaDefaultValue,
+ ((Types.TimestampType) type).shouldAdjustToUTC()));
+ break;
+ case STRING:
+ generator.writeString((String) javaDefaultValue);
+ break;
+ case UUID:
+ generator.writeString(javaDefaultValue.toString());
+ break;
+ case FIXED:
+ case BINARY:
+
generator.writeString(BaseEncoding.base16().encode(ByteBuffers.toByteArray(((ByteBuffer)
javaDefaultValue))));
+ break;
+ case DECIMAL:
+ generator.writeNumber((BigDecimal) javaDefaultValue);
+ break;
+ case LIST:
+ List<Object> defaultList = (List<Object>) javaDefaultValue;
+ Type elementType = type.asListType().elementType();
+ generator.writeStartArray();
+ for (Object elementDefault : defaultList) {
+ toJson(elementType, elementDefault, generator);
+ }
+ generator.writeEndArray();
+ break;
+ case MAP:
+ Map<Object, Object> defaultMap = (Map<Object, Object>)
javaDefaultValue;
+ List<Object> keyList =
Lists.newArrayListWithExpectedSize(defaultMap.size());
+ List<Object> valueList =
Lists.newArrayListWithExpectedSize(defaultMap.size());
+ Type keyType = type.asMapType().keyType();
+ Type valueType = type.asMapType().valueType();
+
+ for (Map.Entry<Object, Object> entry : defaultMap.entrySet()) {
+ keyList.add(entry.getKey());
+ valueList.add(entry.getValue());
+ }
+ generator.writeStartObject();
+ generator.writeFieldName("keys");
Review Comment:
fixed
##########
core/src/main/java/org/apache/iceberg/DefaultValueParser.java:
##########
@@ -0,0 +1,307 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iceberg;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonNode;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.math.BigDecimal;
+import java.nio.ByteBuffer;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.iceberg.data.GenericRecord;
+import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
+import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
+import org.apache.iceberg.relocated.com.google.common.collect.Iterables;
+import org.apache.iceberg.relocated.com.google.common.collect.Lists;
+import org.apache.iceberg.relocated.com.google.common.io.BaseEncoding;
+import org.apache.iceberg.types.Type;
+import org.apache.iceberg.types.Types;
+import org.apache.iceberg.util.ByteBuffers;
+import org.apache.iceberg.util.DateTimeUtil;
+import org.apache.iceberg.util.JsonUtil;
+
+public class DefaultValueParser {
+ private DefaultValueParser() {
+ }
+
+ @SuppressWarnings("checkstyle:CyclomaticComplexity")
+ public static Object fromJson(Type type, JsonNode defaultValue) {
+
+ if (defaultValue == null || defaultValue.isNull()) {
+ return null;
+ }
+
+ switch (type.typeId()) {
+ case BOOLEAN:
+ Preconditions.checkArgument(defaultValue.isBoolean(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.booleanValue();
+ case INTEGER:
+ Preconditions.checkArgument(defaultValue.isIntegralNumber() &&
defaultValue.canConvertToInt(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.intValue();
+ case LONG:
+ Preconditions.checkArgument(defaultValue.isIntegralNumber() &&
defaultValue.canConvertToLong(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.longValue();
+ case FLOAT:
+ Preconditions.checkArgument(defaultValue.isFloatingPointNumber(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.floatValue();
+ case DOUBLE:
+ Preconditions.checkArgument(defaultValue.isNumber(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.doubleValue();
+ case DECIMAL:
+ Preconditions.checkArgument(defaultValue.isNumber(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ BigDecimal retDecimal = defaultValue.decimalValue();
+ Preconditions.checkArgument(
+ retDecimal.scale() == ((Types.DecimalType) type).scale(), "Cannot
parse default as a %s value: %s",
+ type,
+ defaultValue);
+ return retDecimal;
+ case STRING:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return defaultValue.textValue();
+ case UUID:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ try {
+ UUID.fromString(defaultValue.textValue());
+ } catch (IllegalArgumentException e) {
+ throw new IllegalArgumentException(String.format("Cannot parse
default as a %s value: %s", type,
+ defaultValue));
+ }
+ return UUID.fromString(defaultValue.textValue());
+ case DATE:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return DateTimeUtil.daysFromISODateString(defaultValue.textValue());
+ case TIME:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ return DateTimeUtil.microsFromISOTimeString(defaultValue.textValue());
+ case TIMESTAMP:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ if (((Types.TimestampType) type).shouldAdjustToUTC()) {
+ return
DateTimeUtil.microsFromISOOffsetTsString(defaultValue.textValue());
+ } else {
+ return DateTimeUtil.microsFromISOTsString(defaultValue.textValue());
+ }
+ case FIXED:
+ Preconditions.checkArgument(
+ defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ int defaultLength = defaultValue.textValue().length();
+ int fixedLength = ((Types.FixedType) type).length();
+ Preconditions.checkArgument(defaultLength == fixedLength * 2,
+ "Default value %s is not compatible with the expected fixed type,
the fixed type is expected to store " +
+ "exactly %s bytes, which means the default value should be of
exactly 2 * %s length hex string",
+ defaultValue, fixedLength, fixedLength);
+ byte[] fixedBytes =
BaseEncoding.base16().decode(defaultValue.textValue().toUpperCase(Locale.ROOT));
+ return ByteBuffer.wrap(fixedBytes);
+ case BINARY:
+ Preconditions.checkArgument(defaultValue.isTextual(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ byte[] binaryBytes =
BaseEncoding.base16().decode(defaultValue.textValue().toUpperCase(Locale.ROOT));
+ return ByteBuffer.wrap(binaryBytes);
+ case LIST:
+ Preconditions.checkArgument(defaultValue.isArray(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ Type elementType = type.asListType().elementType();
+ return Lists.newArrayList(Iterables.transform(defaultValue, e ->
fromJson(elementType, e)));
+ case MAP:
+ Preconditions.checkArgument(
+ defaultValue.isObject() && defaultValue.has("keys") &&
defaultValue.has("values") &&
+ defaultValue.get("keys").isArray() &&
defaultValue.get("values").isArray(),
+ "Cannot parse %s to a %s value",
+ defaultValue, type);
+ JsonNode keys = defaultValue.get("keys");
+ JsonNode values = defaultValue.get("values");
+ Preconditions.checkArgument(keys.size() == values.size(), "Cannot
parse default as a %s value: %s", type,
+ defaultValue);
+
+ ImmutableMap.Builder<Object, Object> mapBuilder =
ImmutableMap.builder();
+
+ Iterator<JsonNode> keyIter = keys.iterator();
+ Type keyType = type.asMapType().keyType();
+ Iterator<JsonNode> valueIter = values.iterator();
+ Type valueType = type.asMapType().valueType();
+
+ while (keyIter.hasNext()) {
+ mapBuilder.put(fromJson(keyType, keyIter.next()),
fromJson(valueType, valueIter.next()));
+ }
+
+ return mapBuilder.build();
+ case STRUCT:
+ Preconditions.checkArgument(defaultValue.isObject(),
+ "Cannot parse default as a %s value: %s", type, defaultValue);
+ Types.StructType struct = type.asStructType();
+ StructLike defaultRecord = GenericRecord.create(struct);
+
+ List<Types.NestedField> fields = struct.fields();
+ for (int pos = 0; pos < fields.size(); pos += 1) {
+ Types.NestedField field = fields.get(pos);
+ String idString = String.valueOf(field.fieldId());
+ if (defaultValue.has(idString)) {
+ defaultRecord.set(pos, fromJson(field.type(),
defaultValue.get(idString)));
+ }
+ }
+ return defaultRecord;
+ default:
+ throw new IllegalArgumentException(String.format("Type: %s is not
supported", type));
+ }
+ }
+
+ public static Object fromJson(Type type, String defaultValue) {
+ try {
+ JsonNode defaultValueJN = JsonUtil.mapper().readTree(defaultValue);
+ return fromJson(type, defaultValueJN);
+ } catch (IOException e) {
+ throw new IllegalArgumentException("Failed to parse: " + defaultValue +
"; reason: " + e.getMessage(), e);
+ }
+ }
+
+ public static String toJson(Type type, Object defaultValue) {
+ return toJson(type, defaultValue, false);
+ }
+
+ public static String toJson(Type type, Object defaultValue, boolean pretty) {
+ try {
+ StringWriter writer = new StringWriter();
+ JsonGenerator generator = JsonUtil.factory().createGenerator(writer);
+ if (pretty) {
+ generator.useDefaultPrettyPrinter();
+ }
+ toJson(type, defaultValue, generator);
+ generator.flush();
+ return writer.toString();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static void toJson(Type type, Object javaDefaultValue, JsonGenerator
generator)
+ throws IOException {
+ switch (type.typeId()) {
+ case BOOLEAN:
+ generator.writeBoolean((boolean) javaDefaultValue);
+ break;
+ case INTEGER:
+ generator.writeNumber((int) javaDefaultValue);
+ break;
+ case LONG:
+ generator.writeNumber((long) javaDefaultValue);
+ break;
+ case FLOAT:
+ generator.writeNumber((float) javaDefaultValue);
+ break;
+ case DOUBLE:
+ generator.writeNumber((double) javaDefaultValue);
+ break;
+ case DATE:
+ generator.writeString(DateTimeUtil.formatEpochDays((int)
javaDefaultValue));
+ break;
+ case TIME:
+ generator.writeString(DateTimeUtil.formatTimeOfDayMicros((long)
javaDefaultValue));
+ break;
+ case TIMESTAMP:
+ generator.writeString(DateTimeUtil.formatEpochTimeMicros(
+ (long) javaDefaultValue,
+ ((Types.TimestampType) type).shouldAdjustToUTC()));
+ break;
+ case STRING:
+ generator.writeString((String) javaDefaultValue);
Review Comment:
fixed
--
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]
