yihua commented on code in PR #11265: URL: https://github.com/apache/hudi/pull/11265#discussion_r1608735139
########## hudi-common/src/main/java/org/apache/hudi/avro/AvroLogicalTypeEnum.java: ########## @@ -0,0 +1,42 @@ +/* + * 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.hudi.avro; + +public enum AvroLogicalTypeEnum { Review Comment: nit: Javadocs. Does this work with all Avro spec versions? ########## hudi-common/src/main/java/org/apache/hudi/avro/AvroLogicalTypeEnum.java: ########## @@ -0,0 +1,42 @@ +/* + * 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.hudi.avro; + +public enum AvroLogicalTypeEnum { Review Comment: Also, Avro library defines the `LogicalTypes`. Can we use that instead of creating own enums? https://github.com/apache/avro/blob/main/lang/java/avro/src/main/java/org/apache/avro/LogicalTypes.java ########## hudi-common/src/main/java/org/apache/hudi/avro/MercifulJsonConverter.java: ########## @@ -187,196 +178,774 @@ private static Object convertJsonToAvroField(Object value, String name, Schema s throw new HoodieJsonToAvroConversionException(null, name, schema, shouldSanitize, invalidCharMask); } - JsonToAvroFieldProcessor processor = FIELD_TYPE_PROCESSORS.get(schema.getType()); - if (null != processor) { + return JsonToAvroFieldProcessorUtil.convertToAvro(value, name, schema, shouldSanitize, invalidCharMask); + } + + private static class JsonToAvroFieldProcessorUtil { Review Comment: Are you porting the logic from another library? If so, could you reference the source? ########## hudi-common/src/test/java/org/apache/hudi/avro/TestMercifulJsonConverter.java: ########## @@ -55,6 +70,649 @@ public void basicConversion() throws IOException { Assertions.assertEquals(rec, CONVERTER.convert(json, simpleSchema)); } + private static final String DECIMAL_AVRO_FILE_INVALID_PATH = "/decimal-logical-type-invalid.avsc"; + private static final String DECIMAL_AVRO_FILE_PATH = "/decimal-logical-type.avsc"; + private static final String DECIMAL_FIXED_AVRO_FILE_PATH = "/decimal-logical-type-fixed-type.avsc"; + /** + * Covered case: + * Avro Logical Type: Decimal + * Exhaustive unsupported input coverage. + */ + @ParameterizedTest + @MethodSource("decimalBadCases") + void decimalLogicalTypeInvalidCaseTest(String avroFile, String strInput, Double numInput, Review Comment: Similar for the tests on code porting. And do these cover all cases of logical types? -- 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]
