huaxingao commented on code in PR #15994: URL: https://github.com/apache/iceberg/pull/15994#discussion_r3216037429
########## api/src/main/java/org/apache/iceberg/udf/UdfPrimitiveType.java: ########## @@ -0,0 +1,78 @@ +/* + * 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.udf; + +import java.util.Objects; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; + +/** + * A UDF primitive or semi-structured type, encoded as a type string (e.g., {@code int}, {@code + * string}, {@code decimal(9,2)}, {@code variant}). + */ +public final class UdfPrimitiveType implements UdfType { + + private final String typeString; + + public static UdfPrimitiveType of(String typeString) { + Preconditions.checkArgument(typeString != null, "Invalid primitive type: null"); + return new UdfPrimitiveType(typeString); Review Comment: Done. PrimitiveType.of now validates via Types.fromTypeName. ########## core/src/main/java/org/apache/iceberg/udf/UdfTypeUtil.java: ########## @@ -0,0 +1,130 @@ +/* + * 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.udf; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonNode; +import java.io.IOException; +import java.util.List; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.util.JsonUtil; + +/** + * Utility for reading and writing UDF types. A type is either a primitive type string (e.g., "int", + * "string", "variant") or a JSON object for nested types (struct, list, map). + */ +class UdfTypeUtil { + + private static final String TYPE = "type"; + private static final String LIST = "list"; + private static final String MAP = "map"; + private static final String STRUCT = "struct"; + private static final String ELEMENT = "element"; + private static final String KEY = "key"; + private static final String VALUE = "value"; + private static final String FIELDS = "fields"; + private static final String NAME = "name"; + + private UdfTypeUtil() {} + + /** Reads a UDF type from a JSON node. */ + static UdfType readType(JsonNode node) { + Preconditions.checkArgument(node != null, "Cannot read type from null node"); + + if (node.isTextual()) { + return UdfPrimitiveType.of(node.asText()); + } else if (node.isObject()) { + String typeName = JsonUtil.getString(TYPE, node); + return switch (typeName) { + case LIST -> UdfListType.of(readType(node.get(ELEMENT))); Review Comment: Switched to `JsonUtil.get(...)` -- 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]
