Github user manishgupta88 commented on a diff in the pull request:
https://github.com/apache/carbondata/pull/2671#discussion_r214023293
--- Diff: store/sdk/src/main/java/org/apache/carbondata/sdk/file/AvroCarbonWriter.java ---
@@ -213,6 +181,126 @@ private Object avroFieldToObject(Schema.Field avroField, Object fieldValue) {
}
out = new ArrayObject(arrayChildObjects);
break;
+ case UNION:
+ // Union type will be internally stored as Struct<col:type>
+ // Fill data object only if fieldvalue is instance of datatype
+ // For other field datatypes, fill value as Null
+ List<Schema> unionFields = avroField.schema().getTypes();
+ int notNullUnionFieldsCount = 0;
+ for (Schema unionField : unionFields) {
+ if (!unionField.getType().equals(Schema.Type.NULL)) {
+ notNullUnionFieldsCount++;
+ }
+ }
+ Object[] values = new Object[notNullUnionFieldsCount];
+ int j = 0;
+ for (Schema unionField : unionFields) {
+ if (!unionField.getType().equals(Schema.Type.NULL)) {
+ if (checkFieldValueType(unionField.getType(), fieldValue)) {
+ values[j] = avroFieldToObjectForUnionType(unionField, fieldValue, avroField);
+ } else {
+ values[j] = null;
+ }
+ j++;
+ }
+ }
+ out = new StructObject(values);
+ break;
+ default:
+ out = avroPrimitiveFieldToObject(type, logicalType, fieldValue);
+ }
+ return out;
+ }
+
+ /**
+ * For Union type, fill data if Schema.Type is instance of fieldValue
+ * and return result
+ *
+ * @param type
+ * @param fieldValue
+ * @return
+ */
+ private boolean checkFieldValueType(Schema.Type type, Object fieldValue) {
+ switch (type) {
+ case INT:
+ return (fieldValue instanceof Integer);
+ case BOOLEAN:
+ return (fieldValue instanceof Boolean);
+ case LONG:
+ return (fieldValue instanceof Long);
+ case DOUBLE:
+ return (fieldValue instanceof Double);
+ case STRING:
+ return (fieldValue instanceof Utf8 || fieldValue instanceof String);
+ case FLOAT:
+ return (fieldValue instanceof Float);
+ case RECORD:
+ return (fieldValue instanceof GenericData.Record);
+ case ARRAY:
+ return (fieldValue instanceof GenericData.Array || fieldValue instanceof ArrayList);
+ case BYTES:
+ return (fieldValue instanceof ByteBuffer);
+ case MAP:
+ return (fieldValue instanceof HashMap);
+ case ENUM:
+ return (fieldValue instanceof GenericData.EnumSymbol);
+ default:
+ return false;
+ }
+ }
+
+ private Object avroPrimitiveFieldToObject(Schema.Type type, LogicalType logicalType,
+ Object fieldValue) {
+ Object out;
+ switch (type) {
+ case INT:
+ if (logicalType != null) {
+ if (logicalType instanceof LogicalTypes.Date) {
+ int dateIntValue = (int) fieldValue;
+ out = dateIntValue * DateDirectDictionaryGenerator.MILLIS_PER_DAY;
+ } else {
+ LOGGER.warn("Actual type: INT, Logical Type: " + logicalType.getName());
+ out = fieldValue;
+ }
+ } else {
+ out = fieldValue;
+ }
+ break;
+ case BOOLEAN:
+ case LONG:
+ if (logicalType != null && !(logicalType instanceof LogicalTypes.TimestampMillis)) {
+ if (logicalType instanceof LogicalTypes.TimestampMicros) {
+ long dateIntValue = (long) fieldValue;
+ out = dateIntValue / 1000L;
+ } else {
+ LOGGER.warn("Actual type: INT, Logical Type: " + logicalType.getName());
+ out = fieldValue;
+ }
+ } else {
+ out = fieldValue;
+ }
+ break;
+ case DOUBLE:
+ case STRING:
+ case ENUM:
+ out = fieldValue;
+ break;
+ case FLOAT:
+ // direct conversion will change precision. So parse from string.
+ // also carbon internally needs float as double
+ out = Double.parseDouble(fieldValue.toString());
+ break;
+ case BYTES:
+ // DECIMAL type is defined in Avro as a BYTE type with the logicalType property
+ // set to "decimal" and a specified precision and scale
+ if (logicalType instanceof LogicalTypes.Decimal) {
+ out = new BigDecimal(new String(((ByteBuffer) fieldValue).array(),
+ CarbonCommonConstants.DEFAULT_CHARSET_CLASS));
+ } else {
+ // As binary type is not supported yet, fill value as null
+ out = null;
--- End diff --
Remove this else block
---
Locked
